diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef
index ef5438d..9249116 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.magic.lef
@@ -91,23 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.095000  0.085000 1.265000 0.660000 ;
-        RECT 1.095000  0.660000 1.425000 0.990000 ;
-        RECT 2.415000  0.660000 2.675000 0.990000 ;
-        RECT 2.505000  0.085000 2.675000 0.660000 ;
-        RECT 3.435000  0.085000 3.685000 1.150000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -116,39 +99,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.890000 2.310000 1.100000 3.245000 ;
-        RECT 3.410000 1.820000 3.660000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.360000 1.940000 0.690000 1.970000 ;
-      RECT 0.360000 1.970000 1.630000 2.140000 ;
-      RECT 0.360000 2.140000 0.690000 2.980000 ;
-      RECT 0.385000 0.840000 0.715000 1.160000 ;
-      RECT 0.385000 1.160000 3.115000 1.320000 ;
-      RECT 0.385000 1.320000 3.690000 1.330000 ;
-      RECT 0.385000 1.330000 0.715000 1.340000 ;
-      RECT 1.300000 2.140000 1.630000 2.980000 ;
-      RECT 1.715000 0.840000 2.045000 1.160000 ;
-      RECT 2.530000 1.970000 3.115000 2.140000 ;
-      RECT 2.530000 2.140000 2.860000 2.980000 ;
-      RECT 2.845000 0.660000 3.115000 1.160000 ;
-      RECT 2.945000 1.330000 3.690000 1.650000 ;
-      RECT 2.945000 1.650000 3.115000 1.970000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.360000  1.940000 0.690000 1.970000 ;
+      RECT 0.360000  1.970000 1.630000 2.140000 ;
+      RECT 0.360000  2.140000 0.690000 2.980000 ;
+      RECT 0.385000  0.840000 0.715000 1.160000 ;
+      RECT 0.385000  1.160000 3.115000 1.320000 ;
+      RECT 0.385000  1.320000 3.690000 1.330000 ;
+      RECT 0.385000  1.330000 0.715000 1.340000 ;
+      RECT 0.890000  2.310000 1.100000 3.245000 ;
+      RECT 1.095000  0.085000 1.265000 0.660000 ;
+      RECT 1.095000  0.660000 1.425000 0.990000 ;
+      RECT 1.300000  2.140000 1.630000 2.980000 ;
+      RECT 1.715000  0.840000 2.045000 1.160000 ;
+      RECT 2.415000  0.660000 2.675000 0.990000 ;
+      RECT 2.505000  0.085000 2.675000 0.660000 ;
+      RECT 2.530000  1.970000 3.115000 2.140000 ;
+      RECT 2.530000  2.140000 2.860000 2.980000 ;
+      RECT 2.845000  0.660000 3.115000 1.160000 ;
+      RECT 2.945000  1.330000 3.690000 1.650000 ;
+      RECT 2.945000  1.650000 3.115000 1.970000 ;
+      RECT 3.410000  1.820000 3.660000 3.245000 ;
+      RECT 3.435000  0.085000 3.685000 1.150000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2111o_1
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef
index a65962a..a8cc4aa 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.magic.lef
@@ -89,23 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.180000  0.085000 0.510000 1.130000 ;
-        RECT 1.040000  0.085000 1.370000 0.840000 ;
-        RECT 2.210000  0.085000 2.580000 0.840000 ;
-        RECT 3.180000  0.085000 3.730000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -114,39 +97,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.155000 1.820000 0.405000 3.245000 ;
-        RECT 1.055000 2.290000 1.385000 3.245000 ;
-        RECT 3.675000 2.290000 4.045000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.030000 1.220000 1.360000 1.550000 ;
-      RECT 1.190000 1.010000 4.520000 1.180000 ;
-      RECT 1.190000 1.180000 1.360000 1.220000 ;
-      RECT 1.190000 1.550000 1.360000 1.950000 ;
-      RECT 1.190000 1.950000 2.085000 2.120000 ;
-      RECT 1.755000 2.120000 2.085000 2.980000 ;
-      RECT 1.780000 0.350000 2.030000 1.010000 ;
-      RECT 2.760000 0.350000 3.010000 1.010000 ;
-      RECT 3.135000 1.950000 4.545000 2.120000 ;
-      RECT 3.135000 2.120000 3.505000 2.980000 ;
-      RECT 4.190000 0.350000 4.520000 1.010000 ;
-      RECT 4.215000 2.120000 4.545000 2.980000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.155000  1.820000 0.405000 3.245000 ;
+      RECT 0.180000  0.085000 0.510000 1.130000 ;
+      RECT 1.030000  1.220000 1.360000 1.550000 ;
+      RECT 1.040000  0.085000 1.370000 0.840000 ;
+      RECT 1.055000  2.290000 1.385000 3.245000 ;
+      RECT 1.190000  1.010000 4.520000 1.180000 ;
+      RECT 1.190000  1.180000 1.360000 1.220000 ;
+      RECT 1.190000  1.550000 1.360000 1.950000 ;
+      RECT 1.190000  1.950000 2.085000 2.120000 ;
+      RECT 1.755000  2.120000 2.085000 2.980000 ;
+      RECT 1.780000  0.350000 2.030000 1.010000 ;
+      RECT 2.210000  0.085000 2.580000 0.840000 ;
+      RECT 2.760000  0.350000 3.010000 1.010000 ;
+      RECT 3.135000  1.950000 4.545000 2.120000 ;
+      RECT 3.135000  2.120000 3.505000 2.980000 ;
+      RECT 3.180000  0.085000 3.730000 0.840000 ;
+      RECT 3.675000  2.290000 4.045000 3.245000 ;
+      RECT 4.190000  0.350000 4.520000 1.010000 ;
+      RECT 4.215000  2.120000 4.545000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2111o_2
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef
index 85348f9..30a6384 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.magic.lef
@@ -94,33 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.790000 ;
-        RECT 1.845000  0.085000 2.015000 0.790000 ;
-        RECT 2.625000  0.085000 2.875000 1.030000 ;
-        RECT 3.530000  0.085000 3.870000 0.750000 ;
-        RECT 4.400000  0.085000 4.740000 0.940000 ;
-        RECT 5.270000  0.085000 5.600000 0.940000 ;
-        RECT 7.300000  0.085000 7.630000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -129,66 +102,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.385000 2.140000 0.635000 3.245000 ;
-        RECT 1.365000 2.140000 1.535000 3.245000 ;
-        RECT 2.265000 1.820000 2.515000 3.245000 ;
-        RECT 6.375000 2.290000 6.705000 3.245000 ;
-        RECT 7.275000 2.290000 7.525000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.870000 1.300000 3.215000 1.630000 ;
-      RECT 2.705000 2.290000 3.035000 2.905000 ;
-      RECT 2.705000 2.905000 4.835000 3.075000 ;
-      RECT 3.045000 0.350000 3.350000 0.920000 ;
-      RECT 3.045000 0.920000 4.220000 1.090000 ;
-      RECT 3.045000 1.090000 3.215000 1.300000 ;
-      RECT 3.045000 1.630000 3.215000 1.950000 ;
-      RECT 3.045000 1.950000 3.405000 2.120000 ;
-      RECT 3.235000 2.120000 3.405000 2.735000 ;
-      RECT 3.605000 1.950000 3.935000 2.905000 ;
-      RECT 4.050000 0.350000 4.220000 0.920000 ;
-      RECT 4.050000 1.090000 4.220000 1.110000 ;
-      RECT 4.050000 1.110000 6.770000 1.280000 ;
-      RECT 4.135000 1.950000 5.805000 2.120000 ;
-      RECT 4.135000 2.120000 4.305000 2.735000 ;
-      RECT 4.505000 2.290000 4.835000 2.905000 ;
-      RECT 4.920000 0.350000 5.090000 1.110000 ;
-      RECT 5.025000 2.290000 5.305000 2.905000 ;
-      RECT 5.025000 2.905000 6.175000 3.075000 ;
-      RECT 5.475000 2.120000 5.805000 2.735000 ;
-      RECT 6.005000 1.950000 8.055000 2.120000 ;
-      RECT 6.005000 2.120000 6.175000 2.905000 ;
-      RECT 6.010000 0.285000 7.120000 0.455000 ;
-      RECT 6.010000 0.455000 6.340000 0.940000 ;
-      RECT 6.510000 0.625000 6.770000 1.110000 ;
-      RECT 6.905000 2.120000 7.075000 2.980000 ;
-      RECT 6.950000 0.455000 7.120000 0.920000 ;
-      RECT 6.950000 0.920000 8.060000 1.090000 ;
-      RECT 7.725000 2.120000 8.055000 2.980000 ;
-      RECT 7.810000 0.350000 8.060000 0.920000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.385000  2.140000 0.635000 3.245000 ;
+      RECT 0.870000  1.300000 3.215000 1.630000 ;
+      RECT 0.905000  0.085000 1.235000 0.790000 ;
+      RECT 1.365000  2.140000 1.535000 3.245000 ;
+      RECT 1.845000  0.085000 2.015000 0.790000 ;
+      RECT 2.265000  1.820000 2.515000 3.245000 ;
+      RECT 2.625000  0.085000 2.875000 1.030000 ;
+      RECT 2.705000  2.290000 3.035000 2.905000 ;
+      RECT 2.705000  2.905000 4.835000 3.075000 ;
+      RECT 3.045000  0.350000 3.350000 0.920000 ;
+      RECT 3.045000  0.920000 4.220000 1.090000 ;
+      RECT 3.045000  1.090000 3.215000 1.300000 ;
+      RECT 3.045000  1.630000 3.215000 1.950000 ;
+      RECT 3.045000  1.950000 3.405000 2.120000 ;
+      RECT 3.235000  2.120000 3.405000 2.735000 ;
+      RECT 3.530000  0.085000 3.870000 0.750000 ;
+      RECT 3.605000  1.950000 3.935000 2.905000 ;
+      RECT 4.050000  0.350000 4.220000 0.920000 ;
+      RECT 4.050000  1.090000 4.220000 1.110000 ;
+      RECT 4.050000  1.110000 6.770000 1.280000 ;
+      RECT 4.135000  1.950000 5.805000 2.120000 ;
+      RECT 4.135000  2.120000 4.305000 2.735000 ;
+      RECT 4.400000  0.085000 4.740000 0.940000 ;
+      RECT 4.505000  2.290000 4.835000 2.905000 ;
+      RECT 4.920000  0.350000 5.090000 1.110000 ;
+      RECT 5.025000  2.290000 5.305000 2.905000 ;
+      RECT 5.025000  2.905000 6.175000 3.075000 ;
+      RECT 5.270000  0.085000 5.600000 0.940000 ;
+      RECT 5.475000  2.120000 5.805000 2.735000 ;
+      RECT 6.005000  1.950000 8.055000 2.120000 ;
+      RECT 6.005000  2.120000 6.175000 2.905000 ;
+      RECT 6.010000  0.285000 7.120000 0.455000 ;
+      RECT 6.010000  0.455000 6.340000 0.940000 ;
+      RECT 6.375000  2.290000 6.705000 3.245000 ;
+      RECT 6.510000  0.625000 6.770000 1.110000 ;
+      RECT 6.905000  2.120000 7.075000 2.980000 ;
+      RECT 6.950000  0.455000 7.120000 0.920000 ;
+      RECT 6.950000  0.920000 8.060000 1.090000 ;
+      RECT 7.275000  2.290000 7.525000 3.245000 ;
+      RECT 7.300000  0.085000 7.630000 0.750000 ;
+      RECT 7.725000  2.120000 8.055000 2.980000 ;
+      RECT 7.810000  0.350000 8.060000 0.920000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2111o_4
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef
index 267bfca..28f25c4 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.magic.lef
@@ -92,19 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.340000  0.085000 0.670000 0.840000 ;
-        RECT 1.270000  0.085000 1.680000 0.840000 ;
-        RECT 2.750000  0.085000 3.080000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -113,26 +100,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 2.235000 2.290000 2.605000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.695000 1.950000 3.105000 2.120000 ;
-      RECT 1.695000 2.120000 2.065000 2.980000 ;
-      RECT 2.775000 1.820000 3.105000 1.950000 ;
-      RECT 2.775000 2.120000 3.105000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.340000  0.085000 0.670000 0.840000 ;
+      RECT 1.270000  0.085000 1.680000 0.840000 ;
+      RECT 1.695000  1.950000 3.105000 2.120000 ;
+      RECT 1.695000  2.120000 2.065000 2.980000 ;
+      RECT 2.235000  2.290000 2.605000 3.245000 ;
+      RECT 2.750000  0.085000 3.080000 1.010000 ;
+      RECT 2.775000  1.820000 3.105000 1.950000 ;
+      RECT 2.775000  2.120000 3.105000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2111oi_1
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef
index bbababb..e86f1be 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.magic.lef
@@ -96,24 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.660000  0.085000 0.990000 0.840000 ;
-        RECT 1.660000  0.085000 2.000000 0.840000 ;
-        RECT 4.860000  0.085000 5.200000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -122,47 +104,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 4.055000 2.290000 4.225000 3.245000 ;
-        RECT 4.875000 2.290000 5.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.305000 2.290000 0.555000 2.905000 ;
-      RECT 0.305000 2.905000 2.435000 3.075000 ;
-      RECT 1.285000 1.950000 1.455000 2.905000 ;
-      RECT 1.655000 1.950000 3.325000 2.120000 ;
-      RECT 1.655000 2.120000 1.985000 2.735000 ;
-      RECT 2.185000 2.290000 2.435000 2.905000 ;
-      RECT 2.625000 2.290000 2.905000 2.905000 ;
-      RECT 2.625000 2.905000 3.855000 3.075000 ;
-      RECT 3.075000 1.820000 3.325000 1.950000 ;
-      RECT 3.075000 2.120000 3.325000 2.735000 ;
-      RECT 3.525000 1.950000 5.655000 2.120000 ;
-      RECT 3.525000 2.120000 3.855000 2.905000 ;
-      RECT 3.570000 0.350000 4.680000 0.600000 ;
-      RECT 4.425000 2.120000 4.675000 2.980000 ;
-      RECT 4.510000 0.600000 4.680000 1.010000 ;
-      RECT 4.510000 1.010000 5.630000 1.180000 ;
-      RECT 5.380000 0.350000 5.630000 1.010000 ;
-      RECT 5.405000 1.820000 5.655000 1.950000 ;
-      RECT 5.405000 2.120000 5.655000 2.980000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.305000  2.290000 0.555000 2.905000 ;
+      RECT 0.305000  2.905000 2.435000 3.075000 ;
+      RECT 0.660000  0.085000 0.990000 0.840000 ;
+      RECT 1.285000  1.950000 1.455000 2.905000 ;
+      RECT 1.655000  1.950000 3.325000 2.120000 ;
+      RECT 1.655000  2.120000 1.985000 2.735000 ;
+      RECT 1.660000  0.085000 2.000000 0.840000 ;
+      RECT 2.185000  2.290000 2.435000 2.905000 ;
+      RECT 2.625000  2.290000 2.905000 2.905000 ;
+      RECT 2.625000  2.905000 3.855000 3.075000 ;
+      RECT 3.075000  1.820000 3.325000 1.950000 ;
+      RECT 3.075000  2.120000 3.325000 2.735000 ;
+      RECT 3.525000  1.950000 5.655000 2.120000 ;
+      RECT 3.525000  2.120000 3.855000 2.905000 ;
+      RECT 3.570000  0.350000 4.680000 0.600000 ;
+      RECT 4.055000  2.290000 4.225000 3.245000 ;
+      RECT 4.425000  2.120000 4.675000 2.980000 ;
+      RECT 4.510000  0.600000 4.680000 1.010000 ;
+      RECT 4.510000  1.010000 5.630000 1.180000 ;
+      RECT 4.860000  0.085000 5.200000 0.840000 ;
+      RECT 4.875000  2.290000 5.205000 3.245000 ;
+      RECT 5.380000  0.350000 5.630000 1.010000 ;
+      RECT 5.405000  1.820000 5.655000 1.950000 ;
+      RECT 5.405000  2.120000 5.655000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2111oi_2
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef
index 9f76764..b911fd9 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.magic.lef
@@ -101,36 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 1.020000  0.085000  1.350000 0.670000 ;
-        RECT 1.880000  0.085000  2.210000 0.670000 ;
-        RECT 2.810000  0.085000  3.900000 0.840000 ;
-        RECT 4.500000  0.085000  4.830000 0.805000 ;
-        RECT 8.270000  0.085000  8.600000 0.840000 ;
-        RECT 9.130000  0.085000  9.460000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -139,68 +109,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 6.495000 2.290000  6.825000 3.245000 ;
-        RECT 7.395000 2.290000  7.725000 3.245000 ;
-        RECT 8.295000 2.290000  8.545000 3.245000 ;
-        RECT 9.275000 2.290000  9.525000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 2.060000 0.355000 2.905000 ;
-      RECT 0.105000 2.905000 2.235000 3.075000 ;
-      RECT 1.085000 2.060000 1.255000 2.905000 ;
-      RECT 1.905000 1.950000 4.035000 2.120000 ;
-      RECT 1.905000 2.120000 2.235000 2.905000 ;
-      RECT 2.435000 2.290000 2.685000 2.905000 ;
-      RECT 2.435000 2.905000 5.925000 3.075000 ;
-      RECT 2.855000 2.120000 3.085000 2.735000 ;
-      RECT 3.255000 2.290000 3.585000 2.905000 ;
-      RECT 3.705000 1.820000 4.035000 1.950000 ;
-      RECT 3.755000 2.120000 4.035000 2.735000 ;
-      RECT 4.245000 1.950000 9.975000 2.120000 ;
-      RECT 4.245000 2.120000 4.525000 2.735000 ;
-      RECT 4.695000 2.290000 5.025000 2.905000 ;
-      RECT 5.195000 2.120000 5.425000 2.735000 ;
-      RECT 5.595000 2.290000 5.925000 2.905000 ;
-      RECT 6.120000 0.350000 8.090000 0.600000 ;
-      RECT 6.120000 0.600000 6.380000 0.680000 ;
-      RECT 6.125000 2.120000 6.295000 2.980000 ;
-      RECT 7.025000 2.120000 7.195000 2.980000 ;
-      RECT 7.040000 0.600000 7.250000 0.680000 ;
-      RECT 7.920000 0.600000 8.090000 1.010000 ;
-      RECT 7.920000 1.010000 9.890000 1.180000 ;
-      RECT 7.925000 2.120000 8.095000 2.980000 ;
-      RECT 8.745000 2.120000 9.075000 2.980000 ;
-      RECT 8.780000 0.350000 8.950000 1.010000 ;
-      RECT 9.640000 0.350000 9.890000 1.010000 ;
-      RECT 9.725000 1.820000 9.975000 1.950000 ;
-      RECT 9.725000 2.120000 9.975000 2.980000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.105000  2.060000  0.355000 2.905000 ;
+      RECT 0.105000  2.905000  2.235000 3.075000 ;
+      RECT 1.020000  0.085000  1.350000 0.670000 ;
+      RECT 1.085000  2.060000  1.255000 2.905000 ;
+      RECT 1.880000  0.085000  2.210000 0.670000 ;
+      RECT 1.905000  1.950000  4.035000 2.120000 ;
+      RECT 1.905000  2.120000  2.235000 2.905000 ;
+      RECT 2.435000  2.290000  2.685000 2.905000 ;
+      RECT 2.435000  2.905000  5.925000 3.075000 ;
+      RECT 2.810000  0.085000  3.900000 0.840000 ;
+      RECT 2.855000  2.120000  3.085000 2.735000 ;
+      RECT 3.255000  2.290000  3.585000 2.905000 ;
+      RECT 3.705000  1.820000  4.035000 1.950000 ;
+      RECT 3.755000  2.120000  4.035000 2.735000 ;
+      RECT 4.245000  1.950000  9.975000 2.120000 ;
+      RECT 4.245000  2.120000  4.525000 2.735000 ;
+      RECT 4.500000  0.085000  4.830000 0.805000 ;
+      RECT 4.695000  2.290000  5.025000 2.905000 ;
+      RECT 5.195000  2.120000  5.425000 2.735000 ;
+      RECT 5.595000  2.290000  5.925000 2.905000 ;
+      RECT 6.120000  0.350000  8.090000 0.600000 ;
+      RECT 6.120000  0.600000  6.380000 0.680000 ;
+      RECT 6.125000  2.120000  6.295000 2.980000 ;
+      RECT 6.495000  2.290000  6.825000 3.245000 ;
+      RECT 7.025000  2.120000  7.195000 2.980000 ;
+      RECT 7.040000  0.600000  7.250000 0.680000 ;
+      RECT 7.395000  2.290000  7.725000 3.245000 ;
+      RECT 7.920000  0.600000  8.090000 1.010000 ;
+      RECT 7.920000  1.010000  9.890000 1.180000 ;
+      RECT 7.925000  2.120000  8.095000 2.980000 ;
+      RECT 8.270000  0.085000  8.600000 0.840000 ;
+      RECT 8.295000  2.290000  8.545000 3.245000 ;
+      RECT 8.745000  2.120000  9.075000 2.980000 ;
+      RECT 8.780000  0.350000  8.950000 1.010000 ;
+      RECT 9.130000  0.085000  9.460000 0.840000 ;
+      RECT 9.275000  2.290000  9.525000 3.245000 ;
+      RECT 9.640000  0.350000  9.890000 1.010000 ;
+      RECT 9.725000  1.820000  9.975000 1.950000 ;
+      RECT 9.725000  2.120000  9.975000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2111oi_4
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef
index a4738dc..2e7338a 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_1.magic.lef
@@ -83,20 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.255000  0.085000 1.705000 0.940000 ;
-        RECT 2.780000  0.740000 3.215000 0.910000 ;
-        RECT 3.045000  0.085000 3.215000 0.740000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -105,33 +91,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.635000 1.820000 0.885000 3.245000 ;
-        RECT 1.885000 2.290000 2.085000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.400000 1.415000 1.650000 ;
-      RECT 1.245000 1.110000 3.540000 1.280000 ;
-      RECT 1.245000 1.280000 1.415000 1.400000 ;
-      RECT 1.355000 1.950000 2.615000 2.120000 ;
-      RECT 1.355000 2.120000 1.685000 2.980000 ;
-      RECT 2.280000 0.840000 2.610000 1.080000 ;
-      RECT 2.280000 1.080000 3.540000 1.110000 ;
-      RECT 2.285000 2.120000 2.615000 2.980000 ;
-      RECT 3.125000 1.280000 3.540000 2.980000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.425000  1.400000 1.415000 1.650000 ;
+      RECT 0.635000  1.820000 0.885000 3.245000 ;
+      RECT 1.245000  1.110000 3.540000 1.280000 ;
+      RECT 1.245000  1.280000 1.415000 1.400000 ;
+      RECT 1.255000  0.085000 1.705000 0.940000 ;
+      RECT 1.355000  1.950000 2.615000 2.120000 ;
+      RECT 1.355000  2.120000 1.685000 2.980000 ;
+      RECT 1.885000  2.290000 2.085000 3.245000 ;
+      RECT 2.280000  0.840000 2.610000 1.080000 ;
+      RECT 2.280000  1.080000 3.540000 1.110000 ;
+      RECT 2.285000  2.120000 2.615000 2.980000 ;
+      RECT 2.780000  0.740000 3.215000 0.910000 ;
+      RECT 3.045000  0.085000 3.215000 0.740000 ;
+      RECT 3.125000  1.280000 3.540000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef
index b6b0f3e..7780248 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_2.magic.lef
@@ -81,22 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.300000  0.085000 0.630000 0.840000 ;
-        RECT 1.160000  0.085000 1.330000 0.350000 ;
-        RECT 1.160000  0.350000 1.870000 0.750000 ;
-        RECT 2.870000  0.085000 3.040000 0.350000 ;
-        RECT 2.870000  0.350000 3.310000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -105,37 +89,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.125000 1.820000 0.375000 3.245000 ;
-        RECT 1.025000 2.290000 1.355000 3.245000 ;
-        RECT 2.075000 2.630000 2.365000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.005000 1.350000 1.335000 1.680000 ;
-      RECT 1.165000 0.920000 3.740000 1.090000 ;
-      RECT 1.165000 1.090000 1.335000 1.350000 ;
-      RECT 1.165000 1.680000 1.335000 1.950000 ;
-      RECT 1.165000 1.950000 3.735000 2.120000 ;
-      RECT 1.545000 2.290000 2.865000 2.460000 ;
-      RECT 1.545000 2.460000 1.875000 2.980000 ;
-      RECT 2.330000 0.350000 2.700000 0.920000 ;
-      RECT 2.535000 2.460000 2.865000 2.980000 ;
-      RECT 3.405000 2.120000 3.735000 2.980000 ;
-      RECT 3.490000 0.350000 3.740000 0.920000 ;
-      RECT 3.490000 1.090000 3.740000 1.130000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.125000  1.820000 0.375000 3.245000 ;
+      RECT 0.300000  0.085000 0.630000 0.840000 ;
+      RECT 1.005000  1.350000 1.335000 1.680000 ;
+      RECT 1.025000  2.290000 1.355000 3.245000 ;
+      RECT 1.160000  0.085000 1.330000 0.350000 ;
+      RECT 1.160000  0.350000 1.870000 0.750000 ;
+      RECT 1.165000  0.920000 3.740000 1.090000 ;
+      RECT 1.165000  1.090000 1.335000 1.350000 ;
+      RECT 1.165000  1.680000 1.335000 1.950000 ;
+      RECT 1.165000  1.950000 3.735000 2.120000 ;
+      RECT 1.545000  2.290000 2.865000 2.460000 ;
+      RECT 1.545000  2.460000 1.875000 2.980000 ;
+      RECT 2.075000  2.630000 2.365000 3.245000 ;
+      RECT 2.330000  0.350000 2.700000 0.920000 ;
+      RECT 2.535000  2.460000 2.865000 2.980000 ;
+      RECT 2.870000  0.085000 3.040000 0.350000 ;
+      RECT 2.870000  0.350000 3.310000 0.750000 ;
+      RECT 3.405000  2.120000 3.735000 2.980000 ;
+      RECT 3.490000  0.350000 3.740000 0.920000 ;
+      RECT 3.490000  1.090000 3.740000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef
index f60cd07..9dbbefd 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_4.magic.lef
@@ -91,30 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.820000  0.085000 1.150000 1.050000 ;
-        RECT 1.680000  0.085000 2.010000 0.620000 ;
-        RECT 2.540000  0.085000 2.870000 0.960000 ;
-        RECT 3.460000  0.085000 3.790000 0.700000 ;
-        RECT 4.425000  0.085000 4.755000 0.940000 ;
-        RECT 6.585000  0.085000 6.915000 1.275000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -123,59 +99,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.225000 1.820000 0.475000 3.245000 ;
-        RECT 1.125000 2.060000 1.375000 3.245000 ;
-        RECT 2.105000 1.820000 2.275000 3.245000 ;
-        RECT 4.880000 2.400000 5.555000 3.245000 ;
-        RECT 6.130000 2.290000 6.460000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.965000 1.130000 3.280000 1.300000 ;
-      RECT 1.965000 1.300000 2.615000 1.550000 ;
-      RECT 2.445000 1.550000 2.615000 2.060000 ;
-      RECT 2.445000 2.060000 3.825000 2.230000 ;
-      RECT 2.545000 2.400000 4.710000 2.570000 ;
-      RECT 2.545000 2.570000 2.875000 2.780000 ;
-      RECT 3.040000 0.450000 3.280000 0.870000 ;
-      RECT 3.040000 0.870000 4.245000 1.040000 ;
-      RECT 3.040000 1.040000 3.280000 1.130000 ;
-      RECT 3.045000 2.740000 4.300000 2.990000 ;
-      RECT 3.960000 0.595000 4.245000 0.870000 ;
-      RECT 3.960000 1.040000 4.245000 1.110000 ;
-      RECT 3.960000 1.110000 6.055000 1.280000 ;
-      RECT 4.420000 2.060000 6.910000 2.120000 ;
-      RECT 4.420000 2.120000 5.960000 2.230000 ;
-      RECT 4.420000 2.230000 4.710000 2.400000 ;
-      RECT 4.500000 2.570000 4.710000 2.990000 ;
-      RECT 5.295000 0.675000 6.405000 0.845000 ;
-      RECT 5.680000 1.950000 6.910000 2.060000 ;
-      RECT 5.725000 1.015000 6.055000 1.110000 ;
-      RECT 5.725000 2.230000 5.960000 2.980000 ;
-      RECT 6.235000 0.595000 6.405000 0.675000 ;
-      RECT 6.235000 0.845000 6.405000 1.275000 ;
-      RECT 6.580000 1.940000 6.910000 1.950000 ;
-      RECT 6.630000 2.120000 6.910000 2.980000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.225000  1.820000 0.475000 3.245000 ;
+      RECT 0.820000  0.085000 1.150000 1.050000 ;
+      RECT 1.125000  2.060000 1.375000 3.245000 ;
+      RECT 1.680000  0.085000 2.010000 0.620000 ;
+      RECT 1.965000  1.130000 3.280000 1.300000 ;
+      RECT 1.965000  1.300000 2.615000 1.550000 ;
+      RECT 2.105000  1.820000 2.275000 3.245000 ;
+      RECT 2.445000  1.550000 2.615000 2.060000 ;
+      RECT 2.445000  2.060000 3.825000 2.230000 ;
+      RECT 2.540000  0.085000 2.870000 0.960000 ;
+      RECT 2.545000  2.400000 4.710000 2.570000 ;
+      RECT 2.545000  2.570000 2.875000 2.780000 ;
+      RECT 3.040000  0.450000 3.280000 0.870000 ;
+      RECT 3.040000  0.870000 4.245000 1.040000 ;
+      RECT 3.040000  1.040000 3.280000 1.130000 ;
+      RECT 3.045000  2.740000 4.300000 2.990000 ;
+      RECT 3.460000  0.085000 3.790000 0.700000 ;
+      RECT 3.960000  0.595000 4.245000 0.870000 ;
+      RECT 3.960000  1.040000 4.245000 1.110000 ;
+      RECT 3.960000  1.110000 6.055000 1.280000 ;
+      RECT 4.420000  2.060000 6.910000 2.120000 ;
+      RECT 4.420000  2.120000 5.960000 2.230000 ;
+      RECT 4.420000  2.230000 4.710000 2.400000 ;
+      RECT 4.425000  0.085000 4.755000 0.940000 ;
+      RECT 4.500000  2.570000 4.710000 2.990000 ;
+      RECT 4.880000  2.400000 5.555000 3.245000 ;
+      RECT 5.295000  0.675000 6.405000 0.845000 ;
+      RECT 5.680000  1.950000 6.910000 2.060000 ;
+      RECT 5.725000  1.015000 6.055000 1.110000 ;
+      RECT 5.725000  2.230000 5.960000 2.980000 ;
+      RECT 6.130000  2.290000 6.460000 3.245000 ;
+      RECT 6.235000  0.595000 6.405000 0.675000 ;
+      RECT 6.235000  0.845000 6.405000 1.275000 ;
+      RECT 6.580000  1.940000 6.910000 1.950000 ;
+      RECT 6.585000  0.085000 6.915000 1.275000 ;
+      RECT 6.630000  2.120000 6.910000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__a211o_4
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef
index e3eccfd..0b04197 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.magic.lef
@@ -85,17 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.340000  0.085000 0.670000 1.130000 ;
-        RECT 1.670000  0.085000 2.040000 0.640000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -104,24 +93,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.815000 2.290000 1.135000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.315000 1.950000 1.635000 2.120000 ;
-      RECT 0.315000 2.120000 0.645000 2.980000 ;
-      RECT 1.305000 2.120000 1.635000 2.980000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.315000  1.950000 1.635000 2.120000 ;
+      RECT 0.315000  2.120000 0.645000 2.980000 ;
+      RECT 0.340000  0.085000 0.670000 1.130000 ;
+      RECT 0.815000  2.290000 1.135000 3.245000 ;
+      RECT 1.305000  2.120000 1.635000 2.980000 ;
+      RECT 1.670000  0.085000 2.040000 0.640000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef
index 78fd6ba..bef1a6c 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.magic.lef
@@ -86,23 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 1.440000  0.085000 1.610000 0.330000 ;
-        RECT 1.440000  0.330000 1.810000 0.580000 ;
-        RECT 2.460000  0.085000 2.790000 0.670000 ;
-        RECT 3.760000  0.085000 4.090000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -111,43 +94,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.105000 1.820000 0.355000 3.245000 ;
-        RECT 1.005000 2.290000 1.335000 3.245000 ;
-        RECT 1.905000 2.400000 2.235000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 0.255000 1.260000 0.425000 ;
-      RECT 0.150000 0.425000 0.480000 1.010000 ;
-      RECT 0.555000 1.820000 0.805000 1.950000 ;
-      RECT 0.555000 1.950000 2.355000 2.060000 ;
-      RECT 0.555000 2.060000 3.245000 2.120000 ;
-      RECT 0.555000 2.120000 0.805000 2.980000 ;
-      RECT 1.010000 0.425000 1.260000 0.750000 ;
-      RECT 1.010000 0.750000 2.240000 0.920000 ;
-      RECT 1.535000 2.120000 3.245000 2.230000 ;
-      RECT 1.535000 2.230000 1.705000 2.980000 ;
-      RECT 1.990000 0.330000 2.240000 0.750000 ;
-      RECT 2.465000 2.400000 2.795000 2.905000 ;
-      RECT 2.465000 2.905000 4.595000 3.075000 ;
-      RECT 2.965000 2.230000 3.245000 2.735000 ;
-      RECT 3.445000 2.060000 3.615000 2.905000 ;
-      RECT 4.345000 1.820000 4.595000 2.905000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.105000  1.820000 0.355000 3.245000 ;
+      RECT 0.150000  0.255000 1.260000 0.425000 ;
+      RECT 0.150000  0.425000 0.480000 1.010000 ;
+      RECT 0.555000  1.820000 0.805000 1.950000 ;
+      RECT 0.555000  1.950000 2.355000 2.060000 ;
+      RECT 0.555000  2.060000 3.245000 2.120000 ;
+      RECT 0.555000  2.120000 0.805000 2.980000 ;
+      RECT 1.005000  2.290000 1.335000 3.245000 ;
+      RECT 1.010000  0.425000 1.260000 0.750000 ;
+      RECT 1.010000  0.750000 2.240000 0.920000 ;
+      RECT 1.440000  0.085000 1.610000 0.330000 ;
+      RECT 1.440000  0.330000 1.810000 0.580000 ;
+      RECT 1.535000  2.120000 3.245000 2.230000 ;
+      RECT 1.535000  2.230000 1.705000 2.980000 ;
+      RECT 1.905000  2.400000 2.235000 3.245000 ;
+      RECT 1.990000  0.330000 2.240000 0.750000 ;
+      RECT 2.460000  0.085000 2.790000 0.670000 ;
+      RECT 2.465000  2.400000 2.795000 2.905000 ;
+      RECT 2.465000  2.905000 4.595000 3.075000 ;
+      RECT 2.965000  2.230000 3.245000 2.735000 ;
+      RECT 3.445000  2.060000 3.615000 2.905000 ;
+      RECT 3.760000  0.085000 4.090000 1.010000 ;
+      RECT 4.345000  1.820000 4.595000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef
index 39f89fb..7b54103 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.magic.lef
@@ -89,31 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.850000  0.085000 1.180000 0.840000 ;
-        RECT 1.710000  0.085000 2.040000 0.840000 ;
-        RECT 5.810000  0.085000 6.140000 0.790000 ;
-        RECT 6.670000  0.085000 7.000000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -122,56 +97,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.875000 2.290000 1.045000 3.245000 ;
-        RECT 1.695000 2.290000 2.025000 3.245000 ;
-        RECT 2.595000 2.290000 2.925000 3.245000 ;
-        RECT 3.495000 2.290000 3.825000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.345000 1.950000 6.145000 2.120000 ;
-      RECT 0.345000 2.120000 0.675000 2.980000 ;
-      RECT 0.420000 0.350000 0.670000 1.010000 ;
-      RECT 0.420000 1.010000 2.390000 1.180000 ;
-      RECT 1.245000 2.120000 1.495000 2.980000 ;
-      RECT 1.360000 0.350000 1.530000 1.010000 ;
-      RECT 2.220000 0.350000 4.190000 0.615000 ;
-      RECT 2.220000 0.615000 2.390000 1.010000 ;
-      RECT 2.225000 2.120000 2.395000 2.980000 ;
-      RECT 3.125000 2.120000 3.295000 2.980000 ;
-      RECT 4.025000 1.820000 4.275000 1.950000 ;
-      RECT 4.025000 2.120000 4.275000 2.980000 ;
-      RECT 4.465000 2.290000 4.795000 2.905000 ;
-      RECT 4.465000 2.905000 8.395000 3.075000 ;
-      RECT 4.995000 2.120000 5.165000 2.735000 ;
-      RECT 5.365000 2.290000 5.695000 2.905000 ;
-      RECT 5.895000 2.120000 6.145000 2.735000 ;
-      RECT 6.315000 1.950000 6.595000 2.905000 ;
-      RECT 7.165000 2.290000 7.495000 2.905000 ;
-      RECT 8.065000 2.120000 8.395000 2.905000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.345000  1.950000 6.145000 2.120000 ;
+      RECT 0.345000  2.120000 0.675000 2.980000 ;
+      RECT 0.420000  0.350000 0.670000 1.010000 ;
+      RECT 0.420000  1.010000 2.390000 1.180000 ;
+      RECT 0.850000  0.085000 1.180000 0.840000 ;
+      RECT 0.875000  2.290000 1.045000 3.245000 ;
+      RECT 1.245000  2.120000 1.495000 2.980000 ;
+      RECT 1.360000  0.350000 1.530000 1.010000 ;
+      RECT 1.695000  2.290000 2.025000 3.245000 ;
+      RECT 1.710000  0.085000 2.040000 0.840000 ;
+      RECT 2.220000  0.350000 4.190000 0.615000 ;
+      RECT 2.220000  0.615000 2.390000 1.010000 ;
+      RECT 2.225000  2.120000 2.395000 2.980000 ;
+      RECT 2.595000  2.290000 2.925000 3.245000 ;
+      RECT 3.125000  2.120000 3.295000 2.980000 ;
+      RECT 3.495000  2.290000 3.825000 3.245000 ;
+      RECT 4.025000  1.820000 4.275000 1.950000 ;
+      RECT 4.025000  2.120000 4.275000 2.980000 ;
+      RECT 4.465000  2.290000 4.795000 2.905000 ;
+      RECT 4.465000  2.905000 8.395000 3.075000 ;
+      RECT 4.995000  2.120000 5.165000 2.735000 ;
+      RECT 5.365000  2.290000 5.695000 2.905000 ;
+      RECT 5.810000  0.085000 6.140000 0.790000 ;
+      RECT 5.895000  2.120000 6.145000 2.735000 ;
+      RECT 6.315000  1.950000 6.595000 2.905000 ;
+      RECT 6.670000  0.085000 7.000000 0.840000 ;
+      RECT 7.165000  2.290000 7.495000 2.905000 ;
+      RECT 8.065000  2.120000 8.395000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__a211oi_4
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef
index d59b712..fb96acb 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.magic.lef
@@ -72,22 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.155000  0.840000 0.775000 1.095000 ;
-        RECT 0.155000  1.095000 0.485000 1.340000 ;
-        RECT 0.605000  0.085000 0.775000 0.840000 ;
-        RECT 1.485000  0.085000 1.815000 0.930000 ;
-        RECT 2.900000  0.085000 3.115000 0.895000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -96,41 +80,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.660000 2.290000 0.860000 3.245000 ;
-        RECT 2.900000 2.580000 3.230000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.130000 1.940000 0.460000 1.950000 ;
-      RECT 0.130000 1.950000 1.390000 2.120000 ;
-      RECT 0.130000 2.120000 0.460000 2.980000 ;
-      RECT 0.945000 0.660000 1.315000 1.110000 ;
-      RECT 0.945000 1.110000 1.745000 1.280000 ;
-      RECT 1.060000 2.120000 1.390000 2.980000 ;
-      RECT 1.575000 1.280000 1.745000 1.940000 ;
-      RECT 1.575000 1.940000 1.760000 2.240000 ;
-      RECT 1.575000 2.240000 3.255000 2.410000 ;
-      RECT 1.575000 2.410000 1.760000 2.980000 ;
-      RECT 1.915000 1.100000 2.245000 1.770000 ;
-      RECT 2.075000 0.350000 2.720000 0.940000 ;
-      RECT 2.075000 0.940000 2.245000 1.100000 ;
-      RECT 2.075000 1.770000 2.245000 1.820000 ;
-      RECT 2.075000 1.820000 2.695000 2.070000 ;
-      RECT 3.085000 1.320000 3.415000 1.650000 ;
-      RECT 3.085000 1.650000 3.255000 2.240000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.130000  1.940000 0.460000 1.950000 ;
+      RECT 0.130000  1.950000 1.390000 2.120000 ;
+      RECT 0.130000  2.120000 0.460000 2.980000 ;
+      RECT 0.155000  0.840000 0.775000 1.095000 ;
+      RECT 0.155000  1.095000 0.485000 1.340000 ;
+      RECT 0.605000  0.085000 0.775000 0.840000 ;
+      RECT 0.660000  2.290000 0.860000 3.245000 ;
+      RECT 0.945000  0.660000 1.315000 1.110000 ;
+      RECT 0.945000  1.110000 1.745000 1.280000 ;
+      RECT 1.060000  2.120000 1.390000 2.980000 ;
+      RECT 1.485000  0.085000 1.815000 0.930000 ;
+      RECT 1.575000  1.280000 1.745000 1.940000 ;
+      RECT 1.575000  1.940000 1.760000 2.240000 ;
+      RECT 1.575000  2.240000 3.255000 2.410000 ;
+      RECT 1.575000  2.410000 1.760000 2.980000 ;
+      RECT 1.915000  1.100000 2.245000 1.770000 ;
+      RECT 2.075000  0.350000 2.720000 0.940000 ;
+      RECT 2.075000  0.940000 2.245000 1.100000 ;
+      RECT 2.075000  1.770000 2.245000 1.820000 ;
+      RECT 2.075000  1.820000 2.695000 2.070000 ;
+      RECT 2.900000  0.085000 3.115000 0.895000 ;
+      RECT 2.900000  2.580000 3.230000 3.245000 ;
+      RECT 3.085000  1.320000 3.415000 1.650000 ;
+      RECT 3.085000  1.650000 3.255000 2.240000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef
index 19950fd..c849599 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.magic.lef
@@ -74,20 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.805000  0.085000 1.055000 0.670000 ;
-        RECT 1.735000  0.085000 2.310000 0.750000 ;
-        RECT 3.380000  0.085000 3.710000 1.090000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -96,47 +82,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.635000 2.580000 0.965000 3.245000 ;
-        RECT 1.535000 2.580000 1.865000 3.245000 ;
-        RECT 2.955000 2.440000 3.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 1.820000 0.450000 2.240000 ;
-      RECT 0.120000 2.240000 1.810000 2.410000 ;
-      RECT 0.120000 2.410000 0.450000 2.700000 ;
-      RECT 0.270000 0.540000 0.600000 0.840000 ;
-      RECT 0.270000 0.840000 0.850000 1.010000 ;
-      RECT 0.680000 1.010000 0.850000 2.240000 ;
-      RECT 1.360000 1.220000 1.735000 1.550000 ;
-      RECT 1.565000 0.920000 2.810000 1.090000 ;
-      RECT 1.565000 1.090000 1.735000 1.220000 ;
-      RECT 1.605000 1.720000 2.075000 1.890000 ;
-      RECT 1.605000 1.890000 1.810000 2.240000 ;
-      RECT 1.905000 1.260000 2.215000 1.590000 ;
-      RECT 1.905000 1.590000 2.075000 1.720000 ;
-      RECT 2.055000 2.060000 2.415000 2.980000 ;
-      RECT 2.245000 1.760000 2.555000 1.930000 ;
-      RECT 2.245000 1.930000 2.415000 2.060000 ;
-      RECT 2.385000 1.090000 2.555000 1.760000 ;
-      RECT 2.480000 0.350000 2.810000 0.920000 ;
-      RECT 2.585000 2.100000 3.735000 2.270000 ;
-      RECT 2.585000 2.270000 2.755000 2.980000 ;
-      RECT 3.405000 1.950000 3.735000 2.100000 ;
-      RECT 3.405000 2.270000 3.735000 2.980000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.120000  1.820000 0.450000 2.240000 ;
+      RECT 0.120000  2.240000 1.810000 2.410000 ;
+      RECT 0.120000  2.410000 0.450000 2.700000 ;
+      RECT 0.270000  0.540000 0.600000 0.840000 ;
+      RECT 0.270000  0.840000 0.850000 1.010000 ;
+      RECT 0.635000  2.580000 0.965000 3.245000 ;
+      RECT 0.680000  1.010000 0.850000 2.240000 ;
+      RECT 0.805000  0.085000 1.055000 0.670000 ;
+      RECT 1.360000  1.220000 1.735000 1.550000 ;
+      RECT 1.535000  2.580000 1.865000 3.245000 ;
+      RECT 1.565000  0.920000 2.810000 1.090000 ;
+      RECT 1.565000  1.090000 1.735000 1.220000 ;
+      RECT 1.605000  1.720000 2.075000 1.890000 ;
+      RECT 1.605000  1.890000 1.810000 2.240000 ;
+      RECT 1.735000  0.085000 2.310000 0.750000 ;
+      RECT 1.905000  1.260000 2.215000 1.590000 ;
+      RECT 1.905000  1.590000 2.075000 1.720000 ;
+      RECT 2.055000  2.060000 2.415000 2.980000 ;
+      RECT 2.245000  1.760000 2.555000 1.930000 ;
+      RECT 2.245000  1.930000 2.415000 2.060000 ;
+      RECT 2.385000  1.090000 2.555000 1.760000 ;
+      RECT 2.480000  0.350000 2.810000 0.920000 ;
+      RECT 2.585000  2.100000 3.735000 2.270000 ;
+      RECT 2.585000  2.270000 2.755000 2.980000 ;
+      RECT 2.955000  2.440000 3.205000 3.245000 ;
+      RECT 3.380000  0.085000 3.710000 1.090000 ;
+      RECT 3.405000  1.950000 3.735000 2.100000 ;
+      RECT 3.405000  2.270000 3.735000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef
index 7d3f65c..ff6c1dc 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.magic.lef
@@ -76,27 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.795000  0.085000 1.045000 1.275000 ;
-        RECT 1.735000  0.085000 1.985000 0.840000 ;
-        RECT 2.595000  0.085000 2.845000 0.940000 ;
-        RECT 3.595000  0.085000 3.765000 0.940000 ;
-        RECT 5.725000  0.085000 5.975000 1.275000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -105,56 +84,74 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.620000 2.610000 0.950000 3.245000 ;
-        RECT 1.520000 2.610000 1.850000 3.245000 ;
-        RECT 2.420000 2.610000 2.750000 3.245000 ;
-        RECT 4.290000 2.290000 4.540000 3.245000 ;
-        RECT 5.270000 2.290000 5.520000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.840000 0.615000 1.275000 ;
-      RECT 0.105000 1.275000 0.435000 2.270000 ;
-      RECT 0.105000 2.270000 2.640000 2.440000 ;
-      RECT 0.105000 2.440000 0.435000 2.980000 ;
-      RECT 1.590000 1.350000 2.755000 1.680000 ;
-      RECT 2.470000 1.850000 3.290000 2.020000 ;
-      RECT 2.470000 2.020000 2.640000 2.270000 ;
-      RECT 2.585000 1.110000 5.035000 1.280000 ;
-      RECT 2.585000 1.280000 2.755000 1.350000 ;
-      RECT 2.940000 2.190000 3.270000 2.905000 ;
-      RECT 2.940000 2.905000 4.090000 3.075000 ;
-      RECT 2.960000 1.450000 3.290000 1.850000 ;
-      RECT 3.085000 0.595000 3.415000 1.110000 ;
-      RECT 3.470000 1.280000 3.720000 2.735000 ;
-      RECT 3.920000 1.940000 4.090000 1.950000 ;
-      RECT 3.920000 1.950000 5.970000 2.120000 ;
-      RECT 3.920000 2.120000 4.090000 2.905000 ;
-      RECT 4.435000 0.255000 5.545000 0.425000 ;
-      RECT 4.435000 0.425000 4.605000 0.940000 ;
-      RECT 4.740000 2.120000 5.070000 2.980000 ;
-      RECT 4.785000 0.595000 5.035000 1.110000 ;
-      RECT 5.215000 0.425000 5.545000 1.275000 ;
-      RECT 5.720000 1.940000 5.970000 1.950000 ;
-      RECT 5.720000 2.120000 5.970000 2.980000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.105000  0.840000 0.615000 1.275000 ;
+      RECT 0.105000  1.275000 0.435000 2.270000 ;
+      RECT 0.105000  2.270000 2.640000 2.440000 ;
+      RECT 0.105000  2.440000 0.435000 2.980000 ;
+      RECT 0.620000  2.610000 0.950000 3.245000 ;
+      RECT 0.795000  0.085000 1.045000 1.275000 ;
+      RECT 1.520000  2.610000 1.850000 3.245000 ;
+      RECT 1.590000  1.350000 2.755000 1.680000 ;
+      RECT 1.735000  0.085000 1.985000 0.840000 ;
+      RECT 2.420000  2.610000 2.750000 3.245000 ;
+      RECT 2.470000  1.850000 3.290000 2.020000 ;
+      RECT 2.470000  2.020000 2.640000 2.270000 ;
+      RECT 2.585000  1.110000 5.035000 1.280000 ;
+      RECT 2.585000  1.280000 2.755000 1.350000 ;
+      RECT 2.595000  0.085000 2.845000 0.940000 ;
+      RECT 2.940000  2.190000 3.270000 2.905000 ;
+      RECT 2.940000  2.905000 4.090000 3.075000 ;
+      RECT 2.960000  1.450000 3.290000 1.850000 ;
+      RECT 3.085000  0.595000 3.415000 1.110000 ;
+      RECT 3.470000  1.280000 3.720000 2.735000 ;
+      RECT 3.595000  0.085000 3.765000 0.940000 ;
+      RECT 3.920000  1.940000 4.090000 1.950000 ;
+      RECT 3.920000  1.950000 5.970000 2.120000 ;
+      RECT 3.920000  2.120000 4.090000 2.905000 ;
+      RECT 4.290000  2.290000 4.540000 3.245000 ;
+      RECT 4.435000  0.255000 5.545000 0.425000 ;
+      RECT 4.435000  0.425000 4.605000 0.940000 ;
+      RECT 4.740000  2.120000 5.070000 2.980000 ;
+      RECT 4.785000  0.595000 5.035000 1.110000 ;
+      RECT 5.215000  0.425000 5.545000 1.275000 ;
+      RECT 5.270000  2.290000 5.520000 3.245000 ;
+      RECT 5.720000  1.940000 5.970000 1.950000 ;
+      RECT 5.720000  2.120000 5.970000 2.980000 ;
+      RECT 5.725000  0.085000 5.975000 1.275000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21bo_4
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef
index 6405c6c..08b5ea6 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.magic.lef
@@ -75,19 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.120000  0.085000 1.630000 0.760000 ;
-        RECT 1.120000  0.760000 1.450000 1.050000 ;
-        RECT 2.630000  0.085000 2.960000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -96,33 +83,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.635000 2.115000 0.885000 3.245000 ;
-        RECT 2.190000 2.400000 2.520000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.775000 0.915000 1.945000 ;
-      RECT 0.105000 1.945000 0.435000 2.980000 ;
-      RECT 0.620000 0.540000 0.950000 1.050000 ;
-      RECT 0.745000 1.050000 0.950000 1.220000 ;
-      RECT 0.745000 1.220000 1.535000 1.550000 ;
-      RECT 0.745000 1.550000 0.915000 1.775000 ;
-      RECT 1.725000 2.060000 2.985000 2.230000 ;
-      RECT 1.725000 2.230000 2.020000 2.980000 ;
-      RECT 2.655000 1.820000 2.985000 2.060000 ;
-      RECT 2.690000 2.230000 2.985000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.105000  1.775000 0.915000 1.945000 ;
+      RECT 0.105000  1.945000 0.435000 2.980000 ;
+      RECT 0.620000  0.540000 0.950000 1.050000 ;
+      RECT 0.635000  2.115000 0.885000 3.245000 ;
+      RECT 0.745000  1.050000 0.950000 1.220000 ;
+      RECT 0.745000  1.220000 1.535000 1.550000 ;
+      RECT 0.745000  1.550000 0.915000 1.775000 ;
+      RECT 1.120000  0.085000 1.630000 0.760000 ;
+      RECT 1.120000  0.760000 1.450000 1.050000 ;
+      RECT 1.725000  2.060000 2.985000 2.230000 ;
+      RECT 1.725000  2.230000 2.020000 2.980000 ;
+      RECT 2.190000  2.400000 2.520000 3.245000 ;
+      RECT 2.630000  0.085000 2.960000 1.010000 ;
+      RECT 2.655000  1.820000 2.985000 2.060000 ;
+      RECT 2.690000  2.230000 2.985000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef
index a55e685..bf0fbc0 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.magic.lef
@@ -75,21 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.760000  0.085000 1.090000 0.940000 ;
-        RECT 1.620000  0.085000 1.950000 0.810000 ;
-        RECT 3.430000  0.085000 3.760000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -98,47 +83,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.195000 1.950000 0.445000 3.245000 ;
-        RECT 2.515000 2.290000 2.845000 3.245000 ;
-        RECT 3.415000 2.060000 3.765000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.270000 0.450000 0.520000 1.110000 ;
-      RECT 0.270000 1.110000 0.975000 1.280000 ;
-      RECT 0.645000 1.940000 0.975000 2.980000 ;
-      RECT 0.805000 1.280000 0.975000 1.320000 ;
-      RECT 0.805000 1.320000 1.395000 1.650000 ;
-      RECT 0.805000 1.650000 0.975000 1.940000 ;
-      RECT 1.165000 1.820000 1.415000 2.905000 ;
-      RECT 1.165000 2.905000 2.315000 3.075000 ;
-      RECT 2.115000 1.820000 2.315000 1.950000 ;
-      RECT 2.115000 1.950000 3.215000 2.120000 ;
-      RECT 2.115000 2.120000 2.315000 2.905000 ;
-      RECT 2.140000 0.350000 3.250000 0.600000 ;
-      RECT 3.045000 1.720000 4.215000 1.890000 ;
-      RECT 3.045000 1.890000 3.215000 1.950000 ;
-      RECT 3.045000 2.120000 3.215000 2.980000 ;
-      RECT 3.080000 0.600000 3.250000 0.840000 ;
-      RECT 3.080000 0.840000 4.190000 1.010000 ;
-      RECT 3.080000 1.010000 3.250000 1.050000 ;
-      RECT 3.940000 0.350000 4.190000 0.840000 ;
-      RECT 3.940000 1.010000 4.190000 1.130000 ;
-      RECT 3.965000 1.890000 4.215000 2.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.195000  1.950000 0.445000 3.245000 ;
+      RECT 0.270000  0.450000 0.520000 1.110000 ;
+      RECT 0.270000  1.110000 0.975000 1.280000 ;
+      RECT 0.645000  1.940000 0.975000 2.980000 ;
+      RECT 0.760000  0.085000 1.090000 0.940000 ;
+      RECT 0.805000  1.280000 0.975000 1.320000 ;
+      RECT 0.805000  1.320000 1.395000 1.650000 ;
+      RECT 0.805000  1.650000 0.975000 1.940000 ;
+      RECT 1.165000  1.820000 1.415000 2.905000 ;
+      RECT 1.165000  2.905000 2.315000 3.075000 ;
+      RECT 1.620000  0.085000 1.950000 0.810000 ;
+      RECT 2.115000  1.820000 2.315000 1.950000 ;
+      RECT 2.115000  1.950000 3.215000 2.120000 ;
+      RECT 2.115000  2.120000 2.315000 2.905000 ;
+      RECT 2.140000  0.350000 3.250000 0.600000 ;
+      RECT 2.515000  2.290000 2.845000 3.245000 ;
+      RECT 3.045000  1.720000 4.215000 1.890000 ;
+      RECT 3.045000  1.890000 3.215000 1.950000 ;
+      RECT 3.045000  2.120000 3.215000 2.980000 ;
+      RECT 3.080000  0.600000 3.250000 0.840000 ;
+      RECT 3.080000  0.840000 4.190000 1.010000 ;
+      RECT 3.080000  1.010000 3.250000 1.050000 ;
+      RECT 3.415000  2.060000 3.765000 3.245000 ;
+      RECT 3.430000  0.085000 3.760000 0.670000 ;
+      RECT 3.940000  0.350000 4.190000 0.840000 ;
+      RECT 3.940000  1.010000 4.190000 1.130000 ;
+      RECT 3.965000  1.890000 4.215000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef
index 2a77118..516e654 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.magic.lef
@@ -82,30 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 2.340000  0.085000 2.670000 0.580000 ;
-        RECT 3.200000  0.085000 3.530000 0.580000 ;
-        RECT 4.180000  0.085000 4.430000 0.880000 ;
-        RECT 5.040000  0.085000 5.290000 0.810000 ;
-        RECT 5.900000  0.085000 6.230000 0.980000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -114,58 +90,79 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.565000 2.290000 0.895000 3.245000 ;
-        RECT 1.465000 2.290000 1.795000 3.245000 ;
-        RECT 2.365000 2.290000 2.615000 3.245000 ;
-        RECT 3.345000 2.290000 3.515000 3.245000 ;
-        RECT 6.035000 2.330000 6.365000 3.245000 ;
-        RECT 7.015000 2.100000 7.265000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 3.995000 2.120000 ;
-      RECT 0.115000 2.120000 0.365000 2.980000 ;
-      RECT 0.190000 0.350000 2.160000 0.600000 ;
-      RECT 0.190000 0.600000 0.520000 1.130000 ;
-      RECT 1.095000 2.120000 1.265000 2.980000 ;
-      RECT 1.990000 0.600000 2.160000 0.750000 ;
-      RECT 1.990000 0.750000 3.960000 0.920000 ;
-      RECT 1.995000 1.820000 2.165000 1.950000 ;
-      RECT 1.995000 2.120000 2.165000 2.980000 ;
-      RECT 2.815000 2.120000 3.145000 2.980000 ;
-      RECT 2.850000 0.510000 3.020000 0.750000 ;
-      RECT 3.710000 0.510000 3.960000 0.750000 ;
-      RECT 3.715000 2.120000 3.995000 2.905000 ;
-      RECT 3.715000 2.905000 5.845000 3.075000 ;
-      RECT 4.665000 2.160000 4.895000 2.905000 ;
-      RECT 4.915000 1.320000 6.195000 1.650000 ;
-      RECT 5.565000 1.820000 5.845000 2.905000 ;
-      RECT 6.025000 1.150000 6.660000 1.320000 ;
-      RECT 6.025000 1.650000 6.195000 1.990000 ;
-      RECT 6.025000 1.990000 6.815000 2.160000 ;
-      RECT 6.400000 0.350000 6.660000 1.150000 ;
-      RECT 6.535000 2.160000 6.815000 2.980000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.115000  1.950000 3.995000 2.120000 ;
+      RECT 0.115000  2.120000 0.365000 2.980000 ;
+      RECT 0.190000  0.350000 2.160000 0.600000 ;
+      RECT 0.190000  0.600000 0.520000 1.130000 ;
+      RECT 0.565000  2.290000 0.895000 3.245000 ;
+      RECT 1.095000  2.120000 1.265000 2.980000 ;
+      RECT 1.465000  2.290000 1.795000 3.245000 ;
+      RECT 1.990000  0.600000 2.160000 0.750000 ;
+      RECT 1.990000  0.750000 3.960000 0.920000 ;
+      RECT 1.995000  1.820000 2.165000 1.950000 ;
+      RECT 1.995000  2.120000 2.165000 2.980000 ;
+      RECT 2.340000  0.085000 2.670000 0.580000 ;
+      RECT 2.365000  2.290000 2.615000 3.245000 ;
+      RECT 2.815000  2.120000 3.145000 2.980000 ;
+      RECT 2.850000  0.510000 3.020000 0.750000 ;
+      RECT 3.200000  0.085000 3.530000 0.580000 ;
+      RECT 3.345000  2.290000 3.515000 3.245000 ;
+      RECT 3.710000  0.510000 3.960000 0.750000 ;
+      RECT 3.715000  2.120000 3.995000 2.905000 ;
+      RECT 3.715000  2.905000 5.845000 3.075000 ;
+      RECT 4.180000  0.085000 4.430000 0.880000 ;
+      RECT 4.665000  2.160000 4.895000 2.905000 ;
+      RECT 4.915000  1.320000 6.195000 1.650000 ;
+      RECT 5.040000  0.085000 5.290000 0.810000 ;
+      RECT 5.565000  1.820000 5.845000 2.905000 ;
+      RECT 5.900000  0.085000 6.230000 0.980000 ;
+      RECT 6.025000  1.150000 6.660000 1.320000 ;
+      RECT 6.025000  1.650000 6.195000 1.990000 ;
+      RECT 6.025000  1.990000 6.815000 2.160000 ;
+      RECT 6.035000  2.330000 6.365000 3.245000 ;
+      RECT 6.400000  0.350000 6.660000 1.150000 ;
+      RECT 6.535000  2.160000 6.815000 2.980000 ;
+      RECT 7.015000  2.100000 7.265000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21boi_4
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef
index 958f312..ee79cdc 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_1.magic.lef
@@ -74,20 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.255000  0.085000 1.585000 0.940000 ;
-        RECT 2.305000  0.085000 2.475000 0.840000 ;
-        RECT 2.305000  0.840000 3.040000 1.010000 ;
-        RECT 2.710000  1.010000 3.040000 1.340000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -96,33 +82,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.635000 1.820000 0.885000 3.245000 ;
-        RECT 2.335000 2.290000 2.535000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.320000 1.415000 1.650000 ;
-      RECT 1.245000 1.110000 2.135000 1.280000 ;
-      RECT 1.245000 1.280000 1.415000 1.320000 ;
-      RECT 1.245000 1.650000 1.415000 1.950000 ;
-      RECT 1.245000 1.950000 1.605000 2.980000 ;
-      RECT 1.805000 0.660000 2.135000 1.110000 ;
-      RECT 1.805000 1.950000 3.065000 2.120000 ;
-      RECT 1.805000 2.120000 2.135000 2.980000 ;
-      RECT 2.735000 1.940000 3.065000 1.950000 ;
-      RECT 2.735000 2.120000 3.065000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.425000  1.320000 1.415000 1.650000 ;
+      RECT 0.635000  1.820000 0.885000 3.245000 ;
+      RECT 1.245000  1.110000 2.135000 1.280000 ;
+      RECT 1.245000  1.280000 1.415000 1.320000 ;
+      RECT 1.245000  1.650000 1.415000 1.950000 ;
+      RECT 1.245000  1.950000 1.605000 2.980000 ;
+      RECT 1.255000  0.085000 1.585000 0.940000 ;
+      RECT 1.805000  0.660000 2.135000 1.110000 ;
+      RECT 1.805000  1.950000 3.065000 2.120000 ;
+      RECT 1.805000  2.120000 2.135000 2.980000 ;
+      RECT 2.305000  0.085000 2.475000 0.840000 ;
+      RECT 2.305000  0.840000 3.040000 1.010000 ;
+      RECT 2.335000  2.290000 2.535000 3.245000 ;
+      RECT 2.710000  1.010000 3.040000 1.340000 ;
+      RECT 2.735000  1.940000 3.065000 1.950000 ;
+      RECT 2.735000  2.120000 3.065000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef
index cda5bfd..bfc015a 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_2.magic.lef
@@ -73,19 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.295000  0.085000 0.545000 1.130000 ;
-        RECT 1.225000  0.085000 1.795000 0.670000 ;
-        RECT 2.865000  0.085000 3.195000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -94,33 +81,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.120000 1.820000 0.370000 3.245000 ;
-        RECT 1.020000 2.045000 1.350000 3.245000 ;
-        RECT 2.440000 2.060000 2.770000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.070000 1.220000 1.395000 1.705000 ;
-      RECT 1.070000 1.705000 1.790000 1.875000 ;
-      RECT 1.225000 0.840000 2.295000 1.010000 ;
-      RECT 1.225000 1.010000 1.395000 1.220000 ;
-      RECT 1.540000 1.875000 1.790000 2.980000 ;
-      RECT 1.965000 0.350000 2.295000 0.840000 ;
-      RECT 1.990000 1.720000 3.220000 1.890000 ;
-      RECT 1.990000 1.890000 2.240000 2.980000 ;
-      RECT 2.970000 1.890000 3.220000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.120000  1.820000 0.370000 3.245000 ;
+      RECT 0.295000  0.085000 0.545000 1.130000 ;
+      RECT 1.020000  2.045000 1.350000 3.245000 ;
+      RECT 1.070000  1.220000 1.395000 1.705000 ;
+      RECT 1.070000  1.705000 1.790000 1.875000 ;
+      RECT 1.225000  0.085000 1.795000 0.670000 ;
+      RECT 1.225000  0.840000 2.295000 1.010000 ;
+      RECT 1.225000  1.010000 1.395000 1.220000 ;
+      RECT 1.540000  1.875000 1.790000 2.980000 ;
+      RECT 1.965000  0.350000 2.295000 0.840000 ;
+      RECT 1.990000  1.720000 3.220000 1.890000 ;
+      RECT 1.990000  1.890000 2.240000 2.980000 ;
+      RECT 2.440000  2.060000 2.770000 3.245000 ;
+      RECT 2.865000  0.085000 3.195000 1.010000 ;
+      RECT 2.970000  1.890000 3.220000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef
index 12cb4b5..5f6beab 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_4.magic.lef
@@ -76,26 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.150000  0.085000 0.480000 0.790000 ;
-        RECT 1.010000  0.085000 1.260000 0.790000 ;
-        RECT 1.870000  0.085000 2.120000 0.925000 ;
-        RECT 2.790000  0.085000 3.120000 0.925000 ;
-        RECT 4.750000  0.085000 5.080000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -104,51 +84,68 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.155000 2.140000 0.485000 3.245000 ;
-        RECT 1.055000 2.140000 1.305000 3.245000 ;
-        RECT 2.035000 1.950000 2.285000 3.245000 ;
-        RECT 3.825000 2.290000 4.075000 3.245000 ;
-        RECT 4.725000 2.290000 5.055000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.635000 1.300000 2.205000 1.630000 ;
-      RECT 1.870000 1.095000 3.255000 1.110000 ;
-      RECT 1.870000 1.110000 4.220000 1.265000 ;
-      RECT 1.870000 1.265000 2.205000 1.300000 ;
-      RECT 2.360000 0.450000 2.610000 1.095000 ;
-      RECT 2.475000 1.950000 2.725000 2.905000 ;
-      RECT 2.475000 2.905000 3.625000 3.075000 ;
-      RECT 2.925000 1.265000 4.220000 1.280000 ;
-      RECT 2.925000 1.280000 3.255000 2.735000 ;
-      RECT 3.455000 1.950000 5.505000 2.120000 ;
-      RECT 3.455000 2.120000 3.625000 2.905000 ;
-      RECT 3.460000 0.255000 4.570000 0.425000 ;
-      RECT 3.460000 0.425000 3.790000 0.940000 ;
-      RECT 3.960000 0.595000 4.220000 1.110000 ;
-      RECT 4.275000 2.120000 4.525000 2.980000 ;
-      RECT 4.400000 0.425000 4.570000 0.920000 ;
-      RECT 4.400000 0.920000 5.510000 1.090000 ;
-      RECT 5.255000 1.940000 5.505000 1.950000 ;
-      RECT 5.255000 2.120000 5.505000 2.980000 ;
-      RECT 5.260000 0.350000 5.510000 0.920000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.150000  0.085000 0.480000 0.790000 ;
+      RECT 0.155000  2.140000 0.485000 3.245000 ;
+      RECT 0.635000  1.300000 2.205000 1.630000 ;
+      RECT 1.010000  0.085000 1.260000 0.790000 ;
+      RECT 1.055000  2.140000 1.305000 3.245000 ;
+      RECT 1.870000  0.085000 2.120000 0.925000 ;
+      RECT 1.870000  1.095000 3.255000 1.110000 ;
+      RECT 1.870000  1.110000 4.220000 1.265000 ;
+      RECT 1.870000  1.265000 2.205000 1.300000 ;
+      RECT 2.035000  1.950000 2.285000 3.245000 ;
+      RECT 2.360000  0.450000 2.610000 1.095000 ;
+      RECT 2.475000  1.950000 2.725000 2.905000 ;
+      RECT 2.475000  2.905000 3.625000 3.075000 ;
+      RECT 2.790000  0.085000 3.120000 0.925000 ;
+      RECT 2.925000  1.265000 4.220000 1.280000 ;
+      RECT 2.925000  1.280000 3.255000 2.735000 ;
+      RECT 3.455000  1.950000 5.505000 2.120000 ;
+      RECT 3.455000  2.120000 3.625000 2.905000 ;
+      RECT 3.460000  0.255000 4.570000 0.425000 ;
+      RECT 3.460000  0.425000 3.790000 0.940000 ;
+      RECT 3.825000  2.290000 4.075000 3.245000 ;
+      RECT 3.960000  0.595000 4.220000 1.110000 ;
+      RECT 4.275000  2.120000 4.525000 2.980000 ;
+      RECT 4.400000  0.425000 4.570000 0.920000 ;
+      RECT 4.400000  0.920000 5.510000 1.090000 ;
+      RECT 4.725000  2.290000 5.055000 3.245000 ;
+      RECT 4.750000  0.085000 5.080000 0.750000 ;
+      RECT 5.255000  1.940000 5.505000 1.950000 ;
+      RECT 5.255000  2.120000 5.505000 2.980000 ;
+      RECT 5.260000  0.350000 5.510000 0.920000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21o_4
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef
index d4ac352..c6d4088 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.magic.lef
@@ -74,15 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.130000  0.085000 0.460000 1.010000 ;
-        RECT 1.560000  0.085000 1.790000 1.020000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -91,24 +82,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.570000 2.400000 0.900000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.820000 0.435000 1.985000 ;
-      RECT 0.105000 1.985000 0.955000 2.060000 ;
-      RECT 0.105000 2.060000 1.365000 2.230000 ;
-      RECT 0.105000 2.230000 0.400000 2.980000 ;
-      RECT 1.070000 2.230000 1.365000 2.980000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.105000  1.820000 0.435000 1.985000 ;
+      RECT 0.105000  1.985000 0.955000 2.060000 ;
+      RECT 0.105000  2.060000 1.365000 2.230000 ;
+      RECT 0.105000  2.230000 0.400000 2.980000 ;
+      RECT 0.130000  0.085000 0.460000 1.010000 ;
+      RECT 0.570000  2.400000 0.900000 3.245000 ;
+      RECT 1.070000  2.230000 1.365000 2.980000 ;
+      RECT 1.560000  0.085000 1.790000 1.020000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef
index 55d31ef..2903037 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.magic.lef
@@ -75,19 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.100000  0.085000 0.430000 1.130000 ;
-        RECT 2.000000  0.085000 2.330000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -96,36 +83,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 2.045000 2.630000 2.305000 3.245000 ;
-        RECT 3.005000 2.630000 3.175000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 1.950000 0.895000 2.905000 ;
-      RECT 0.615000 2.905000 1.845000 3.075000 ;
-      RECT 1.360000 1.090000 1.775000 1.260000 ;
-      RECT 1.565000 1.260000 1.775000 1.950000 ;
-      RECT 1.565000 1.950000 3.690000 2.120000 ;
-      RECT 1.565000 2.290000 3.705000 2.460000 ;
-      RECT 1.565000 2.460000 1.845000 2.905000 ;
-      RECT 2.475000 2.460000 2.805000 2.980000 ;
-      RECT 2.500000 0.330000 3.690000 0.580000 ;
-      RECT 3.360000 0.580000 3.690000 1.130000 ;
-      RECT 3.375000 2.460000 3.705000 2.980000 ;
-      RECT 3.520000 1.130000 3.690000 1.950000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.100000  0.085000 0.430000 1.130000 ;
+      RECT 0.615000  1.950000 0.895000 2.905000 ;
+      RECT 0.615000  2.905000 1.845000 3.075000 ;
+      RECT 1.360000  1.090000 1.775000 1.260000 ;
+      RECT 1.565000  1.260000 1.775000 1.950000 ;
+      RECT 1.565000  1.950000 3.690000 2.120000 ;
+      RECT 1.565000  2.290000 3.705000 2.460000 ;
+      RECT 1.565000  2.460000 1.845000 2.905000 ;
+      RECT 2.000000  0.085000 2.330000 0.580000 ;
+      RECT 2.045000  2.630000 2.305000 3.245000 ;
+      RECT 2.475000  2.460000 2.805000 2.980000 ;
+      RECT 2.500000  0.330000 3.690000 0.580000 ;
+      RECT 3.005000  2.630000 3.175000 3.245000 ;
+      RECT 3.360000  0.580000 3.690000 1.130000 ;
+      RECT 3.375000  2.460000 3.705000 2.980000 ;
+      RECT 3.520000  1.130000 3.690000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef
index 6e6d9e3..296577e 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.magic.lef
@@ -78,25 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.810000  0.085000 1.140000 0.840000 ;
-        RECT 1.670000  0.085000 2.000000 0.840000 ;
-        RECT 4.830000  0.085000 5.160000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -105,50 +86,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.755000 2.290000 1.005000 3.245000 ;
-        RECT 1.735000 2.290000 1.905000 3.245000 ;
-        RECT 2.555000 2.630000 2.805000 3.245000 ;
-        RECT 3.535000 2.630000 3.705000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.305000 1.820000 0.555000 1.950000 ;
-      RECT 0.305000 1.950000 2.355000 2.120000 ;
-      RECT 0.305000 2.120000 0.555000 2.980000 ;
-      RECT 0.380000 0.350000 0.630000 1.010000 ;
-      RECT 0.380000 1.010000 2.350000 1.180000 ;
-      RECT 1.205000 2.120000 1.535000 2.980000 ;
-      RECT 1.320000 0.350000 1.490000 1.010000 ;
-      RECT 2.105000 2.120000 2.355000 2.290000 ;
-      RECT 2.105000 2.290000 4.155000 2.460000 ;
-      RECT 2.105000 2.460000 2.355000 2.980000 ;
-      RECT 2.180000 0.255000 4.150000 0.425000 ;
-      RECT 2.180000 0.425000 2.350000 1.010000 ;
-      RECT 2.960000 0.425000 3.290000 0.710000 ;
-      RECT 3.005000 2.460000 3.335000 2.980000 ;
-      RECT 3.820000 0.425000 4.150000 0.710000 ;
-      RECT 3.905000 2.460000 4.155000 2.905000 ;
-      RECT 3.905000 2.905000 6.035000 3.075000 ;
-      RECT 4.885000 2.290000 5.055000 2.905000 ;
-      RECT 5.785000 1.820000 6.035000 2.905000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.305000  1.820000 0.555000 1.950000 ;
+      RECT 0.305000  1.950000 2.355000 2.120000 ;
+      RECT 0.305000  2.120000 0.555000 2.980000 ;
+      RECT 0.380000  0.350000 0.630000 1.010000 ;
+      RECT 0.380000  1.010000 2.350000 1.180000 ;
+      RECT 0.755000  2.290000 1.005000 3.245000 ;
+      RECT 0.810000  0.085000 1.140000 0.840000 ;
+      RECT 1.205000  2.120000 1.535000 2.980000 ;
+      RECT 1.320000  0.350000 1.490000 1.010000 ;
+      RECT 1.670000  0.085000 2.000000 0.840000 ;
+      RECT 1.735000  2.290000 1.905000 3.245000 ;
+      RECT 2.105000  2.120000 2.355000 2.290000 ;
+      RECT 2.105000  2.290000 4.155000 2.460000 ;
+      RECT 2.105000  2.460000 2.355000 2.980000 ;
+      RECT 2.180000  0.255000 4.150000 0.425000 ;
+      RECT 2.180000  0.425000 2.350000 1.010000 ;
+      RECT 2.555000  2.630000 2.805000 3.245000 ;
+      RECT 2.960000  0.425000 3.290000 0.710000 ;
+      RECT 3.005000  2.460000 3.335000 2.980000 ;
+      RECT 3.535000  2.630000 3.705000 3.245000 ;
+      RECT 3.820000  0.425000 4.150000 0.710000 ;
+      RECT 3.905000  2.460000 4.155000 2.905000 ;
+      RECT 3.905000  2.905000 6.035000 3.075000 ;
+      RECT 4.830000  0.085000 5.160000 0.840000 ;
+      RECT 4.885000  2.290000 5.055000 2.905000 ;
+      RECT 5.785000  1.820000 6.035000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__a21oi_4
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef
index 544cd79..b6e948b 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_1.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.045000  0.085000 1.965000 0.840000 ;
-        RECT 3.320000  0.085000 3.690000 0.945000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -112,41 +98,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.100000 1.950000 1.350000 3.245000 ;
-        RECT 1.985000 2.310000 2.315000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.740000 1.300000 1.205000 1.630000 ;
-      RECT 1.035000 1.010000 2.860000 1.115000 ;
-      RECT 1.035000 1.115000 4.215000 1.180000 ;
-      RECT 1.035000 1.180000 1.205000 1.300000 ;
-      RECT 1.535000 1.950000 1.785000 1.970000 ;
-      RECT 1.535000 1.970000 3.285000 2.140000 ;
-      RECT 1.535000 2.140000 1.785000 2.980000 ;
-      RECT 2.420000 0.375000 2.860000 1.010000 ;
-      RECT 2.465000 1.180000 4.215000 1.285000 ;
-      RECT 2.505000 2.310000 2.785000 2.905000 ;
-      RECT 2.505000 2.905000 3.685000 3.075000 ;
-      RECT 2.955000 1.950000 3.285000 1.970000 ;
-      RECT 2.955000 2.140000 3.285000 2.735000 ;
-      RECT 3.485000 1.950000 3.685000 2.905000 ;
-      RECT 3.860000 0.840000 4.215000 1.115000 ;
-      RECT 3.885000 1.285000 4.215000 2.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.740000  1.300000 1.205000 1.630000 ;
+      RECT 1.035000  1.010000 2.860000 1.115000 ;
+      RECT 1.035000  1.115000 4.215000 1.180000 ;
+      RECT 1.035000  1.180000 1.205000 1.300000 ;
+      RECT 1.045000  0.085000 1.965000 0.840000 ;
+      RECT 1.100000  1.950000 1.350000 3.245000 ;
+      RECT 1.535000  1.950000 1.785000 1.970000 ;
+      RECT 1.535000  1.970000 3.285000 2.140000 ;
+      RECT 1.535000  2.140000 1.785000 2.980000 ;
+      RECT 1.985000  2.310000 2.315000 3.245000 ;
+      RECT 2.420000  0.375000 2.860000 1.010000 ;
+      RECT 2.465000  1.180000 4.215000 1.285000 ;
+      RECT 2.505000  2.310000 2.785000 2.905000 ;
+      RECT 2.505000  2.905000 3.685000 3.075000 ;
+      RECT 2.955000  1.950000 3.285000 1.970000 ;
+      RECT 2.955000  2.140000 3.285000 2.735000 ;
+      RECT 3.320000  0.085000 3.690000 0.945000 ;
+      RECT 3.485000  1.950000 3.685000 2.905000 ;
+      RECT 3.860000  0.840000 4.215000 1.115000 ;
+      RECT 3.885000  1.285000 4.215000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a221o_1
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef
index 713dd96..aa2ce89 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_2.magic.lef
@@ -92,21 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.175000  0.085000 0.425000 0.790000 ;
-        RECT 1.035000  0.085000 1.560000 0.750000 ;
-        RECT 3.350000  0.085000 3.720000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -115,45 +100,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.150000 2.140000 0.400000 3.245000 ;
-        RECT 1.130000 1.950000 1.380000 3.245000 ;
-        RECT 2.015000 2.290000 2.345000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.300000 1.195000 1.630000 ;
-      RECT 1.025000 0.920000 4.220000 1.010000 ;
-      RECT 1.025000 1.010000 3.100000 1.090000 ;
-      RECT 1.025000 1.090000 1.195000 1.300000 ;
-      RECT 1.565000 1.950000 2.730000 2.060000 ;
-      RECT 1.565000 2.060000 3.315000 2.120000 ;
-      RECT 1.565000 2.120000 1.815000 2.980000 ;
-      RECT 2.020000 0.350000 2.890000 0.840000 ;
-      RECT 2.020000 0.840000 4.220000 0.920000 ;
-      RECT 2.020000 1.090000 3.100000 1.130000 ;
-      RECT 2.535000 2.400000 2.785000 2.905000 ;
-      RECT 2.535000 2.905000 3.685000 3.075000 ;
-      RECT 2.540000 2.120000 3.315000 2.230000 ;
-      RECT 2.930000 1.130000 3.100000 1.720000 ;
-      RECT 2.930000 1.720000 4.215000 1.890000 ;
-      RECT 2.985000 2.230000 3.315000 2.735000 ;
-      RECT 3.515000 2.060000 3.685000 2.905000 ;
-      RECT 3.885000 1.890000 4.215000 2.980000 ;
-      RECT 3.890000 0.350000 4.220000 0.840000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.150000  2.140000 0.400000 3.245000 ;
+      RECT 0.175000  0.085000 0.425000 0.790000 ;
+      RECT 0.525000  1.300000 1.195000 1.630000 ;
+      RECT 1.025000  0.920000 4.220000 1.010000 ;
+      RECT 1.025000  1.010000 3.100000 1.090000 ;
+      RECT 1.025000  1.090000 1.195000 1.300000 ;
+      RECT 1.035000  0.085000 1.560000 0.750000 ;
+      RECT 1.130000  1.950000 1.380000 3.245000 ;
+      RECT 1.565000  1.950000 2.730000 2.060000 ;
+      RECT 1.565000  2.060000 3.315000 2.120000 ;
+      RECT 1.565000  2.120000 1.815000 2.980000 ;
+      RECT 2.015000  2.290000 2.345000 3.245000 ;
+      RECT 2.020000  0.350000 2.890000 0.840000 ;
+      RECT 2.020000  0.840000 4.220000 0.920000 ;
+      RECT 2.020000  1.090000 3.100000 1.130000 ;
+      RECT 2.535000  2.400000 2.785000 2.905000 ;
+      RECT 2.535000  2.905000 3.685000 3.075000 ;
+      RECT 2.540000  2.120000 3.315000 2.230000 ;
+      RECT 2.930000  1.130000 3.100000 1.720000 ;
+      RECT 2.930000  1.720000 4.215000 1.890000 ;
+      RECT 2.985000  2.230000 3.315000 2.735000 ;
+      RECT 3.350000  0.085000 3.720000 0.670000 ;
+      RECT 3.515000  2.060000 3.685000 2.905000 ;
+      RECT 3.885000  1.890000 4.215000 2.980000 ;
+      RECT 3.890000  0.350000 4.220000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a221o_2
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef
index a4d9838..b12bd79 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_4.magic.lef
@@ -84,17 +84,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.125000 1.180000 0.355000 1.920000 ;
-        RECT 0.125000 1.920000 4.525000 2.090000 ;
-        RECT 2.850000 2.090000 4.525000 2.190000 ;
-        RECT 3.005000 1.010000 4.540000 1.180000 ;
-        RECT 3.005000 1.180000 3.235000 1.410000 ;
-        RECT 3.430000 0.440000 3.760000 1.010000 ;
-        RECT 4.290000 0.480000 4.540000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 1.210000 0.325000 1.380000 ;
-        RECT 3.035000 1.210000 3.205000 1.380000 ;
       LAYER met1 ;
         RECT 0.095000 1.180000 0.385000 1.225000 ;
         RECT 0.095000 1.225000 3.265000 1.365000 ;
@@ -107,38 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 1.935000  0.085000 2.105000 0.675000 ;
-        RECT 1.935000  0.675000 2.330000 1.070000 ;
-        RECT 3.000000  0.085000 3.250000 0.840000 ;
-        RECT 3.940000  0.085000 4.110000 0.840000 ;
-        RECT 4.720000  0.085000 5.440000 0.960000 ;
-        RECT 6.130000  0.085000 6.300000 0.675000 ;
-        RECT 6.130000  0.675000 6.525000 0.960000 ;
-        RECT 6.275000  0.960000 6.525000 1.280000 ;
-        RECT 7.215000  0.085000 7.465000 1.090000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -147,73 +104,111 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.320000 2.260000 0.650000 3.245000 ;
-        RECT 1.395000 2.600000 2.065000 3.245000 ;
-        RECT 2.845000 2.700000 3.175000 3.245000 ;
-        RECT 3.745000 2.700000 4.075000 3.245000 ;
-        RECT 4.645000 2.700000 4.975000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.315000 0.655000 0.565000 0.735000 ;
-      RECT 0.315000 0.735000 1.425000 0.905000 ;
-      RECT 0.315000 0.905000 0.565000 1.010000 ;
-      RECT 0.745000 1.075000 1.075000 1.580000 ;
-      RECT 0.745000 1.580000 4.880000 1.750000 ;
-      RECT 0.890000 2.260000 2.565000 2.360000 ;
-      RECT 0.890000 2.360000 7.150000 2.430000 ;
-      RECT 0.890000 2.430000 1.220000 2.900000 ;
-      RECT 1.255000 0.905000 1.425000 1.240000 ;
-      RECT 1.255000 1.240000 2.760000 1.410000 ;
-      RECT 2.235000 2.430000 7.150000 2.530000 ;
-      RECT 2.235000 2.530000 2.565000 2.900000 ;
-      RECT 2.510000 0.840000 2.760000 1.240000 ;
-      RECT 3.595000 1.350000 4.880000 1.580000 ;
-      RECT 4.710000 1.130000 6.090000 1.300000 ;
-      RECT 4.710000 1.300000 4.880000 1.350000 ;
-      RECT 5.470000 2.700000 6.700000 2.905000 ;
-      RECT 5.470000 2.905000 8.830000 3.075000 ;
-      RECT 5.610000 0.580000 5.940000 1.130000 ;
-      RECT 5.920000 1.300000 6.090000 1.600000 ;
-      RECT 5.920000 1.600000 8.445000 1.770000 ;
-      RECT 5.920000 1.770000 6.250000 2.190000 ;
-      RECT 6.705000 0.840000 7.035000 1.260000 ;
-      RECT 6.705000 1.260000 7.935000 1.430000 ;
-      RECT 6.820000 1.940000 8.380000 2.110000 ;
-      RECT 6.820000 2.110000 7.150000 2.360000 ;
-      RECT 6.870000 2.530000 7.150000 2.735000 ;
-      RECT 7.425000 2.280000 7.755000 2.905000 ;
-      RECT 7.685000 0.255000 8.925000 0.425000 ;
-      RECT 7.685000 0.425000 7.935000 1.260000 ;
-      RECT 8.010000 2.110000 8.380000 2.735000 ;
-      RECT 8.115000 0.595000 8.445000 1.600000 ;
-      RECT 8.580000 1.940000 8.830000 2.905000 ;
-      RECT 8.625000 0.425000 8.925000 1.040000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.125000  1.180000 0.355000 1.920000 ;
+      RECT 0.125000  1.920000 4.525000 2.090000 ;
+      RECT 0.315000  0.655000 0.565000 0.735000 ;
+      RECT 0.315000  0.735000 1.425000 0.905000 ;
+      RECT 0.315000  0.905000 0.565000 1.010000 ;
+      RECT 0.320000  2.260000 0.650000 3.245000 ;
+      RECT 0.745000  1.075000 1.075000 1.580000 ;
+      RECT 0.745000  1.580000 4.880000 1.750000 ;
+      RECT 0.890000  2.260000 2.565000 2.360000 ;
+      RECT 0.890000  2.360000 7.150000 2.430000 ;
+      RECT 0.890000  2.430000 1.220000 2.900000 ;
+      RECT 1.255000  0.905000 1.425000 1.240000 ;
+      RECT 1.255000  1.240000 2.760000 1.410000 ;
+      RECT 1.395000  2.600000 2.065000 3.245000 ;
+      RECT 1.935000  0.085000 2.105000 0.675000 ;
+      RECT 1.935000  0.675000 2.330000 1.070000 ;
+      RECT 2.235000  2.430000 7.150000 2.530000 ;
+      RECT 2.235000  2.530000 2.565000 2.900000 ;
+      RECT 2.510000  0.840000 2.760000 1.240000 ;
+      RECT 2.845000  2.700000 3.175000 3.245000 ;
+      RECT 2.850000  2.090000 4.525000 2.190000 ;
+      RECT 3.000000  0.085000 3.250000 0.840000 ;
+      RECT 3.005000  1.010000 4.540000 1.180000 ;
+      RECT 3.005000  1.180000 3.235000 1.410000 ;
+      RECT 3.430000  0.440000 3.760000 1.010000 ;
+      RECT 3.595000  1.350000 4.880000 1.580000 ;
+      RECT 3.745000  2.700000 4.075000 3.245000 ;
+      RECT 3.940000  0.085000 4.110000 0.840000 ;
+      RECT 4.290000  0.480000 4.540000 1.010000 ;
+      RECT 4.645000  2.700000 4.975000 3.245000 ;
+      RECT 4.710000  1.130000 6.090000 1.300000 ;
+      RECT 4.710000  1.300000 4.880000 1.350000 ;
+      RECT 4.720000  0.085000 5.440000 0.960000 ;
+      RECT 5.470000  2.700000 6.700000 2.905000 ;
+      RECT 5.470000  2.905000 8.830000 3.075000 ;
+      RECT 5.610000  0.580000 5.940000 1.130000 ;
+      RECT 5.920000  1.300000 6.090000 1.600000 ;
+      RECT 5.920000  1.600000 8.445000 1.770000 ;
+      RECT 5.920000  1.770000 6.250000 2.190000 ;
+      RECT 6.130000  0.085000 6.300000 0.675000 ;
+      RECT 6.130000  0.675000 6.525000 0.960000 ;
+      RECT 6.275000  0.960000 6.525000 1.280000 ;
+      RECT 6.705000  0.840000 7.035000 1.260000 ;
+      RECT 6.705000  1.260000 7.935000 1.430000 ;
+      RECT 6.820000  1.940000 8.380000 2.110000 ;
+      RECT 6.820000  2.110000 7.150000 2.360000 ;
+      RECT 6.870000  2.530000 7.150000 2.735000 ;
+      RECT 7.215000  0.085000 7.465000 1.090000 ;
+      RECT 7.425000  2.280000 7.755000 2.905000 ;
+      RECT 7.685000  0.255000 8.925000 0.425000 ;
+      RECT 7.685000  0.425000 7.935000 1.260000 ;
+      RECT 8.010000  2.110000 8.380000 2.735000 ;
+      RECT 8.115000  0.595000 8.445000 1.600000 ;
+      RECT 8.580000  1.940000 8.830000 2.905000 ;
+      RECT 8.625000  0.425000 8.925000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  1.210000 0.325000 1.380000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  1.210000 3.205000 1.380000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
   END
 END sky130_fd_sc_hs__a221o_4
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef
index 75d1b1a..6f0ecd6 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.magic.lef
@@ -91,19 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.260000  0.085000 1.630000 0.825000 ;
-        RECT 3.170000  0.085000 3.500000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -112,31 +99,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 2.675000 2.290000 3.025000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.575000 1.950000 0.905000 2.905000 ;
-      RECT 0.575000 2.905000 2.055000 3.075000 ;
-      RECT 1.275000 1.950000 3.525000 2.120000 ;
-      RECT 1.275000 2.120000 1.545000 2.735000 ;
-      RECT 1.725000 2.290000 2.055000 2.905000 ;
-      RECT 2.255000 2.120000 2.505000 2.980000 ;
-      RECT 3.195000 1.820000 3.525000 1.950000 ;
-      RECT 3.195000 2.120000 3.525000 2.980000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.575000  1.950000 0.905000 2.905000 ;
+      RECT 0.575000  2.905000 2.055000 3.075000 ;
+      RECT 1.260000  0.085000 1.630000 0.825000 ;
+      RECT 1.275000  1.950000 3.525000 2.120000 ;
+      RECT 1.275000  2.120000 1.545000 2.735000 ;
+      RECT 1.725000  2.290000 2.055000 2.905000 ;
+      RECT 2.255000  2.120000 2.505000 2.980000 ;
+      RECT 2.675000  2.290000 3.025000 3.245000 ;
+      RECT 3.170000  0.085000 3.500000 1.010000 ;
+      RECT 3.195000  1.820000 3.525000 1.950000 ;
+      RECT 3.195000  2.120000 3.525000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef
index f7f7537..66aceec 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.magic.lef
@@ -104,24 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.560000  0.085000 0.910000 0.840000 ;
-        RECT 1.940000  0.085000 2.280000 0.580000 ;
-        RECT 4.200000  0.085000 4.530000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -130,44 +112,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 3.355000 2.630000 3.605000 3.245000 ;
-        RECT 4.335000 2.630000 4.505000 3.245000 ;
-        RECT 5.235000 1.950000 5.485000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 2.290000 0.355000 2.905000 ;
-      RECT 0.105000 2.905000 3.165000 2.980000 ;
-      RECT 0.105000 2.980000 2.265000 3.075000 ;
-      RECT 1.085000 1.850000 1.255000 2.905000 ;
-      RECT 1.440000 0.350000 1.770000 0.750000 ;
-      RECT 1.440000 0.750000 2.780000 0.920000 ;
-      RECT 1.455000 2.290000 5.035000 2.460000 ;
-      RECT 1.455000 2.460000 1.815000 2.735000 ;
-      RECT 2.015000 2.630000 3.165000 2.905000 ;
-      RECT 2.450000 0.330000 2.780000 0.750000 ;
-      RECT 3.350000 0.330000 4.030000 0.750000 ;
-      RECT 3.350000 0.750000 5.000000 0.920000 ;
-      RECT 3.805000 2.460000 4.135000 2.980000 ;
-      RECT 4.700000 0.330000 5.000000 0.750000 ;
-      RECT 4.705000 2.460000 5.035000 2.980000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.105000  2.290000 0.355000 2.905000 ;
+      RECT 0.105000  2.905000 3.165000 2.980000 ;
+      RECT 0.105000  2.980000 2.265000 3.075000 ;
+      RECT 0.560000  0.085000 0.910000 0.840000 ;
+      RECT 1.085000  1.850000 1.255000 2.905000 ;
+      RECT 1.440000  0.350000 1.770000 0.750000 ;
+      RECT 1.440000  0.750000 2.780000 0.920000 ;
+      RECT 1.455000  2.290000 5.035000 2.460000 ;
+      RECT 1.455000  2.460000 1.815000 2.735000 ;
+      RECT 1.940000  0.085000 2.280000 0.580000 ;
+      RECT 2.015000  2.630000 3.165000 2.905000 ;
+      RECT 2.450000  0.330000 2.780000 0.750000 ;
+      RECT 3.350000  0.330000 4.030000 0.750000 ;
+      RECT 3.350000  0.750000 5.000000 0.920000 ;
+      RECT 3.355000  2.630000 3.605000 3.245000 ;
+      RECT 3.805000  2.460000 4.135000 2.980000 ;
+      RECT 4.200000  0.085000 4.530000 0.580000 ;
+      RECT 4.335000  2.630000 4.505000 3.245000 ;
+      RECT 4.700000  0.330000 5.000000 0.750000 ;
+      RECT 4.705000  2.460000 5.035000 2.980000 ;
+      RECT 5.235000  1.950000 5.485000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef
index a45d826..f0eb817 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.magic.lef
@@ -102,37 +102,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.675000  0.085000  1.005000 0.840000 ;
-        RECT 1.535000  0.085000  1.865000 0.840000 ;
-        RECT 3.060000  0.085000  3.390000 0.580000 ;
-        RECT 3.920000  0.085000  4.250000 0.580000 ;
-        RECT 8.740000  0.085000  9.070000 0.840000 ;
-        RECT 9.600000  0.085000  9.930000 0.840000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
@@ -141,72 +110,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 3.145000 2.630000  3.315000 3.245000 ;
-        RECT 4.045000 2.630000  4.215000 3.245000 ;
-        RECT 4.945000 2.630000  5.115000 3.245000 ;
-        RECT 5.815000 2.630000  6.275000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.560000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.555000 1.950000  9.925000 2.120000 ;
-      RECT  0.555000 2.120000  0.835000 2.735000 ;
-      RECT  1.505000 2.120000  1.735000 2.735000 ;
-      RECT  2.615000 2.290000  6.725000 2.460000 ;
-      RECT  2.615000 2.460000  2.945000 2.980000 ;
-      RECT  2.630000 0.350000  2.880000 0.750000 ;
-      RECT  2.630000 0.750000  4.680000 0.920000 ;
-      RECT  3.515000 2.460000  3.845000 2.980000 ;
-      RECT  3.570000 0.350000  3.740000 0.750000 ;
-      RECT  4.415000 2.460000  4.745000 2.980000 ;
-      RECT  4.430000 0.300000  6.400000 0.470000 ;
-      RECT  4.430000 0.470000  4.680000 0.750000 ;
-      RECT  5.210000 0.470000  5.540000 0.920000 ;
-      RECT  5.315000 2.460000  5.645000 2.980000 ;
-      RECT  6.070000 0.470000  6.400000 0.680000 ;
-      RECT  6.445000 2.460000  6.725000 2.905000 ;
-      RECT  6.445000 2.905000 10.375000 3.075000 ;
-      RECT  6.590000 0.350000  8.560000 0.600000 ;
-      RECT  6.590000 0.600000  6.920000 0.680000 ;
-      RECT  6.895000 2.120000  7.225000 2.735000 ;
-      RECT  7.395000 2.290000  7.625000 2.905000 ;
-      RECT  7.450000 0.600000  7.745000 0.680000 ;
-      RECT  7.795000 2.120000  8.125000 2.735000 ;
-      RECT  8.295000 2.290000  8.525000 2.905000 ;
-      RECT  8.390000 0.600000  8.560000 1.010000 ;
-      RECT  8.390000 1.010000 10.360000 1.180000 ;
-      RECT  8.695000 2.120000  9.025000 2.735000 ;
-      RECT  9.195000 2.290000  9.425000 2.905000 ;
-      RECT  9.250000 0.350000  9.420000 1.010000 ;
-      RECT  9.595000 2.120000  9.925000 2.735000 ;
-      RECT 10.110000 0.350000 10.360000 1.010000 ;
-      RECT 10.125000 1.820000 10.375000 2.905000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.555000  1.950000  9.925000 2.120000 ;
+      RECT  0.555000  2.120000  0.835000 2.735000 ;
+      RECT  0.675000  0.085000  1.005000 0.840000 ;
+      RECT  1.505000  2.120000  1.735000 2.735000 ;
+      RECT  1.535000  0.085000  1.865000 0.840000 ;
+      RECT  2.615000  2.290000  6.725000 2.460000 ;
+      RECT  2.615000  2.460000  2.945000 2.980000 ;
+      RECT  2.630000  0.350000  2.880000 0.750000 ;
+      RECT  2.630000  0.750000  4.680000 0.920000 ;
+      RECT  3.060000  0.085000  3.390000 0.580000 ;
+      RECT  3.145000  2.630000  3.315000 3.245000 ;
+      RECT  3.515000  2.460000  3.845000 2.980000 ;
+      RECT  3.570000  0.350000  3.740000 0.750000 ;
+      RECT  3.920000  0.085000  4.250000 0.580000 ;
+      RECT  4.045000  2.630000  4.215000 3.245000 ;
+      RECT  4.415000  2.460000  4.745000 2.980000 ;
+      RECT  4.430000  0.300000  6.400000 0.470000 ;
+      RECT  4.430000  0.470000  4.680000 0.750000 ;
+      RECT  4.945000  2.630000  5.115000 3.245000 ;
+      RECT  5.210000  0.470000  5.540000 0.920000 ;
+      RECT  5.315000  2.460000  5.645000 2.980000 ;
+      RECT  5.815000  2.630000  6.275000 3.245000 ;
+      RECT  6.070000  0.470000  6.400000 0.680000 ;
+      RECT  6.445000  2.460000  6.725000 2.905000 ;
+      RECT  6.445000  2.905000 10.375000 3.075000 ;
+      RECT  6.590000  0.350000  8.560000 0.600000 ;
+      RECT  6.590000  0.600000  6.920000 0.680000 ;
+      RECT  6.895000  2.120000  7.225000 2.735000 ;
+      RECT  7.395000  2.290000  7.625000 2.905000 ;
+      RECT  7.450000  0.600000  7.745000 0.680000 ;
+      RECT  7.795000  2.120000  8.125000 2.735000 ;
+      RECT  8.295000  2.290000  8.525000 2.905000 ;
+      RECT  8.390000  0.600000  8.560000 1.010000 ;
+      RECT  8.390000  1.010000 10.360000 1.180000 ;
+      RECT  8.695000  2.120000  9.025000 2.735000 ;
+      RECT  8.740000  0.085000  9.070000 0.840000 ;
+      RECT  9.195000  2.290000  9.425000 2.905000 ;
+      RECT  9.250000  0.350000  9.420000 1.010000 ;
+      RECT  9.595000  2.120000  9.925000 2.735000 ;
+      RECT  9.600000  0.085000  9.930000 0.840000 ;
+      RECT 10.110000  0.350000 10.360000 1.010000 ;
+      RECT 10.125000  1.820000 10.375000 2.905000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
   END
 END sky130_fd_sc_hs__a221oi_4
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef b/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef
index 6ec4648..6423311 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_1.magic.lef
@@ -99,21 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.960000  0.085000 1.805000 0.600000 ;
-        RECT 3.620000  0.085000 4.185000 0.610000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -122,42 +107,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 2.820000 2.300000 3.150000 3.245000 ;
-        RECT 3.855000 1.895000 4.185000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.960000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 2.590000 3.075000 ;
-      RECT 0.140000 0.350000 0.470000 0.780000 ;
-      RECT 0.140000 0.780000 4.185000 0.950000 ;
-      RECT 0.720000 0.950000 0.890000 1.930000 ;
-      RECT 0.720000 1.930000 1.050000 2.735000 ;
-      RECT 1.220000 1.930000 1.550000 2.905000 ;
-      RECT 1.720000 1.930000 2.050000 1.960000 ;
-      RECT 1.720000 1.960000 3.650000 2.130000 ;
-      RECT 1.720000 2.130000 2.050000 2.735000 ;
-      RECT 2.260000 2.300000 2.590000 2.905000 ;
-      RECT 2.295000 0.330000 3.130000 0.780000 ;
-      RECT 3.320000 1.895000 3.650000 1.960000 ;
-      RECT 3.320000 2.130000 3.650000 2.935000 ;
-      RECT 4.015000 0.950000 4.185000 1.300000 ;
-      RECT 4.015000 1.300000 4.370000 1.630000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  1.960000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 2.590000 3.075000 ;
+      RECT 0.140000  0.350000 0.470000 0.780000 ;
+      RECT 0.140000  0.780000 4.185000 0.950000 ;
+      RECT 0.720000  0.950000 0.890000 1.930000 ;
+      RECT 0.720000  1.930000 1.050000 2.735000 ;
+      RECT 0.960000  0.085000 1.805000 0.600000 ;
+      RECT 1.220000  1.930000 1.550000 2.905000 ;
+      RECT 1.720000  1.930000 2.050000 1.960000 ;
+      RECT 1.720000  1.960000 3.650000 2.130000 ;
+      RECT 1.720000  2.130000 2.050000 2.735000 ;
+      RECT 2.260000  2.300000 2.590000 2.905000 ;
+      RECT 2.295000  0.330000 3.130000 0.780000 ;
+      RECT 2.820000  2.300000 3.150000 3.245000 ;
+      RECT 3.320000  1.895000 3.650000 1.960000 ;
+      RECT 3.320000  2.130000 3.650000 2.935000 ;
+      RECT 3.620000  0.085000 4.185000 0.610000 ;
+      RECT 3.855000  1.895000 4.185000 3.245000 ;
+      RECT 4.015000  0.950000 4.185000 1.300000 ;
+      RECT 4.015000  1.300000 4.370000 1.630000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__a222o_1
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef b/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef
index 677b967..911d5d6 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_2.magic.lef
@@ -98,23 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.935000  0.085000 1.185000 0.750000 ;
-        RECT 2.205000  0.085000 2.535000 0.410000 ;
-        RECT 4.260000  0.085000 4.590000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -123,51 +106,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 1.575000 2.710000 1.905000 3.245000 ;
-        RECT 2.645000 2.710000 2.975000 3.245000 ;
-        RECT 4.835000 1.950000 5.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.390000 0.365000 0.920000 ;
-      RECT 0.115000 0.920000 1.525000 1.090000 ;
-      RECT 0.115000 1.950000 1.525000 2.200000 ;
-      RECT 0.115000 2.200000 0.365000 2.980000 ;
-      RECT 0.565000 2.370000 4.165000 2.540000 ;
-      RECT 0.565000 2.540000 0.895000 2.980000 ;
-      RECT 1.355000 0.580000 2.400000 0.750000 ;
-      RECT 1.355000 0.750000 1.525000 0.920000 ;
-      RECT 1.355000 1.090000 1.525000 1.950000 ;
-      RECT 2.230000 0.750000 2.400000 1.010000 ;
-      RECT 2.230000 1.010000 3.750000 1.180000 ;
-      RECT 2.230000 1.180000 2.560000 1.590000 ;
-      RECT 2.765000 0.350000 4.090000 0.520000 ;
-      RECT 2.765000 0.520000 3.095000 0.840000 ;
-      RECT 3.265000 0.700000 3.750000 1.010000 ;
-      RECT 3.265000 2.710000 3.630000 2.905000 ;
-      RECT 3.265000 2.905000 4.665000 3.075000 ;
-      RECT 3.835000 1.950000 4.165000 2.370000 ;
-      RECT 3.835000 2.540000 4.165000 2.735000 ;
-      RECT 3.920000 0.520000 4.090000 1.010000 ;
-      RECT 3.920000 1.010000 5.140000 1.180000 ;
-      RECT 4.335000 1.950000 4.665000 2.905000 ;
-      RECT 4.810000 0.350000 5.140000 1.010000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  0.390000 0.365000 0.920000 ;
+      RECT 0.115000  0.920000 1.525000 1.090000 ;
+      RECT 0.115000  1.950000 1.525000 2.200000 ;
+      RECT 0.115000  2.200000 0.365000 2.980000 ;
+      RECT 0.565000  2.370000 4.165000 2.540000 ;
+      RECT 0.565000  2.540000 0.895000 2.980000 ;
+      RECT 0.935000  0.085000 1.185000 0.750000 ;
+      RECT 1.355000  0.580000 2.400000 0.750000 ;
+      RECT 1.355000  0.750000 1.525000 0.920000 ;
+      RECT 1.355000  1.090000 1.525000 1.950000 ;
+      RECT 1.575000  2.710000 1.905000 3.245000 ;
+      RECT 2.205000  0.085000 2.535000 0.410000 ;
+      RECT 2.230000  0.750000 2.400000 1.010000 ;
+      RECT 2.230000  1.010000 3.750000 1.180000 ;
+      RECT 2.230000  1.180000 2.560000 1.590000 ;
+      RECT 2.645000  2.710000 2.975000 3.245000 ;
+      RECT 2.765000  0.350000 4.090000 0.520000 ;
+      RECT 2.765000  0.520000 3.095000 0.840000 ;
+      RECT 3.265000  0.700000 3.750000 1.010000 ;
+      RECT 3.265000  2.710000 3.630000 2.905000 ;
+      RECT 3.265000  2.905000 4.665000 3.075000 ;
+      RECT 3.835000  1.950000 4.165000 2.370000 ;
+      RECT 3.835000  2.540000 4.165000 2.735000 ;
+      RECT 3.920000  0.520000 4.090000 1.010000 ;
+      RECT 3.920000  1.010000 5.140000 1.180000 ;
+      RECT 4.260000  0.085000 4.590000 0.840000 ;
+      RECT 4.335000  1.950000 4.665000 2.905000 ;
+      RECT 4.810000  0.350000 5.140000 1.010000 ;
+      RECT 4.835000  1.950000 5.165000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__a222o_2
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef
index eb8af3a..bb7aadd 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.magic.lef
@@ -104,20 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.960000  0.085000 2.180000 0.600000 ;
-        RECT 3.850000  0.085000 4.180000 0.950000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -126,31 +112,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 3.325000 2.300000 3.655000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 2.300000 0.945000 2.905000 ;
-      RECT 0.615000 2.905000 2.655000 3.075000 ;
-      RECT 1.825000 1.960000 4.205000 2.130000 ;
-      RECT 1.825000 2.130000 2.155000 2.735000 ;
-      RECT 2.325000 2.300000 2.655000 2.905000 ;
-      RECT 2.825000 2.130000 3.155000 2.980000 ;
-      RECT 3.875000 2.130000 4.205000 2.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.615000  2.300000 0.945000 2.905000 ;
+      RECT 0.615000  2.905000 2.655000 3.075000 ;
+      RECT 0.960000  0.085000 2.180000 0.600000 ;
+      RECT 1.825000  1.960000 4.205000 2.130000 ;
+      RECT 1.825000  2.130000 2.155000 2.735000 ;
+      RECT 2.325000  2.300000 2.655000 2.905000 ;
+      RECT 2.825000  2.130000 3.155000 2.980000 ;
+      RECT 3.325000  2.300000 3.655000 3.245000 ;
+      RECT 3.850000  0.085000 4.180000 0.950000 ;
+      RECT 3.875000  2.130000 4.205000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a222oi_1
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef
index c3b2891..f22516e 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.magic.lef
@@ -124,27 +124,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.115000  0.085000 0.480000 0.655000 ;
-        RECT 1.950000  0.085000 2.280000 0.940000 ;
-        RECT 3.450000  0.085000 3.840000 0.410000 ;
-        RECT 5.385000  0.085000 5.715000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -153,53 +132,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 4.895000 2.650000 5.255000 3.245000 ;
-        RECT 5.825000 2.650000 6.155000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 2.345000 0.895000 2.905000 ;
-      RECT 0.565000 2.905000 4.325000 2.980000 ;
-      RECT 0.565000 2.980000 3.335000 3.075000 ;
-      RECT 0.660000 0.350000 1.780000 0.610000 ;
-      RECT 1.495000 2.345000 1.825000 2.905000 ;
-      RECT 1.590000 0.610000 1.780000 0.885000 ;
-      RECT 2.635000 1.970000 2.805000 2.290000 ;
-      RECT 2.635000 2.290000 6.605000 2.460000 ;
-      RECT 2.635000 2.460000 2.805000 2.735000 ;
-      RECT 3.005000 2.630000 3.335000 2.650000 ;
-      RECT 3.005000 2.650000 4.325000 2.905000 ;
-      RECT 3.020000 0.350000 3.270000 0.580000 ;
-      RECT 3.020000 0.580000 4.270000 0.750000 ;
-      RECT 4.020000 0.350000 4.270000 0.580000 ;
-      RECT 4.445000 1.950000 4.775000 2.290000 ;
-      RECT 4.500000 2.460000 6.605000 2.480000 ;
-      RECT 4.500000 2.480000 4.715000 2.980000 ;
-      RECT 4.885000 0.350000 5.215000 0.770000 ;
-      RECT 4.885000 0.770000 6.150000 0.940000 ;
-      RECT 5.425000 2.480000 5.655000 2.980000 ;
-      RECT 5.900000 0.330000 6.150000 0.770000 ;
-      RECT 6.275000 1.950000 6.605000 2.290000 ;
-      RECT 6.335000 2.480000 6.605000 3.000000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  0.085000 0.480000 0.655000 ;
+      RECT 0.565000  2.345000 0.895000 2.905000 ;
+      RECT 0.565000  2.905000 4.325000 2.980000 ;
+      RECT 0.565000  2.980000 3.335000 3.075000 ;
+      RECT 0.660000  0.350000 1.780000 0.610000 ;
+      RECT 1.495000  2.345000 1.825000 2.905000 ;
+      RECT 1.590000  0.610000 1.780000 0.885000 ;
+      RECT 1.950000  0.085000 2.280000 0.940000 ;
+      RECT 2.635000  1.970000 2.805000 2.290000 ;
+      RECT 2.635000  2.290000 6.605000 2.460000 ;
+      RECT 2.635000  2.460000 2.805000 2.735000 ;
+      RECT 3.005000  2.630000 3.335000 2.650000 ;
+      RECT 3.005000  2.650000 4.325000 2.905000 ;
+      RECT 3.020000  0.350000 3.270000 0.580000 ;
+      RECT 3.020000  0.580000 4.270000 0.750000 ;
+      RECT 3.450000  0.085000 3.840000 0.410000 ;
+      RECT 4.020000  0.350000 4.270000 0.580000 ;
+      RECT 4.445000  1.950000 4.775000 2.290000 ;
+      RECT 4.500000  2.460000 6.605000 2.480000 ;
+      RECT 4.500000  2.480000 4.715000 2.980000 ;
+      RECT 4.885000  0.350000 5.215000 0.770000 ;
+      RECT 4.885000  0.770000 6.150000 0.940000 ;
+      RECT 4.895000  2.650000 5.255000 3.245000 ;
+      RECT 5.385000  0.085000 5.715000 0.600000 ;
+      RECT 5.425000  2.480000 5.655000 2.980000 ;
+      RECT 5.825000  2.650000 6.155000 3.245000 ;
+      RECT 5.900000  0.330000 6.150000 0.770000 ;
+      RECT 6.275000  1.950000 6.605000 2.290000 ;
+      RECT 6.335000  2.480000 6.605000 3.000000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__a222oi_2
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef
index 1ff1877..11e0674 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_1.magic.lef
@@ -80,18 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.730000  0.085000 0.945000 0.960000 ;
-        RECT 2.495000  0.085000 2.745000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -100,35 +88,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.195000 1.970000 0.445000 3.245000 ;
-        RECT 2.165000 2.310000 2.725000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.220000 0.840000 0.550000 1.130000 ;
-      RECT 0.220000 1.130000 1.285000 1.300000 ;
-      RECT 0.645000 1.970000 0.895000 2.905000 ;
-      RECT 0.645000 2.905000 1.995000 3.075000 ;
-      RECT 1.095000 1.970000 2.755000 2.140000 ;
-      RECT 1.095000 2.140000 1.425000 2.735000 ;
-      RECT 1.115000 0.375000 2.245000 0.625000 ;
-      RECT 1.115000 0.625000 1.285000 1.130000 ;
-      RECT 1.485000 0.795000 1.815000 1.010000 ;
-      RECT 1.485000 1.010000 2.755000 1.180000 ;
-      RECT 1.595000 2.310000 1.995000 2.905000 ;
-      RECT 2.505000 1.180000 2.755000 1.970000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.195000  1.970000 0.445000 3.245000 ;
+      RECT 0.220000  0.840000 0.550000 1.130000 ;
+      RECT 0.220000  1.130000 1.285000 1.300000 ;
+      RECT 0.645000  1.970000 0.895000 2.905000 ;
+      RECT 0.645000  2.905000 1.995000 3.075000 ;
+      RECT 0.730000  0.085000 0.945000 0.960000 ;
+      RECT 1.095000  1.970000 2.755000 2.140000 ;
+      RECT 1.095000  2.140000 1.425000 2.735000 ;
+      RECT 1.115000  0.375000 2.245000 0.625000 ;
+      RECT 1.115000  0.625000 1.285000 1.130000 ;
+      RECT 1.485000  0.795000 1.815000 1.010000 ;
+      RECT 1.485000  1.010000 2.755000 1.180000 ;
+      RECT 1.595000  2.310000 1.995000 2.905000 ;
+      RECT 2.165000  2.310000 2.725000 3.245000 ;
+      RECT 2.495000  0.085000 2.745000 0.840000 ;
+      RECT 2.505000  1.180000 2.755000 1.970000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef
index ad8670c..f858805 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_2.magic.lef
@@ -82,20 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.100000  0.085000 0.350000 1.130000 ;
-        RECT 1.040000  0.085000 1.290000 0.840000 ;
-        RECT 2.870000  0.085000 3.200000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -104,39 +90,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.485000 2.060000 0.735000 3.245000 ;
-        RECT 1.385000 2.290000 1.715000 3.245000 ;
-        RECT 3.395000 1.950000 3.725000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.085000 1.010000 2.330000 1.180000 ;
-      RECT 1.085000 1.180000 1.415000 1.550000 ;
-      RECT 1.245000 1.550000 1.415000 1.950000 ;
-      RECT 1.245000 1.950000 2.705000 2.120000 ;
-      RECT 1.500000 0.255000 2.670000 0.425000 ;
-      RECT 1.500000 0.425000 1.830000 0.840000 ;
-      RECT 1.925000 2.290000 2.255000 2.905000 ;
-      RECT 1.925000 2.905000 3.225000 3.075000 ;
-      RECT 2.000000 0.595000 2.330000 1.010000 ;
-      RECT 2.455000 2.120000 2.705000 2.735000 ;
-      RECT 2.500000 0.425000 2.670000 1.010000 ;
-      RECT 2.500000 1.010000 3.700000 1.180000 ;
-      RECT 2.875000 1.950000 3.225000 2.905000 ;
-      RECT 3.370000 0.350000 3.700000 1.010000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.100000  0.085000 0.350000 1.130000 ;
+      RECT 0.485000  2.060000 0.735000 3.245000 ;
+      RECT 1.040000  0.085000 1.290000 0.840000 ;
+      RECT 1.085000  1.010000 2.330000 1.180000 ;
+      RECT 1.085000  1.180000 1.415000 1.550000 ;
+      RECT 1.245000  1.550000 1.415000 1.950000 ;
+      RECT 1.245000  1.950000 2.705000 2.120000 ;
+      RECT 1.385000  2.290000 1.715000 3.245000 ;
+      RECT 1.500000  0.255000 2.670000 0.425000 ;
+      RECT 1.500000  0.425000 1.830000 0.840000 ;
+      RECT 1.925000  2.290000 2.255000 2.905000 ;
+      RECT 1.925000  2.905000 3.225000 3.075000 ;
+      RECT 2.000000  0.595000 2.330000 1.010000 ;
+      RECT 2.455000  2.120000 2.705000 2.735000 ;
+      RECT 2.500000  0.425000 2.670000 1.010000 ;
+      RECT 2.500000  1.010000 3.700000 1.180000 ;
+      RECT 2.870000  0.085000 3.200000 0.840000 ;
+      RECT 2.875000  1.950000 3.225000 2.905000 ;
+      RECT 3.370000  0.350000 3.700000 1.010000 ;
+      RECT 3.395000  1.950000 3.725000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef
index ffcb53b..adcfd91 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_4.magic.lef
@@ -91,29 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.975000  0.085000 1.225000 0.970000 ;
-        RECT 1.835000  0.085000 2.085000 0.840000 ;
-        RECT 2.695000  0.085000 3.025000 0.925000 ;
-        RECT 4.535000  0.085000 4.785000 0.925000 ;
-        RECT 6.585000  0.085000 6.915000 1.275000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -122,59 +99,79 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.175000 1.900000 0.505000 3.245000 ;
-        RECT 1.075000 1.820000 1.325000 3.245000 ;
-        RECT 2.055000 1.850000 2.305000 3.245000 ;
-        RECT 5.035000 2.290000 5.510000 3.245000 ;
-        RECT 6.130000 2.290000 6.460000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 2.025000 1.350000 2.855000 1.680000 ;
-      RECT 2.475000 1.680000 2.645000 2.905000 ;
-      RECT 2.475000 2.905000 4.415000 2.980000 ;
-      RECT 2.475000 2.980000 3.515000 3.075000 ;
-      RECT 2.685000 1.095000 6.055000 1.265000 ;
-      RECT 2.685000 1.265000 2.855000 1.350000 ;
-      RECT 2.815000 1.940000 2.985000 2.320000 ;
-      RECT 2.815000 2.320000 4.865000 2.490000 ;
-      RECT 2.815000 2.490000 2.985000 2.735000 ;
-      RECT 3.185000 2.660000 4.415000 2.905000 ;
-      RECT 3.200000 0.580000 4.355000 0.830000 ;
-      RECT 3.630000 1.000000 3.960000 1.095000 ;
-      RECT 4.140000 0.830000 4.355000 0.925000 ;
-      RECT 4.615000 1.940000 4.865000 1.950000 ;
-      RECT 4.615000 1.950000 6.910000 2.120000 ;
-      RECT 4.615000 2.120000 4.865000 2.320000 ;
-      RECT 4.615000 2.490000 4.865000 2.980000 ;
-      RECT 5.295000 0.675000 6.405000 0.845000 ;
-      RECT 5.680000 2.120000 5.930000 2.980000 ;
-      RECT 5.725000 1.015000 6.055000 1.095000 ;
-      RECT 5.725000 1.265000 6.055000 1.275000 ;
-      RECT 6.235000 0.595000 6.405000 0.675000 ;
-      RECT 6.235000 0.845000 6.405000 1.275000 ;
-      RECT 6.660000 1.940000 6.910000 1.950000 ;
-      RECT 6.660000 2.120000 6.910000 2.980000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.175000  1.900000 0.505000 3.245000 ;
+      RECT 0.975000  0.085000 1.225000 0.970000 ;
+      RECT 1.075000  1.820000 1.325000 3.245000 ;
+      RECT 1.835000  0.085000 2.085000 0.840000 ;
+      RECT 2.025000  1.350000 2.855000 1.680000 ;
+      RECT 2.055000  1.850000 2.305000 3.245000 ;
+      RECT 2.475000  1.680000 2.645000 2.905000 ;
+      RECT 2.475000  2.905000 4.415000 2.980000 ;
+      RECT 2.475000  2.980000 3.515000 3.075000 ;
+      RECT 2.685000  1.095000 6.055000 1.265000 ;
+      RECT 2.685000  1.265000 2.855000 1.350000 ;
+      RECT 2.695000  0.085000 3.025000 0.925000 ;
+      RECT 2.815000  1.940000 2.985000 2.320000 ;
+      RECT 2.815000  2.320000 4.865000 2.490000 ;
+      RECT 2.815000  2.490000 2.985000 2.735000 ;
+      RECT 3.185000  2.660000 4.415000 2.905000 ;
+      RECT 3.200000  0.580000 4.355000 0.830000 ;
+      RECT 3.630000  1.000000 3.960000 1.095000 ;
+      RECT 4.140000  0.830000 4.355000 0.925000 ;
+      RECT 4.535000  0.085000 4.785000 0.925000 ;
+      RECT 4.615000  1.940000 4.865000 1.950000 ;
+      RECT 4.615000  1.950000 6.910000 2.120000 ;
+      RECT 4.615000  2.120000 4.865000 2.320000 ;
+      RECT 4.615000  2.490000 4.865000 2.980000 ;
+      RECT 5.035000  2.290000 5.510000 3.245000 ;
+      RECT 5.295000  0.675000 6.405000 0.845000 ;
+      RECT 5.680000  2.120000 5.930000 2.980000 ;
+      RECT 5.725000  1.015000 6.055000 1.095000 ;
+      RECT 5.725000  1.265000 6.055000 1.275000 ;
+      RECT 6.130000  2.290000 6.460000 3.245000 ;
+      RECT 6.235000  0.595000 6.405000 0.675000 ;
+      RECT 6.235000  0.845000 6.405000 1.275000 ;
+      RECT 6.585000  0.085000 6.915000 1.275000 ;
+      RECT 6.660000  1.940000 6.910000 1.950000 ;
+      RECT 6.660000  2.120000 6.910000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__a22o_4
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef
index ce51443..8bf9de5 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.magic.lef
@@ -83,17 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.340000  0.085000 0.670000 0.840000 ;
-        RECT 2.210000  0.085000 2.540000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -102,26 +91,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.715000 2.290000 2.065000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.315000 2.290000 0.645000 2.905000 ;
-      RECT 0.315000 2.905000 1.545000 3.075000 ;
-      RECT 1.215000 1.950000 2.565000 2.120000 ;
-      RECT 1.215000 2.120000 1.545000 2.905000 ;
-      RECT 2.235000 2.120000 2.565000 2.980000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.315000  2.290000 0.645000 2.905000 ;
+      RECT 0.315000  2.905000 1.545000 3.075000 ;
+      RECT 0.340000  0.085000 0.670000 0.840000 ;
+      RECT 1.215000  1.950000 2.565000 2.120000 ;
+      RECT 1.215000  2.120000 1.545000 2.905000 ;
+      RECT 1.715000  2.290000 2.065000 3.245000 ;
+      RECT 2.210000  0.085000 2.540000 1.130000 ;
+      RECT 2.235000  2.120000 2.565000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef
index 9922a8f..bb655ab 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.magic.lef
@@ -96,21 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 1.145000  0.085000 1.475000 0.580000 ;
-        RECT 3.305000  0.085000 3.635000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -119,42 +104,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.740000 2.630000 0.990000 3.245000 ;
-        RECT 1.690000 2.630000 2.230000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.290000 1.950000 0.540000 2.290000 ;
-      RECT 0.290000 2.290000 2.730000 2.460000 ;
-      RECT 0.290000 2.460000 0.540000 2.980000 ;
-      RECT 0.715000 0.330000 0.965000 0.750000 ;
-      RECT 0.715000 0.750000 1.815000 0.920000 ;
-      RECT 1.190000 2.460000 1.520000 2.980000 ;
-      RECT 1.645000 0.350000 1.975000 0.640000 ;
-      RECT 1.645000 0.640000 1.815000 0.750000 ;
-      RECT 2.400000 2.060000 2.730000 2.290000 ;
-      RECT 2.400000 2.460000 2.730000 2.905000 ;
-      RECT 2.400000 2.905000 4.560000 3.075000 ;
-      RECT 2.835000 0.330000 3.135000 0.750000 ;
-      RECT 2.835000 0.750000 4.065000 0.920000 ;
-      RECT 3.330000 2.290000 3.660000 2.905000 ;
-      RECT 3.815000 0.330000 4.065000 0.750000 ;
-      RECT 4.230000 2.290000 4.560000 2.905000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.290000  1.950000 0.540000 2.290000 ;
+      RECT 0.290000  2.290000 2.730000 2.460000 ;
+      RECT 0.290000  2.460000 0.540000 2.980000 ;
+      RECT 0.715000  0.330000 0.965000 0.750000 ;
+      RECT 0.715000  0.750000 1.815000 0.920000 ;
+      RECT 0.740000  2.630000 0.990000 3.245000 ;
+      RECT 1.145000  0.085000 1.475000 0.580000 ;
+      RECT 1.190000  2.460000 1.520000 2.980000 ;
+      RECT 1.645000  0.350000 1.975000 0.640000 ;
+      RECT 1.645000  0.640000 1.815000 0.750000 ;
+      RECT 1.690000  2.630000 2.230000 3.245000 ;
+      RECT 2.400000  2.060000 2.730000 2.290000 ;
+      RECT 2.400000  2.460000 2.730000 2.905000 ;
+      RECT 2.400000  2.905000 4.560000 3.075000 ;
+      RECT 2.835000  0.330000 3.135000 0.750000 ;
+      RECT 2.835000  0.750000 4.065000 0.920000 ;
+      RECT 3.305000  0.085000 3.635000 0.580000 ;
+      RECT 3.330000  2.290000 3.660000 2.905000 ;
+      RECT 3.815000  0.330000 4.065000 0.750000 ;
+      RECT 4.230000  2.290000 4.560000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef
index 2fb567e..a5bccfb 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.magic.lef
@@ -91,30 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.630000  0.085000 0.880000 0.840000 ;
-        RECT 1.490000  0.085000 1.820000 0.840000 ;
-        RECT 6.310000  0.085000 6.560000 0.840000 ;
-        RECT 7.170000  0.085000 7.420000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -123,61 +99,82 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 4.235000 2.290000 4.565000 3.245000 ;
-        RECT 5.185000 2.290000 5.645000 3.245000 ;
-        RECT 6.265000 2.290000 6.595000 3.245000 ;
-        RECT 7.165000 2.290000 7.495000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.185000 1.820000 0.435000 2.905000 ;
-      RECT 0.185000 2.905000 4.035000 3.075000 ;
-      RECT 0.200000 0.350000 0.450000 1.010000 ;
-      RECT 0.200000 1.010000 2.170000 1.180000 ;
-      RECT 1.060000 0.350000 1.310000 1.010000 ;
-      RECT 1.085000 2.290000 1.415000 2.905000 ;
-      RECT 1.985000 2.290000 2.315000 2.905000 ;
-      RECT 2.000000 0.255000 3.970000 0.425000 ;
-      RECT 2.000000 0.425000 2.170000 1.010000 ;
-      RECT 2.860000 0.425000 3.970000 0.600000 ;
-      RECT 2.860000 0.600000 3.030000 0.840000 ;
-      RECT 2.885000 2.290000 3.215000 2.905000 ;
-      RECT 3.785000 1.820000 4.035000 1.950000 ;
-      RECT 3.785000 1.950000 7.945000 2.120000 ;
-      RECT 3.785000 2.120000 4.035000 2.905000 ;
-      RECT 4.160000 0.350000 6.130000 0.600000 ;
-      RECT 4.160000 0.600000 4.490000 0.680000 ;
-      RECT 4.765000 2.120000 5.015000 2.980000 ;
-      RECT 5.815000 2.120000 6.065000 2.980000 ;
-      RECT 5.960000 0.600000 6.130000 1.010000 ;
-      RECT 5.960000 1.010000 7.930000 1.180000 ;
-      RECT 6.740000 0.350000 6.990000 1.010000 ;
-      RECT 6.795000 2.120000 6.965000 2.980000 ;
-      RECT 7.600000 0.350000 7.930000 1.010000 ;
-      RECT 7.695000 1.820000 7.945000 1.950000 ;
-      RECT 7.695000 2.120000 7.945000 2.980000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.185000  1.820000 0.435000 2.905000 ;
+      RECT 0.185000  2.905000 4.035000 3.075000 ;
+      RECT 0.200000  0.350000 0.450000 1.010000 ;
+      RECT 0.200000  1.010000 2.170000 1.180000 ;
+      RECT 0.630000  0.085000 0.880000 0.840000 ;
+      RECT 1.060000  0.350000 1.310000 1.010000 ;
+      RECT 1.085000  2.290000 1.415000 2.905000 ;
+      RECT 1.490000  0.085000 1.820000 0.840000 ;
+      RECT 1.985000  2.290000 2.315000 2.905000 ;
+      RECT 2.000000  0.255000 3.970000 0.425000 ;
+      RECT 2.000000  0.425000 2.170000 1.010000 ;
+      RECT 2.860000  0.425000 3.970000 0.600000 ;
+      RECT 2.860000  0.600000 3.030000 0.840000 ;
+      RECT 2.885000  2.290000 3.215000 2.905000 ;
+      RECT 3.785000  1.820000 4.035000 1.950000 ;
+      RECT 3.785000  1.950000 7.945000 2.120000 ;
+      RECT 3.785000  2.120000 4.035000 2.905000 ;
+      RECT 4.160000  0.350000 6.130000 0.600000 ;
+      RECT 4.160000  0.600000 4.490000 0.680000 ;
+      RECT 4.235000  2.290000 4.565000 3.245000 ;
+      RECT 4.765000  2.120000 5.015000 2.980000 ;
+      RECT 5.185000  2.290000 5.645000 3.245000 ;
+      RECT 5.815000  2.120000 6.065000 2.980000 ;
+      RECT 5.960000  0.600000 6.130000 1.010000 ;
+      RECT 5.960000  1.010000 7.930000 1.180000 ;
+      RECT 6.265000  2.290000 6.595000 3.245000 ;
+      RECT 6.310000  0.085000 6.560000 0.840000 ;
+      RECT 6.740000  0.350000 6.990000 1.010000 ;
+      RECT 6.795000  2.120000 6.965000 2.980000 ;
+      RECT 7.165000  2.290000 7.495000 3.245000 ;
+      RECT 7.170000  0.085000 7.420000 0.840000 ;
+      RECT 7.600000  0.350000 7.930000 1.010000 ;
+      RECT 7.695000  1.820000 7.945000 1.950000 ;
+      RECT 7.695000  2.120000 7.945000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__a22oi_4
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef
index e2bf10e..5908285 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.magic.lef
@@ -81,24 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.770000  0.085000 1.100000 1.010000 ;
-        RECT 1.760000  0.690000 2.935000 0.860000 ;
-        RECT 2.765000  0.085000 2.935000 0.690000 ;
-        RECT 3.145000  0.085000 3.315000 0.840000 ;
-        RECT 3.145000  0.840000 3.870000 1.010000 ;
-        RECT 3.540000  1.010000 3.870000 1.290000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -107,43 +89,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.760000 2.130000 1.090000 3.245000 ;
-        RECT 3.085000 2.290000 3.445000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.465000 1.320000 0.900000 1.650000 ;
-      RECT 0.730000 1.650000 0.900000 1.790000 ;
-      RECT 0.730000 1.790000 2.190000 1.960000 ;
-      RECT 1.285000 0.255000 2.595000 0.520000 ;
-      RECT 1.285000 0.520000 1.590000 1.010000 ;
-      RECT 1.325000 1.960000 1.495000 2.905000 ;
-      RECT 1.325000 2.905000 2.515000 3.075000 ;
-      RECT 1.665000 2.130000 2.530000 2.300000 ;
-      RECT 1.665000 2.300000 1.995000 2.735000 ;
-      RECT 2.020000 1.030000 2.900000 1.210000 ;
-      RECT 2.020000 1.210000 2.190000 1.790000 ;
-      RECT 2.185000 2.470000 2.515000 2.905000 ;
-      RECT 2.360000 1.450000 2.665000 1.780000 ;
-      RECT 2.360000 1.780000 2.530000 2.130000 ;
-      RECT 2.715000 1.950000 3.895000 2.120000 ;
-      RECT 2.715000 2.120000 2.885000 2.980000 ;
-      RECT 3.645000 1.940000 3.895000 1.950000 ;
-      RECT 3.645000 2.120000 3.895000 2.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.465000  1.320000 0.900000 1.650000 ;
+      RECT 0.730000  1.650000 0.900000 1.790000 ;
+      RECT 0.730000  1.790000 2.190000 1.960000 ;
+      RECT 0.760000  2.130000 1.090000 3.245000 ;
+      RECT 0.770000  0.085000 1.100000 1.010000 ;
+      RECT 1.285000  0.255000 2.595000 0.520000 ;
+      RECT 1.285000  0.520000 1.590000 1.010000 ;
+      RECT 1.325000  1.960000 1.495000 2.905000 ;
+      RECT 1.325000  2.905000 2.515000 3.075000 ;
+      RECT 1.665000  2.130000 2.530000 2.300000 ;
+      RECT 1.665000  2.300000 1.995000 2.735000 ;
+      RECT 1.760000  0.690000 2.935000 0.860000 ;
+      RECT 2.020000  1.030000 2.900000 1.210000 ;
+      RECT 2.020000  1.210000 2.190000 1.790000 ;
+      RECT 2.185000  2.470000 2.515000 2.905000 ;
+      RECT 2.360000  1.450000 2.665000 1.780000 ;
+      RECT 2.360000  1.780000 2.530000 2.130000 ;
+      RECT 2.715000  1.950000 3.895000 2.120000 ;
+      RECT 2.715000  2.120000 2.885000 2.980000 ;
+      RECT 2.765000  0.085000 2.935000 0.690000 ;
+      RECT 3.085000  2.290000 3.445000 3.245000 ;
+      RECT 3.145000  0.085000 3.315000 0.840000 ;
+      RECT 3.145000  0.840000 3.870000 1.010000 ;
+      RECT 3.540000  1.010000 3.870000 1.290000 ;
+      RECT 3.645000  1.940000 3.895000 1.950000 ;
+      RECT 3.645000  2.120000 3.895000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef
index b5b2be7..2cac903 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.magic.lef
@@ -79,23 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.290000  0.085000 0.620000 1.010000 ;
-        RECT 1.650000  0.085000 2.520000 0.670000 ;
-        RECT 3.050000  0.085000 3.315000 0.940000 ;
-        RECT 4.100000  0.085000 4.350000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -104,45 +87,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.715000 2.060000 1.045000 3.245000 ;
-        RECT 3.105000 2.660000 3.495000 3.245000 ;
-        RECT 4.065000 2.660000 4.395000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.265000 1.720000 1.415000 1.890000 ;
-      RECT 0.265000 1.890000 0.515000 2.980000 ;
-      RECT 1.080000 0.350000 1.480000 0.840000 ;
-      RECT 1.080000 0.840000 1.655000 1.010000 ;
-      RECT 1.245000 1.890000 1.415000 2.980000 ;
-      RECT 1.485000 1.010000 1.655000 1.380000 ;
-      RECT 1.485000 1.380000 1.755000 1.550000 ;
-      RECT 1.585000 1.550000 1.755000 2.020000 ;
-      RECT 1.585000 2.020000 1.945000 2.810000 ;
-      RECT 1.585000 2.810000 2.920000 2.980000 ;
-      RECT 1.925000 0.840000 2.870000 1.010000 ;
-      RECT 1.925000 1.010000 2.175000 1.680000 ;
-      RECT 1.925000 1.680000 2.580000 1.850000 ;
-      RECT 2.265000 1.850000 2.580000 2.640000 ;
-      RECT 2.690000 0.350000 2.870000 0.840000 ;
-      RECT 2.750000 2.320000 4.470000 2.490000 ;
-      RECT 2.750000 2.490000 2.920000 2.810000 ;
-      RECT 4.090000 1.350000 4.470000 2.320000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.265000  1.720000 1.415000 1.890000 ;
+      RECT 0.265000  1.890000 0.515000 2.980000 ;
+      RECT 0.290000  0.085000 0.620000 1.010000 ;
+      RECT 0.715000  2.060000 1.045000 3.245000 ;
+      RECT 1.080000  0.350000 1.480000 0.840000 ;
+      RECT 1.080000  0.840000 1.655000 1.010000 ;
+      RECT 1.245000  1.890000 1.415000 2.980000 ;
+      RECT 1.485000  1.010000 1.655000 1.380000 ;
+      RECT 1.485000  1.380000 1.755000 1.550000 ;
+      RECT 1.585000  1.550000 1.755000 2.020000 ;
+      RECT 1.585000  2.020000 1.945000 2.810000 ;
+      RECT 1.585000  2.810000 2.920000 2.980000 ;
+      RECT 1.650000  0.085000 2.520000 0.670000 ;
+      RECT 1.925000  0.840000 2.870000 1.010000 ;
+      RECT 1.925000  1.010000 2.175000 1.680000 ;
+      RECT 1.925000  1.680000 2.580000 1.850000 ;
+      RECT 2.265000  1.850000 2.580000 2.640000 ;
+      RECT 2.690000  0.350000 2.870000 0.840000 ;
+      RECT 2.750000  2.320000 4.470000 2.490000 ;
+      RECT 2.750000  2.490000 2.920000 2.810000 ;
+      RECT 3.050000  0.085000 3.315000 0.940000 ;
+      RECT 3.105000  2.660000 3.495000 3.245000 ;
+      RECT 4.065000  2.660000 4.395000 3.245000 ;
+      RECT 4.090000  1.350000 4.470000 2.320000 ;
+      RECT 4.100000  0.085000 4.350000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef
index f6b4741..214fb75 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.magic.lef
@@ -86,30 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.505000  0.085000 0.755000 0.790000 ;
-        RECT 1.365000  0.085000 1.615000 0.790000 ;
-        RECT 2.225000  0.085000 2.475000 0.840000 ;
-        RECT 3.700000  0.085000 4.385000 0.840000 ;
-        RECT 6.295000  0.350000 6.665000 0.750000 ;
-        RECT 6.495000  0.085000 6.665000 0.350000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -118,59 +94,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.560000 2.140000 0.810000 3.245000 ;
-        RECT 1.540000 2.140000 1.710000 3.245000 ;
-        RECT 2.410000 1.950000 2.780000 3.245000 ;
-        RECT 5.410000 2.290000 5.660000 3.245000 ;
-        RECT 6.390000 2.290000 6.560000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.035000 1.300000 2.385000 1.630000 ;
-      RECT 2.215000 1.010000 2.815000 1.180000 ;
-      RECT 2.215000 1.180000 2.385000 1.300000 ;
-      RECT 2.645000 0.255000 3.530000 0.425000 ;
-      RECT 2.645000 0.425000 2.815000 1.010000 ;
-      RECT 2.985000 0.595000 3.190000 1.130000 ;
-      RECT 3.020000 1.130000 3.190000 1.950000 ;
-      RECT 3.020000 1.950000 4.150000 2.120000 ;
-      RECT 3.290000 2.120000 3.620000 2.980000 ;
-      RECT 3.360000 0.425000 3.530000 1.010000 ;
-      RECT 3.360000 1.010000 4.815000 1.180000 ;
-      RECT 3.855000 1.470000 4.150000 1.950000 ;
-      RECT 4.060000 2.290000 4.390000 2.905000 ;
-      RECT 4.060000 2.905000 5.210000 3.075000 ;
-      RECT 4.565000 0.350000 5.765000 0.600000 ;
-      RECT 4.565000 0.600000 4.815000 1.010000 ;
-      RECT 4.565000 1.180000 4.760000 2.735000 ;
-      RECT 4.960000 1.950000 7.090000 2.120000 ;
-      RECT 4.960000 2.120000 5.210000 2.905000 ;
-      RECT 5.005000 0.770000 6.115000 0.920000 ;
-      RECT 5.005000 0.920000 7.095000 1.090000 ;
-      RECT 5.860000 2.120000 6.190000 2.980000 ;
-      RECT 5.945000 0.350000 6.115000 0.770000 ;
-      RECT 6.760000 2.120000 7.090000 2.980000 ;
-      RECT 6.845000 0.350000 7.095000 0.920000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.505000  0.085000 0.755000 0.790000 ;
+      RECT 0.560000  2.140000 0.810000 3.245000 ;
+      RECT 1.035000  1.300000 2.385000 1.630000 ;
+      RECT 1.365000  0.085000 1.615000 0.790000 ;
+      RECT 1.540000  2.140000 1.710000 3.245000 ;
+      RECT 2.215000  1.010000 2.815000 1.180000 ;
+      RECT 2.215000  1.180000 2.385000 1.300000 ;
+      RECT 2.225000  0.085000 2.475000 0.840000 ;
+      RECT 2.410000  1.950000 2.780000 3.245000 ;
+      RECT 2.645000  0.255000 3.530000 0.425000 ;
+      RECT 2.645000  0.425000 2.815000 1.010000 ;
+      RECT 2.985000  0.595000 3.190000 1.130000 ;
+      RECT 3.020000  1.130000 3.190000 1.950000 ;
+      RECT 3.020000  1.950000 4.150000 2.120000 ;
+      RECT 3.290000  2.120000 3.620000 2.980000 ;
+      RECT 3.360000  0.425000 3.530000 1.010000 ;
+      RECT 3.360000  1.010000 4.815000 1.180000 ;
+      RECT 3.700000  0.085000 4.385000 0.840000 ;
+      RECT 3.855000  1.470000 4.150000 1.950000 ;
+      RECT 4.060000  2.290000 4.390000 2.905000 ;
+      RECT 4.060000  2.905000 5.210000 3.075000 ;
+      RECT 4.565000  0.350000 5.765000 0.600000 ;
+      RECT 4.565000  0.600000 4.815000 1.010000 ;
+      RECT 4.565000  1.180000 4.760000 2.735000 ;
+      RECT 4.960000  1.950000 7.090000 2.120000 ;
+      RECT 4.960000  2.120000 5.210000 2.905000 ;
+      RECT 5.005000  0.770000 6.115000 0.920000 ;
+      RECT 5.005000  0.920000 7.095000 1.090000 ;
+      RECT 5.410000  2.290000 5.660000 3.245000 ;
+      RECT 5.860000  2.120000 6.190000 2.980000 ;
+      RECT 5.945000  0.350000 6.115000 0.770000 ;
+      RECT 6.295000  0.350000 6.665000 0.750000 ;
+      RECT 6.390000  2.290000 6.560000 3.245000 ;
+      RECT 6.495000  0.085000 6.665000 0.350000 ;
+      RECT 6.760000  2.120000 7.090000 2.980000 ;
+      RECT 6.845000  0.350000 7.095000 0.920000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2bb2o_4
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef
index e96826c..43a1777 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.magic.lef
@@ -86,20 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.175000  0.085000 0.425000 1.090000 ;
-        RECT 1.105000  0.085000 1.885000 0.710000 ;
-        RECT 1.105000  0.710000 1.710000 0.790000 ;
-        RECT 2.885000  0.085000 3.215000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -108,35 +94,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.120000 1.950000 0.450000 3.245000 ;
-        RECT 2.430000 2.730000 2.790000 2.980000 ;
-        RECT 2.430000 2.980000 2.600000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.605000 0.540000 0.935000 0.960000 ;
-      RECT 0.605000 0.960000 1.440000 1.130000 ;
-      RECT 0.960000 1.950000 1.440000 2.120000 ;
-      RECT 0.960000 2.120000 1.290000 2.980000 ;
-      RECT 1.270000 1.130000 1.440000 1.220000 ;
-      RECT 1.270000 1.220000 1.710000 1.550000 ;
-      RECT 1.270000 1.550000 1.440000 1.950000 ;
-      RECT 1.980000 2.390000 3.240000 2.560000 ;
-      RECT 1.980000 2.560000 2.230000 2.980000 ;
-      RECT 2.990000 1.820000 3.240000 2.390000 ;
-      RECT 2.990000 2.560000 3.240000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.120000  1.950000 0.450000 3.245000 ;
+      RECT 0.175000  0.085000 0.425000 1.090000 ;
+      RECT 0.605000  0.540000 0.935000 0.960000 ;
+      RECT 0.605000  0.960000 1.440000 1.130000 ;
+      RECT 0.960000  1.950000 1.440000 2.120000 ;
+      RECT 0.960000  2.120000 1.290000 2.980000 ;
+      RECT 1.105000  0.085000 1.885000 0.710000 ;
+      RECT 1.105000  0.710000 1.710000 0.790000 ;
+      RECT 1.270000  1.130000 1.440000 1.220000 ;
+      RECT 1.270000  1.220000 1.710000 1.550000 ;
+      RECT 1.270000  1.550000 1.440000 1.950000 ;
+      RECT 1.980000  2.390000 3.240000 2.560000 ;
+      RECT 1.980000  2.560000 2.230000 2.980000 ;
+      RECT 2.430000  2.730000 2.790000 2.980000 ;
+      RECT 2.430000  2.980000 2.600000 3.245000 ;
+      RECT 2.885000  0.085000 3.215000 1.010000 ;
+      RECT 2.990000  1.820000 3.240000 2.390000 ;
+      RECT 2.990000  2.560000 3.240000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef
index 22706e8..8d45331 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.magic.lef
@@ -83,24 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.605000  0.085000 0.855000 1.170000 ;
-        RECT 1.570000  0.085000 1.900000 0.940000 ;
-        RECT 2.430000  0.085000 2.760000 0.810000 ;
-        RECT 4.325000  0.085000 4.575000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -109,46 +91,61 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.580000 1.940000 0.910000 3.245000 ;
-        RECT 3.430000 2.290000 3.760000 3.245000 ;
-        RECT 4.330000 2.290000 4.660000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.035000 0.490000 1.330000 1.110000 ;
-      RECT 1.035000 1.110000 1.910000 1.280000 ;
-      RECT 1.420000 1.950000 1.910000 2.980000 ;
-      RECT 1.740000 1.280000 1.910000 1.320000 ;
-      RECT 1.740000 1.320000 2.205000 1.650000 ;
-      RECT 1.740000 1.650000 1.910000 1.950000 ;
-      RECT 2.080000 1.820000 2.330000 2.905000 ;
-      RECT 2.080000 2.905000 3.230000 3.075000 ;
-      RECT 2.980000 1.820000 3.230000 1.950000 ;
-      RECT 2.980000 1.950000 5.110000 2.120000 ;
-      RECT 2.980000 2.120000 3.230000 2.905000 ;
-      RECT 3.035000 0.350000 4.145000 0.600000 ;
-      RECT 3.960000 2.120000 4.130000 2.980000 ;
-      RECT 3.975000 0.600000 4.145000 1.010000 ;
-      RECT 3.975000 1.010000 5.085000 1.180000 ;
-      RECT 4.755000 0.350000 5.085000 1.010000 ;
-      RECT 4.860000 1.820000 5.110000 1.950000 ;
-      RECT 4.860000 2.120000 5.110000 2.980000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.580000  1.940000 0.910000 3.245000 ;
+      RECT 0.605000  0.085000 0.855000 1.170000 ;
+      RECT 1.035000  0.490000 1.330000 1.110000 ;
+      RECT 1.035000  1.110000 1.910000 1.280000 ;
+      RECT 1.420000  1.950000 1.910000 2.980000 ;
+      RECT 1.570000  0.085000 1.900000 0.940000 ;
+      RECT 1.740000  1.280000 1.910000 1.320000 ;
+      RECT 1.740000  1.320000 2.205000 1.650000 ;
+      RECT 1.740000  1.650000 1.910000 1.950000 ;
+      RECT 2.080000  1.820000 2.330000 2.905000 ;
+      RECT 2.080000  2.905000 3.230000 3.075000 ;
+      RECT 2.430000  0.085000 2.760000 0.810000 ;
+      RECT 2.980000  1.820000 3.230000 1.950000 ;
+      RECT 2.980000  1.950000 5.110000 2.120000 ;
+      RECT 2.980000  2.120000 3.230000 2.905000 ;
+      RECT 3.035000  0.350000 4.145000 0.600000 ;
+      RECT 3.430000  2.290000 3.760000 3.245000 ;
+      RECT 3.960000  2.120000 4.130000 2.980000 ;
+      RECT 3.975000  0.600000 4.145000 1.010000 ;
+      RECT 3.975000  1.010000 5.085000 1.180000 ;
+      RECT 4.325000  0.085000 4.575000 0.840000 ;
+      RECT 4.330000  2.290000 4.660000 3.245000 ;
+      RECT 4.755000  0.350000 5.085000 1.010000 ;
+      RECT 4.860000  1.820000 5.110000 1.950000 ;
+      RECT 4.860000  2.120000 5.110000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef
index b21ac34..9ca0eb5 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.magic.lef
@@ -87,33 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.940000  0.085000 1.270000 0.960000 ;
-        RECT 1.800000  0.085000 2.090000 0.885000 ;
-        RECT 2.700000  0.085000 3.030000 0.620000 ;
-        RECT 3.560000  0.085000 3.890000 0.620000 ;
-        RECT 6.680000  0.085000 6.930000 0.840000 ;
-        RECT 7.540000  0.085000 7.790000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -122,62 +95,86 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 1.455000 2.310000 1.705000 3.245000 ;
-        RECT 4.985000 2.290000 5.155000 3.245000 ;
-        RECT 5.885000 2.290000 6.135000 3.245000 ;
-        RECT 6.705000 2.290000 6.955000 3.245000 ;
-        RECT 7.685000 2.290000 7.855000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.940000 0.435000 2.905000 ;
-      RECT 0.105000 2.905000 1.255000 3.075000 ;
-      RECT 0.635000 1.130000 3.585000 1.300000 ;
-      RECT 0.635000 1.300000 0.885000 2.735000 ;
-      RECT 1.085000 1.940000 1.255000 1.970000 ;
-      RECT 1.085000 1.970000 2.235000 2.140000 ;
-      RECT 1.085000 2.140000 1.255000 2.905000 ;
-      RECT 1.450000 0.350000 1.620000 1.130000 ;
-      RECT 1.905000 2.140000 2.235000 2.980000 ;
-      RECT 2.575000 1.300000 3.585000 1.550000 ;
-      RECT 2.655000 1.820000 2.985000 2.905000 ;
-      RECT 2.655000 2.905000 4.785000 3.075000 ;
-      RECT 3.555000 2.060000 3.885000 2.905000 ;
-      RECT 4.455000 1.950000 8.385000 2.120000 ;
-      RECT 4.455000 2.120000 4.785000 2.905000 ;
-      RECT 4.530000 0.350000 6.500000 0.600000 ;
-      RECT 5.355000 2.120000 5.685000 2.980000 ;
-      RECT 6.330000 0.600000 6.500000 1.010000 ;
-      RECT 6.330000 1.010000 8.300000 1.180000 ;
-      RECT 6.335000 1.820000 6.505000 1.950000 ;
-      RECT 6.335000 2.120000 6.505000 2.980000 ;
-      RECT 7.110000 0.350000 7.360000 1.010000 ;
-      RECT 7.155000 2.120000 7.485000 2.980000 ;
-      RECT 7.970000 0.350000 8.300000 1.010000 ;
-      RECT 8.055000 2.120000 8.385000 2.980000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.105000  1.940000 0.435000 2.905000 ;
+      RECT 0.105000  2.905000 1.255000 3.075000 ;
+      RECT 0.635000  1.130000 3.585000 1.300000 ;
+      RECT 0.635000  1.300000 0.885000 2.735000 ;
+      RECT 0.940000  0.085000 1.270000 0.960000 ;
+      RECT 1.085000  1.940000 1.255000 1.970000 ;
+      RECT 1.085000  1.970000 2.235000 2.140000 ;
+      RECT 1.085000  2.140000 1.255000 2.905000 ;
+      RECT 1.450000  0.350000 1.620000 1.130000 ;
+      RECT 1.455000  2.310000 1.705000 3.245000 ;
+      RECT 1.800000  0.085000 2.090000 0.885000 ;
+      RECT 1.905000  2.140000 2.235000 2.980000 ;
+      RECT 2.575000  1.300000 3.585000 1.550000 ;
+      RECT 2.655000  1.820000 2.985000 2.905000 ;
+      RECT 2.655000  2.905000 4.785000 3.075000 ;
+      RECT 2.700000  0.085000 3.030000 0.620000 ;
+      RECT 3.555000  2.060000 3.885000 2.905000 ;
+      RECT 3.560000  0.085000 3.890000 0.620000 ;
+      RECT 4.455000  1.950000 8.385000 2.120000 ;
+      RECT 4.455000  2.120000 4.785000 2.905000 ;
+      RECT 4.530000  0.350000 6.500000 0.600000 ;
+      RECT 4.985000  2.290000 5.155000 3.245000 ;
+      RECT 5.355000  2.120000 5.685000 2.980000 ;
+      RECT 5.885000  2.290000 6.135000 3.245000 ;
+      RECT 6.330000  0.600000 6.500000 1.010000 ;
+      RECT 6.330000  1.010000 8.300000 1.180000 ;
+      RECT 6.335000  1.820000 6.505000 1.950000 ;
+      RECT 6.335000  2.120000 6.505000 2.980000 ;
+      RECT 6.680000  0.085000 6.930000 0.840000 ;
+      RECT 6.705000  2.290000 6.955000 3.245000 ;
+      RECT 7.110000  0.350000 7.360000 1.010000 ;
+      RECT 7.155000  2.120000 7.485000 2.980000 ;
+      RECT 7.540000  0.085000 7.790000 0.840000 ;
+      RECT 7.685000  2.290000 7.855000 3.245000 ;
+      RECT 7.970000  0.350000 8.300000 1.010000 ;
+      RECT 8.055000  2.120000 8.385000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__a2bb2oi_4
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef
index 5d13501..7e71bff 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_1.magic.lef
@@ -93,22 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.785000  0.085000 1.115000 0.940000 ;
-        RECT 2.750000  0.855000 3.075000 1.185000 ;
-        RECT 2.895000  0.675000 3.215000 0.845000 ;
-        RECT 2.895000  0.845000 3.075000 0.855000 ;
-        RECT 3.045000  0.085000 3.215000 0.675000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -117,37 +101,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.645000 1.950000 1.105000 3.245000 ;
-        RECT 1.805000 2.290000 2.095000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.480000 1.350000 0.945000 1.680000 ;
-      RECT 0.775000 1.110000 2.570000 1.280000 ;
-      RECT 0.775000 1.280000 0.945000 1.350000 ;
-      RECT 1.275000 1.950000 2.595000 2.120000 ;
-      RECT 1.275000 2.120000 1.605000 2.980000 ;
-      RECT 2.240000 0.840000 2.570000 1.110000 ;
-      RECT 2.240000 1.280000 2.570000 1.445000 ;
-      RECT 2.240000 1.445000 3.575000 1.615000 ;
-      RECT 2.265000 1.940000 2.595000 1.950000 ;
-      RECT 2.265000 2.120000 2.595000 2.980000 ;
-      RECT 3.105000 1.940000 3.575000 2.980000 ;
-      RECT 3.245000 1.015000 3.575000 1.445000 ;
-      RECT 3.245000 1.615000 3.575000 1.940000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.480000  1.350000 0.945000 1.680000 ;
+      RECT 0.645000  1.950000 1.105000 3.245000 ;
+      RECT 0.775000  1.110000 2.570000 1.280000 ;
+      RECT 0.775000  1.280000 0.945000 1.350000 ;
+      RECT 0.785000  0.085000 1.115000 0.940000 ;
+      RECT 1.275000  1.950000 2.595000 2.120000 ;
+      RECT 1.275000  2.120000 1.605000 2.980000 ;
+      RECT 1.805000  2.290000 2.095000 3.245000 ;
+      RECT 2.240000  0.840000 2.570000 1.110000 ;
+      RECT 2.240000  1.280000 2.570000 1.445000 ;
+      RECT 2.240000  1.445000 3.575000 1.615000 ;
+      RECT 2.265000  1.940000 2.595000 1.950000 ;
+      RECT 2.265000  2.120000 2.595000 2.980000 ;
+      RECT 2.750000  0.855000 3.075000 1.185000 ;
+      RECT 2.895000  0.675000 3.215000 0.845000 ;
+      RECT 2.895000  0.845000 3.075000 0.855000 ;
+      RECT 3.045000  0.085000 3.215000 0.675000 ;
+      RECT 3.105000  1.940000 3.575000 2.980000 ;
+      RECT 3.245000  1.015000 3.575000 1.445000 ;
+      RECT 3.245000  1.615000 3.575000 1.940000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a311o_1
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef
index 5ccdcb2..865617a 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_2.magic.lef
@@ -90,21 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.300000  0.085000 0.550000 1.130000 ;
-        RECT 1.230000  0.085000 1.630000 0.750000 ;
-        RECT 3.170000  0.085000 3.540000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -113,38 +98,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.215000 2.570000 0.545000 3.245000 ;
-        RECT 1.115000 2.570000 1.445000 3.245000 ;
-        RECT 2.135000 2.740000 2.665000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.350000 0.435000 2.230000 ;
-      RECT 0.105000 2.230000 1.335000 2.400000 ;
-      RECT 1.165000 0.920000 4.040000 1.090000 ;
-      RECT 1.165000 1.090000 1.335000 1.950000 ;
-      RECT 1.165000 1.950000 4.035000 2.120000 ;
-      RECT 1.165000 2.120000 1.335000 2.230000 ;
-      RECT 1.635000 2.290000 3.165000 2.570000 ;
-      RECT 1.635000 2.570000 1.965000 2.980000 ;
-      RECT 2.630000 0.350000 3.000000 0.920000 ;
-      RECT 2.835000 2.570000 3.165000 2.980000 ;
-      RECT 3.705000 2.120000 4.035000 2.980000 ;
-      RECT 3.710000 0.350000 4.040000 0.920000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.105000  1.350000 0.435000 2.230000 ;
+      RECT 0.105000  2.230000 1.335000 2.400000 ;
+      RECT 0.215000  2.570000 0.545000 3.245000 ;
+      RECT 0.300000  0.085000 0.550000 1.130000 ;
+      RECT 1.115000  2.570000 1.445000 3.245000 ;
+      RECT 1.165000  0.920000 4.040000 1.090000 ;
+      RECT 1.165000  1.090000 1.335000 1.950000 ;
+      RECT 1.165000  1.950000 4.035000 2.120000 ;
+      RECT 1.165000  2.120000 1.335000 2.230000 ;
+      RECT 1.230000  0.085000 1.630000 0.750000 ;
+      RECT 1.635000  2.290000 3.165000 2.570000 ;
+      RECT 1.635000  2.570000 1.965000 2.980000 ;
+      RECT 2.135000  2.740000 2.665000 3.245000 ;
+      RECT 2.630000  0.350000 3.000000 0.920000 ;
+      RECT 2.835000  2.570000 3.165000 2.980000 ;
+      RECT 3.170000  0.085000 3.540000 0.750000 ;
+      RECT 3.705000  2.120000 4.035000 2.980000 ;
+      RECT 3.710000  0.350000 4.040000 0.920000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a311o_2
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef
index 92f0c99..da76a1d 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_4.magic.lef
@@ -80,20 +80,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.125000 0.810000 0.355000 1.040000 ;
-        RECT 0.125000 1.040000 0.295000 2.360000 ;
-        RECT 0.125000 2.360000 1.505000 2.530000 ;
-        RECT 1.335000 1.970000 4.305000 2.140000 ;
-        RECT 1.335000 2.140000 1.505000 2.360000 ;
-        RECT 2.525000 1.820000 4.305000 1.970000 ;
-        RECT 2.525000 2.140000 4.305000 2.150000 ;
-        RECT 2.535000 0.390000 2.920000 0.980000 ;
-        RECT 2.535000 0.980000 3.745000 1.150000 ;
-        RECT 3.495000 0.405000 3.745000 0.980000 ;
-      LAYER mcon ;
-        RECT 0.155000 0.840000 0.325000 1.010000 ;
-        RECT 2.555000 0.840000 2.725000 1.010000 ;
       LAYER met1 ;
         RECT 0.095000 0.810000 0.385000 0.855000 ;
         RECT 0.095000 0.855000 2.785000 0.995000 ;
@@ -106,32 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.395000  0.085000 0.725000 0.640000 ;
-        RECT 1.255000  0.085000 1.585000 0.960000 ;
-        RECT 2.115000  0.085000 2.365000 0.960000 ;
-        RECT 3.100000  0.085000 3.315000 0.810000 ;
-        RECT 3.925000  0.085000 4.175000 0.935000 ;
-        RECT 3.925000  0.935000 5.175000 1.150000 ;
-        RECT 4.175000  1.150000 5.175000 1.185000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -140,68 +100,103 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 2.625000 2.660000 2.955000 3.245000 ;
-        RECT 3.525000 2.660000 3.855000 3.245000 ;
-        RECT 4.425000 2.660000 4.755000 3.245000 ;
-        RECT 5.470000 2.630000 5.720000 3.245000 ;
-        RECT 6.290000 2.290000 6.650000 3.245000 ;
-        RECT 7.220000 1.950000 7.550000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.305000 2.700000 1.535000 2.905000 ;
-      RECT 0.305000 2.905000 2.435000 2.980000 ;
-      RECT 0.755000 2.020000 1.165000 2.190000 ;
-      RECT 0.905000 0.390000 1.085000 1.130000 ;
-      RECT 0.905000 1.130000 2.325000 1.300000 ;
-      RECT 0.995000 1.300000 1.165000 2.020000 ;
-      RECT 1.205000 2.980000 2.435000 3.075000 ;
-      RECT 1.735000 2.310000 1.905000 2.320000 ;
-      RECT 1.735000 2.320000 6.090000 2.460000 ;
-      RECT 1.735000 2.460000 5.270000 2.490000 ;
-      RECT 1.735000 2.490000 1.905000 2.735000 ;
-      RECT 1.755000 0.390000 1.935000 1.130000 ;
-      RECT 2.055000 1.300000 2.325000 1.320000 ;
-      RECT 2.055000 1.320000 3.905000 1.480000 ;
-      RECT 2.055000 1.480000 4.645000 1.650000 ;
-      RECT 2.105000 2.660000 2.435000 2.905000 ;
-      RECT 4.415000 0.505000 4.745000 0.595000 ;
-      RECT 4.415000 0.595000 7.105000 0.765000 ;
-      RECT 4.475000 1.650000 4.645000 1.950000 ;
-      RECT 4.475000 1.950000 5.715000 2.120000 ;
-      RECT 4.940000 2.290000 6.090000 2.320000 ;
-      RECT 4.940000 2.490000 5.270000 2.980000 ;
-      RECT 5.365000 0.255000 7.535000 0.425000 ;
-      RECT 5.545000 0.935000 6.105000 1.265000 ;
-      RECT 5.545000 1.265000 5.715000 1.950000 ;
-      RECT 5.920000 1.950000 7.020000 2.120000 ;
-      RECT 5.920000 2.120000 6.090000 2.290000 ;
-      RECT 5.920000 2.460000 6.090000 2.980000 ;
-      RECT 6.285000 0.985000 7.535000 1.245000 ;
-      RECT 6.775000 0.765000 7.105000 0.815000 ;
-      RECT 6.850000 2.120000 7.020000 2.980000 ;
-      RECT 7.285000 0.425000 7.535000 0.985000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.125000  0.810000 0.355000 1.040000 ;
+      RECT 0.125000  1.040000 0.295000 2.360000 ;
+      RECT 0.125000  2.360000 1.505000 2.530000 ;
+      RECT 0.305000  2.700000 1.535000 2.905000 ;
+      RECT 0.305000  2.905000 2.435000 2.980000 ;
+      RECT 0.395000  0.085000 0.725000 0.640000 ;
+      RECT 0.755000  2.020000 1.165000 2.190000 ;
+      RECT 0.905000  0.390000 1.085000 1.130000 ;
+      RECT 0.905000  1.130000 2.325000 1.300000 ;
+      RECT 0.995000  1.300000 1.165000 2.020000 ;
+      RECT 1.205000  2.980000 2.435000 3.075000 ;
+      RECT 1.255000  0.085000 1.585000 0.960000 ;
+      RECT 1.335000  1.970000 4.305000 2.140000 ;
+      RECT 1.335000  2.140000 1.505000 2.360000 ;
+      RECT 1.735000  2.310000 1.905000 2.320000 ;
+      RECT 1.735000  2.320000 6.090000 2.460000 ;
+      RECT 1.735000  2.460000 5.270000 2.490000 ;
+      RECT 1.735000  2.490000 1.905000 2.735000 ;
+      RECT 1.755000  0.390000 1.935000 1.130000 ;
+      RECT 2.055000  1.300000 2.325000 1.320000 ;
+      RECT 2.055000  1.320000 3.905000 1.480000 ;
+      RECT 2.055000  1.480000 4.645000 1.650000 ;
+      RECT 2.105000  2.660000 2.435000 2.905000 ;
+      RECT 2.115000  0.085000 2.365000 0.960000 ;
+      RECT 2.525000  1.820000 4.305000 1.970000 ;
+      RECT 2.525000  2.140000 4.305000 2.150000 ;
+      RECT 2.535000  0.390000 2.920000 0.980000 ;
+      RECT 2.535000  0.980000 3.745000 1.150000 ;
+      RECT 2.625000  2.660000 2.955000 3.245000 ;
+      RECT 3.100000  0.085000 3.315000 0.810000 ;
+      RECT 3.495000  0.405000 3.745000 0.980000 ;
+      RECT 3.525000  2.660000 3.855000 3.245000 ;
+      RECT 3.925000  0.085000 4.175000 0.935000 ;
+      RECT 3.925000  0.935000 5.175000 1.150000 ;
+      RECT 4.175000  1.150000 5.175000 1.185000 ;
+      RECT 4.415000  0.505000 4.745000 0.595000 ;
+      RECT 4.415000  0.595000 7.105000 0.765000 ;
+      RECT 4.425000  2.660000 4.755000 3.245000 ;
+      RECT 4.475000  1.650000 4.645000 1.950000 ;
+      RECT 4.475000  1.950000 5.715000 2.120000 ;
+      RECT 4.940000  2.290000 6.090000 2.320000 ;
+      RECT 4.940000  2.490000 5.270000 2.980000 ;
+      RECT 5.365000  0.255000 7.535000 0.425000 ;
+      RECT 5.470000  2.630000 5.720000 3.245000 ;
+      RECT 5.545000  0.935000 6.105000 1.265000 ;
+      RECT 5.545000  1.265000 5.715000 1.950000 ;
+      RECT 5.920000  1.950000 7.020000 2.120000 ;
+      RECT 5.920000  2.120000 6.090000 2.290000 ;
+      RECT 5.920000  2.460000 6.090000 2.980000 ;
+      RECT 6.285000  0.985000 7.535000 1.245000 ;
+      RECT 6.290000  2.290000 6.650000 3.245000 ;
+      RECT 6.775000  0.765000 7.105000 0.815000 ;
+      RECT 6.850000  2.120000 7.020000 2.980000 ;
+      RECT 7.220000  1.950000 7.550000 3.245000 ;
+      RECT 7.285000  0.425000 7.535000 0.985000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  0.840000 0.325000 1.010000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  0.840000 2.725000 1.010000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__a311o_4
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef
index 5161ef9..ee78933 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.magic.lef
@@ -93,18 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.340000  0.085000 0.670000 0.840000 ;
-        RECT 2.210000  0.085000 2.580000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -113,26 +101,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.315000 2.290000 0.565000 3.245000 ;
-        RECT 1.265000 2.630000 1.675000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.765000 2.290000 2.175000 2.460000 ;
-      RECT 0.765000 2.460000 1.095000 2.980000 ;
-      RECT 1.845000 2.460000 2.175000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.315000  2.290000 0.565000 3.245000 ;
+      RECT 0.340000  0.085000 0.670000 0.840000 ;
+      RECT 0.765000  2.290000 2.175000 2.460000 ;
+      RECT 0.765000  2.460000 1.095000 2.980000 ;
+      RECT 1.265000  2.630000 1.675000 3.245000 ;
+      RECT 1.845000  2.460000 2.175000 2.980000 ;
+      RECT 2.210000  0.085000 2.580000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a311oi_1
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef
index 9dcca71..4ebb83c 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.magic.lef
@@ -97,23 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.670000 ;
-        RECT 3.915000  0.085000 4.515000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -122,49 +105,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.170000 1.820000 0.420000 3.245000 ;
-        RECT 1.150000 2.060000 1.320000 3.245000 ;
-        RECT 2.050000 2.060000 2.330000 3.245000 ;
-        RECT 2.900000 2.290000 3.230000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.185000 0.350000 0.435000 0.840000 ;
-      RECT 0.185000 0.840000 2.235000 1.010000 ;
-      RECT 0.185000 1.010000 0.435000 1.050000 ;
-      RECT 0.620000 1.720000 2.700000 1.890000 ;
-      RECT 0.620000 1.890000 0.950000 2.980000 ;
-      RECT 1.125000 0.330000 1.295000 0.770000 ;
-      RECT 1.125000 0.770000 2.235000 0.840000 ;
-      RECT 1.475000 0.350000 3.315000 0.600000 ;
-      RECT 1.520000 1.890000 1.850000 2.980000 ;
-      RECT 1.905000 1.010000 2.235000 1.050000 ;
-      RECT 2.530000 1.890000 2.700000 1.950000 ;
-      RECT 2.530000 1.950000 4.120000 2.120000 ;
-      RECT 2.530000 2.120000 2.700000 2.980000 ;
-      RECT 2.985000 0.600000 3.315000 0.680000 ;
-      RECT 3.420000 2.290000 3.755000 2.905000 ;
-      RECT 3.420000 2.905000 5.550000 3.075000 ;
-      RECT 3.925000 2.120000 4.120000 2.735000 ;
-      RECT 4.320000 1.950000 4.650000 2.905000 ;
-      RECT 5.220000 2.290000 5.550000 2.905000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.170000  1.820000 0.420000 3.245000 ;
+      RECT 0.185000  0.350000 0.435000 0.840000 ;
+      RECT 0.185000  0.840000 2.235000 1.010000 ;
+      RECT 0.185000  1.010000 0.435000 1.050000 ;
+      RECT 0.615000  0.085000 0.945000 0.670000 ;
+      RECT 0.620000  1.720000 2.700000 1.890000 ;
+      RECT 0.620000  1.890000 0.950000 2.980000 ;
+      RECT 1.125000  0.330000 1.295000 0.770000 ;
+      RECT 1.125000  0.770000 2.235000 0.840000 ;
+      RECT 1.150000  2.060000 1.320000 3.245000 ;
+      RECT 1.475000  0.350000 3.315000 0.600000 ;
+      RECT 1.520000  1.890000 1.850000 2.980000 ;
+      RECT 1.905000  1.010000 2.235000 1.050000 ;
+      RECT 2.050000  2.060000 2.330000 3.245000 ;
+      RECT 2.530000  1.890000 2.700000 1.950000 ;
+      RECT 2.530000  1.950000 4.120000 2.120000 ;
+      RECT 2.530000  2.120000 2.700000 2.980000 ;
+      RECT 2.900000  2.290000 3.230000 3.245000 ;
+      RECT 2.985000  0.600000 3.315000 0.680000 ;
+      RECT 3.420000  2.290000 3.755000 2.905000 ;
+      RECT 3.420000  2.905000 5.550000 3.075000 ;
+      RECT 3.915000  0.085000 4.515000 0.840000 ;
+      RECT 3.925000  2.120000 4.120000 2.735000 ;
+      RECT 4.320000  1.950000 4.650000 2.905000 ;
+      RECT 5.220000  2.290000 5.550000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__a311oi_2
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef
index 7f3cb9d..979f9bf 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.magic.lef
@@ -102,34 +102,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.580000  0.085000  0.830000 0.840000 ;
-        RECT 1.440000  0.085000  1.770000 0.840000 ;
-        RECT 6.550000  0.085000  7.590000 0.670000 ;
-        RECT 8.190000  0.085000  8.520000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -138,71 +110,96 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.105000 1.820000  0.355000 3.245000 ;
-        RECT 1.005000 2.290000  1.335000 3.245000 ;
-        RECT 1.905000 2.290000  2.235000 3.245000 ;
-        RECT 2.805000 2.290000  3.135000 3.245000 ;
-        RECT 3.705000 2.290000  4.035000 3.245000 ;
-        RECT 4.605000 2.290000  4.855000 3.245000 ;
-        RECT 5.505000 2.290000  5.835000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 0.350000 0.400000 1.010000 ;
-      RECT 0.150000 1.010000 3.920000 1.180000 ;
-      RECT 0.555000 1.950000 7.655000 2.120000 ;
-      RECT 0.555000 2.120000 0.805000 2.980000 ;
-      RECT 1.010000 0.350000 1.260000 1.010000 ;
-      RECT 1.535000 2.120000 1.705000 2.980000 ;
-      RECT 1.950000 0.350000 2.120000 0.975000 ;
-      RECT 1.950000 0.975000 3.920000 1.010000 ;
-      RECT 2.300000 0.350000 5.950000 0.600000 ;
-      RECT 2.300000 0.600000 2.560000 0.680000 ;
-      RECT 2.435000 2.120000 2.605000 2.980000 ;
-      RECT 2.730000 0.770000 3.060000 0.975000 ;
-      RECT 3.230000 0.600000 3.420000 0.680000 ;
-      RECT 3.335000 2.120000 3.505000 2.980000 ;
-      RECT 3.590000 0.770000 3.920000 0.975000 ;
-      RECT 4.235000 1.820000 4.405000 1.950000 ;
-      RECT 4.235000 2.120000 4.405000 2.980000 ;
-      RECT 5.055000 2.120000 5.305000 2.980000 ;
-      RECT 5.620000 0.600000 5.950000 0.680000 ;
-      RECT 6.025000 2.320000 6.355000 2.905000 ;
-      RECT 6.025000 2.905000 9.955000 3.075000 ;
-      RECT 6.475000 1.820000 7.655000 1.950000 ;
-      RECT 6.475000 2.120000 7.655000 2.150000 ;
-      RECT 6.525000 2.150000 6.755000 2.735000 ;
-      RECT 6.925000 2.320000 7.255000 2.905000 ;
-      RECT 7.425000 2.150000 7.655000 2.735000 ;
-      RECT 7.825000 1.820000 8.155000 2.905000 ;
-      RECT 8.725000 2.060000 9.055000 2.905000 ;
-      RECT 9.625000 1.820000 9.955000 2.905000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.105000  1.820000  0.355000 3.245000 ;
+      RECT 0.150000  0.350000  0.400000 1.010000 ;
+      RECT 0.150000  1.010000  3.920000 1.180000 ;
+      RECT 0.555000  1.950000  7.655000 2.120000 ;
+      RECT 0.555000  2.120000  0.805000 2.980000 ;
+      RECT 0.580000  0.085000  0.830000 0.840000 ;
+      RECT 1.005000  2.290000  1.335000 3.245000 ;
+      RECT 1.010000  0.350000  1.260000 1.010000 ;
+      RECT 1.440000  0.085000  1.770000 0.840000 ;
+      RECT 1.535000  2.120000  1.705000 2.980000 ;
+      RECT 1.905000  2.290000  2.235000 3.245000 ;
+      RECT 1.950000  0.350000  2.120000 0.975000 ;
+      RECT 1.950000  0.975000  3.920000 1.010000 ;
+      RECT 2.300000  0.350000  5.950000 0.600000 ;
+      RECT 2.300000  0.600000  2.560000 0.680000 ;
+      RECT 2.435000  2.120000  2.605000 2.980000 ;
+      RECT 2.730000  0.770000  3.060000 0.975000 ;
+      RECT 2.805000  2.290000  3.135000 3.245000 ;
+      RECT 3.230000  0.600000  3.420000 0.680000 ;
+      RECT 3.335000  2.120000  3.505000 2.980000 ;
+      RECT 3.590000  0.770000  3.920000 0.975000 ;
+      RECT 3.705000  2.290000  4.035000 3.245000 ;
+      RECT 4.235000  1.820000  4.405000 1.950000 ;
+      RECT 4.235000  2.120000  4.405000 2.980000 ;
+      RECT 4.605000  2.290000  4.855000 3.245000 ;
+      RECT 5.055000  2.120000  5.305000 2.980000 ;
+      RECT 5.505000  2.290000  5.835000 3.245000 ;
+      RECT 5.620000  0.600000  5.950000 0.680000 ;
+      RECT 6.025000  2.320000  6.355000 2.905000 ;
+      RECT 6.025000  2.905000  9.955000 3.075000 ;
+      RECT 6.475000  1.820000  7.655000 1.950000 ;
+      RECT 6.475000  2.120000  7.655000 2.150000 ;
+      RECT 6.525000  2.150000  6.755000 2.735000 ;
+      RECT 6.550000  0.085000  7.590000 0.670000 ;
+      RECT 6.925000  2.320000  7.255000 2.905000 ;
+      RECT 7.425000  2.150000  7.655000 2.735000 ;
+      RECT 7.825000  1.820000  8.155000 2.905000 ;
+      RECT 8.190000  0.085000  8.520000 0.670000 ;
+      RECT 8.725000  2.060000  9.055000 2.905000 ;
+      RECT 9.625000  1.820000  9.955000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__a311oi_4
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef
index 7a4c70f..95bea2f 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_1.magic.lef
@@ -81,19 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.620000  0.085000 1.200000 0.980000 ;
-        RECT 2.790000  0.810000 3.155000 0.980000 ;
-        RECT 2.985000  0.085000 3.155000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -102,31 +89,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.605000 1.970000 1.065000 3.245000 ;
-        RECT 1.735000 2.310000 2.145000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.350000 0.825000 1.680000 ;
-      RECT 0.620000 1.150000 3.095000 1.320000 ;
-      RECT 0.620000 1.320000 0.825000 1.350000 ;
-      RECT 1.235000 1.970000 2.645000 2.140000 ;
-      RECT 1.235000 2.140000 1.565000 2.980000 ;
-      RECT 2.280000 0.810000 2.610000 1.150000 ;
-      RECT 2.315000 2.140000 2.645000 2.980000 ;
-      RECT 2.845000 1.320000 3.095000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.425000  1.350000 0.825000 1.680000 ;
+      RECT 0.605000  1.970000 1.065000 3.245000 ;
+      RECT 0.620000  0.085000 1.200000 0.980000 ;
+      RECT 0.620000  1.150000 3.095000 1.320000 ;
+      RECT 0.620000  1.320000 0.825000 1.350000 ;
+      RECT 1.235000  1.970000 2.645000 2.140000 ;
+      RECT 1.235000  2.140000 1.565000 2.980000 ;
+      RECT 1.735000  2.310000 2.145000 3.245000 ;
+      RECT 2.280000  0.810000 2.610000 1.150000 ;
+      RECT 2.315000  2.140000 2.645000 2.980000 ;
+      RECT 2.790000  0.810000 3.155000 0.980000 ;
+      RECT 2.845000  1.320000 3.095000 2.980000 ;
+      RECT 2.985000  0.085000 3.155000 0.810000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef
index bb52b1c..b030374 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_2.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.060000  0.085000 1.730000 0.600000 ;
-        RECT 3.360000  0.085000 3.690000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -103,35 +89,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.185000 1.820000 0.435000 3.245000 ;
-        RECT 1.090000 2.060000 1.625000 3.245000 ;
-        RECT 2.350000 2.400000 2.680000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.955000 1.300000 1.305000 1.630000 ;
-      RECT 1.135000 0.840000 3.180000 1.010000 ;
-      RECT 1.135000 1.010000 1.305000 1.300000 ;
-      RECT 1.135000 1.630000 1.305000 1.720000 ;
-      RECT 1.135000 1.720000 3.725000 1.890000 ;
-      RECT 1.795000 2.060000 3.215000 2.230000 ;
-      RECT 1.795000 2.230000 2.125000 2.860000 ;
-      RECT 2.850000 0.350000 3.180000 0.840000 ;
-      RECT 2.885000 2.230000 3.215000 2.860000 ;
-      RECT 3.385000 1.890000 3.725000 2.860000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.185000  1.820000 0.435000 3.245000 ;
+      RECT 0.955000  1.300000 1.305000 1.630000 ;
+      RECT 1.060000  0.085000 1.730000 0.600000 ;
+      RECT 1.090000  2.060000 1.625000 3.245000 ;
+      RECT 1.135000  0.840000 3.180000 1.010000 ;
+      RECT 1.135000  1.010000 1.305000 1.300000 ;
+      RECT 1.135000  1.630000 1.305000 1.720000 ;
+      RECT 1.135000  1.720000 3.725000 1.890000 ;
+      RECT 1.795000  2.060000 3.215000 2.230000 ;
+      RECT 1.795000  2.230000 2.125000 2.860000 ;
+      RECT 2.350000  2.400000 2.680000 3.245000 ;
+      RECT 2.850000  0.350000 3.180000 0.840000 ;
+      RECT 2.885000  2.230000 3.215000 2.860000 ;
+      RECT 3.360000  0.085000 3.690000 1.010000 ;
+      RECT 3.385000  1.890000 3.725000 2.860000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef
index 7bc2305..b78d2cd 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_4.magic.lef
@@ -86,29 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.045000  0.085000 1.375000 0.660000 ;
-        RECT 1.930000  0.085000 2.260000 0.960000 ;
-        RECT 2.920000  0.085000 3.250000 0.960000 ;
-        RECT 6.270000  0.085000 6.600000 0.940000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -117,59 +94,79 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.065000 2.060000 1.395000 3.245000 ;
-        RECT 2.065000 1.820000 2.395000 3.245000 ;
-        RECT 4.245000 2.290000 4.575000 3.245000 ;
-        RECT 5.245000 2.290000 5.575000 3.245000 ;
-        RECT 6.255000 2.290000 6.585000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.065000 1.220000 4.750000 1.280000 ;
-      RECT 1.065000 1.280000 3.590000 1.300000 ;
-      RECT 1.065000 1.300000 2.335000 1.550000 ;
-      RECT 1.895000 1.130000 4.750000 1.220000 ;
-      RECT 2.490000 0.350000 2.740000 1.130000 ;
-      RECT 2.625000 1.970000 2.955000 2.810000 ;
-      RECT 2.625000 2.810000 4.075000 2.980000 ;
-      RECT 3.125000 1.970000 3.575000 2.640000 ;
-      RECT 3.405000 1.300000 3.575000 1.970000 ;
-      RECT 3.420000 0.350000 3.750000 1.110000 ;
-      RECT 3.420000 1.110000 4.750000 1.130000 ;
-      RECT 3.745000 1.950000 7.085000 2.120000 ;
-      RECT 3.745000 2.120000 4.075000 2.810000 ;
-      RECT 3.920000 0.255000 5.740000 0.425000 ;
-      RECT 3.920000 0.425000 4.250000 0.940000 ;
-      RECT 4.420000 0.595000 4.750000 1.110000 ;
-      RECT 4.745000 2.120000 5.075000 2.980000 ;
-      RECT 4.980000 0.595000 5.230000 1.110000 ;
-      RECT 4.980000 1.110000 7.030000 1.280000 ;
-      RECT 5.410000 0.425000 5.740000 0.940000 ;
-      RECT 5.755000 2.120000 6.085000 2.980000 ;
-      RECT 5.920000 0.350000 6.090000 1.110000 ;
-      RECT 6.755000 2.120000 7.085000 2.980000 ;
-      RECT 6.780000 0.350000 7.030000 1.110000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 1.045000  0.085000 1.375000 0.660000 ;
+      RECT 1.065000  1.220000 4.750000 1.280000 ;
+      RECT 1.065000  1.280000 3.590000 1.300000 ;
+      RECT 1.065000  1.300000 2.335000 1.550000 ;
+      RECT 1.065000  2.060000 1.395000 3.245000 ;
+      RECT 1.895000  1.130000 4.750000 1.220000 ;
+      RECT 1.930000  0.085000 2.260000 0.960000 ;
+      RECT 2.065000  1.820000 2.395000 3.245000 ;
+      RECT 2.490000  0.350000 2.740000 1.130000 ;
+      RECT 2.625000  1.970000 2.955000 2.810000 ;
+      RECT 2.625000  2.810000 4.075000 2.980000 ;
+      RECT 2.920000  0.085000 3.250000 0.960000 ;
+      RECT 3.125000  1.970000 3.575000 2.640000 ;
+      RECT 3.405000  1.300000 3.575000 1.970000 ;
+      RECT 3.420000  0.350000 3.750000 1.110000 ;
+      RECT 3.420000  1.110000 4.750000 1.130000 ;
+      RECT 3.745000  1.950000 7.085000 2.120000 ;
+      RECT 3.745000  2.120000 4.075000 2.810000 ;
+      RECT 3.920000  0.255000 5.740000 0.425000 ;
+      RECT 3.920000  0.425000 4.250000 0.940000 ;
+      RECT 4.245000  2.290000 4.575000 3.245000 ;
+      RECT 4.420000  0.595000 4.750000 1.110000 ;
+      RECT 4.745000  2.120000 5.075000 2.980000 ;
+      RECT 4.980000  0.595000 5.230000 1.110000 ;
+      RECT 4.980000  1.110000 7.030000 1.280000 ;
+      RECT 5.245000  2.290000 5.575000 3.245000 ;
+      RECT 5.410000  0.425000 5.740000 0.940000 ;
+      RECT 5.755000  2.120000 6.085000 2.980000 ;
+      RECT 5.920000  0.350000 6.090000 1.110000 ;
+      RECT 6.255000  2.290000 6.585000 3.245000 ;
+      RECT 6.270000  0.085000 6.600000 0.940000 ;
+      RECT 6.755000  2.120000 7.085000 2.980000 ;
+      RECT 6.780000  0.350000 7.030000 1.110000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__a31o_4
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef
index 5752757..4db75d2 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.magic.lef
@@ -83,17 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 1.010000 ;
-        RECT 2.230000  0.085000 2.560000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -102,25 +91,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.125000 1.820000 0.455000 3.245000 ;
-        RECT 1.205000 2.400000 1.535000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.665000 2.060000 2.085000 2.230000 ;
-      RECT 0.665000 2.230000 0.995000 2.980000 ;
-      RECT 1.755000 2.230000 2.085000 2.980000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.125000  0.085000 0.455000 1.010000 ;
+      RECT 0.125000  1.820000 0.455000 3.245000 ;
+      RECT 0.665000  2.060000 2.085000 2.230000 ;
+      RECT 0.665000  2.230000 0.995000 2.980000 ;
+      RECT 1.205000  2.400000 1.535000 3.245000 ;
+      RECT 1.755000  2.230000 2.085000 2.980000 ;
+      RECT 2.230000  0.085000 2.560000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef
index bc850e0..28ed82d 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.magic.lef
@@ -87,20 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 0.920000 ;
-        RECT 2.045000  0.085000 2.375000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -109,42 +95,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.565000 2.290000 0.895000 3.245000 ;
-        RECT 1.595000 2.290000 1.845000 3.245000 ;
-        RECT 3.425000 2.400000 3.755000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.820000 0.365000 1.950000 ;
-      RECT 0.115000 1.950000 2.275000 2.120000 ;
-      RECT 0.115000 2.120000 0.365000 2.980000 ;
-      RECT 0.545000 0.255000 1.875000 0.425000 ;
-      RECT 0.545000 0.425000 0.875000 0.920000 ;
-      RECT 1.045000 0.595000 1.375000 0.750000 ;
-      RECT 1.045000 0.750000 3.705000 0.920000 ;
-      RECT 1.065000 2.120000 1.395000 2.980000 ;
-      RECT 1.545000 0.425000 1.875000 0.580000 ;
-      RECT 2.015000 2.120000 2.275000 2.905000 ;
-      RECT 2.015000 2.905000 3.255000 3.075000 ;
-      RECT 2.975000 2.060000 4.205000 2.230000 ;
-      RECT 2.975000 2.230000 3.255000 2.905000 ;
-      RECT 3.430000 0.670000 3.705000 0.750000 ;
-      RECT 3.875000 1.950000 4.205000 2.060000 ;
-      RECT 3.925000 2.230000 4.205000 2.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.085000 0.365000 0.920000 ;
+      RECT 0.115000  1.820000 0.365000 1.950000 ;
+      RECT 0.115000  1.950000 2.275000 2.120000 ;
+      RECT 0.115000  2.120000 0.365000 2.980000 ;
+      RECT 0.545000  0.255000 1.875000 0.425000 ;
+      RECT 0.545000  0.425000 0.875000 0.920000 ;
+      RECT 0.565000  2.290000 0.895000 3.245000 ;
+      RECT 1.045000  0.595000 1.375000 0.750000 ;
+      RECT 1.045000  0.750000 3.705000 0.920000 ;
+      RECT 1.065000  2.120000 1.395000 2.980000 ;
+      RECT 1.545000  0.425000 1.875000 0.580000 ;
+      RECT 1.595000  2.290000 1.845000 3.245000 ;
+      RECT 2.015000  2.120000 2.275000 2.905000 ;
+      RECT 2.015000  2.905000 3.255000 3.075000 ;
+      RECT 2.045000  0.085000 2.375000 0.580000 ;
+      RECT 2.975000  2.060000 4.205000 2.230000 ;
+      RECT 2.975000  2.230000 3.255000 2.905000 ;
+      RECT 3.425000  2.400000 3.755000 3.245000 ;
+      RECT 3.430000  0.670000 3.705000 0.750000 ;
+      RECT 3.875000  1.950000 4.205000 2.060000 ;
+      RECT 3.925000  2.230000 4.205000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef
index e7b1567..af166eb 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.magic.lef
@@ -89,30 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.560000  0.085000 0.890000 0.840000 ;
-        RECT 1.420000  0.085000 1.750000 0.840000 ;
-        RECT 7.010000  0.085000 8.025000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -121,64 +97,85 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.565000 2.290000 0.895000 3.245000 ;
-        RECT 1.465000 2.290000 1.795000 3.245000 ;
-        RECT 2.365000 2.320000 2.695000 3.245000 ;
-        RECT 3.365000 2.290000 3.695000 3.245000 ;
-        RECT 4.365000 2.630000 4.695000 3.245000 ;
-        RECT 5.845000 2.630000 6.175000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 4.195000 2.120000 ;
-      RECT 0.115000 2.120000 0.395000 2.980000 ;
-      RECT 0.130000 0.350000 0.380000 1.010000 ;
-      RECT 0.130000 1.010000 4.120000 1.180000 ;
-      RECT 1.065000 2.120000 1.295000 2.935000 ;
-      RECT 1.070000 0.350000 1.240000 1.010000 ;
-      RECT 1.915000 1.820000 2.245000 1.950000 ;
-      RECT 1.920000 0.330000 2.170000 1.010000 ;
-      RECT 1.965000 2.120000 3.195000 2.150000 ;
-      RECT 1.965000 2.150000 2.195000 2.950000 ;
-      RECT 2.350000 0.255000 6.340000 0.425000 ;
-      RECT 2.350000 0.425000 2.655000 0.840000 ;
-      RECT 2.825000 0.595000 3.120000 1.010000 ;
-      RECT 2.865000 2.150000 3.195000 2.980000 ;
-      RECT 3.290000 0.425000 3.620000 0.840000 ;
-      RECT 3.790000 0.595000 4.120000 1.010000 ;
-      RECT 3.865000 2.120000 4.195000 2.290000 ;
-      RECT 3.865000 2.290000 6.675000 2.460000 ;
-      RECT 3.865000 2.460000 4.195000 2.980000 ;
-      RECT 4.865000 2.460000 5.675000 2.930000 ;
-      RECT 4.935000 0.425000 5.265000 0.795000 ;
-      RECT 6.010000 0.425000 6.340000 0.840000 ;
-      RECT 6.345000 2.460000 6.675000 2.905000 ;
-      RECT 6.345000 2.905000 8.525000 3.075000 ;
-      RECT 7.375000 2.290000 7.575000 2.905000 ;
-      RECT 8.255000 1.950000 8.525000 2.905000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  1.950000 4.195000 2.120000 ;
+      RECT 0.115000  2.120000 0.395000 2.980000 ;
+      RECT 0.130000  0.350000 0.380000 1.010000 ;
+      RECT 0.130000  1.010000 4.120000 1.180000 ;
+      RECT 0.560000  0.085000 0.890000 0.840000 ;
+      RECT 0.565000  2.290000 0.895000 3.245000 ;
+      RECT 1.065000  2.120000 1.295000 2.935000 ;
+      RECT 1.070000  0.350000 1.240000 1.010000 ;
+      RECT 1.420000  0.085000 1.750000 0.840000 ;
+      RECT 1.465000  2.290000 1.795000 3.245000 ;
+      RECT 1.915000  1.820000 2.245000 1.950000 ;
+      RECT 1.920000  0.330000 2.170000 1.010000 ;
+      RECT 1.965000  2.120000 3.195000 2.150000 ;
+      RECT 1.965000  2.150000 2.195000 2.950000 ;
+      RECT 2.350000  0.255000 6.340000 0.425000 ;
+      RECT 2.350000  0.425000 2.655000 0.840000 ;
+      RECT 2.365000  2.320000 2.695000 3.245000 ;
+      RECT 2.825000  0.595000 3.120000 1.010000 ;
+      RECT 2.865000  2.150000 3.195000 2.980000 ;
+      RECT 3.290000  0.425000 3.620000 0.840000 ;
+      RECT 3.365000  2.290000 3.695000 3.245000 ;
+      RECT 3.790000  0.595000 4.120000 1.010000 ;
+      RECT 3.865000  2.120000 4.195000 2.290000 ;
+      RECT 3.865000  2.290000 6.675000 2.460000 ;
+      RECT 3.865000  2.460000 4.195000 2.980000 ;
+      RECT 4.365000  2.630000 4.695000 3.245000 ;
+      RECT 4.865000  2.460000 5.675000 2.930000 ;
+      RECT 4.935000  0.425000 5.265000 0.795000 ;
+      RECT 5.845000  2.630000 6.175000 3.245000 ;
+      RECT 6.010000  0.425000 6.340000 0.840000 ;
+      RECT 6.345000  2.460000 6.675000 2.905000 ;
+      RECT 6.345000  2.905000 8.525000 3.075000 ;
+      RECT 7.010000  0.085000 8.025000 0.840000 ;
+      RECT 7.375000  2.290000 7.575000 2.905000 ;
+      RECT 8.255000  1.950000 8.525000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__a31oi_4
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef
index 800d873..c407b8b 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_1.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.650000  0.085000 1.050000 0.680000 ;
-        RECT 3.370000  0.085000 3.700000 1.040000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -111,36 +98,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.625000 2.060000 1.015000 3.245000 ;
-        RECT 1.800000 2.400000 2.130000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.300000 0.795000 1.630000 ;
-      RECT 0.625000 0.850000 2.880000 1.020000 ;
-      RECT 0.625000 1.020000 0.795000 1.300000 ;
-      RECT 0.625000 1.630000 0.795000 1.720000 ;
-      RECT 0.625000 1.720000 3.225000 1.890000 ;
-      RECT 1.205000 2.060000 2.725000 2.230000 ;
-      RECT 1.205000 2.230000 1.535000 2.860000 ;
-      RECT 2.200000 0.430000 2.880000 0.850000 ;
-      RECT 2.395000 2.230000 2.725000 2.905000 ;
-      RECT 2.395000 2.905000 3.725000 3.075000 ;
-      RECT 2.895000 1.890000 3.225000 2.735000 ;
-      RECT 3.395000 1.820000 3.725000 2.905000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.425000  1.300000 0.795000 1.630000 ;
+      RECT 0.625000  0.850000 2.880000 1.020000 ;
+      RECT 0.625000  1.020000 0.795000 1.300000 ;
+      RECT 0.625000  1.630000 0.795000 1.720000 ;
+      RECT 0.625000  1.720000 3.225000 1.890000 ;
+      RECT 0.625000  2.060000 1.015000 3.245000 ;
+      RECT 0.650000  0.085000 1.050000 0.680000 ;
+      RECT 1.205000  2.060000 2.725000 2.230000 ;
+      RECT 1.205000  2.230000 1.535000 2.860000 ;
+      RECT 1.800000  2.400000 2.130000 3.245000 ;
+      RECT 2.200000  0.430000 2.880000 0.850000 ;
+      RECT 2.395000  2.230000 2.725000 2.905000 ;
+      RECT 2.395000  2.905000 3.725000 3.075000 ;
+      RECT 2.895000  1.890000 3.225000 2.735000 ;
+      RECT 3.370000  0.085000 3.700000 1.040000 ;
+      RECT 3.395000  1.820000 3.725000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef
index b76a993..45bfb8b 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_2.magic.lef
@@ -90,21 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.185000  0.085000 1.515000 0.840000 ;
-        RECT 3.850000  0.085000 4.180000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -113,40 +98,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.115000 2.660000 0.445000 3.245000 ;
-        RECT 1.100000 2.660000 1.510000 3.245000 ;
-        RECT 2.265000 2.630000 2.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.225000 1.320000 0.555000 1.650000 ;
-      RECT 0.225000 1.650000 0.395000 2.320000 ;
-      RECT 0.225000 2.320000 1.275000 2.490000 ;
-      RECT 1.105000 1.010000 3.105000 1.180000 ;
-      RECT 1.105000 1.180000 1.275000 1.950000 ;
-      RECT 1.105000 1.950000 3.705000 2.120000 ;
-      RECT 1.105000 2.120000 1.275000 2.320000 ;
-      RECT 1.715000 2.290000 3.205000 2.460000 ;
-      RECT 1.715000 2.460000 2.045000 2.860000 ;
-      RECT 2.775000 0.350000 3.105000 1.010000 ;
-      RECT 2.875000 2.460000 3.205000 2.905000 ;
-      RECT 2.875000 2.905000 4.205000 3.075000 ;
-      RECT 3.375000 2.120000 3.705000 2.735000 ;
-      RECT 3.875000 1.950000 4.205000 2.905000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.115000  2.660000 0.445000 3.245000 ;
+      RECT 0.225000  1.320000 0.555000 1.650000 ;
+      RECT 0.225000  1.650000 0.395000 2.320000 ;
+      RECT 0.225000  2.320000 1.275000 2.490000 ;
+      RECT 1.100000  2.660000 1.510000 3.245000 ;
+      RECT 1.105000  1.010000 3.105000 1.180000 ;
+      RECT 1.105000  1.180000 1.275000 1.950000 ;
+      RECT 1.105000  1.950000 3.705000 2.120000 ;
+      RECT 1.105000  2.120000 1.275000 2.320000 ;
+      RECT 1.185000  0.085000 1.515000 0.840000 ;
+      RECT 1.715000  2.290000 3.205000 2.460000 ;
+      RECT 1.715000  2.460000 2.045000 2.860000 ;
+      RECT 2.265000  2.630000 2.645000 3.245000 ;
+      RECT 2.775000  0.350000 3.105000 1.010000 ;
+      RECT 2.875000  2.460000 3.205000 2.905000 ;
+      RECT 2.875000  2.905000 4.205000 3.075000 ;
+      RECT 3.375000  2.120000 3.705000 2.735000 ;
+      RECT 3.850000  0.085000 4.180000 1.130000 ;
+      RECT 3.875000  1.950000 4.205000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef
index ce5e2d3..af88c05 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_4.magic.lef
@@ -103,32 +103,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.760000 ;
-        RECT 0.990000  0.085000 1.400000 0.760000 ;
-        RECT 2.070000  0.085000 2.400000 1.180000 ;
-        RECT 4.350000  0.755000 4.755000 0.940000 ;
-        RECT 4.585000  0.085000 4.755000 0.755000 ;
-        RECT 7.190000  0.085000 7.545000 0.920000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -137,68 +111,91 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.015000 2.190000 1.345000 3.245000 ;
-        RECT 1.965000 2.290000 2.295000 3.245000 ;
-        RECT 5.210000 2.630000 5.615000 3.245000 ;
-        RECT 6.285000 2.630000 6.645000 3.245000 ;
-        RECT 7.265000 2.290000 7.545000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.350000 2.185000 1.680000 ;
-      RECT 2.015000 1.680000 2.185000 1.950000 ;
-      RECT 2.015000 1.950000 4.355000 2.120000 ;
-      RECT 2.525000 2.290000 2.855000 2.905000 ;
-      RECT 2.525000 2.905000 4.925000 3.075000 ;
-      RECT 2.910000 0.595000 3.240000 0.755000 ;
-      RECT 2.910000 0.755000 4.180000 0.925000 ;
-      RECT 2.910000 0.925000 3.240000 1.210000 ;
-      RECT 3.025000 2.120000 3.355000 2.735000 ;
-      RECT 3.420000 1.095000 3.750000 1.110000 ;
-      RECT 3.420000 1.110000 6.130000 1.280000 ;
-      RECT 3.525000 2.290000 3.855000 2.905000 ;
-      RECT 3.885000 1.280000 4.055000 1.950000 ;
-      RECT 4.025000 2.120000 4.355000 2.735000 ;
-      RECT 4.595000 1.960000 4.925000 2.290000 ;
-      RECT 4.595000 2.290000 7.095000 2.460000 ;
-      RECT 4.595000 2.460000 4.925000 2.905000 ;
-      RECT 4.940000 0.255000 6.990000 0.425000 ;
-      RECT 4.940000 0.425000 5.190000 0.940000 ;
-      RECT 5.370000 0.595000 6.560000 0.765000 ;
-      RECT 5.370000 0.765000 5.620000 0.940000 ;
-      RECT 5.785000 2.460000 6.115000 2.900000 ;
-      RECT 5.800000 0.935000 6.130000 1.110000 ;
-      RECT 6.310000 0.765000 6.560000 1.270000 ;
-      RECT 6.740000 0.425000 6.990000 1.100000 ;
-      RECT 6.740000 1.100000 8.045000 1.270000 ;
-      RECT 6.765000 1.950000 8.045000 2.120000 ;
-      RECT 6.765000 2.120000 7.095000 2.290000 ;
-      RECT 6.815000 2.460000 7.095000 3.000000 ;
-      RECT 7.715000 0.590000 8.045000 1.100000 ;
-      RECT 7.715000 2.120000 8.045000 2.980000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.760000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.985000  1.350000 2.185000 1.680000 ;
+      RECT 0.990000  0.085000 1.400000 0.760000 ;
+      RECT 1.015000  2.190000 1.345000 3.245000 ;
+      RECT 1.965000  2.290000 2.295000 3.245000 ;
+      RECT 2.015000  1.680000 2.185000 1.950000 ;
+      RECT 2.015000  1.950000 4.355000 2.120000 ;
+      RECT 2.070000  0.085000 2.400000 1.180000 ;
+      RECT 2.525000  2.290000 2.855000 2.905000 ;
+      RECT 2.525000  2.905000 4.925000 3.075000 ;
+      RECT 2.910000  0.595000 3.240000 0.755000 ;
+      RECT 2.910000  0.755000 4.180000 0.925000 ;
+      RECT 2.910000  0.925000 3.240000 1.210000 ;
+      RECT 3.025000  2.120000 3.355000 2.735000 ;
+      RECT 3.420000  1.095000 3.750000 1.110000 ;
+      RECT 3.420000  1.110000 6.130000 1.280000 ;
+      RECT 3.525000  2.290000 3.855000 2.905000 ;
+      RECT 3.885000  1.280000 4.055000 1.950000 ;
+      RECT 4.025000  2.120000 4.355000 2.735000 ;
+      RECT 4.350000  0.755000 4.755000 0.940000 ;
+      RECT 4.585000  0.085000 4.755000 0.755000 ;
+      RECT 4.595000  1.960000 4.925000 2.290000 ;
+      RECT 4.595000  2.290000 7.095000 2.460000 ;
+      RECT 4.595000  2.460000 4.925000 2.905000 ;
+      RECT 4.940000  0.255000 6.990000 0.425000 ;
+      RECT 4.940000  0.425000 5.190000 0.940000 ;
+      RECT 5.210000  2.630000 5.615000 3.245000 ;
+      RECT 5.370000  0.595000 6.560000 0.765000 ;
+      RECT 5.370000  0.765000 5.620000 0.940000 ;
+      RECT 5.785000  2.460000 6.115000 2.900000 ;
+      RECT 5.800000  0.935000 6.130000 1.110000 ;
+      RECT 6.285000  2.630000 6.645000 3.245000 ;
+      RECT 6.310000  0.765000 6.560000 1.270000 ;
+      RECT 6.740000  0.425000 6.990000 1.100000 ;
+      RECT 6.740000  1.100000 8.045000 1.270000 ;
+      RECT 6.765000  1.950000 8.045000 2.120000 ;
+      RECT 6.765000  2.120000 7.095000 2.290000 ;
+      RECT 6.815000  2.460000 7.095000 3.000000 ;
+      RECT 7.190000  0.085000 7.545000 0.920000 ;
+      RECT 7.265000  2.290000 7.545000 3.245000 ;
+      RECT 7.715000  0.590000 8.045000 1.100000 ;
+      RECT 7.715000  2.120000 8.045000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__a32o_4
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef
index b94488b..30cdd50 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.010000 ;
-        RECT 2.890000  0.085000 3.220000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -112,30 +100,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.675000 2.660000 2.345000 3.245000 ;
-        RECT 2.995000 1.820000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.820000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 1.445000 3.075000 ;
-      RECT 1.115000 2.060000 1.420000 2.320000 ;
-      RECT 1.115000 2.320000 2.795000 2.490000 ;
-      RECT 1.115000 2.490000 1.445000 2.905000 ;
-      RECT 2.465000 1.820000 2.795000 2.320000 ;
-      RECT 2.515000 2.490000 2.795000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.010000 ;
+      RECT 0.115000  1.820000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 1.445000 3.075000 ;
+      RECT 1.115000  2.060000 1.420000 2.320000 ;
+      RECT 1.115000  2.320000 2.795000 2.490000 ;
+      RECT 1.115000  2.490000 1.445000 2.905000 ;
+      RECT 1.675000  2.660000 2.345000 3.245000 ;
+      RECT 2.465000  1.820000 2.795000 2.320000 ;
+      RECT 2.515000  2.490000 2.795000 2.980000 ;
+      RECT 2.890000  0.085000 3.220000 1.010000 ;
+      RECT 2.995000  1.820000 3.245000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef
index b4516fd..b23b33b 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.magic.lef
@@ -98,25 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.790000 ;
-        RECT 4.935000  0.085000 5.185000 0.840000 ;
-        RECT 5.795000  0.085000 6.125000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -125,54 +106,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 2.570000 2.400000 3.280000 3.245000 ;
-        RECT 3.905000 2.290000 4.250000 3.245000 ;
-        RECT 5.045000 2.060000 5.375000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.960000 ;
-      RECT 0.115000 0.960000 1.275000 1.130000 ;
-      RECT 0.115000 1.950000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 2.400000 3.075000 ;
-      RECT 1.105000 0.255000 2.285000 0.425000 ;
-      RECT 1.105000 0.425000 1.275000 0.960000 ;
-      RECT 1.115000 2.140000 1.445000 2.905000 ;
-      RECT 1.955000 0.425000 2.285000 0.670000 ;
-      RECT 2.115000 2.060000 4.875000 2.120000 ;
-      RECT 2.115000 2.120000 3.735000 2.230000 ;
-      RECT 2.115000 2.230000 2.400000 2.905000 ;
-      RECT 2.515000 0.255000 4.705000 0.425000 ;
-      RECT 2.515000 0.425000 2.845000 0.670000 ;
-      RECT 3.375000 0.425000 3.705000 1.130000 ;
-      RECT 3.405000 1.950000 4.875000 2.060000 ;
-      RECT 3.450000 2.230000 3.735000 2.980000 ;
-      RECT 3.875000 0.595000 4.205000 1.010000 ;
-      RECT 3.875000 1.010000 5.615000 1.180000 ;
-      RECT 4.375000 0.425000 4.705000 0.840000 ;
-      RECT 4.420000 2.120000 4.875000 2.980000 ;
-      RECT 4.545000 1.720000 5.875000 1.890000 ;
-      RECT 4.545000 1.890000 4.875000 1.950000 ;
-      RECT 5.365000 0.350000 5.615000 1.010000 ;
-      RECT 5.545000 1.890000 5.875000 2.980000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.960000 ;
+      RECT 0.115000  0.960000 1.275000 1.130000 ;
+      RECT 0.115000  1.950000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 2.400000 3.075000 ;
+      RECT 0.545000  0.085000 0.875000 0.790000 ;
+      RECT 1.105000  0.255000 2.285000 0.425000 ;
+      RECT 1.105000  0.425000 1.275000 0.960000 ;
+      RECT 1.115000  2.140000 1.445000 2.905000 ;
+      RECT 1.955000  0.425000 2.285000 0.670000 ;
+      RECT 2.115000  2.060000 4.875000 2.120000 ;
+      RECT 2.115000  2.120000 3.735000 2.230000 ;
+      RECT 2.115000  2.230000 2.400000 2.905000 ;
+      RECT 2.515000  0.255000 4.705000 0.425000 ;
+      RECT 2.515000  0.425000 2.845000 0.670000 ;
+      RECT 2.570000  2.400000 3.280000 3.245000 ;
+      RECT 3.375000  0.425000 3.705000 1.130000 ;
+      RECT 3.405000  1.950000 4.875000 2.060000 ;
+      RECT 3.450000  2.230000 3.735000 2.980000 ;
+      RECT 3.875000  0.595000 4.205000 1.010000 ;
+      RECT 3.875000  1.010000 5.615000 1.180000 ;
+      RECT 3.905000  2.290000 4.250000 3.245000 ;
+      RECT 4.375000  0.425000 4.705000 0.840000 ;
+      RECT 4.420000  2.120000 4.875000 2.980000 ;
+      RECT 4.545000  1.720000 5.875000 1.890000 ;
+      RECT 4.545000  1.890000 4.875000 1.950000 ;
+      RECT 4.935000  0.085000 5.185000 0.840000 ;
+      RECT 5.045000  2.060000 5.375000 3.245000 ;
+      RECT 5.365000  0.350000 5.615000 1.010000 ;
+      RECT 5.545000  1.890000 5.875000 2.980000 ;
+      RECT 5.795000  0.085000 6.125000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef
index 0a14cb3..eb193ba 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.magic.lef
@@ -98,36 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.560000 0.085000 ;
-        RECT  0.615000  0.085000  0.945000 0.840000 ;
-        RECT  1.475000  0.085000  1.805000 0.840000 ;
-        RECT  8.395000  0.085000  8.725000 0.840000 ;
-        RECT  9.255000  0.085000  9.585000 0.840000 ;
-        RECT 10.115000  0.085000 10.445000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
@@ -136,72 +106,99 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 4.605000 2.630000  4.935000 3.245000 ;
-        RECT 5.605000 2.630000  5.935000 3.245000 ;
-        RECT 6.605000 2.630000  6.935000 3.245000 ;
-        RECT 7.605000 2.290000  7.935000 3.245000 ;
-        RECT 8.605000 2.290000  8.935000 3.245000 ;
-        RECT 9.605000 2.290000  9.935000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.560000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.445000 1.010000 ;
-      RECT  0.115000 1.010000  2.220000 1.180000 ;
-      RECT  0.115000 1.950000  0.445000 2.905000 ;
-      RECT  0.115000 2.905000  4.345000 3.075000 ;
-      RECT  1.125000 0.350000  1.295000 1.010000 ;
-      RECT  1.145000 2.290000  1.315000 2.905000 ;
-      RECT  2.015000 2.290000  2.345000 2.905000 ;
-      RECT  2.050000 0.255000  4.090000 0.425000 ;
-      RECT  2.050000 0.425000  2.220000 1.010000 ;
-      RECT  2.900000 0.425000  3.230000 0.710000 ;
-      RECT  3.015000 2.290000  3.345000 2.905000 ;
-      RECT  3.760000 0.425000  4.090000 0.710000 ;
-      RECT  4.015000 2.290000  7.435000 2.460000 ;
-      RECT  4.015000 2.460000  4.345000 2.905000 ;
-      RECT  4.320000 0.350000  8.165000 0.600000 ;
-      RECT  4.320000 0.600000  4.650000 0.840000 ;
-      RECT  5.105000 2.460000  5.435000 2.980000 ;
-      RECT  6.105000 2.460000  6.435000 2.980000 ;
-      RECT  6.540000 0.770000  6.870000 0.850000 ;
-      RECT  6.540000 0.850000  7.735000 1.010000 ;
-      RECT  6.540000 1.010000  9.935000 1.180000 ;
-      RECT  7.105000 1.950000 10.440000 2.120000 ;
-      RECT  7.105000 2.120000  7.435000 2.290000 ;
-      RECT  7.105000 2.460000  7.435000 2.980000 ;
-      RECT  7.835000 0.600000  8.165000 0.680000 ;
-      RECT  8.105000 2.120000  8.435000 2.980000 ;
-      RECT  8.905000 0.350000  9.075000 1.010000 ;
-      RECT  9.105000 2.120000  9.435000 2.980000 ;
-      RECT  9.765000 0.350000  9.935000 1.010000 ;
-      RECT 10.110000 2.120000 10.440000 2.980000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.115000  0.350000  0.445000 1.010000 ;
+      RECT  0.115000  1.010000  2.220000 1.180000 ;
+      RECT  0.115000  1.950000  0.445000 2.905000 ;
+      RECT  0.115000  2.905000  4.345000 3.075000 ;
+      RECT  0.615000  0.085000  0.945000 0.840000 ;
+      RECT  1.125000  0.350000  1.295000 1.010000 ;
+      RECT  1.145000  2.290000  1.315000 2.905000 ;
+      RECT  1.475000  0.085000  1.805000 0.840000 ;
+      RECT  2.015000  2.290000  2.345000 2.905000 ;
+      RECT  2.050000  0.255000  4.090000 0.425000 ;
+      RECT  2.050000  0.425000  2.220000 1.010000 ;
+      RECT  2.900000  0.425000  3.230000 0.710000 ;
+      RECT  3.015000  2.290000  3.345000 2.905000 ;
+      RECT  3.760000  0.425000  4.090000 0.710000 ;
+      RECT  4.015000  2.290000  7.435000 2.460000 ;
+      RECT  4.015000  2.460000  4.345000 2.905000 ;
+      RECT  4.320000  0.350000  8.165000 0.600000 ;
+      RECT  4.320000  0.600000  4.650000 0.840000 ;
+      RECT  4.605000  2.630000  4.935000 3.245000 ;
+      RECT  5.105000  2.460000  5.435000 2.980000 ;
+      RECT  5.605000  2.630000  5.935000 3.245000 ;
+      RECT  6.105000  2.460000  6.435000 2.980000 ;
+      RECT  6.540000  0.770000  6.870000 0.850000 ;
+      RECT  6.540000  0.850000  7.735000 1.010000 ;
+      RECT  6.540000  1.010000  9.935000 1.180000 ;
+      RECT  6.605000  2.630000  6.935000 3.245000 ;
+      RECT  7.105000  1.950000 10.440000 2.120000 ;
+      RECT  7.105000  2.120000  7.435000 2.290000 ;
+      RECT  7.105000  2.460000  7.435000 2.980000 ;
+      RECT  7.605000  2.290000  7.935000 3.245000 ;
+      RECT  7.835000  0.600000  8.165000 0.680000 ;
+      RECT  8.105000  2.120000  8.435000 2.980000 ;
+      RECT  8.395000  0.085000  8.725000 0.840000 ;
+      RECT  8.605000  2.290000  8.935000 3.245000 ;
+      RECT  8.905000  0.350000  9.075000 1.010000 ;
+      RECT  9.105000  2.120000  9.435000 2.980000 ;
+      RECT  9.255000  0.085000  9.585000 0.840000 ;
+      RECT  9.605000  2.290000  9.935000 3.245000 ;
+      RECT  9.765000  0.350000  9.935000 1.010000 ;
+      RECT 10.110000  2.120000 10.440000 2.980000 ;
+      RECT 10.115000  0.085000 10.445000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
   END
 END sky130_fd_sc_hs__a32oi_4
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef
index 0f1d084..55ca5f7 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_1.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.290000  0.085000 1.620000 0.940000 ;
-        RECT 3.830000  0.085000 4.160000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -112,37 +98,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.645000 1.820000 0.895000 3.245000 ;
-        RECT 2.305000 2.290000 2.635000 3.245000 ;
-        RECT 3.335000 2.060000 3.665000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.575000 1.110000 2.120000 1.280000 ;
-      RECT 0.575000 1.280000 1.315000 1.550000 ;
-      RECT 1.145000 1.550000 1.315000 1.950000 ;
-      RECT 1.145000 1.950000 1.635000 2.980000 ;
-      RECT 1.790000 0.350000 2.120000 1.110000 ;
-      RECT 1.805000 1.950000 3.165000 2.120000 ;
-      RECT 1.805000 2.120000 2.135000 2.980000 ;
-      RECT 2.835000 1.720000 4.185000 1.890000 ;
-      RECT 2.835000 1.890000 3.165000 1.950000 ;
-      RECT 2.835000 2.120000 3.165000 2.980000 ;
-      RECT 3.855000 1.890000 4.185000 2.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.575000  1.110000 2.120000 1.280000 ;
+      RECT 0.575000  1.280000 1.315000 1.550000 ;
+      RECT 0.645000  1.820000 0.895000 3.245000 ;
+      RECT 1.145000  1.550000 1.315000 1.950000 ;
+      RECT 1.145000  1.950000 1.635000 2.980000 ;
+      RECT 1.290000  0.085000 1.620000 0.940000 ;
+      RECT 1.790000  0.350000 2.120000 1.110000 ;
+      RECT 1.805000  1.950000 3.165000 2.120000 ;
+      RECT 1.805000  2.120000 2.135000 2.980000 ;
+      RECT 2.305000  2.290000 2.635000 3.245000 ;
+      RECT 2.835000  1.720000 4.185000 1.890000 ;
+      RECT 2.835000  1.890000 3.165000 1.950000 ;
+      RECT 2.835000  2.120000 3.165000 2.980000 ;
+      RECT 3.335000  2.060000 3.665000 3.245000 ;
+      RECT 3.830000  0.085000 4.160000 1.010000 ;
+      RECT 3.855000  1.890000 4.185000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__a41o_1
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef
index f84c0d8..f35cd5c 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_2.magic.lef
@@ -91,22 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.150000  0.085000 0.480000 1.010000 ;
-        RECT 2.790000  0.085000 3.120000 0.940000 ;
-        RECT 3.885000  0.085000 4.685000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -115,40 +99,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.615000 2.060000 0.945000 3.245000 ;
-        RECT 1.615000 2.290000 2.125000 3.245000 ;
-        RECT 3.355000 2.270000 3.685000 3.245000 ;
-        RECT 4.355000 1.820000 4.685000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.720000 1.445000 1.890000 ;
-      RECT 0.115000 1.890000 0.445000 2.980000 ;
-      RECT 1.115000 1.890000 1.445000 1.950000 ;
-      RECT 1.115000 1.950000 2.625000 2.120000 ;
-      RECT 1.115000 2.120000 1.445000 2.980000 ;
-      RECT 2.230000 0.350000 2.560000 1.110000 ;
-      RECT 2.230000 1.110000 3.845000 1.280000 ;
-      RECT 2.295000 2.120000 2.625000 2.980000 ;
-      RECT 2.795000 1.950000 3.265000 2.120000 ;
-      RECT 2.795000 2.120000 3.125000 2.980000 ;
-      RECT 3.095000 1.280000 3.845000 1.550000 ;
-      RECT 3.095000 1.550000 3.265000 1.950000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  1.720000 1.445000 1.890000 ;
+      RECT 0.115000  1.890000 0.445000 2.980000 ;
+      RECT 0.150000  0.085000 0.480000 1.010000 ;
+      RECT 0.615000  2.060000 0.945000 3.245000 ;
+      RECT 1.115000  1.890000 1.445000 1.950000 ;
+      RECT 1.115000  1.950000 2.625000 2.120000 ;
+      RECT 1.115000  2.120000 1.445000 2.980000 ;
+      RECT 1.615000  2.290000 2.125000 3.245000 ;
+      RECT 2.230000  0.350000 2.560000 1.110000 ;
+      RECT 2.230000  1.110000 3.845000 1.280000 ;
+      RECT 2.295000  2.120000 2.625000 2.980000 ;
+      RECT 2.790000  0.085000 3.120000 0.940000 ;
+      RECT 2.795000  1.950000 3.265000 2.120000 ;
+      RECT 2.795000  2.120000 3.125000 2.980000 ;
+      RECT 3.095000  1.280000 3.845000 1.550000 ;
+      RECT 3.095000  1.550000 3.265000 1.950000 ;
+      RECT 3.355000  2.270000 3.685000 3.245000 ;
+      RECT 3.885000  0.085000 4.685000 0.600000 ;
+      RECT 4.355000  1.820000 4.685000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__a41o_2
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef
index 41b84a7..ab6f77e 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_4.magic.lef
@@ -90,31 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.110000  0.085000 0.360000 1.250000 ;
-        RECT 1.045000  0.085000 1.375000 0.490000 ;
-        RECT 2.055000  0.085000 2.385000 0.490000 ;
-        RECT 3.055000  0.085000 3.305000 0.490000 ;
-        RECT 7.290000  0.085000 7.620000 0.940000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -123,72 +98,94 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 1.625000 2.630000 1.955000 3.245000 ;
-        RECT 2.525000 2.630000 2.855000 3.245000 ;
-        RECT 3.425000 2.650000 3.775000 3.245000 ;
-        RECT 4.635000 2.290000 5.095000 3.245000 ;
-        RECT 5.765000 2.290000 6.095000 3.245000 ;
-        RECT 6.765000 2.290000 7.095000 3.245000 ;
-        RECT 7.795000 1.950000 8.045000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 1.395000 3.075000 ;
-      RECT 0.540000 0.470000 0.870000 0.660000 ;
-      RECT 0.540000 0.660000 3.645000 0.830000 ;
-      RECT 0.540000 0.830000 1.225000 1.250000 ;
-      RECT 0.615000 1.950000 0.890000 2.735000 ;
-      RECT 0.720000 1.250000 1.225000 1.340000 ;
-      RECT 0.720000 1.340000 2.385000 1.670000 ;
-      RECT 0.720000 1.670000 0.890000 1.950000 ;
-      RECT 1.065000 1.940000 1.395000 2.290000 ;
-      RECT 1.065000 2.290000 4.375000 2.460000 ;
-      RECT 1.065000 2.460000 1.395000 2.905000 ;
-      RECT 3.475000 0.255000 4.495000 0.425000 ;
-      RECT 3.475000 0.425000 3.645000 0.660000 ;
-      RECT 3.815000 0.700000 3.985000 0.770000 ;
-      RECT 3.815000 0.770000 4.845000 1.150000 ;
-      RECT 4.045000 1.950000 7.595000 2.120000 ;
-      RECT 4.045000 2.120000 4.375000 2.290000 ;
-      RECT 4.045000 2.460000 4.375000 2.980000 ;
-      RECT 4.165000 0.425000 4.495000 0.600000 ;
-      RECT 4.675000 0.330000 5.785000 0.600000 ;
-      RECT 4.675000 0.600000 4.845000 0.770000 ;
-      RECT 5.025000 0.770000 5.285000 1.110000 ;
-      RECT 5.025000 1.110000 6.680000 1.280000 ;
-      RECT 5.265000 2.120000 5.595000 2.980000 ;
-      RECT 5.455000 0.600000 5.785000 0.940000 ;
-      RECT 6.000000 0.255000 7.110000 0.425000 ;
-      RECT 6.000000 0.425000 6.330000 0.940000 ;
-      RECT 6.265000 2.120000 6.595000 2.980000 ;
-      RECT 6.510000 0.595000 6.680000 1.110000 ;
-      RECT 6.860000 0.425000 7.110000 1.110000 ;
-      RECT 6.860000 1.110000 8.050000 1.280000 ;
-      RECT 7.265000 2.120000 7.595000 2.980000 ;
-      RECT 7.790000 0.350000 8.050000 1.110000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.110000  0.085000 0.360000 1.250000 ;
+      RECT 0.115000  1.950000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 1.395000 3.075000 ;
+      RECT 0.540000  0.470000 0.870000 0.660000 ;
+      RECT 0.540000  0.660000 3.645000 0.830000 ;
+      RECT 0.540000  0.830000 1.225000 1.250000 ;
+      RECT 0.615000  1.950000 0.890000 2.735000 ;
+      RECT 0.720000  1.250000 1.225000 1.340000 ;
+      RECT 0.720000  1.340000 2.385000 1.670000 ;
+      RECT 0.720000  1.670000 0.890000 1.950000 ;
+      RECT 1.045000  0.085000 1.375000 0.490000 ;
+      RECT 1.065000  1.940000 1.395000 2.290000 ;
+      RECT 1.065000  2.290000 4.375000 2.460000 ;
+      RECT 1.065000  2.460000 1.395000 2.905000 ;
+      RECT 1.625000  2.630000 1.955000 3.245000 ;
+      RECT 2.055000  0.085000 2.385000 0.490000 ;
+      RECT 2.525000  2.630000 2.855000 3.245000 ;
+      RECT 3.055000  0.085000 3.305000 0.490000 ;
+      RECT 3.425000  2.650000 3.775000 3.245000 ;
+      RECT 3.475000  0.255000 4.495000 0.425000 ;
+      RECT 3.475000  0.425000 3.645000 0.660000 ;
+      RECT 3.815000  0.700000 3.985000 0.770000 ;
+      RECT 3.815000  0.770000 4.845000 1.150000 ;
+      RECT 4.045000  1.950000 7.595000 2.120000 ;
+      RECT 4.045000  2.120000 4.375000 2.290000 ;
+      RECT 4.045000  2.460000 4.375000 2.980000 ;
+      RECT 4.165000  0.425000 4.495000 0.600000 ;
+      RECT 4.635000  2.290000 5.095000 3.245000 ;
+      RECT 4.675000  0.330000 5.785000 0.600000 ;
+      RECT 4.675000  0.600000 4.845000 0.770000 ;
+      RECT 5.025000  0.770000 5.285000 1.110000 ;
+      RECT 5.025000  1.110000 6.680000 1.280000 ;
+      RECT 5.265000  2.120000 5.595000 2.980000 ;
+      RECT 5.455000  0.600000 5.785000 0.940000 ;
+      RECT 5.765000  2.290000 6.095000 3.245000 ;
+      RECT 6.000000  0.255000 7.110000 0.425000 ;
+      RECT 6.000000  0.425000 6.330000 0.940000 ;
+      RECT 6.265000  2.120000 6.595000 2.980000 ;
+      RECT 6.510000  0.595000 6.680000 1.110000 ;
+      RECT 6.765000  2.290000 7.095000 3.245000 ;
+      RECT 6.860000  0.425000 7.110000 1.110000 ;
+      RECT 6.860000  1.110000 8.050000 1.280000 ;
+      RECT 7.265000  2.120000 7.595000 2.980000 ;
+      RECT 7.290000  0.085000 7.620000 0.940000 ;
+      RECT 7.790000  0.350000 8.050000 1.110000 ;
+      RECT 7.795000  1.950000 8.045000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__a41o_4
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef
index ff8896a..13c4081 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.magic.lef
@@ -93,17 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 1.260000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -112,28 +101,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.115000 2.630000 1.785000 3.245000 ;
-        RECT 1.445000 2.460000 1.785000 2.630000 ;
-        RECT 2.405000 2.460000 2.745000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 2.290000 1.275000 2.460000 ;
-      RECT 0.615000 2.460000 0.945000 2.980000 ;
-      RECT 1.105000 1.950000 3.245000 2.290000 ;
-      RECT 2.915000 2.290000 3.245000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.615000  0.085000 1.260000 0.680000 ;
+      RECT 0.615000  2.290000 1.275000 2.460000 ;
+      RECT 0.615000  2.460000 0.945000 2.980000 ;
+      RECT 1.105000  1.950000 3.245000 2.290000 ;
+      RECT 1.115000  2.630000 1.785000 3.245000 ;
+      RECT 1.445000  2.460000 1.785000 2.630000 ;
+      RECT 2.405000  2.460000 2.745000 3.245000 ;
+      RECT 2.915000  2.290000 3.245000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__a41oi_1
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef
index b80afc3..b4ebd77 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.magic.lef
@@ -97,23 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.180000 ;
-        RECT 4.815000  0.085000 5.145000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -122,53 +105,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 1.615000 2.650000 2.135000 3.245000 ;
-        RECT 2.805000 2.290000 3.135000 3.245000 ;
-        RECT 3.805000 2.290000 4.135000 3.245000 ;
-        RECT 4.840000 2.290000 5.170000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 1.445000 3.075000 ;
-      RECT 1.115000 2.290000 2.635000 2.460000 ;
-      RECT 1.115000 2.460000 1.445000 2.905000 ;
-      RECT 1.175000 0.255000 2.355000 0.425000 ;
-      RECT 1.175000 0.425000 1.505000 0.840000 ;
-      RECT 2.105000 0.425000 2.355000 0.750000 ;
-      RECT 2.105000 0.750000 3.295000 0.920000 ;
-      RECT 2.305000 1.820000 2.635000 1.950000 ;
-      RECT 2.305000 1.950000 5.645000 2.120000 ;
-      RECT 2.305000 2.120000 2.635000 2.290000 ;
-      RECT 2.305000 2.460000 2.635000 2.980000 ;
-      RECT 2.535000 0.330000 4.285000 0.580000 ;
-      RECT 2.965000 0.920000 3.295000 1.080000 ;
-      RECT 3.305000 2.120000 3.635000 2.980000 ;
-      RECT 3.525000 0.850000 4.635000 1.010000 ;
-      RECT 3.525000 1.010000 5.645000 1.130000 ;
-      RECT 3.955000 0.580000 4.285000 0.680000 ;
-      RECT 4.305000 2.120000 4.670000 3.000000 ;
-      RECT 4.465000 0.350000 4.635000 0.850000 ;
-      RECT 4.465000 1.130000 5.645000 1.180000 ;
-      RECT 5.315000 0.350000 5.645000 1.010000 ;
-      RECT 5.340000 2.120000 5.645000 3.000000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.180000 ;
+      RECT 0.115000  1.950000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 1.445000 3.075000 ;
+      RECT 1.115000  2.290000 2.635000 2.460000 ;
+      RECT 1.115000  2.460000 1.445000 2.905000 ;
+      RECT 1.175000  0.255000 2.355000 0.425000 ;
+      RECT 1.175000  0.425000 1.505000 0.840000 ;
+      RECT 1.615000  2.650000 2.135000 3.245000 ;
+      RECT 2.105000  0.425000 2.355000 0.750000 ;
+      RECT 2.105000  0.750000 3.295000 0.920000 ;
+      RECT 2.305000  1.820000 2.635000 1.950000 ;
+      RECT 2.305000  1.950000 5.645000 2.120000 ;
+      RECT 2.305000  2.120000 2.635000 2.290000 ;
+      RECT 2.305000  2.460000 2.635000 2.980000 ;
+      RECT 2.535000  0.330000 4.285000 0.580000 ;
+      RECT 2.805000  2.290000 3.135000 3.245000 ;
+      RECT 2.965000  0.920000 3.295000 1.080000 ;
+      RECT 3.305000  2.120000 3.635000 2.980000 ;
+      RECT 3.525000  0.850000 4.635000 1.010000 ;
+      RECT 3.525000  1.010000 5.645000 1.130000 ;
+      RECT 3.805000  2.290000 4.135000 3.245000 ;
+      RECT 3.955000  0.580000 4.285000 0.680000 ;
+      RECT 4.305000  2.120000 4.670000 3.000000 ;
+      RECT 4.465000  0.350000 4.635000 0.850000 ;
+      RECT 4.465000  1.130000 5.645000 1.180000 ;
+      RECT 4.815000  0.085000 5.145000 0.840000 ;
+      RECT 4.840000  2.290000 5.170000 3.245000 ;
+      RECT 5.315000  0.350000 5.645000 1.010000 ;
+      RECT 5.340000  2.120000 5.645000 3.000000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__a41oi_2
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef
index 81cb648..606e206 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.magic.lef
@@ -99,34 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.115000  0.085000  0.365000 1.130000 ;
-        RECT 1.045000  0.085000  1.375000 0.840000 ;
-        RECT 8.305000  0.085000  8.635000 0.840000 ;
-        RECT 9.165000  0.085000  9.495000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -135,72 +107,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 2.515000 2.630000  2.845000 3.245000 ;
-        RECT 3.545000 2.630000  3.795000 3.245000 ;
-        RECT 4.500000 2.290000  4.750000 3.245000 ;
-        RECT 5.460000 2.290000  5.710000 3.245000 ;
-        RECT 6.410000 2.290000  6.660000 3.245000 ;
-        RECT 7.360000 2.290000  7.610000 3.245000 ;
-        RECT 8.280000 2.290000  8.530000 3.245000 ;
-        RECT 9.260000 2.290000  9.430000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 2.345000 3.075000 ;
-      RECT 1.115000 2.290000 1.445000 2.905000 ;
-      RECT 1.605000 0.255000 5.925000 0.425000 ;
-      RECT 1.605000 0.425000 1.935000 0.840000 ;
-      RECT 2.015000 2.290000 4.300000 2.460000 ;
-      RECT 2.015000 2.460000 2.345000 2.905000 ;
-      RECT 2.605000 0.425000 3.135000 1.130000 ;
-      RECT 3.015000 2.460000 3.345000 2.980000 ;
-      RECT 3.805000 0.425000 5.925000 0.620000 ;
-      RECT 3.805000 0.620000 4.135000 1.130000 ;
-      RECT 3.970000 1.950000 9.960000 2.120000 ;
-      RECT 3.970000 2.120000 4.300000 2.290000 ;
-      RECT 3.970000 2.460000 4.300000 2.980000 ;
-      RECT 4.305000 0.790000 7.775000 1.130000 ;
-      RECT 4.930000 1.820000 5.260000 1.950000 ;
-      RECT 4.930000 2.120000 5.260000 2.980000 ;
-      RECT 5.880000 2.120000 6.210000 2.980000 ;
-      RECT 6.155000 0.350000 8.125000 0.600000 ;
-      RECT 6.155000 0.600000 6.485000 0.620000 ;
-      RECT 6.830000 2.120000 7.160000 2.980000 ;
-      RECT 7.445000 0.770000 7.775000 0.790000 ;
-      RECT 7.780000 2.120000 8.110000 2.980000 ;
-      RECT 7.955000 0.600000 8.125000 1.010000 ;
-      RECT 7.955000 1.010000 9.965000 1.180000 ;
-      RECT 8.730000 2.120000 9.060000 2.980000 ;
-      RECT 8.815000 0.350000 8.985000 1.010000 ;
-      RECT 9.630000 2.120000 9.960000 2.980000 ;
-      RECT 9.715000 0.350000 9.965000 1.010000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  0.085000  0.365000 1.130000 ;
+      RECT 0.115000  1.950000  0.445000 2.905000 ;
+      RECT 0.115000  2.905000  2.345000 3.075000 ;
+      RECT 1.045000  0.085000  1.375000 0.840000 ;
+      RECT 1.115000  2.290000  1.445000 2.905000 ;
+      RECT 1.605000  0.255000  5.925000 0.425000 ;
+      RECT 1.605000  0.425000  1.935000 0.840000 ;
+      RECT 2.015000  2.290000  4.300000 2.460000 ;
+      RECT 2.015000  2.460000  2.345000 2.905000 ;
+      RECT 2.515000  2.630000  2.845000 3.245000 ;
+      RECT 2.605000  0.425000  3.135000 1.130000 ;
+      RECT 3.015000  2.460000  3.345000 2.980000 ;
+      RECT 3.545000  2.630000  3.795000 3.245000 ;
+      RECT 3.805000  0.425000  5.925000 0.620000 ;
+      RECT 3.805000  0.620000  4.135000 1.130000 ;
+      RECT 3.970000  1.950000  9.960000 2.120000 ;
+      RECT 3.970000  2.120000  4.300000 2.290000 ;
+      RECT 3.970000  2.460000  4.300000 2.980000 ;
+      RECT 4.305000  0.790000  7.775000 1.130000 ;
+      RECT 4.500000  2.290000  4.750000 3.245000 ;
+      RECT 4.930000  1.820000  5.260000 1.950000 ;
+      RECT 4.930000  2.120000  5.260000 2.980000 ;
+      RECT 5.460000  2.290000  5.710000 3.245000 ;
+      RECT 5.880000  2.120000  6.210000 2.980000 ;
+      RECT 6.155000  0.350000  8.125000 0.600000 ;
+      RECT 6.155000  0.600000  6.485000 0.620000 ;
+      RECT 6.410000  2.290000  6.660000 3.245000 ;
+      RECT 6.830000  2.120000  7.160000 2.980000 ;
+      RECT 7.360000  2.290000  7.610000 3.245000 ;
+      RECT 7.445000  0.770000  7.775000 0.790000 ;
+      RECT 7.780000  2.120000  8.110000 2.980000 ;
+      RECT 7.955000  0.600000  8.125000 1.010000 ;
+      RECT 7.955000  1.010000  9.965000 1.180000 ;
+      RECT 8.280000  2.290000  8.530000 3.245000 ;
+      RECT 8.305000  0.085000  8.635000 0.840000 ;
+      RECT 8.730000  2.120000  9.060000 2.980000 ;
+      RECT 8.815000  0.350000  8.985000 1.010000 ;
+      RECT 9.165000  0.085000  9.495000 0.840000 ;
+      RECT 9.260000  2.290000  9.430000 3.245000 ;
+      RECT 9.630000  2.120000  9.960000 2.980000 ;
+      RECT 9.715000  0.350000  9.965000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__a41oi_4
diff --git a/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef
index 4e6fa15..33a04b2 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hs__and2_1.magic.lef
@@ -63,15 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.340000  0.085000 1.670000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -80,26 +71,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.350000 2.190000 0.685000 3.245000 ;
-        RECT 1.390000 2.190000 1.720000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.260000 0.840000 0.590000 1.850000 ;
-      RECT 0.260000 1.850000 1.750000 2.020000 ;
-      RECT 0.855000 2.020000 1.185000 3.000000 ;
-      RECT 1.580000 1.350000 1.975000 1.680000 ;
-      RECT 1.580000 1.680000 1.750000 1.850000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.260000  0.840000 0.590000 1.850000 ;
+      RECT 0.260000  1.850000 1.750000 2.020000 ;
+      RECT 0.350000  2.190000 0.685000 3.245000 ;
+      RECT 0.855000  2.020000 1.185000 3.000000 ;
+      RECT 1.340000  0.085000 1.670000 1.010000 ;
+      RECT 1.390000  2.190000 1.720000 3.245000 ;
+      RECT 1.580000  1.350000 1.975000 1.680000 ;
+      RECT 1.580000  1.680000 1.750000 1.850000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__and2_1
diff --git a/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef
index 9317ab7..0d754c3 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hs__and2_2.magic.lef
@@ -66,16 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.955000  0.085000 1.285000 0.790000 ;
-        RECT 1.975000  0.085000 2.285000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -84,29 +74,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.110000 1.950000 0.440000 3.245000 ;
-        RECT 1.060000 2.290000 1.390000 3.245000 ;
-        RECT 2.045000 2.060000 2.295000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.350000 0.465000 0.960000 ;
-      RECT 0.135000 0.960000 1.425000 1.130000 ;
-      RECT 0.640000 1.950000 1.425000 2.120000 ;
-      RECT 0.640000 2.120000 0.890000 2.980000 ;
-      RECT 1.255000 1.130000 1.425000 1.220000 ;
-      RECT 1.255000 1.220000 1.670000 1.550000 ;
-      RECT 1.255000 1.550000 1.425000 1.950000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.110000  1.950000 0.440000 3.245000 ;
+      RECT 0.135000  0.350000 0.465000 0.960000 ;
+      RECT 0.135000  0.960000 1.425000 1.130000 ;
+      RECT 0.640000  1.950000 1.425000 2.120000 ;
+      RECT 0.640000  2.120000 0.890000 2.980000 ;
+      RECT 0.955000  0.085000 1.285000 0.790000 ;
+      RECT 1.060000  2.290000 1.390000 3.245000 ;
+      RECT 1.255000  1.130000 1.425000 1.220000 ;
+      RECT 1.255000  1.220000 1.670000 1.550000 ;
+      RECT 1.255000  1.550000 1.425000 1.950000 ;
+      RECT 1.975000  0.085000 2.285000 0.680000 ;
+      RECT 2.045000  2.060000 2.295000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__and2_2
diff --git a/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef
index c63e42e..9848b1b 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hs__and2_4.magic.lef
@@ -68,22 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 1.255000 ;
-        RECT 0.975000  0.085000 1.305000 0.835000 ;
-        RECT 1.985000  0.085000 2.315000 1.175000 ;
-        RECT 3.875000  0.085000 4.205000 1.255000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -92,39 +76,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.015000 2.185000 1.265000 3.245000 ;
-        RECT 1.935000 2.290000 2.265000 3.245000 ;
-        RECT 2.970000 2.290000 3.300000 3.245000 ;
-        RECT 3.870000 2.025000 4.200000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.005000 1.345000 2.055000 1.675000 ;
-      RECT 1.885000 1.675000 2.055000 1.950000 ;
-      RECT 1.885000 1.950000 3.670000 2.120000 ;
-      RECT 2.470000 2.120000 2.800000 2.905000 ;
-      RECT 2.495000 0.255000 3.675000 0.425000 ;
-      RECT 2.495000 0.425000 2.825000 1.175000 ;
-      RECT 2.995000 0.595000 3.325000 1.110000 ;
-      RECT 2.995000 1.110000 3.670000 1.280000 ;
-      RECT 3.500000 1.280000 3.670000 1.950000 ;
-      RECT 3.500000 2.120000 3.670000 2.905000 ;
-      RECT 3.505000 0.425000 3.675000 0.940000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.085000 0.365000 1.255000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.975000  0.085000 1.305000 0.835000 ;
+      RECT 1.005000  1.345000 2.055000 1.675000 ;
+      RECT 1.015000  2.185000 1.265000 3.245000 ;
+      RECT 1.885000  1.675000 2.055000 1.950000 ;
+      RECT 1.885000  1.950000 3.670000 2.120000 ;
+      RECT 1.935000  2.290000 2.265000 3.245000 ;
+      RECT 1.985000  0.085000 2.315000 1.175000 ;
+      RECT 2.470000  2.120000 2.800000 2.905000 ;
+      RECT 2.495000  0.255000 3.675000 0.425000 ;
+      RECT 2.495000  0.425000 2.825000 1.175000 ;
+      RECT 2.970000  2.290000 3.300000 3.245000 ;
+      RECT 2.995000  0.595000 3.325000 1.110000 ;
+      RECT 2.995000  1.110000 3.670000 1.280000 ;
+      RECT 3.500000  1.280000 3.670000 1.950000 ;
+      RECT 3.500000  2.120000 3.670000 2.905000 ;
+      RECT 3.505000  0.425000 3.675000 0.940000 ;
+      RECT 3.870000  2.025000 4.200000 3.245000 ;
+      RECT 3.875000  0.085000 4.205000 1.255000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__and2_4
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef
index bf42238..a78c5a9 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_1.magic.lef
@@ -63,18 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.840000 ;
-        RECT 2.130000  0.085000 2.745000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -83,33 +71,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.365000 1.820000 1.535000 3.245000 ;
-        RECT 2.270000 1.950000 2.600000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 1.140000 1.180000 ;
-      RECT 0.115000 2.320000 1.165000 2.650000 ;
-      RECT 0.810000 1.180000 1.140000 2.320000 ;
-      RECT 1.310000 0.470000 1.640000 0.980000 ;
-      RECT 1.310000 0.980000 2.745000 1.150000 ;
-      RECT 1.705000 1.150000 1.875000 1.950000 ;
-      RECT 1.705000 1.950000 2.065000 2.700000 ;
-      RECT 2.575000 1.150000 2.745000 1.320000 ;
-      RECT 2.575000 1.320000 2.915000 1.650000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 1.140000 1.180000 ;
+      RECT 0.115000  2.320000 1.165000 2.650000 ;
+      RECT 0.615000  0.085000 0.945000 0.840000 ;
+      RECT 0.810000  1.180000 1.140000 2.320000 ;
+      RECT 1.310000  0.470000 1.640000 0.980000 ;
+      RECT 1.310000  0.980000 2.745000 1.150000 ;
+      RECT 1.365000  1.820000 1.535000 3.245000 ;
+      RECT 1.705000  1.150000 1.875000 1.950000 ;
+      RECT 1.705000  1.950000 2.065000 2.700000 ;
+      RECT 2.130000  0.085000 2.745000 0.810000 ;
+      RECT 2.270000  1.950000 2.600000 3.245000 ;
+      RECT 2.575000  1.150000 2.745000 1.320000 ;
+      RECT 2.575000  1.320000 2.915000 1.650000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef
index b416c90..5678a61 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_2.magic.lef
@@ -63,18 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.840000 ;
-        RECT 1.615000  0.085000 2.400000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -83,39 +71,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.650000 2.660000 0.980000 3.245000 ;
-        RECT 1.635000 2.660000 2.260000 3.245000 ;
-        RECT 2.915000 2.660000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 0.890000 1.180000 ;
-      RECT 0.115000 1.950000 0.890000 2.320000 ;
-      RECT 0.115000 2.320000 3.135000 2.490000 ;
-      RECT 0.115000 2.490000 0.445000 2.700000 ;
-      RECT 0.720000 1.180000 0.890000 1.950000 ;
-      RECT 1.455000 1.300000 1.855000 1.630000 ;
-      RECT 1.685000 0.840000 3.220000 1.010000 ;
-      RECT 1.685000 1.010000 1.855000 1.300000 ;
-      RECT 1.685000 1.630000 1.855000 1.870000 ;
-      RECT 1.685000 1.870000 2.795000 2.150000 ;
-      RECT 2.765000 1.300000 3.135000 1.630000 ;
-      RECT 2.890000 0.350000 3.220000 0.840000 ;
-      RECT 2.890000 1.010000 3.220000 1.130000 ;
-      RECT 2.965000 1.630000 3.135000 2.320000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 0.890000 1.180000 ;
+      RECT 0.115000  1.950000 0.890000 2.320000 ;
+      RECT 0.115000  2.320000 3.135000 2.490000 ;
+      RECT 0.115000  2.490000 0.445000 2.700000 ;
+      RECT 0.615000  0.085000 0.945000 0.840000 ;
+      RECT 0.650000  2.660000 0.980000 3.245000 ;
+      RECT 0.720000  1.180000 0.890000 1.950000 ;
+      RECT 1.455000  1.300000 1.855000 1.630000 ;
+      RECT 1.615000  0.085000 2.400000 0.600000 ;
+      RECT 1.635000  2.660000 2.260000 3.245000 ;
+      RECT 1.685000  0.840000 3.220000 1.010000 ;
+      RECT 1.685000  1.010000 1.855000 1.300000 ;
+      RECT 1.685000  1.630000 1.855000 1.870000 ;
+      RECT 1.685000  1.870000 2.795000 2.150000 ;
+      RECT 2.765000  1.300000 3.135000 1.630000 ;
+      RECT 2.890000  0.350000 3.220000 0.840000 ;
+      RECT 2.890000  1.010000 3.220000 1.130000 ;
+      RECT 2.915000  2.660000 3.245000 3.245000 ;
+      RECT 2.965000  1.630000 3.135000 2.320000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef
index 1d0203d..775d132 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_4.magic.lef
@@ -71,23 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.710000  0.085000 1.040000 0.925000 ;
-        RECT 2.570000  0.085000 2.900000 0.585000 ;
-        RECT 3.445000  0.085000 3.695000 0.810000 ;
-        RECT 4.340000  0.085000 4.670000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -96,43 +79,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.555000 2.100000 0.885000 3.245000 ;
-        RECT 1.605000 2.300000 1.855000 3.245000 ;
-        RECT 2.565000 2.300000 2.895000 3.245000 ;
-        RECT 3.465000 2.160000 3.795000 3.245000 ;
-        RECT 4.365000 1.820000 4.695000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.350000 0.540000 1.095000 ;
-      RECT 0.085000 1.095000 1.845000 1.265000 ;
-      RECT 0.085000 1.265000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.355000 2.980000 ;
-      RECT 1.075000 1.960000 2.925000 2.130000 ;
-      RECT 1.075000 2.130000 1.405000 2.980000 ;
-      RECT 1.210000 0.335000 2.400000 0.585000 ;
-      RECT 1.210000 0.585000 1.470000 0.925000 ;
-      RECT 1.515000 1.265000 1.845000 1.450000 ;
-      RECT 1.640000 0.755000 2.925000 0.925000 ;
-      RECT 2.045000 2.130000 2.375000 2.980000 ;
-      RECT 2.755000 0.925000 2.925000 1.320000 ;
-      RECT 2.755000 1.320000 3.825000 1.650000 ;
-      RECT 2.755000 1.650000 2.925000 1.960000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.085000  0.350000 0.540000 1.095000 ;
+      RECT 0.085000  1.095000 1.845000 1.265000 ;
+      RECT 0.085000  1.265000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.355000 2.980000 ;
+      RECT 0.555000  2.100000 0.885000 3.245000 ;
+      RECT 0.710000  0.085000 1.040000 0.925000 ;
+      RECT 1.075000  1.960000 2.925000 2.130000 ;
+      RECT 1.075000  2.130000 1.405000 2.980000 ;
+      RECT 1.210000  0.335000 2.400000 0.585000 ;
+      RECT 1.210000  0.585000 1.470000 0.925000 ;
+      RECT 1.515000  1.265000 1.845000 1.450000 ;
+      RECT 1.605000  2.300000 1.855000 3.245000 ;
+      RECT 1.640000  0.755000 2.925000 0.925000 ;
+      RECT 2.045000  2.130000 2.375000 2.980000 ;
+      RECT 2.565000  2.300000 2.895000 3.245000 ;
+      RECT 2.570000  0.085000 2.900000 0.585000 ;
+      RECT 2.755000  0.925000 2.925000 1.320000 ;
+      RECT 2.755000  1.320000 3.825000 1.650000 ;
+      RECT 2.755000  1.650000 2.925000 1.960000 ;
+      RECT 3.445000  0.085000 3.695000 0.810000 ;
+      RECT 3.465000  2.160000 3.795000 3.245000 ;
+      RECT 4.340000  0.085000 4.670000 0.810000 ;
+      RECT 4.365000  1.820000 4.695000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__and2b_4
diff --git a/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef
index c0017e0..caf0cd7 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hs__and3_1.magic.lef
@@ -74,16 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.695000  0.085000 2.025000 1.180000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -92,28 +82,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.615000 2.290000 0.945000 3.245000 ;
-        RECT 1.570000 2.290000 2.310000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.740000 0.480000 1.950000 ;
-      RECT 0.115000 1.950000 2.240000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.850000 ;
-      RECT 1.115000 2.120000 1.400000 2.850000 ;
-      RECT 2.070000 1.350000 2.400000 1.680000 ;
-      RECT 2.070000 1.680000 2.240000 1.950000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.115000  0.740000 0.480000 1.950000 ;
+      RECT 0.115000  1.950000 2.240000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.850000 ;
+      RECT 0.615000  2.290000 0.945000 3.245000 ;
+      RECT 1.115000  2.120000 1.400000 2.850000 ;
+      RECT 1.570000  2.290000 2.310000 3.245000 ;
+      RECT 1.695000  0.085000 2.025000 1.180000 ;
+      RECT 2.070000  1.350000 2.400000 1.680000 ;
+      RECT 2.070000  1.680000 2.240000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__and3_1
diff --git a/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef
index d89b488..df6d600 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hs__and3_2.magic.lef
@@ -73,19 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.680000  0.085000 2.010000 1.170000 ;
-        RECT 2.680000  0.085000 3.245000 0.640000 ;
-        RECT 2.925000  0.640000 3.245000 1.170000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -94,31 +81,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.685000 2.290000 1.015000 3.245000 ;
-        RECT 1.875000 2.290000 2.205000 3.245000 ;
-        RECT 2.895000 1.820000 3.225000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.185000 0.840000 0.540000 1.340000 ;
-      RECT 0.185000 1.340000 0.515000 1.950000 ;
-      RECT 0.185000 1.950000 2.205000 2.120000 ;
-      RECT 0.185000 2.120000 0.515000 2.780000 ;
-      RECT 1.205000 2.120000 1.535000 2.780000 ;
-      RECT 2.035000 1.340000 2.385000 1.670000 ;
-      RECT 2.035000 1.670000 2.205000 1.950000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.185000  0.840000 0.540000 1.340000 ;
+      RECT 0.185000  1.340000 0.515000 1.950000 ;
+      RECT 0.185000  1.950000 2.205000 2.120000 ;
+      RECT 0.185000  2.120000 0.515000 2.780000 ;
+      RECT 0.685000  2.290000 1.015000 3.245000 ;
+      RECT 1.205000  2.120000 1.535000 2.780000 ;
+      RECT 1.680000  0.085000 2.010000 1.170000 ;
+      RECT 1.875000  2.290000 2.205000 3.245000 ;
+      RECT 2.035000  1.340000 2.385000 1.670000 ;
+      RECT 2.035000  1.670000 2.205000 1.950000 ;
+      RECT 2.680000  0.085000 3.245000 0.640000 ;
+      RECT 2.895000  1.820000 3.225000 3.245000 ;
+      RECT 2.925000  0.640000 3.245000 1.170000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__and3_2
diff --git a/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef
index bdaa508..162b67a 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hs__and3_4.magic.lef
@@ -76,25 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.130000  0.085000 0.380000 1.130000 ;
-        RECT 1.070000  0.085000 1.320000 0.790000 ;
-        RECT 1.920000  0.085000 2.250000 1.030000 ;
-        RECT 2.850000  0.085000 3.180000 0.815000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -103,48 +84,64 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.065000 2.140000 1.395000 3.245000 ;
-        RECT 2.065000 2.290000 2.395000 3.245000 ;
-        RECT 3.065000 2.290000 3.645000 3.245000 ;
-        RECT 4.315000 2.290000 4.645000 3.245000 ;
-        RECT 5.315000 2.290000 5.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.035000 1.300000 2.235000 1.630000 ;
-      RECT 2.065000 1.630000 2.235000 1.950000 ;
-      RECT 2.065000 1.950000 5.625000 2.120000 ;
-      RECT 2.420000 0.350000 2.670000 0.985000 ;
-      RECT 2.420000 0.985000 4.090000 1.155000 ;
-      RECT 2.565000 2.120000 2.895000 2.980000 ;
-      RECT 3.410000 0.255000 5.640000 0.425000 ;
-      RECT 3.410000 0.425000 3.740000 0.815000 ;
-      RECT 3.815000 2.120000 4.145000 2.980000 ;
-      RECT 3.920000 0.595000 4.090000 0.985000 ;
-      RECT 4.310000 0.425000 4.640000 1.030000 ;
-      RECT 4.810000 0.595000 5.140000 1.110000 ;
-      RECT 4.810000 1.110000 5.625000 1.280000 ;
-      RECT 4.815000 2.120000 5.145000 2.980000 ;
-      RECT 5.310000 0.425000 5.640000 0.940000 ;
-      RECT 5.455000 1.280000 5.625000 1.950000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.130000  0.085000 0.380000 1.130000 ;
+      RECT 1.035000  1.300000 2.235000 1.630000 ;
+      RECT 1.065000  2.140000 1.395000 3.245000 ;
+      RECT 1.070000  0.085000 1.320000 0.790000 ;
+      RECT 1.920000  0.085000 2.250000 1.030000 ;
+      RECT 2.065000  1.630000 2.235000 1.950000 ;
+      RECT 2.065000  1.950000 5.625000 2.120000 ;
+      RECT 2.065000  2.290000 2.395000 3.245000 ;
+      RECT 2.420000  0.350000 2.670000 0.985000 ;
+      RECT 2.420000  0.985000 4.090000 1.155000 ;
+      RECT 2.565000  2.120000 2.895000 2.980000 ;
+      RECT 2.850000  0.085000 3.180000 0.815000 ;
+      RECT 3.065000  2.290000 3.645000 3.245000 ;
+      RECT 3.410000  0.255000 5.640000 0.425000 ;
+      RECT 3.410000  0.425000 3.740000 0.815000 ;
+      RECT 3.815000  2.120000 4.145000 2.980000 ;
+      RECT 3.920000  0.595000 4.090000 0.985000 ;
+      RECT 4.310000  0.425000 4.640000 1.030000 ;
+      RECT 4.315000  2.290000 4.645000 3.245000 ;
+      RECT 4.810000  0.595000 5.140000 1.110000 ;
+      RECT 4.810000  1.110000 5.625000 1.280000 ;
+      RECT 4.815000  2.120000 5.145000 2.980000 ;
+      RECT 5.310000  0.425000 5.640000 0.940000 ;
+      RECT 5.315000  2.290000 5.645000 3.245000 ;
+      RECT 5.455000  1.280000 5.625000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__and3_4
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef
index bc969f6..01312bf 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_1.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.940000 ;
-        RECT 2.625000  0.085000 3.215000 0.880000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -93,38 +80,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.115000 2.100000 0.445000 3.245000 ;
-        RECT 1.810000 2.290000 2.140000 3.245000 ;
-        RECT 2.845000 1.950000 3.175000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.350000 0.945000 0.940000 ;
-      RECT 0.615000 2.100000 0.945000 2.980000 ;
-      RECT 0.775000 0.940000 0.945000 1.030000 ;
-      RECT 0.775000 1.030000 1.140000 1.700000 ;
-      RECT 0.775000 1.700000 0.945000 2.100000 ;
-      RECT 1.310000 0.450000 1.640000 1.050000 ;
-      RECT 1.310000 1.050000 3.215000 1.220000 ;
-      RECT 1.310000 1.220000 1.640000 1.950000 ;
-      RECT 1.310000 1.950000 2.640000 2.120000 ;
-      RECT 1.310000 2.120000 1.640000 2.700000 ;
-      RECT 2.310000 2.120000 2.640000 2.700000 ;
-      RECT 3.045000 1.220000 3.215000 1.300000 ;
-      RECT 3.045000 1.300000 3.415000 1.630000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.940000 ;
+      RECT 0.115000  2.100000 0.445000 3.245000 ;
+      RECT 0.615000  0.350000 0.945000 0.940000 ;
+      RECT 0.615000  2.100000 0.945000 2.980000 ;
+      RECT 0.775000  0.940000 0.945000 1.030000 ;
+      RECT 0.775000  1.030000 1.140000 1.700000 ;
+      RECT 0.775000  1.700000 0.945000 2.100000 ;
+      RECT 1.310000  0.450000 1.640000 1.050000 ;
+      RECT 1.310000  1.050000 3.215000 1.220000 ;
+      RECT 1.310000  1.220000 1.640000 1.950000 ;
+      RECT 1.310000  1.950000 2.640000 2.120000 ;
+      RECT 1.310000  2.120000 1.640000 2.700000 ;
+      RECT 1.810000  2.290000 2.140000 3.245000 ;
+      RECT 2.310000  2.120000 2.640000 2.700000 ;
+      RECT 2.625000  0.085000 3.215000 0.880000 ;
+      RECT 2.845000  1.950000 3.175000 3.245000 ;
+      RECT 3.045000  1.220000 3.215000 1.300000 ;
+      RECT 3.045000  1.300000 3.415000 1.630000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef
index 20b4f2a..781d495 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_2.magic.lef
@@ -72,21 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.750000 ;
-        RECT 2.815000  0.085000 3.145000 1.130000 ;
-        RECT 3.895000  0.085000 4.145000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -95,41 +80,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.570000 2.440000 0.900000 3.245000 ;
-        RECT 1.900000 2.290000 2.230000 3.245000 ;
-        RECT 2.960000 2.580000 3.290000 3.245000 ;
-        RECT 3.875000 2.580000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.420000 0.375000 0.920000 ;
-      RECT 0.115000 0.920000 1.230000 1.090000 ;
-      RECT 0.115000 2.100000 1.070000 2.270000 ;
-      RECT 0.115000 2.270000 0.400000 2.980000 ;
-      RECT 0.900000 1.090000 1.230000 1.855000 ;
-      RECT 0.900000 1.855000 1.070000 2.100000 ;
-      RECT 1.400000 0.350000 1.755000 1.950000 ;
-      RECT 1.400000 1.950000 2.750000 2.120000 ;
-      RECT 1.400000 2.120000 1.730000 2.860000 ;
-      RECT 2.420000 2.120000 2.750000 2.240000 ;
-      RECT 2.420000 2.240000 4.215000 2.410000 ;
-      RECT 2.420000 2.410000 2.750000 2.860000 ;
-      RECT 3.885000 1.300000 4.215000 1.630000 ;
-      RECT 4.045000 1.630000 4.215000 2.240000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.420000 0.375000 0.920000 ;
+      RECT 0.115000  0.920000 1.230000 1.090000 ;
+      RECT 0.115000  2.100000 1.070000 2.270000 ;
+      RECT 0.115000  2.270000 0.400000 2.980000 ;
+      RECT 0.545000  0.085000 0.875000 0.750000 ;
+      RECT 0.570000  2.440000 0.900000 3.245000 ;
+      RECT 0.900000  1.090000 1.230000 1.855000 ;
+      RECT 0.900000  1.855000 1.070000 2.100000 ;
+      RECT 1.400000  0.350000 1.755000 1.950000 ;
+      RECT 1.400000  1.950000 2.750000 2.120000 ;
+      RECT 1.400000  2.120000 1.730000 2.860000 ;
+      RECT 1.900000  2.290000 2.230000 3.245000 ;
+      RECT 2.420000  2.120000 2.750000 2.240000 ;
+      RECT 2.420000  2.240000 4.215000 2.410000 ;
+      RECT 2.420000  2.410000 2.750000 2.860000 ;
+      RECT 2.815000  0.085000 3.145000 1.130000 ;
+      RECT 2.960000  2.580000 3.290000 3.245000 ;
+      RECT 3.875000  2.580000 4.205000 3.245000 ;
+      RECT 3.885000  1.300000 4.215000 1.630000 ;
+      RECT 3.895000  0.085000 4.145000 1.130000 ;
+      RECT 4.045000  1.630000 4.215000 2.240000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef
index cd539e0..3f72d1e 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_4.magic.lef
@@ -77,28 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.615000  0.085000 0.875000 1.010000 ;
-        RECT 3.525000  0.085000 3.855000 0.840000 ;
-        RECT 4.465000  0.085000 4.795000 1.130000 ;
-        RECT 5.395000  0.085000 5.725000 0.790000 ;
-        RECT 6.275000  0.085000 6.605000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -107,58 +85,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.975000 2.020000 1.305000 3.245000 ;
-        RECT 1.975000 2.290000 2.305000 3.245000 ;
-        RECT 2.975000 2.290000 3.305000 3.245000 ;
-        RECT 4.070000 1.820000 4.400000 3.245000 ;
-        RECT 5.070000 2.140000 5.400000 3.245000 ;
-        RECT 6.070000 2.140000 6.400000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 0.285000 1.680000 ;
-      RECT 0.115000 1.680000 1.305000 1.850000 ;
-      RECT 0.475000 1.850000 0.805000 2.860000 ;
-      RECT 1.135000 1.320000 1.525000 1.650000 ;
-      RECT 1.135000 1.650000 1.305000 1.680000 ;
-      RECT 1.175000 0.255000 2.365000 0.425000 ;
-      RECT 1.175000 0.425000 1.505000 1.150000 ;
-      RECT 1.475000 1.820000 1.865000 1.950000 ;
-      RECT 1.475000 1.950000 3.900000 2.120000 ;
-      RECT 1.475000 2.120000 1.805000 2.860000 ;
-      RECT 1.685000 0.595000 1.865000 1.150000 ;
-      RECT 1.695000 1.150000 1.865000 1.820000 ;
-      RECT 2.035000 0.425000 2.365000 0.470000 ;
-      RECT 2.035000 0.470000 3.295000 0.720000 ;
-      RECT 2.035000 0.720000 2.365000 1.150000 ;
-      RECT 2.475000 2.120000 2.805000 2.860000 ;
-      RECT 2.535000 0.890000 2.865000 1.010000 ;
-      RECT 2.535000 1.010000 4.285000 1.180000 ;
-      RECT 3.535000 2.120000 3.900000 2.860000 ;
-      RECT 3.730000 1.460000 5.765000 1.630000 ;
-      RECT 3.730000 1.630000 3.900000 1.950000 ;
-      RECT 4.035000 0.450000 4.285000 1.010000 ;
-      RECT 4.755000 1.300000 5.765000 1.460000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 0.285000 1.680000 ;
+      RECT 0.115000  1.680000 1.305000 1.850000 ;
+      RECT 0.475000  1.850000 0.805000 2.860000 ;
+      RECT 0.615000  0.085000 0.875000 1.010000 ;
+      RECT 0.975000  2.020000 1.305000 3.245000 ;
+      RECT 1.135000  1.320000 1.525000 1.650000 ;
+      RECT 1.135000  1.650000 1.305000 1.680000 ;
+      RECT 1.175000  0.255000 2.365000 0.425000 ;
+      RECT 1.175000  0.425000 1.505000 1.150000 ;
+      RECT 1.475000  1.820000 1.865000 1.950000 ;
+      RECT 1.475000  1.950000 3.900000 2.120000 ;
+      RECT 1.475000  2.120000 1.805000 2.860000 ;
+      RECT 1.685000  0.595000 1.865000 1.150000 ;
+      RECT 1.695000  1.150000 1.865000 1.820000 ;
+      RECT 1.975000  2.290000 2.305000 3.245000 ;
+      RECT 2.035000  0.425000 2.365000 0.470000 ;
+      RECT 2.035000  0.470000 3.295000 0.720000 ;
+      RECT 2.035000  0.720000 2.365000 1.150000 ;
+      RECT 2.475000  2.120000 2.805000 2.860000 ;
+      RECT 2.535000  0.890000 2.865000 1.010000 ;
+      RECT 2.535000  1.010000 4.285000 1.180000 ;
+      RECT 2.975000  2.290000 3.305000 3.245000 ;
+      RECT 3.525000  0.085000 3.855000 0.840000 ;
+      RECT 3.535000  2.120000 3.900000 2.860000 ;
+      RECT 3.730000  1.460000 5.765000 1.630000 ;
+      RECT 3.730000  1.630000 3.900000 1.950000 ;
+      RECT 4.035000  0.450000 4.285000 1.010000 ;
+      RECT 4.070000  1.820000 4.400000 3.245000 ;
+      RECT 4.465000  0.085000 4.795000 1.130000 ;
+      RECT 4.755000  1.300000 5.765000 1.460000 ;
+      RECT 5.070000  2.140000 5.400000 3.245000 ;
+      RECT 5.395000  0.085000 5.725000 0.790000 ;
+      RECT 6.070000  2.140000 6.400000 3.245000 ;
+      RECT 6.275000  0.085000 6.605000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__and3b_4
diff --git a/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef
index a31af3b..02b873c 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hs__and4_1.magic.lef
@@ -81,17 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.220000  0.085000 2.550000 1.030000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -100,33 +89,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 2.315000 0.445000 3.245000 ;
-        RECT 1.115000 2.315000 1.705000 3.245000 ;
-        RECT 2.410000 2.300000 2.740000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.355000 0.770000 0.950000 ;
-      RECT 0.085000 0.950000 0.255000 1.975000 ;
-      RECT 0.085000 1.975000 2.740000 2.130000 ;
-      RECT 0.085000 2.130000 2.205000 2.145000 ;
-      RECT 0.615000 2.145000 0.945000 2.980000 ;
-      RECT 1.875000 1.960000 2.740000 1.975000 ;
-      RECT 1.875000 2.145000 2.205000 2.980000 ;
-      RECT 2.570000 1.320000 2.935000 1.650000 ;
-      RECT 2.570000 1.650000 2.740000 1.960000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.085000  0.355000 0.770000 0.950000 ;
+      RECT 0.085000  0.950000 0.255000 1.975000 ;
+      RECT 0.085000  1.975000 2.740000 2.130000 ;
+      RECT 0.085000  2.130000 2.205000 2.145000 ;
+      RECT 0.115000  2.315000 0.445000 3.245000 ;
+      RECT 0.615000  2.145000 0.945000 2.980000 ;
+      RECT 1.115000  2.315000 1.705000 3.245000 ;
+      RECT 1.875000  1.960000 2.740000 1.975000 ;
+      RECT 1.875000  2.145000 2.205000 2.980000 ;
+      RECT 2.220000  0.085000 2.550000 1.030000 ;
+      RECT 2.410000  2.300000 2.740000 3.245000 ;
+      RECT 2.570000  1.320000 2.935000 1.650000 ;
+      RECT 2.570000  1.650000 2.740000 1.960000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4_1
diff --git a/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef
index cbffa74..c6fe58d 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hs__and4_2.magic.lef
@@ -80,20 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 2.265000  0.085000 2.595000 1.010000 ;
-        RECT 3.220000  0.085000 3.655000 0.600000 ;
-        RECT 3.405000  0.600000 3.655000 1.080000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -102,35 +88,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.115000 1.950000 0.445000 3.245000 ;
-        RECT 1.215000 2.060000 1.545000 3.245000 ;
-        RECT 2.300000 2.660000 2.630000 3.245000 ;
-        RECT 3.370000 2.660000 3.725000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.260000 0.350000 0.590000 0.960000 ;
-      RECT 0.260000 0.960000 0.785000 1.130000 ;
-      RECT 0.615000 1.130000 0.785000 1.720000 ;
-      RECT 0.615000 1.720000 2.095000 1.890000 ;
-      RECT 0.615000 1.890000 0.985000 2.980000 ;
-      RECT 1.765000 1.890000 2.095000 2.320000 ;
-      RECT 1.765000 2.320000 3.735000 2.490000 ;
-      RECT 1.765000 2.490000 2.095000 2.980000 ;
-      RECT 3.405000 1.300000 3.735000 2.320000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  1.950000 0.445000 3.245000 ;
+      RECT 0.260000  0.350000 0.590000 0.960000 ;
+      RECT 0.260000  0.960000 0.785000 1.130000 ;
+      RECT 0.615000  1.130000 0.785000 1.720000 ;
+      RECT 0.615000  1.720000 2.095000 1.890000 ;
+      RECT 0.615000  1.890000 0.985000 2.980000 ;
+      RECT 1.215000  2.060000 1.545000 3.245000 ;
+      RECT 1.765000  1.890000 2.095000 2.320000 ;
+      RECT 1.765000  2.320000 3.735000 2.490000 ;
+      RECT 1.765000  2.490000 2.095000 2.980000 ;
+      RECT 2.265000  0.085000 2.595000 1.010000 ;
+      RECT 2.300000  2.660000 2.630000 3.245000 ;
+      RECT 3.220000  0.085000 3.655000 0.600000 ;
+      RECT 3.370000  2.660000 3.725000 3.245000 ;
+      RECT 3.405000  0.600000 3.655000 1.080000 ;
+      RECT 3.405000  1.300000 3.735000 2.320000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4_2
diff --git a/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef
index 8ac42b1..20bca76 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hs__and4_4.magic.lef
@@ -87,27 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 2.800000  0.085000 3.130000 0.620000 ;
-        RECT 4.330000  0.085000 4.660000 1.130000 ;
-        RECT 5.260000  0.085000 5.590000 0.790000 ;
-        RECT 6.260000  0.085000 6.520000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -116,60 +95,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.115000 1.950000 0.395000 3.245000 ;
-        RECT 1.015000 2.410000 1.345000 3.245000 ;
-        RECT 1.930000 1.940000 2.260000 3.245000 ;
-        RECT 2.930000 2.310000 3.645000 3.245000 ;
-        RECT 4.315000 2.290000 4.645000 3.245000 ;
-        RECT 5.405000 2.140000 5.655000 3.245000 ;
-        RECT 6.275000 1.820000 6.605000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.140000 0.315000 2.110000 0.485000 ;
-      RECT 0.140000 0.485000 0.390000 1.255000 ;
-      RECT 0.565000 1.950000 1.730000 2.240000 ;
-      RECT 0.570000 0.655000 1.760000 0.835000 ;
-      RECT 0.720000 1.005000 1.330000 1.255000 ;
-      RECT 0.720000 1.255000 0.890000 1.950000 ;
-      RECT 1.560000 1.600000 2.760000 1.770000 ;
-      RECT 1.560000 1.770000 1.730000 1.950000 ;
-      RECT 1.560000 2.240000 1.730000 2.980000 ;
-      RECT 1.940000 0.485000 2.110000 1.130000 ;
-      RECT 1.940000 1.130000 4.070000 1.175000 ;
-      RECT 1.940000 1.175000 3.810000 1.300000 ;
-      RECT 2.290000 0.575000 2.620000 0.790000 ;
-      RECT 2.290000 0.790000 3.640000 0.825000 ;
-      RECT 2.290000 0.825000 3.470000 0.960000 ;
-      RECT 2.430000 1.770000 2.760000 1.970000 ;
-      RECT 2.430000 1.970000 4.705000 2.120000 ;
-      RECT 2.430000 2.120000 4.145000 2.140000 ;
-      RECT 2.430000 2.140000 2.760000 2.980000 ;
-      RECT 3.300000 0.575000 3.640000 0.790000 ;
-      RECT 3.640000 0.995000 4.070000 1.130000 ;
-      RECT 3.815000 1.950000 4.705000 1.970000 ;
-      RECT 3.815000 2.140000 4.145000 2.980000 ;
-      RECT 4.535000 1.300000 5.685000 1.630000 ;
-      RECT 4.535000 1.630000 4.705000 1.950000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  1.950000 0.395000 3.245000 ;
+      RECT 0.140000  0.315000 2.110000 0.485000 ;
+      RECT 0.140000  0.485000 0.390000 1.255000 ;
+      RECT 0.565000  1.950000 1.730000 2.240000 ;
+      RECT 0.570000  0.655000 1.760000 0.835000 ;
+      RECT 0.720000  1.005000 1.330000 1.255000 ;
+      RECT 0.720000  1.255000 0.890000 1.950000 ;
+      RECT 1.015000  2.410000 1.345000 3.245000 ;
+      RECT 1.560000  1.600000 2.760000 1.770000 ;
+      RECT 1.560000  1.770000 1.730000 1.950000 ;
+      RECT 1.560000  2.240000 1.730000 2.980000 ;
+      RECT 1.930000  1.940000 2.260000 3.245000 ;
+      RECT 1.940000  0.485000 2.110000 1.130000 ;
+      RECT 1.940000  1.130000 4.070000 1.175000 ;
+      RECT 1.940000  1.175000 3.810000 1.300000 ;
+      RECT 2.290000  0.575000 2.620000 0.790000 ;
+      RECT 2.290000  0.790000 3.640000 0.825000 ;
+      RECT 2.290000  0.825000 3.470000 0.960000 ;
+      RECT 2.430000  1.770000 2.760000 1.970000 ;
+      RECT 2.430000  1.970000 4.705000 2.120000 ;
+      RECT 2.430000  2.120000 4.145000 2.140000 ;
+      RECT 2.430000  2.140000 2.760000 2.980000 ;
+      RECT 2.800000  0.085000 3.130000 0.620000 ;
+      RECT 2.930000  2.310000 3.645000 3.245000 ;
+      RECT 3.300000  0.575000 3.640000 0.790000 ;
+      RECT 3.640000  0.995000 4.070000 1.130000 ;
+      RECT 3.815000  1.950000 4.705000 1.970000 ;
+      RECT 3.815000  2.140000 4.145000 2.980000 ;
+      RECT 4.315000  2.290000 4.645000 3.245000 ;
+      RECT 4.330000  0.085000 4.660000 1.130000 ;
+      RECT 4.535000  1.300000 5.685000 1.630000 ;
+      RECT 4.535000  1.630000 4.705000 1.950000 ;
+      RECT 5.260000  0.085000 5.590000 0.790000 ;
+      RECT 5.405000  2.140000 5.655000 3.245000 ;
+      RECT 6.260000  0.085000 6.520000 0.680000 ;
+      RECT 6.275000  1.820000 6.605000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4_4
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef
index 02991d8..8ce107e 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_1.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.575000  0.085000 0.875000 0.680000 ;
-        RECT 3.375000  0.085000 3.705000 1.040000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -103,42 +89,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.615000 2.370000 0.945000 3.245000 ;
-        RECT 1.645000 2.535000 2.595000 3.245000 ;
-        RECT 3.335000 2.100000 3.665000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.405000 0.850000 ;
-      RECT 0.115000 0.850000 0.945000 1.020000 ;
-      RECT 0.115000 2.030000 0.945000 2.200000 ;
-      RECT 0.115000 2.200000 0.445000 2.980000 ;
-      RECT 0.775000 1.020000 0.945000 1.550000 ;
-      RECT 0.775000 1.550000 1.255000 1.880000 ;
-      RECT 0.775000 1.880000 0.945000 2.030000 ;
-      RECT 1.115000 2.130000 3.095000 2.350000 ;
-      RECT 1.115000 2.350000 1.460000 2.460000 ;
-      RECT 1.310000 0.600000 1.640000 1.210000 ;
-      RECT 1.310000 1.210000 3.705000 1.350000 ;
-      RECT 1.310000 1.350000 3.890000 1.380000 ;
-      RECT 2.595000 1.380000 2.765000 2.100000 ;
-      RECT 2.595000 2.100000 3.095000 2.130000 ;
-      RECT 2.765000 2.350000 3.095000 2.980000 ;
-      RECT 3.535000 1.380000 3.890000 1.680000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.350000 0.405000 0.850000 ;
+      RECT 0.115000  0.850000 0.945000 1.020000 ;
+      RECT 0.115000  2.030000 0.945000 2.200000 ;
+      RECT 0.115000  2.200000 0.445000 2.980000 ;
+      RECT 0.575000  0.085000 0.875000 0.680000 ;
+      RECT 0.615000  2.370000 0.945000 3.245000 ;
+      RECT 0.775000  1.020000 0.945000 1.550000 ;
+      RECT 0.775000  1.550000 1.255000 1.880000 ;
+      RECT 0.775000  1.880000 0.945000 2.030000 ;
+      RECT 1.115000  2.130000 3.095000 2.350000 ;
+      RECT 1.115000  2.350000 1.460000 2.460000 ;
+      RECT 1.310000  0.600000 1.640000 1.210000 ;
+      RECT 1.310000  1.210000 3.705000 1.350000 ;
+      RECT 1.310000  1.350000 3.890000 1.380000 ;
+      RECT 1.645000  2.535000 2.595000 3.245000 ;
+      RECT 2.595000  1.380000 2.765000 2.100000 ;
+      RECT 2.595000  2.100000 3.095000 2.130000 ;
+      RECT 2.765000  2.350000 3.095000 2.980000 ;
+      RECT 3.335000  2.100000 3.665000 3.245000 ;
+      RECT 3.375000  0.085000 3.705000 1.040000 ;
+      RECT 3.535000  1.380000 3.890000 1.680000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef
index 9cefef0..cc169c1 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_2.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.625000  0.085000 0.875000 0.790000 ;
-        RECT 1.555000  0.085000 2.165000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -103,41 +89,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.650000 2.710000 0.980000 3.245000 ;
-        RECT 1.645000 2.710000 1.975000 3.245000 ;
-        RECT 2.740000 2.710000 3.070000 3.245000 ;
-        RECT 3.850000 2.710000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.540000 0.445000 0.960000 ;
-      RECT 0.115000 0.960000 0.795000 1.130000 ;
-      RECT 0.115000 1.950000 0.795000 2.370000 ;
-      RECT 0.115000 2.370000 3.985000 2.540000 ;
-      RECT 0.115000 2.540000 0.445000 2.700000 ;
-      RECT 0.625000 1.130000 0.795000 1.950000 ;
-      RECT 1.395000 1.300000 1.780000 1.630000 ;
-      RECT 1.610000 0.960000 4.070000 1.130000 ;
-      RECT 1.610000 1.130000 1.780000 1.300000 ;
-      RECT 1.610000 1.630000 1.780000 1.950000 ;
-      RECT 1.610000 1.950000 3.645000 2.200000 ;
-      RECT 3.615000 1.350000 3.985000 1.680000 ;
-      RECT 3.740000 0.350000 4.070000 0.960000 ;
-      RECT 3.815000 1.680000 3.985000 2.370000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.540000 0.445000 0.960000 ;
+      RECT 0.115000  0.960000 0.795000 1.130000 ;
+      RECT 0.115000  1.950000 0.795000 2.370000 ;
+      RECT 0.115000  2.370000 3.985000 2.540000 ;
+      RECT 0.115000  2.540000 0.445000 2.700000 ;
+      RECT 0.625000  0.085000 0.875000 0.790000 ;
+      RECT 0.625000  1.130000 0.795000 1.950000 ;
+      RECT 0.650000  2.710000 0.980000 3.245000 ;
+      RECT 1.395000  1.300000 1.780000 1.630000 ;
+      RECT 1.555000  0.085000 2.165000 0.790000 ;
+      RECT 1.610000  0.960000 4.070000 1.130000 ;
+      RECT 1.610000  1.130000 1.780000 1.300000 ;
+      RECT 1.610000  1.630000 1.780000 1.950000 ;
+      RECT 1.610000  1.950000 3.645000 2.200000 ;
+      RECT 1.645000  2.710000 1.975000 3.245000 ;
+      RECT 2.740000  2.710000 3.070000 3.245000 ;
+      RECT 3.615000  1.350000 3.985000 1.680000 ;
+      RECT 3.740000  0.350000 4.070000 0.960000 ;
+      RECT 3.815000  1.680000 3.985000 2.370000 ;
+      RECT 3.850000  2.710000 4.205000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef
index 672427a..21407ee 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_4.magic.lef
@@ -83,29 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 1.020000 ;
-        RECT 1.670000  0.085000 2.000000 0.810000 ;
-        RECT 2.710000  0.085000 3.040000 1.130000 ;
-        RECT 4.285000  0.085000 4.615000 0.620000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -114,66 +91,86 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.650000 2.730000 1.025000 3.245000 ;
-        RECT 1.595000 2.730000 1.955000 3.245000 ;
-        RECT 2.635000 2.730000 2.980000 3.245000 ;
-        RECT 3.720000 2.730000 4.050000 3.245000 ;
-        RECT 5.180000 2.730000 5.530000 3.245000 ;
-        RECT 6.100000 2.730000 6.430000 3.245000 ;
-        RECT 7.000000 2.730000 7.565000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.405000 1.020000 ;
-      RECT 0.085000 1.020000 0.255000 1.820000 ;
-      RECT 0.085000 1.820000 0.445000 2.390000 ;
-      RECT 0.085000 2.390000 7.520000 2.560000 ;
-      RECT 0.085000 2.560000 0.445000 2.860000 ;
-      RECT 1.485000 1.320000 2.745000 1.650000 ;
-      RECT 2.575000 1.650000 2.745000 1.950000 ;
-      RECT 2.575000 1.950000 3.515000 1.970000 ;
-      RECT 2.575000 1.970000 6.880000 2.220000 ;
-      RECT 3.300000 0.605000 3.630000 1.130000 ;
-      RECT 3.300000 1.130000 5.475000 1.180000 ;
-      RECT 3.460000 1.180000 5.475000 1.300000 ;
-      RECT 3.810000 0.630000 4.105000 0.790000 ;
-      RECT 3.810000 0.790000 5.125000 0.960000 ;
-      RECT 4.795000 0.605000 5.125000 0.790000 ;
-      RECT 5.305000 0.255000 7.495000 0.425000 ;
-      RECT 5.305000 0.425000 5.475000 1.130000 ;
-      RECT 5.650000 1.940000 6.080000 1.970000 ;
-      RECT 5.655000 0.595000 6.955000 0.765000 ;
-      RECT 5.655000 0.765000 5.905000 0.960000 ;
-      RECT 5.910000 1.130000 6.335000 1.300000 ;
-      RECT 5.910000 1.300000 6.080000 1.940000 ;
-      RECT 6.080000 0.935000 6.335000 1.130000 ;
-      RECT 6.250000 1.470000 6.675000 1.800000 ;
-      RECT 6.505000 1.130000 7.520000 1.300000 ;
-      RECT 6.505000 1.300000 6.675000 1.470000 ;
-      RECT 6.625000 0.765000 6.955000 0.935000 ;
-      RECT 7.165000 0.425000 7.495000 0.960000 ;
-      RECT 7.350000 1.300000 7.520000 2.390000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.085000  0.450000 0.405000 1.020000 ;
+      RECT 0.085000  1.020000 0.255000 1.820000 ;
+      RECT 0.085000  1.820000 0.445000 2.390000 ;
+      RECT 0.085000  2.390000 7.520000 2.560000 ;
+      RECT 0.085000  2.560000 0.445000 2.860000 ;
+      RECT 0.585000  0.085000 0.915000 1.020000 ;
+      RECT 0.650000  2.730000 1.025000 3.245000 ;
+      RECT 1.485000  1.320000 2.745000 1.650000 ;
+      RECT 1.595000  2.730000 1.955000 3.245000 ;
+      RECT 1.670000  0.085000 2.000000 0.810000 ;
+      RECT 2.575000  1.650000 2.745000 1.950000 ;
+      RECT 2.575000  1.950000 3.515000 1.970000 ;
+      RECT 2.575000  1.970000 6.880000 2.220000 ;
+      RECT 2.635000  2.730000 2.980000 3.245000 ;
+      RECT 2.710000  0.085000 3.040000 1.130000 ;
+      RECT 3.300000  0.605000 3.630000 1.130000 ;
+      RECT 3.300000  1.130000 5.475000 1.180000 ;
+      RECT 3.460000  1.180000 5.475000 1.300000 ;
+      RECT 3.720000  2.730000 4.050000 3.245000 ;
+      RECT 3.810000  0.630000 4.105000 0.790000 ;
+      RECT 3.810000  0.790000 5.125000 0.960000 ;
+      RECT 4.285000  0.085000 4.615000 0.620000 ;
+      RECT 4.795000  0.605000 5.125000 0.790000 ;
+      RECT 5.180000  2.730000 5.530000 3.245000 ;
+      RECT 5.305000  0.255000 7.495000 0.425000 ;
+      RECT 5.305000  0.425000 5.475000 1.130000 ;
+      RECT 5.650000  1.940000 6.080000 1.970000 ;
+      RECT 5.655000  0.595000 6.955000 0.765000 ;
+      RECT 5.655000  0.765000 5.905000 0.960000 ;
+      RECT 5.910000  1.130000 6.335000 1.300000 ;
+      RECT 5.910000  1.300000 6.080000 1.940000 ;
+      RECT 6.080000  0.935000 6.335000 1.130000 ;
+      RECT 6.100000  2.730000 6.430000 3.245000 ;
+      RECT 6.250000  1.470000 6.675000 1.800000 ;
+      RECT 6.505000  1.130000 7.520000 1.300000 ;
+      RECT 6.505000  1.300000 6.675000 1.470000 ;
+      RECT 6.625000  0.765000 6.955000 0.935000 ;
+      RECT 7.000000  2.730000 7.565000 3.245000 ;
+      RECT 7.165000  0.425000 7.495000 0.960000 ;
+      RECT 7.350000  1.300000 7.520000 2.390000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4b_4
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef
index 9b7b848..41351c4 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.magic.lef
@@ -82,21 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.790000 ;
-        RECT 3.720000  0.085000 4.110000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -105,50 +90,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.650000 2.660000 0.980000 3.245000 ;
-        RECT 1.795000 2.660000 2.125000 3.245000 ;
-        RECT 2.795000 2.370000 3.125000 3.245000 ;
-        RECT 3.815000 2.290000 4.145000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.960000 ;
-      RECT 0.115000 0.960000 0.740000 1.130000 ;
-      RECT 0.115000 1.950000 0.740000 2.320000 ;
-      RECT 0.115000 2.320000 2.045000 2.490000 ;
-      RECT 0.115000 2.490000 0.445000 2.700000 ;
-      RECT 0.570000 1.130000 0.740000 1.950000 ;
-      RECT 1.250000 1.300000 1.610000 1.630000 ;
-      RECT 1.440000 0.860000 2.385000 1.030000 ;
-      RECT 1.440000 1.030000 1.610000 1.300000 ;
-      RECT 1.780000 1.290000 2.045000 2.320000 ;
-      RECT 1.820000 0.350000 2.385000 0.860000 ;
-      RECT 2.215000 1.030000 2.385000 2.030000 ;
-      RECT 2.215000 2.030000 3.625000 2.200000 ;
-      RECT 2.295000 2.200000 2.625000 2.980000 ;
-      RECT 2.555000 0.850000 4.685000 1.020000 ;
-      RECT 2.555000 1.020000 2.845000 1.790000 ;
-      RECT 3.295000 2.200000 3.625000 2.980000 ;
-      RECT 4.060000 1.020000 4.685000 1.030000 ;
-      RECT 4.060000 1.030000 4.230000 1.950000 ;
-      RECT 4.060000 1.950000 4.645000 2.120000 ;
-      RECT 4.315000 2.120000 4.645000 2.980000 ;
-      RECT 4.355000 0.440000 4.685000 0.850000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.960000 ;
+      RECT 0.115000  0.960000 0.740000 1.130000 ;
+      RECT 0.115000  1.950000 0.740000 2.320000 ;
+      RECT 0.115000  2.320000 2.045000 2.490000 ;
+      RECT 0.115000  2.490000 0.445000 2.700000 ;
+      RECT 0.545000  0.085000 0.875000 0.790000 ;
+      RECT 0.570000  1.130000 0.740000 1.950000 ;
+      RECT 0.650000  2.660000 0.980000 3.245000 ;
+      RECT 1.250000  1.300000 1.610000 1.630000 ;
+      RECT 1.440000  0.860000 2.385000 1.030000 ;
+      RECT 1.440000  1.030000 1.610000 1.300000 ;
+      RECT 1.780000  1.290000 2.045000 2.320000 ;
+      RECT 1.795000  2.660000 2.125000 3.245000 ;
+      RECT 1.820000  0.350000 2.385000 0.860000 ;
+      RECT 2.215000  1.030000 2.385000 2.030000 ;
+      RECT 2.215000  2.030000 3.625000 2.200000 ;
+      RECT 2.295000  2.200000 2.625000 2.980000 ;
+      RECT 2.555000  0.850000 4.685000 1.020000 ;
+      RECT 2.555000  1.020000 2.845000 1.790000 ;
+      RECT 2.795000  2.370000 3.125000 3.245000 ;
+      RECT 3.295000  2.200000 3.625000 2.980000 ;
+      RECT 3.720000  0.085000 4.110000 0.680000 ;
+      RECT 3.815000  2.290000 4.145000 3.245000 ;
+      RECT 4.060000  1.020000 4.685000 1.030000 ;
+      RECT 4.060000  1.030000 4.230000 1.950000 ;
+      RECT 4.060000  1.950000 4.645000 2.120000 ;
+      RECT 4.315000  2.120000 4.645000 2.980000 ;
+      RECT 4.355000  0.440000 4.685000 0.850000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef
index 51fbbe2..3ddd248 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.magic.lef
@@ -81,23 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.940000 ;
-        RECT 2.975000  0.085000 3.305000 0.830000 ;
-        RECT 4.325000  0.085000 4.655000 0.410000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -106,52 +89,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.780000 2.290000 1.110000 3.245000 ;
-        RECT 2.065000 2.290000 2.395000 3.245000 ;
-        RECT 3.200000 2.290000 3.530000 3.245000 ;
-        RECT 4.365000 2.100000 4.615000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.110000 ;
-      RECT 0.115000 1.110000 0.935000 1.280000 ;
-      RECT 0.210000 1.950000 0.935000 2.120000 ;
-      RECT 0.210000 2.120000 0.540000 2.820000 ;
-      RECT 0.765000 1.280000 0.935000 1.340000 ;
-      RECT 0.765000 1.340000 1.260000 1.670000 ;
-      RECT 0.765000 1.670000 0.935000 1.950000 ;
-      RECT 1.105000 0.390000 1.600000 1.170000 ;
-      RECT 1.430000 1.170000 1.600000 1.940000 ;
-      RECT 1.430000 1.940000 1.760000 1.950000 ;
-      RECT 1.430000 1.950000 3.665000 2.120000 ;
-      RECT 1.430000 2.120000 1.760000 2.980000 ;
-      RECT 1.770000 1.000000 3.645000 1.170000 ;
-      RECT 1.770000 1.170000 2.100000 1.590000 ;
-      RECT 2.610000 2.120000 2.940000 2.980000 ;
-      RECT 3.475000 0.580000 5.165000 0.750000 ;
-      RECT 3.475000 0.750000 3.645000 1.000000 ;
-      RECT 3.495000 1.340000 3.855000 1.670000 ;
-      RECT 3.495000 1.670000 3.665000 1.950000 ;
-      RECT 4.365000 0.750000 4.535000 1.760000 ;
-      RECT 4.365000 1.760000 5.165000 1.930000 ;
-      RECT 4.820000 1.930000 5.165000 2.700000 ;
-      RECT 4.835000 0.750000 5.165000 1.010000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.110000 ;
+      RECT 0.115000  1.110000 0.935000 1.280000 ;
+      RECT 0.210000  1.950000 0.935000 2.120000 ;
+      RECT 0.210000  2.120000 0.540000 2.820000 ;
+      RECT 0.545000  0.085000 0.875000 0.940000 ;
+      RECT 0.765000  1.280000 0.935000 1.340000 ;
+      RECT 0.765000  1.340000 1.260000 1.670000 ;
+      RECT 0.765000  1.670000 0.935000 1.950000 ;
+      RECT 0.780000  2.290000 1.110000 3.245000 ;
+      RECT 1.105000  0.390000 1.600000 1.170000 ;
+      RECT 1.430000  1.170000 1.600000 1.940000 ;
+      RECT 1.430000  1.940000 1.760000 1.950000 ;
+      RECT 1.430000  1.950000 3.665000 2.120000 ;
+      RECT 1.430000  2.120000 1.760000 2.980000 ;
+      RECT 1.770000  1.000000 3.645000 1.170000 ;
+      RECT 1.770000  1.170000 2.100000 1.590000 ;
+      RECT 2.065000  2.290000 2.395000 3.245000 ;
+      RECT 2.610000  2.120000 2.940000 2.980000 ;
+      RECT 2.975000  0.085000 3.305000 0.830000 ;
+      RECT 3.200000  2.290000 3.530000 3.245000 ;
+      RECT 3.475000  0.580000 5.165000 0.750000 ;
+      RECT 3.475000  0.750000 3.645000 1.000000 ;
+      RECT 3.495000  1.340000 3.855000 1.670000 ;
+      RECT 3.495000  1.670000 3.665000 1.950000 ;
+      RECT 4.325000  0.085000 4.655000 0.410000 ;
+      RECT 4.365000  0.750000 4.535000 1.760000 ;
+      RECT 4.365000  1.760000 5.165000 1.930000 ;
+      RECT 4.365000  2.100000 4.615000 3.245000 ;
+      RECT 4.820000  1.930000 5.165000 2.700000 ;
+      RECT 4.835000  0.750000 5.165000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef
index b4e2883..b8f19d1 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.magic.lef
@@ -84,33 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.940000 ;
-        RECT 5.880000  0.085000 6.130000 0.840000 ;
-        RECT 6.740000  0.085000 7.070000 1.130000 ;
-        RECT 7.740000  0.085000 8.070000 0.810000 ;
-        RECT 8.670000  0.085000 9.005000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -119,83 +92,107 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.615000 2.290000 0.945000 3.245000 ;
-        RECT 1.890000 2.630000 2.225000 3.245000 ;
-        RECT 2.965000 1.935000 3.295000 3.245000 ;
-        RECT 3.965000 1.935000 4.295000 3.245000 ;
-        RECT 4.965000 2.290000 6.165000 3.245000 ;
-        RECT 6.875000 2.290000 7.205000 3.245000 ;
-        RECT 7.775000 2.320000 8.105000 3.245000 ;
-        RECT 8.675000 2.320000 9.005000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.110000 ;
-      RECT 0.115000 1.110000 1.870000 1.280000 ;
-      RECT 0.115000 1.950000 1.675000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.980000 ;
-      RECT 1.045000 0.255000 1.690000 0.585000 ;
-      RECT 1.045000 0.585000 1.530000 0.940000 ;
-      RECT 1.115000 2.290000 2.260000 2.460000 ;
-      RECT 1.115000 2.460000 1.445000 2.980000 ;
-      RECT 1.505000 1.280000 1.675000 1.950000 ;
-      RECT 1.700000 0.755000 2.030000 0.925000 ;
-      RECT 1.700000 0.925000 1.870000 1.110000 ;
-      RECT 1.860000 0.255000 3.605000 0.585000 ;
-      RECT 1.860000 0.585000 2.030000 0.755000 ;
-      RECT 1.930000 1.450000 2.260000 2.290000 ;
-      RECT 2.040000 1.095000 2.370000 1.280000 ;
-      RECT 2.200000 0.755000 3.220000 0.925000 ;
-      RECT 2.200000 0.925000 2.370000 1.095000 ;
-      RECT 2.430000 1.595000 4.795000 1.765000 ;
-      RECT 2.430000 1.765000 2.760000 2.960000 ;
-      RECT 2.540000 1.095000 2.870000 1.360000 ;
-      RECT 2.540000 1.360000 2.760000 1.595000 ;
-      RECT 3.050000 0.925000 3.220000 1.255000 ;
-      RECT 3.050000 1.255000 4.160000 1.425000 ;
-      RECT 3.400000 0.755000 5.220000 0.925000 ;
-      RECT 3.400000 0.925000 3.650000 1.085000 ;
-      RECT 3.465000 1.765000 3.795000 2.960000 ;
-      RECT 3.830000 1.095000 4.160000 1.255000 ;
-      RECT 4.390000 1.095000 4.720000 1.110000 ;
-      RECT 4.390000 1.110000 6.560000 1.180000 ;
-      RECT 4.390000 1.180000 5.650000 1.280000 ;
-      RECT 4.390000 1.280000 4.720000 1.345000 ;
-      RECT 4.465000 1.765000 4.795000 1.950000 ;
-      RECT 4.465000 1.950000 7.235000 2.120000 ;
-      RECT 4.465000 2.120000 4.795000 2.960000 ;
-      RECT 4.890000 0.665000 5.220000 0.755000 ;
-      RECT 4.890000 0.925000 5.220000 0.940000 ;
-      RECT 5.400000 0.665000 5.650000 1.010000 ;
-      RECT 5.400000 1.010000 6.560000 1.110000 ;
-      RECT 6.310000 0.450000 6.560000 1.010000 ;
-      RECT 6.335000 2.120000 6.665000 2.860000 ;
-      RECT 7.065000 1.320000 8.565000 1.650000 ;
-      RECT 7.065000 1.650000 7.235000 1.950000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.110000 ;
+      RECT 0.115000  1.110000 1.870000 1.280000 ;
+      RECT 0.115000  1.950000 1.675000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.980000 ;
+      RECT 0.545000  0.085000 0.875000 0.940000 ;
+      RECT 0.615000  2.290000 0.945000 3.245000 ;
+      RECT 1.045000  0.255000 1.690000 0.585000 ;
+      RECT 1.045000  0.585000 1.530000 0.940000 ;
+      RECT 1.115000  2.290000 2.260000 2.460000 ;
+      RECT 1.115000  2.460000 1.445000 2.980000 ;
+      RECT 1.505000  1.280000 1.675000 1.950000 ;
+      RECT 1.700000  0.755000 2.030000 0.925000 ;
+      RECT 1.700000  0.925000 1.870000 1.110000 ;
+      RECT 1.860000  0.255000 3.605000 0.585000 ;
+      RECT 1.860000  0.585000 2.030000 0.755000 ;
+      RECT 1.890000  2.630000 2.225000 3.245000 ;
+      RECT 1.930000  1.450000 2.260000 2.290000 ;
+      RECT 2.040000  1.095000 2.370000 1.280000 ;
+      RECT 2.200000  0.755000 3.220000 0.925000 ;
+      RECT 2.200000  0.925000 2.370000 1.095000 ;
+      RECT 2.430000  1.595000 4.795000 1.765000 ;
+      RECT 2.430000  1.765000 2.760000 2.960000 ;
+      RECT 2.540000  1.095000 2.870000 1.360000 ;
+      RECT 2.540000  1.360000 2.760000 1.595000 ;
+      RECT 2.965000  1.935000 3.295000 3.245000 ;
+      RECT 3.050000  0.925000 3.220000 1.255000 ;
+      RECT 3.050000  1.255000 4.160000 1.425000 ;
+      RECT 3.400000  0.755000 5.220000 0.925000 ;
+      RECT 3.400000  0.925000 3.650000 1.085000 ;
+      RECT 3.465000  1.765000 3.795000 2.960000 ;
+      RECT 3.830000  1.095000 4.160000 1.255000 ;
+      RECT 3.965000  1.935000 4.295000 3.245000 ;
+      RECT 4.390000  1.095000 4.720000 1.110000 ;
+      RECT 4.390000  1.110000 6.560000 1.180000 ;
+      RECT 4.390000  1.180000 5.650000 1.280000 ;
+      RECT 4.390000  1.280000 4.720000 1.345000 ;
+      RECT 4.465000  1.765000 4.795000 1.950000 ;
+      RECT 4.465000  1.950000 7.235000 2.120000 ;
+      RECT 4.465000  2.120000 4.795000 2.960000 ;
+      RECT 4.890000  0.665000 5.220000 0.755000 ;
+      RECT 4.890000  0.925000 5.220000 0.940000 ;
+      RECT 4.965000  2.290000 6.165000 3.245000 ;
+      RECT 5.400000  0.665000 5.650000 1.010000 ;
+      RECT 5.400000  1.010000 6.560000 1.110000 ;
+      RECT 5.880000  0.085000 6.130000 0.840000 ;
+      RECT 6.310000  0.450000 6.560000 1.010000 ;
+      RECT 6.335000  2.120000 6.665000 2.860000 ;
+      RECT 6.740000  0.085000 7.070000 1.130000 ;
+      RECT 6.875000  2.290000 7.205000 3.245000 ;
+      RECT 7.065000  1.320000 8.565000 1.650000 ;
+      RECT 7.065000  1.650000 7.235000 1.950000 ;
+      RECT 7.740000  0.085000 8.070000 0.810000 ;
+      RECT 7.775000  2.320000 8.105000 3.245000 ;
+      RECT 8.670000  0.085000 9.005000 0.600000 ;
+      RECT 8.675000  2.320000 9.005000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__and4bb_4
diff --git a/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef
index 6d8cd30..36556ff 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_1.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.975000  0.085000 1.305000 0.940000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -70,26 +62,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.970000 2.290000 1.300000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.800000 0.795000 1.110000 ;
-      RECT 0.115000 1.110000 1.300000 1.280000 ;
-      RECT 0.470000 1.950000 1.300000 2.120000 ;
-      RECT 0.470000 2.120000 0.800000 2.980000 ;
-      RECT 1.130000 1.280000 1.300000 1.300000 ;
-      RECT 1.130000 1.300000 1.490000 1.630000 ;
-      RECT 1.130000 1.630000 1.300000 1.950000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.115000  0.800000 0.795000 1.110000 ;
+      RECT 0.115000  1.110000 1.300000 1.280000 ;
+      RECT 0.470000  1.950000 1.300000 2.120000 ;
+      RECT 0.470000  2.120000 0.800000 2.980000 ;
+      RECT 0.970000  2.290000 1.300000 3.245000 ;
+      RECT 0.975000  0.085000 1.305000 0.940000 ;
+      RECT 1.130000  1.280000 1.300000 1.300000 ;
+      RECT 1.130000  1.300000 1.490000 1.630000 ;
+      RECT 1.130000  1.630000 1.300000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__buf_1
diff --git a/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef
index b755436..158c23c 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_16.magic.lef
@@ -44,34 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.560000 0.350000 0.815000 2.980000 ;
-        RECT 1.465000 0.350000 1.720000 2.980000 ;
-        RECT 2.345000 0.350000 2.610000 1.185000 ;
-        RECT 2.345000 1.185000 2.675000 1.355000 ;
-        RECT 2.415000 1.355000 2.675000 2.980000 ;
-        RECT 3.220000 0.350000 3.480000 1.130000 ;
-        RECT 3.310000 1.130000 3.480000 1.820000 ;
-        RECT 3.310000 1.820000 3.565000 2.980000 ;
-        RECT 4.000000 0.350000 4.385000 1.130000 ;
-        RECT 4.215000 1.130000 4.385000 1.900000 ;
-        RECT 4.215000 1.900000 4.545000 2.980000 ;
-        RECT 5.035000 0.350000 5.330000 1.205000 ;
-        RECT 5.035000 1.205000 5.410000 1.375000 ;
-        RECT 5.115000 1.375000 5.410000 2.980000 ;
-        RECT 6.000000 0.350000 6.330000 1.130000 ;
-        RECT 6.060000 1.130000 6.330000 2.980000 ;
-        RECT 6.980000 1.250000 7.245000 2.980000 ;
-        RECT 7.000000 0.350000 7.250000 1.250000 ;
-      LAYER mcon ;
-        RECT 0.635000 1.950000 0.805000 2.120000 ;
-        RECT 1.515000 1.950000 1.685000 2.120000 ;
-        RECT 2.470000 1.950000 2.640000 2.120000 ;
-        RECT 3.360000 1.950000 3.530000 2.120000 ;
-        RECT 4.300000 1.950000 4.470000 2.120000 ;
-        RECT 5.195000 1.950000 5.365000 2.120000 ;
-        RECT 6.095000 1.950000 6.265000 2.120000 ;
-        RECT 7.025000 1.950000 7.195000 2.120000 ;
       LAYER met1 ;
         RECT 0.575000 1.920000 7.255000 2.150000 ;
     END
@@ -80,43 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.560000 0.085000 ;
-        RECT  0.130000  0.085000  0.380000 1.130000 ;
-        RECT  0.990000  0.085000  1.285000 1.130000 ;
-        RECT  1.895000  0.085000  2.100000 1.130000 ;
-        RECT  2.790000  0.085000  2.960000 1.015000 ;
-        RECT  3.650000  0.085000  3.820000 1.130000 ;
-        RECT  4.555000  0.085000  4.830000 1.130000 ;
-        RECT  5.500000  0.085000  5.830000 1.035000 ;
-        RECT  6.500000  0.085000  6.830000 1.130000 ;
-        RECT  7.430000  0.085000  7.760000 0.840000 ;
-        RECT  8.290000  0.085000  8.620000 0.840000 ;
-        RECT  9.150000  0.085000  9.480000 0.840000 ;
-        RECT 10.115000  0.085000 10.445000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
@@ -125,76 +60,135 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 10.560000 3.415000 ;
-        RECT  0.115000 1.820000  0.365000 3.245000 ;
-        RECT  1.095000 1.965000  1.265000 3.245000 ;
-        RECT  1.965000 1.965000  2.215000 3.245000 ;
-        RECT  2.945000 1.965000  3.115000 3.245000 ;
-        RECT  3.845000 1.965000  4.015000 3.245000 ;
-        RECT  4.745000 1.965000  4.915000 3.245000 ;
-        RECT  5.645000 1.965000  5.815000 3.245000 ;
-        RECT  6.545000 1.965000  6.715000 3.245000 ;
-        RECT  7.445000 2.290000  7.695000 3.245000 ;
-        RECT  8.395000 2.290000  8.565000 3.245000 ;
-        RECT  9.295000 2.290000  9.465000 3.245000 ;
-        RECT 10.195000 1.950000 10.445000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.560000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.300000 1.295000 1.780000 ;
-      RECT 1.890000 1.300000 2.175000 1.780000 ;
-      RECT 2.845000 1.300000 3.140000 1.780000 ;
-      RECT 3.655000 1.300000 4.045000 1.655000 ;
-      RECT 3.735000 1.655000 4.045000 1.780000 ;
-      RECT 4.555000 1.300000 4.865000 1.730000 ;
-      RECT 4.675000 1.730000 4.865000 1.780000 ;
-      RECT 5.580000 1.300000 5.890000 1.780000 ;
-      RECT 6.500000 1.300000 6.810000 1.780000 ;
-      RECT 7.420000 1.010000 9.945000 1.180000 ;
-      RECT 7.420000 1.180000 7.590000 1.950000 ;
-      RECT 7.420000 1.950000 9.995000 2.120000 ;
-      RECT 7.865000 2.120000 8.195000 2.980000 ;
-      RECT 7.940000 0.350000 8.110000 1.010000 ;
-      RECT 8.765000 2.120000 9.095000 2.980000 ;
-      RECT 8.800000 0.350000 8.970000 1.010000 ;
-      RECT 9.665000 2.120000 9.995000 2.980000 ;
-      RECT 9.695000 0.350000 9.945000 1.010000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.115000  1.820000  0.365000 3.245000 ;
+      RECT  0.130000  0.085000  0.380000 1.130000 ;
+      RECT  0.560000  0.350000  0.815000 2.980000 ;
+      RECT  0.985000  1.300000  1.295000 1.780000 ;
+      RECT  0.990000  0.085000  1.285000 1.130000 ;
+      RECT  1.095000  1.965000  1.265000 3.245000 ;
+      RECT  1.465000  0.350000  1.720000 2.980000 ;
+      RECT  1.890000  1.300000  2.175000 1.780000 ;
+      RECT  1.895000  0.085000  2.100000 1.130000 ;
+      RECT  1.965000  1.965000  2.215000 3.245000 ;
+      RECT  2.345000  0.350000  2.610000 1.185000 ;
+      RECT  2.345000  1.185000  2.675000 1.355000 ;
+      RECT  2.415000  1.355000  2.675000 2.980000 ;
+      RECT  2.790000  0.085000  2.960000 1.015000 ;
+      RECT  2.845000  1.300000  3.140000 1.780000 ;
+      RECT  2.945000  1.965000  3.115000 3.245000 ;
+      RECT  3.220000  0.350000  3.480000 1.130000 ;
+      RECT  3.310000  1.130000  3.480000 1.820000 ;
+      RECT  3.310000  1.820000  3.565000 2.980000 ;
+      RECT  3.650000  0.085000  3.820000 1.130000 ;
+      RECT  3.655000  1.300000  4.045000 1.655000 ;
+      RECT  3.735000  1.655000  4.045000 1.780000 ;
+      RECT  3.845000  1.965000  4.015000 3.245000 ;
+      RECT  4.000000  0.350000  4.385000 1.130000 ;
+      RECT  4.215000  1.130000  4.385000 1.900000 ;
+      RECT  4.215000  1.900000  4.545000 2.980000 ;
+      RECT  4.555000  0.085000  4.830000 1.130000 ;
+      RECT  4.555000  1.300000  4.865000 1.730000 ;
+      RECT  4.675000  1.730000  4.865000 1.780000 ;
+      RECT  4.745000  1.965000  4.915000 3.245000 ;
+      RECT  5.035000  0.350000  5.330000 1.205000 ;
+      RECT  5.035000  1.205000  5.410000 1.375000 ;
+      RECT  5.115000  1.375000  5.410000 2.980000 ;
+      RECT  5.500000  0.085000  5.830000 1.035000 ;
+      RECT  5.580000  1.300000  5.890000 1.780000 ;
+      RECT  5.645000  1.965000  5.815000 3.245000 ;
+      RECT  6.000000  0.350000  6.330000 1.130000 ;
+      RECT  6.060000  1.130000  6.330000 2.980000 ;
+      RECT  6.500000  0.085000  6.830000 1.130000 ;
+      RECT  6.500000  1.300000  6.810000 1.780000 ;
+      RECT  6.545000  1.965000  6.715000 3.245000 ;
+      RECT  6.980000  1.250000  7.245000 2.980000 ;
+      RECT  7.000000  0.350000  7.250000 1.250000 ;
+      RECT  7.420000  1.010000  9.945000 1.180000 ;
+      RECT  7.420000  1.180000  7.590000 1.950000 ;
+      RECT  7.420000  1.950000  9.995000 2.120000 ;
+      RECT  7.430000  0.085000  7.760000 0.840000 ;
+      RECT  7.445000  2.290000  7.695000 3.245000 ;
+      RECT  7.865000  2.120000  8.195000 2.980000 ;
+      RECT  7.940000  0.350000  8.110000 1.010000 ;
+      RECT  8.290000  0.085000  8.620000 0.840000 ;
+      RECT  8.395000  2.290000  8.565000 3.245000 ;
+      RECT  8.765000  2.120000  9.095000 2.980000 ;
+      RECT  8.800000  0.350000  8.970000 1.010000 ;
+      RECT  9.150000  0.085000  9.480000 0.840000 ;
+      RECT  9.295000  2.290000  9.465000 3.245000 ;
+      RECT  9.665000  2.120000  9.995000 2.980000 ;
+      RECT  9.695000  0.350000  9.945000 1.010000 ;
+      RECT 10.115000  0.085000 10.445000 1.130000 ;
+      RECT 10.195000  1.950000 10.445000 3.245000 ;
     LAYER mcon ;
-      RECT 1.055000 1.580000 1.225000 1.750000 ;
-      RECT 1.950000 1.580000 2.120000 1.750000 ;
-      RECT 2.910000 1.580000 3.080000 1.750000 ;
-      RECT 3.800000 1.580000 3.970000 1.750000 ;
-      RECT 4.680000 1.580000 4.850000 1.750000 ;
-      RECT 5.650000 1.580000 5.820000 1.750000 ;
-      RECT 6.565000 1.580000 6.735000 1.750000 ;
-      RECT 7.420000 1.580000 7.590000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  1.950000  0.805000 2.120000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.055000  1.580000  1.225000 1.750000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.515000  1.950000  1.685000 2.120000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  1.950000  1.580000  2.120000 1.750000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.470000  1.950000  2.640000 2.120000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  2.910000  1.580000  3.080000 1.750000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.360000  1.950000  3.530000 2.120000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.800000  1.580000  3.970000 1.750000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.300000  1.950000  4.470000 2.120000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.680000  1.580000  4.850000 1.750000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.195000  1.950000  5.365000 2.120000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.650000  1.580000  5.820000 1.750000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.095000  1.950000  6.265000 2.120000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.565000  1.580000  6.735000 1.750000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.025000  1.950000  7.195000 2.120000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.420000  1.580000  7.590000 1.750000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
     LAYER met1 ;
       RECT 0.985000 1.550000 7.650000 1.780000 ;
   END
diff --git a/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef
index 2b41189..7cefbfe 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_2.magic.lef
@@ -53,16 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.515000  0.085000 0.765000 1.130000 ;
-        RECT 1.445000  0.085000 1.775000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -71,30 +61,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.115000 1.820000 0.420000 2.735000 ;
-        RECT 0.115000 2.735000 0.825000 3.245000 ;
-        RECT 1.395000 2.660000 1.725000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.300000 0.775000 1.630000 ;
-      RECT 0.605000 1.630000 0.775000 2.320000 ;
-      RECT 0.605000 2.320000 2.285000 2.490000 ;
-      RECT 1.485000 1.010000 2.285000 1.180000 ;
-      RECT 1.485000 1.180000 1.655000 2.320000 ;
-      RECT 1.930000 1.950000 2.285000 2.320000 ;
-      RECT 1.930000 2.490000 2.285000 2.880000 ;
-      RECT 1.955000 0.450000 2.285000 1.010000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.105000  1.300000 0.775000 1.630000 ;
+      RECT 0.115000  1.820000 0.420000 2.735000 ;
+      RECT 0.115000  2.735000 0.825000 3.245000 ;
+      RECT 0.515000  0.085000 0.765000 1.130000 ;
+      RECT 0.605000  1.630000 0.775000 2.320000 ;
+      RECT 0.605000  2.320000 2.285000 2.490000 ;
+      RECT 1.395000  2.660000 1.725000 3.245000 ;
+      RECT 1.445000  0.085000 1.775000 0.840000 ;
+      RECT 1.485000  1.010000 2.285000 1.180000 ;
+      RECT 1.485000  1.180000 1.655000 2.320000 ;
+      RECT 1.930000  1.950000 2.285000 2.320000 ;
+      RECT 1.930000  2.490000 2.285000 2.880000 ;
+      RECT 1.955000  0.450000 2.285000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__buf_2
diff --git a/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef
index 7302a2b..4eafd6f 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_4.magic.lef
@@ -60,19 +60,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.010000 ;
-        RECT 1.115000  0.085000 1.445000 0.790000 ;
-        RECT 2.115000  0.085000 2.745000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -81,31 +68,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.130000 1.820000 0.460000 3.245000 ;
-        RECT 1.030000 2.140000 1.360000 3.245000 ;
-        RECT 1.930000 1.820000 2.260000 3.245000 ;
-        RECT 2.915000 2.370000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.060000 1.300000 2.285000 1.630000 ;
-      RECT 2.115000 0.960000 3.245000 1.130000 ;
-      RECT 2.115000 1.130000 2.285000 1.300000 ;
-      RECT 2.465000 1.950000 3.245000 2.200000 ;
-      RECT 2.915000 0.350000 3.245000 0.960000 ;
-      RECT 3.075000 1.130000 3.245000 1.950000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.010000 ;
+      RECT 0.130000  1.820000 0.460000 3.245000 ;
+      RECT 1.030000  2.140000 1.360000 3.245000 ;
+      RECT 1.060000  1.300000 2.285000 1.630000 ;
+      RECT 1.115000  0.085000 1.445000 0.790000 ;
+      RECT 1.930000  1.820000 2.260000 3.245000 ;
+      RECT 2.115000  0.085000 2.745000 0.680000 ;
+      RECT 2.115000  0.960000 3.245000 1.130000 ;
+      RECT 2.115000  1.130000 2.285000 1.300000 ;
+      RECT 2.465000  1.950000 3.245000 2.200000 ;
+      RECT 2.915000  0.350000 3.245000 0.960000 ;
+      RECT 2.915000  2.370000 3.245000 3.245000 ;
+      RECT 3.075000  1.130000 3.245000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__buf_4
diff --git a/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef
index 73d8225..c87a79b 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hs__buf_8.magic.lef
@@ -62,27 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.840000 ;
-        RECT 1.450000  0.085000 1.780000 0.840000 ;
-        RECT 2.310000  0.085000 2.640000 0.790000 ;
-        RECT 3.310000  0.085000 3.640000 0.790000 ;
-        RECT 4.310000  0.085000 4.640000 0.790000 ;
-        RECT 5.315000  0.085000 5.645000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -91,41 +70,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.650000 2.290000 0.820000 3.245000 ;
-        RECT 1.550000 2.290000 1.800000 3.245000 ;
-        RECT 2.500000 2.140000 2.750000 3.245000 ;
-        RECT 3.450000 2.140000 3.700000 3.245000 ;
-        RECT 4.400000 2.140000 4.650000 3.245000 ;
-        RECT 5.350000 1.820000 5.600000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 1.770000 1.180000 ;
-      RECT 0.120000 1.950000 1.770000 2.120000 ;
-      RECT 0.120000 2.120000 0.450000 2.980000 ;
-      RECT 1.020000 2.120000 1.350000 2.980000 ;
-      RECT 1.100000 0.350000 1.270000 1.010000 ;
-      RECT 1.600000 1.180000 1.770000 1.300000 ;
-      RECT 1.600000 1.300000 4.805000 1.630000 ;
-      RECT 1.600000 1.630000 1.770000 1.950000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.010000 ;
+      RECT 0.115000  1.010000 1.770000 1.180000 ;
+      RECT 0.120000  1.950000 1.770000 2.120000 ;
+      RECT 0.120000  2.120000 0.450000 2.980000 ;
+      RECT 0.545000  0.085000 0.875000 0.840000 ;
+      RECT 0.650000  2.290000 0.820000 3.245000 ;
+      RECT 1.020000  2.120000 1.350000 2.980000 ;
+      RECT 1.100000  0.350000 1.270000 1.010000 ;
+      RECT 1.450000  0.085000 1.780000 0.840000 ;
+      RECT 1.550000  2.290000 1.800000 3.245000 ;
+      RECT 1.600000  1.180000 1.770000 1.300000 ;
+      RECT 1.600000  1.300000 4.805000 1.630000 ;
+      RECT 1.600000  1.630000 1.770000 1.950000 ;
+      RECT 2.310000  0.085000 2.640000 0.790000 ;
+      RECT 2.500000  2.140000 2.750000 3.245000 ;
+      RECT 3.310000  0.085000 3.640000 0.790000 ;
+      RECT 3.450000  2.140000 3.700000 3.245000 ;
+      RECT 4.310000  0.085000 4.640000 0.790000 ;
+      RECT 4.400000  2.140000 4.650000 3.245000 ;
+      RECT 5.315000  0.085000 5.645000 1.130000 ;
+      RECT 5.350000  1.820000 5.600000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__buf_8
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef
index adba5f9..66519e3 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.magic.lef
@@ -44,39 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  5.635000 0.350000  5.885000 1.900000 ;
-        RECT  5.660000 1.900000  5.885000 1.920000 ;
-        RECT  5.660000 1.920000  5.990000 2.980000 ;
-        RECT  6.535000 0.350000  6.780000 1.650000 ;
-        RECT  6.610000 1.650000  6.780000 1.920000 ;
-        RECT  6.610000 1.920000  6.940000 2.980000 ;
-        RECT  7.385000 0.350000  7.680000 1.650000 ;
-        RECT  7.510000 1.650000  7.680000 1.920000 ;
-        RECT  7.510000 1.920000  7.840000 2.980000 ;
-        RECT  8.285000 0.350000  8.580000 1.650000 ;
-        RECT  8.410000 1.650000  8.580000 1.920000 ;
-        RECT  8.410000 1.920000  8.740000 2.980000 ;
-        RECT  9.215000 0.350000  9.480000 1.650000 ;
-        RECT  9.310000 1.650000  9.480000 1.920000 ;
-        RECT  9.310000 1.920000  9.640000 2.980000 ;
-        RECT 10.145000 0.350000 10.395000 1.650000 ;
-        RECT 10.210000 1.650000 10.395000 1.920000 ;
-        RECT 10.210000 1.920000 10.540000 2.980000 ;
-        RECT 11.110000 0.350000 11.325000 1.920000 ;
-        RECT 11.110000 1.920000 11.440000 2.980000 ;
-        RECT 12.015000 0.350000 12.345000 1.150000 ;
-        RECT 12.060000 1.150000 12.345000 2.020000 ;
-        RECT 12.060000 2.020000 12.390000 2.980000 ;
-      LAYER mcon ;
-        RECT  5.760000 1.950000  5.930000 2.120000 ;
-        RECT  6.675000 1.950000  6.845000 2.120000 ;
-        RECT  7.595000 1.950000  7.765000 2.120000 ;
-        RECT  8.485000 1.950000  8.655000 2.120000 ;
-        RECT  9.405000 1.950000  9.575000 2.120000 ;
-        RECT 10.295000 1.950000 10.465000 2.120000 ;
-        RECT 11.195000 1.950000 11.365000 2.120000 ;
-        RECT 12.115000 1.950000 12.285000 2.120000 ;
       LAYER met1 ;
         RECT 5.700000 1.920000 12.380000 2.150000 ;
     END
@@ -85,50 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.560000  0.085000  0.890000 0.790000 ;
-        RECT  1.420000  0.085000  1.670000 0.790000 ;
-        RECT  2.415000  0.085000  2.745000 1.130000 ;
-        RECT  3.345000  0.085000  3.675000 0.810000 ;
-        RECT  4.275000  0.085000  4.605000 0.810000 ;
-        RECT  5.275000  0.085000  5.455000 1.130000 ;
-        RECT  6.065000  0.085000  6.315000 1.130000 ;
-        RECT  6.960000  0.085000  7.175000 1.130000 ;
-        RECT  7.850000  0.085000  8.115000 1.130000 ;
-        RECT  8.750000  0.085000  9.045000 1.130000 ;
-        RECT  9.665000  0.085000  9.975000 1.130000 ;
-        RECT 10.575000  0.085000 10.905000 1.130000 ;
-        RECT 11.505000  0.085000 11.835000 1.130000 ;
-        RECT 12.515000  0.085000 12.845000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
@@ -137,99 +60,170 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.645000 2.290000  0.815000 3.245000 ;
-        RECT  1.545000 2.140000  1.715000 3.245000 ;
-        RECT  2.490000 1.820000  2.740000 3.245000 ;
-        RECT  3.470000 2.160000  3.640000 3.245000 ;
-        RECT  4.370000 2.160000  4.540000 3.245000 ;
-        RECT  5.280000 1.925000  5.450000 3.245000 ;
-        RECT  6.160000 1.925000  6.410000 3.245000 ;
-        RECT  7.140000 1.925000  7.310000 3.245000 ;
-        RECT  8.040000 1.925000  8.210000 3.245000 ;
-        RECT  8.940000 1.925000  9.110000 3.245000 ;
-        RECT  9.840000 1.925000 10.010000 3.245000 ;
-        RECT 10.740000 1.925000 10.910000 3.245000 ;
-        RECT 11.640000 1.925000 11.890000 3.245000 ;
-        RECT 12.590000 1.820000 12.840000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 1.950000  0.845000 2.120000 ;
-      RECT  0.115000 2.120000  0.445000 2.980000 ;
-      RECT  0.130000 0.350000  0.380000 0.960000 ;
-      RECT  0.130000 0.960000  0.845000 1.130000 ;
-      RECT  0.675000 1.130000  0.845000 1.300000 ;
-      RECT  0.675000 1.300000  1.875000 1.630000 ;
-      RECT  0.675000 1.630000  0.845000 1.950000 ;
-      RECT  1.015000 1.800000  2.245000 1.970000 ;
-      RECT  1.015000 1.970000  1.345000 2.980000 ;
-      RECT  1.070000 0.350000  1.240000 0.960000 ;
-      RECT  1.070000 0.960000  2.215000 1.130000 ;
-      RECT  1.855000 0.350000  2.215000 0.960000 ;
-      RECT  1.915000 1.970000  2.245000 2.980000 ;
-      RECT  2.045000 1.130000  2.215000 1.320000 ;
-      RECT  2.045000 1.320000  4.480000 1.650000 ;
-      RECT  2.045000 1.650000  2.245000 1.800000 ;
-      RECT  2.915000 0.350000  3.165000 0.980000 ;
-      RECT  2.915000 0.980000  5.105000 1.150000 ;
-      RECT  2.940000 1.820000  5.080000 1.990000 ;
-      RECT  2.940000 1.990000  3.270000 2.980000 ;
-      RECT  3.840000 1.990000  4.170000 2.980000 ;
-      RECT  3.845000 0.350000  4.095000 0.980000 ;
-      RECT  4.750000 1.990000  5.080000 2.980000 ;
-      RECT  4.775000 0.350000  5.025000 0.980000 ;
-      RECT  4.845000 1.150000  5.105000 1.320000 ;
-      RECT  4.845000 1.320000  5.405000 1.755000 ;
-      RECT  4.845000 1.755000  5.080000 1.820000 ;
-      RECT  6.055000 1.320000  6.365000 1.750000 ;
-      RECT  6.950000 1.320000  7.215000 1.750000 ;
-      RECT  7.850000 1.320000  8.115000 1.750000 ;
-      RECT  8.750000 1.320000  9.045000 1.750000 ;
-      RECT  9.650000 1.320000  9.975000 1.750000 ;
-      RECT 10.565000 1.320000 10.940000 1.750000 ;
-      RECT 11.495000 1.320000 11.890000 1.750000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.115000  1.950000  0.845000 2.120000 ;
+      RECT  0.115000  2.120000  0.445000 2.980000 ;
+      RECT  0.130000  0.350000  0.380000 0.960000 ;
+      RECT  0.130000  0.960000  0.845000 1.130000 ;
+      RECT  0.560000  0.085000  0.890000 0.790000 ;
+      RECT  0.645000  2.290000  0.815000 3.245000 ;
+      RECT  0.675000  1.130000  0.845000 1.300000 ;
+      RECT  0.675000  1.300000  1.875000 1.630000 ;
+      RECT  0.675000  1.630000  0.845000 1.950000 ;
+      RECT  1.015000  1.800000  2.245000 1.970000 ;
+      RECT  1.015000  1.970000  1.345000 2.980000 ;
+      RECT  1.070000  0.350000  1.240000 0.960000 ;
+      RECT  1.070000  0.960000  2.215000 1.130000 ;
+      RECT  1.420000  0.085000  1.670000 0.790000 ;
+      RECT  1.545000  2.140000  1.715000 3.245000 ;
+      RECT  1.855000  0.350000  2.215000 0.960000 ;
+      RECT  1.915000  1.970000  2.245000 2.980000 ;
+      RECT  2.045000  1.130000  2.215000 1.320000 ;
+      RECT  2.045000  1.320000  4.480000 1.650000 ;
+      RECT  2.045000  1.650000  2.245000 1.800000 ;
+      RECT  2.415000  0.085000  2.745000 1.130000 ;
+      RECT  2.490000  1.820000  2.740000 3.245000 ;
+      RECT  2.915000  0.350000  3.165000 0.980000 ;
+      RECT  2.915000  0.980000  5.105000 1.150000 ;
+      RECT  2.940000  1.820000  5.080000 1.990000 ;
+      RECT  2.940000  1.990000  3.270000 2.980000 ;
+      RECT  3.345000  0.085000  3.675000 0.810000 ;
+      RECT  3.470000  2.160000  3.640000 3.245000 ;
+      RECT  3.840000  1.990000  4.170000 2.980000 ;
+      RECT  3.845000  0.350000  4.095000 0.980000 ;
+      RECT  4.275000  0.085000  4.605000 0.810000 ;
+      RECT  4.370000  2.160000  4.540000 3.245000 ;
+      RECT  4.750000  1.990000  5.080000 2.980000 ;
+      RECT  4.775000  0.350000  5.025000 0.980000 ;
+      RECT  4.845000  1.150000  5.105000 1.320000 ;
+      RECT  4.845000  1.320000  5.405000 1.755000 ;
+      RECT  4.845000  1.755000  5.080000 1.820000 ;
+      RECT  5.275000  0.085000  5.455000 1.130000 ;
+      RECT  5.280000  1.925000  5.450000 3.245000 ;
+      RECT  5.635000  0.350000  5.885000 1.900000 ;
+      RECT  5.660000  1.900000  5.885000 1.920000 ;
+      RECT  5.660000  1.920000  5.990000 2.980000 ;
+      RECT  6.055000  1.320000  6.365000 1.750000 ;
+      RECT  6.065000  0.085000  6.315000 1.130000 ;
+      RECT  6.160000  1.925000  6.410000 3.245000 ;
+      RECT  6.535000  0.350000  6.780000 1.650000 ;
+      RECT  6.610000  1.650000  6.780000 1.920000 ;
+      RECT  6.610000  1.920000  6.940000 2.980000 ;
+      RECT  6.950000  1.320000  7.215000 1.750000 ;
+      RECT  6.960000  0.085000  7.175000 1.130000 ;
+      RECT  7.140000  1.925000  7.310000 3.245000 ;
+      RECT  7.385000  0.350000  7.680000 1.650000 ;
+      RECT  7.510000  1.650000  7.680000 1.920000 ;
+      RECT  7.510000  1.920000  7.840000 2.980000 ;
+      RECT  7.850000  0.085000  8.115000 1.130000 ;
+      RECT  7.850000  1.320000  8.115000 1.750000 ;
+      RECT  8.040000  1.925000  8.210000 3.245000 ;
+      RECT  8.285000  0.350000  8.580000 1.650000 ;
+      RECT  8.410000  1.650000  8.580000 1.920000 ;
+      RECT  8.410000  1.920000  8.740000 2.980000 ;
+      RECT  8.750000  0.085000  9.045000 1.130000 ;
+      RECT  8.750000  1.320000  9.045000 1.750000 ;
+      RECT  8.940000  1.925000  9.110000 3.245000 ;
+      RECT  9.215000  0.350000  9.480000 1.650000 ;
+      RECT  9.310000  1.650000  9.480000 1.920000 ;
+      RECT  9.310000  1.920000  9.640000 2.980000 ;
+      RECT  9.650000  1.320000  9.975000 1.750000 ;
+      RECT  9.665000  0.085000  9.975000 1.130000 ;
+      RECT  9.840000  1.925000 10.010000 3.245000 ;
+      RECT 10.145000  0.350000 10.395000 1.650000 ;
+      RECT 10.210000  1.650000 10.395000 1.920000 ;
+      RECT 10.210000  1.920000 10.540000 2.980000 ;
+      RECT 10.565000  1.320000 10.940000 1.750000 ;
+      RECT 10.575000  0.085000 10.905000 1.130000 ;
+      RECT 10.740000  1.925000 10.910000 3.245000 ;
+      RECT 11.110000  0.350000 11.325000 1.920000 ;
+      RECT 11.110000  1.920000 11.440000 2.980000 ;
+      RECT 11.495000  1.320000 11.890000 1.750000 ;
+      RECT 11.505000  0.085000 11.835000 1.130000 ;
+      RECT 11.640000  1.925000 11.890000 3.245000 ;
+      RECT 12.015000  0.350000 12.345000 1.150000 ;
+      RECT 12.060000  1.150000 12.345000 2.020000 ;
+      RECT 12.060000  2.020000 12.390000 2.980000 ;
+      RECT 12.515000  0.085000 12.845000 1.130000 ;
+      RECT 12.590000  1.820000 12.840000 3.245000 ;
     LAYER mcon ;
-      RECT  5.180000 1.580000  5.350000 1.750000 ;
-      RECT  6.125000 1.580000  6.295000 1.750000 ;
-      RECT  7.000000 1.580000  7.170000 1.750000 ;
-      RECT  7.900000 1.580000  8.070000 1.750000 ;
-      RECT  8.820000 1.580000  8.990000 1.750000 ;
-      RECT  9.730000 1.580000  9.900000 1.750000 ;
-      RECT 10.675000 1.580000 10.845000 1.750000 ;
-      RECT 11.600000 1.580000 11.770000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.180000  1.580000  5.350000 1.750000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.760000  1.950000  5.930000 2.120000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.125000  1.580000  6.295000 1.750000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.675000  1.950000  6.845000 2.120000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.000000  1.580000  7.170000 1.750000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.595000  1.950000  7.765000 2.120000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  7.900000  1.580000  8.070000 1.750000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.485000  1.950000  8.655000 2.120000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  8.820000  1.580000  8.990000 1.750000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.405000  1.950000  9.575000 2.120000 ;
+      RECT  9.730000  1.580000  9.900000 1.750000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.295000  1.950000 10.465000 2.120000 ;
+      RECT 10.675000  1.580000 10.845000 1.750000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  1.950000 11.365000 2.120000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.600000  1.580000 11.770000 1.750000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.115000  1.950000 12.285000 2.120000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
     LAYER met1 ;
       RECT 5.110000 1.550000 11.830000 1.780000 ;
   END
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef
index fd16f13..2f7fb95 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.magic.lef
@@ -62,31 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.840000 ;
-        RECT 2.115000  0.085000 2.445000 0.710000 ;
-        RECT 2.975000  0.085000 3.305000 0.710000 ;
-        RECT 3.975000  0.085000 4.305000 0.710000 ;
-        RECT 4.835000  0.085000 5.165000 0.710000 ;
-        RECT 5.755000  0.085000 6.085000 0.710000 ;
-        RECT 6.755000  0.085000 7.085000 1.100000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -95,56 +70,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.565000 2.370000 0.920000 3.245000 ;
-        RECT 2.150000 2.160000 2.380000 3.245000 ;
-        RECT 3.050000 1.820000 3.380000 3.245000 ;
-        RECT 4.035000 2.140000 4.290000 3.245000 ;
-        RECT 4.930000 2.140000 5.205000 3.245000 ;
-        RECT 5.835000 2.140000 6.105000 3.245000 ;
-        RECT 6.735000 1.950000 7.040000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.540000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 0.920000 1.180000 ;
-      RECT 0.115000 1.950000 0.920000 2.200000 ;
-      RECT 0.115000 2.200000 0.380000 2.700000 ;
-      RECT 0.750000 1.180000 0.920000 1.300000 ;
-      RECT 0.750000 1.300000 1.140000 1.630000 ;
-      RECT 0.750000 1.630000 0.920000 1.950000 ;
-      RECT 1.090000 1.820000 1.480000 2.980000 ;
-      RECT 1.125000 0.350000 1.480000 1.130000 ;
-      RECT 1.310000 1.130000 1.480000 1.300000 ;
-      RECT 1.310000 1.300000 2.500000 1.630000 ;
-      RECT 1.310000 1.630000 1.480000 1.820000 ;
-      RECT 1.650000 1.820000 2.880000 1.990000 ;
-      RECT 1.650000 1.990000 1.980000 2.980000 ;
-      RECT 1.685000 0.350000 1.935000 0.880000 ;
-      RECT 1.685000 0.880000 3.125000 1.130000 ;
-      RECT 2.550000 1.990000 2.880000 2.980000 ;
-      RECT 2.670000 1.130000 3.125000 1.300000 ;
-      RECT 2.670000 1.300000 6.020000 1.630000 ;
-      RECT 2.670000 1.630000 2.880000 1.820000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  0.540000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 0.920000 1.180000 ;
+      RECT 0.115000  1.950000 0.920000 2.200000 ;
+      RECT 0.115000  2.200000 0.380000 2.700000 ;
+      RECT 0.565000  2.370000 0.920000 3.245000 ;
+      RECT 0.625000  0.085000 0.955000 0.840000 ;
+      RECT 0.750000  1.180000 0.920000 1.300000 ;
+      RECT 0.750000  1.300000 1.140000 1.630000 ;
+      RECT 0.750000  1.630000 0.920000 1.950000 ;
+      RECT 1.090000  1.820000 1.480000 2.980000 ;
+      RECT 1.125000  0.350000 1.480000 1.130000 ;
+      RECT 1.310000  1.130000 1.480000 1.300000 ;
+      RECT 1.310000  1.300000 2.500000 1.630000 ;
+      RECT 1.310000  1.630000 1.480000 1.820000 ;
+      RECT 1.650000  1.820000 2.880000 1.990000 ;
+      RECT 1.650000  1.990000 1.980000 2.980000 ;
+      RECT 1.685000  0.350000 1.935000 0.880000 ;
+      RECT 1.685000  0.880000 3.125000 1.130000 ;
+      RECT 2.115000  0.085000 2.445000 0.710000 ;
+      RECT 2.150000  2.160000 2.380000 3.245000 ;
+      RECT 2.550000  1.990000 2.880000 2.980000 ;
+      RECT 2.670000  1.130000 3.125000 1.300000 ;
+      RECT 2.670000  1.300000 6.020000 1.630000 ;
+      RECT 2.670000  1.630000 2.880000 1.820000 ;
+      RECT 2.975000  0.085000 3.305000 0.710000 ;
+      RECT 3.050000  1.820000 3.380000 3.245000 ;
+      RECT 3.975000  0.085000 4.305000 0.710000 ;
+      RECT 4.035000  2.140000 4.290000 3.245000 ;
+      RECT 4.835000  0.085000 5.165000 0.710000 ;
+      RECT 4.930000  2.140000 5.205000 3.245000 ;
+      RECT 5.755000  0.085000 6.085000 0.710000 ;
+      RECT 5.835000  2.140000 6.105000 3.245000 ;
+      RECT 6.735000  1.950000 7.040000 3.245000 ;
+      RECT 6.755000  0.085000 7.085000 1.100000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__bufbuf_8
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef
index e6a41ae..29bb211 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.magic.lef
@@ -44,39 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  4.615000 0.350000  4.865000 1.920000 ;
-        RECT  4.615000 1.920000  4.970000 2.020000 ;
-        RECT  4.640000 2.020000  4.970000 2.980000 ;
-        RECT  5.510000 0.350000  5.725000 1.920000 ;
-        RECT  5.510000 1.920000  5.870000 2.020000 ;
-        RECT  5.540000 2.020000  5.870000 2.980000 ;
-        RECT  6.420000 0.350000  6.655000 1.920000 ;
-        RECT  6.420000 1.920000  6.770000 2.020000 ;
-        RECT  6.440000 2.020000  6.770000 2.980000 ;
-        RECT  7.340000 0.350000  7.585000 1.920000 ;
-        RECT  7.340000 1.920000  7.670000 2.980000 ;
-        RECT  8.240000 2.020000  8.570000 2.980000 ;
-        RECT  8.265000 0.350000  8.515000 1.920000 ;
-        RECT  8.265000 1.920000  8.570000 2.020000 ;
-        RECT  9.190000 2.020000  9.520000 2.980000 ;
-        RECT  9.195000 0.350000  9.445000 1.920000 ;
-        RECT  9.195000 1.920000  9.520000 2.020000 ;
-        RECT 10.125000 0.350000 10.375000 1.920000 ;
-        RECT 10.125000 1.920000 10.470000 2.020000 ;
-        RECT 10.140000 2.020000 10.470000 2.980000 ;
-        RECT 11.055000 0.350000 11.385000 1.790000 ;
-        RECT 11.055000 1.790000 11.420000 2.020000 ;
-        RECT 11.090000 2.020000 11.420000 2.980000 ;
-      LAYER mcon ;
-        RECT  4.730000 1.950000  4.900000 2.120000 ;
-        RECT  5.620000 1.950000  5.790000 2.120000 ;
-        RECT  6.520000 1.950000  6.690000 2.120000 ;
-        RECT  7.420000 1.950000  7.590000 2.120000 ;
-        RECT  8.320000 1.950000  8.490000 2.120000 ;
-        RECT  9.270000 1.950000  9.440000 2.120000 ;
-        RECT 10.220000 1.950000 10.390000 2.120000 ;
-        RECT 11.170000 1.950000 11.340000 2.120000 ;
       LAYER met1 ;
         RECT 4.660000 1.920000 11.400000 2.150000 ;
     END
@@ -85,47 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.840000 ;
-        RECT  1.465000  0.085000  1.795000 0.840000 ;
-        RECT  2.325000  0.085000  2.575000 0.790000 ;
-        RECT  3.185000  0.085000  3.515000 0.790000 ;
-        RECT  4.115000  0.085000  4.445000 1.130000 ;
-        RECT  5.045000  0.085000  5.295000 1.105000 ;
-        RECT  5.905000  0.085000  6.235000 1.105000 ;
-        RECT  6.835000  0.085000  7.165000 1.105000 ;
-        RECT  7.765000  0.085000  8.095000 1.105000 ;
-        RECT  8.695000  0.085000  9.025000 1.105000 ;
-        RECT  9.625000  0.085000  9.955000 1.105000 ;
-        RECT 10.555000  0.085000 10.885000 1.105000 ;
-        RECT 11.555000  0.085000 11.885000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
@@ -134,89 +60,157 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  0.650000 2.290000  0.820000 3.245000 ;
-        RECT  1.550000 2.290000  1.720000 3.245000 ;
-        RECT  2.470000 2.140000  2.640000 3.245000 ;
-        RECT  3.370000 2.140000  3.540000 3.245000 ;
-        RECT  4.270000 1.920000  4.440000 3.245000 ;
-        RECT  5.170000 1.920000  5.340000 3.245000 ;
-        RECT  6.070000 1.920000  6.240000 3.245000 ;
-        RECT  6.970000 1.920000  7.140000 3.245000 ;
-        RECT  7.870000 1.920000  8.040000 3.245000 ;
-        RECT  8.770000 1.920000  8.995000 3.245000 ;
-        RECT  9.720000 1.920000  9.955000 3.245000 ;
-        RECT 10.670000 1.920000 10.885000 3.245000 ;
-        RECT 11.620000 1.820000 11.870000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.000000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.365000 1.010000 ;
-      RECT  0.115000 1.010000  1.770000 1.180000 ;
-      RECT  0.120000 1.950000  1.770000 2.120000 ;
-      RECT  0.120000 2.120000  0.450000 2.980000 ;
-      RECT  1.020000 2.120000  1.350000 2.980000 ;
-      RECT  1.115000 0.350000  1.285000 1.010000 ;
-      RECT  1.600000 1.180000  1.770000 1.300000 ;
-      RECT  1.600000 1.300000  3.460000 1.630000 ;
-      RECT  1.600000 1.630000  1.770000 1.950000 ;
-      RECT  1.940000 1.800000  4.070000 1.970000 ;
-      RECT  1.940000 1.970000  2.270000 2.980000 ;
-      RECT  1.975000 0.350000  2.145000 0.960000 ;
-      RECT  1.975000 0.960000  3.935000 1.130000 ;
-      RECT  2.755000 0.350000  3.005000 0.960000 ;
-      RECT  2.840000 1.970000  3.170000 2.980000 ;
-      RECT  3.685000 0.350000  3.935000 0.960000 ;
-      RECT  3.685000 1.130000  3.935000 1.300000 ;
-      RECT  3.740000 1.300000  4.435000 1.750000 ;
-      RECT  3.740000 1.750000  4.070000 1.800000 ;
-      RECT  3.740000 1.970000  4.070000 2.980000 ;
-      RECT  5.035000 1.300000  5.305000 1.750000 ;
-      RECT  5.900000 1.300000  6.230000 1.750000 ;
-      RECT  6.840000 1.300000  7.170000 1.750000 ;
-      RECT  7.760000 1.300000  8.090000 1.750000 ;
-      RECT  8.685000 1.300000  9.015000 1.750000 ;
-      RECT  9.615000 1.300000  9.945000 1.750000 ;
-      RECT 10.545000 1.300000 10.875000 1.750000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.115000  0.350000  0.365000 1.010000 ;
+      RECT  0.115000  1.010000  1.770000 1.180000 ;
+      RECT  0.120000  1.950000  1.770000 2.120000 ;
+      RECT  0.120000  2.120000  0.450000 2.980000 ;
+      RECT  0.545000  0.085000  0.875000 0.840000 ;
+      RECT  0.650000  2.290000  0.820000 3.245000 ;
+      RECT  1.020000  2.120000  1.350000 2.980000 ;
+      RECT  1.115000  0.350000  1.285000 1.010000 ;
+      RECT  1.465000  0.085000  1.795000 0.840000 ;
+      RECT  1.550000  2.290000  1.720000 3.245000 ;
+      RECT  1.600000  1.180000  1.770000 1.300000 ;
+      RECT  1.600000  1.300000  3.460000 1.630000 ;
+      RECT  1.600000  1.630000  1.770000 1.950000 ;
+      RECT  1.940000  1.800000  4.070000 1.970000 ;
+      RECT  1.940000  1.970000  2.270000 2.980000 ;
+      RECT  1.975000  0.350000  2.145000 0.960000 ;
+      RECT  1.975000  0.960000  3.935000 1.130000 ;
+      RECT  2.325000  0.085000  2.575000 0.790000 ;
+      RECT  2.470000  2.140000  2.640000 3.245000 ;
+      RECT  2.755000  0.350000  3.005000 0.960000 ;
+      RECT  2.840000  1.970000  3.170000 2.980000 ;
+      RECT  3.185000  0.085000  3.515000 0.790000 ;
+      RECT  3.370000  2.140000  3.540000 3.245000 ;
+      RECT  3.685000  0.350000  3.935000 0.960000 ;
+      RECT  3.685000  1.130000  3.935000 1.300000 ;
+      RECT  3.740000  1.300000  4.435000 1.750000 ;
+      RECT  3.740000  1.750000  4.070000 1.800000 ;
+      RECT  3.740000  1.970000  4.070000 2.980000 ;
+      RECT  4.115000  0.085000  4.445000 1.130000 ;
+      RECT  4.270000  1.920000  4.440000 3.245000 ;
+      RECT  4.615000  0.350000  4.865000 1.920000 ;
+      RECT  4.615000  1.920000  4.970000 2.020000 ;
+      RECT  4.640000  2.020000  4.970000 2.980000 ;
+      RECT  5.035000  1.300000  5.305000 1.750000 ;
+      RECT  5.045000  0.085000  5.295000 1.105000 ;
+      RECT  5.170000  1.920000  5.340000 3.245000 ;
+      RECT  5.510000  0.350000  5.725000 1.920000 ;
+      RECT  5.510000  1.920000  5.870000 2.020000 ;
+      RECT  5.540000  2.020000  5.870000 2.980000 ;
+      RECT  5.900000  1.300000  6.230000 1.750000 ;
+      RECT  5.905000  0.085000  6.235000 1.105000 ;
+      RECT  6.070000  1.920000  6.240000 3.245000 ;
+      RECT  6.420000  0.350000  6.655000 1.920000 ;
+      RECT  6.420000  1.920000  6.770000 2.020000 ;
+      RECT  6.440000  2.020000  6.770000 2.980000 ;
+      RECT  6.835000  0.085000  7.165000 1.105000 ;
+      RECT  6.840000  1.300000  7.170000 1.750000 ;
+      RECT  6.970000  1.920000  7.140000 3.245000 ;
+      RECT  7.340000  0.350000  7.585000 1.920000 ;
+      RECT  7.340000  1.920000  7.670000 2.980000 ;
+      RECT  7.760000  1.300000  8.090000 1.750000 ;
+      RECT  7.765000  0.085000  8.095000 1.105000 ;
+      RECT  7.870000  1.920000  8.040000 3.245000 ;
+      RECT  8.240000  2.020000  8.570000 2.980000 ;
+      RECT  8.265000  0.350000  8.515000 1.920000 ;
+      RECT  8.265000  1.920000  8.570000 2.020000 ;
+      RECT  8.685000  1.300000  9.015000 1.750000 ;
+      RECT  8.695000  0.085000  9.025000 1.105000 ;
+      RECT  8.770000  1.920000  8.995000 3.245000 ;
+      RECT  9.190000  2.020000  9.520000 2.980000 ;
+      RECT  9.195000  0.350000  9.445000 1.920000 ;
+      RECT  9.195000  1.920000  9.520000 2.020000 ;
+      RECT  9.615000  1.300000  9.945000 1.750000 ;
+      RECT  9.625000  0.085000  9.955000 1.105000 ;
+      RECT  9.720000  1.920000  9.955000 3.245000 ;
+      RECT 10.125000  0.350000 10.375000 1.920000 ;
+      RECT 10.125000  1.920000 10.470000 2.020000 ;
+      RECT 10.140000  2.020000 10.470000 2.980000 ;
+      RECT 10.545000  1.300000 10.875000 1.750000 ;
+      RECT 10.555000  0.085000 10.885000 1.105000 ;
+      RECT 10.670000  1.920000 10.885000 3.245000 ;
+      RECT 11.055000  0.350000 11.385000 1.790000 ;
+      RECT 11.055000  1.790000 11.420000 2.020000 ;
+      RECT 11.090000  2.020000 11.420000 2.980000 ;
+      RECT 11.555000  0.085000 11.885000 1.130000 ;
+      RECT 11.620000  1.820000 11.870000 3.245000 ;
     LAYER mcon ;
-      RECT  4.225000 1.580000  4.395000 1.750000 ;
-      RECT  5.090000 1.580000  5.260000 1.750000 ;
-      RECT  5.980000 1.580000  6.150000 1.750000 ;
-      RECT  6.920000 1.580000  7.090000 1.750000 ;
-      RECT  7.835000 1.580000  8.005000 1.750000 ;
-      RECT  8.765000 1.580000  8.935000 1.750000 ;
-      RECT  9.690000 1.580000  9.860000 1.750000 ;
-      RECT 10.625000 1.580000 10.795000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.225000  1.580000  4.395000 1.750000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.730000  1.950000  4.900000 2.120000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.090000  1.580000  5.260000 1.750000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.620000  1.950000  5.790000 2.120000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  5.980000  1.580000  6.150000 1.750000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.520000  1.950000  6.690000 2.120000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  6.920000  1.580000  7.090000 1.750000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.420000  1.950000  7.590000 2.120000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.580000  8.005000 1.750000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.320000  1.950000  8.490000 2.120000 ;
+      RECT  8.765000  1.580000  8.935000 1.750000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.270000  1.950000  9.440000 2.120000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.690000  1.580000  9.860000 1.750000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.220000  1.950000 10.390000 2.120000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.625000  1.580000 10.795000 1.750000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.170000  1.950000 11.340000 2.120000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
     LAYER met1 ;
       RECT 4.155000 1.550000 10.855000 1.780000 ;
   END
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef
index a5e953d..5965d31 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.magic.lef
@@ -59,28 +59,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.560000  0.085000 0.890000 0.840000 ;
-        RECT 1.560000  0.085000 1.890000 0.710000 ;
-        RECT 2.420000  0.085000 2.750000 0.710000 ;
-        RECT 3.420000  0.085000 3.750000 0.790000 ;
-        RECT 4.420000  0.085000 4.750000 0.710000 ;
-        RECT 5.295000  0.085000 5.625000 0.710000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -89,51 +67,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.615000 2.580000 0.945000 3.245000 ;
-        RECT 1.515000 2.580000 1.845000 3.245000 ;
-        RECT 2.415000 2.580000 2.745000 3.245000 ;
-        RECT 3.315000 2.580000 3.645000 3.245000 ;
-        RECT 4.345000 2.580000 4.675000 3.245000 ;
-        RECT 5.345000 2.480000 5.675000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.445000 2.240000 ;
-      RECT 0.115000 2.240000 4.565000 2.410000 ;
-      RECT 0.115000 2.410000 0.445000 2.980000 ;
-      RECT 0.130000 0.350000 0.380000 1.010000 ;
-      RECT 0.130000 1.010000 0.890000 1.180000 ;
-      RECT 0.720000 1.180000 0.890000 2.240000 ;
-      RECT 1.665000 1.300000 4.820000 1.630000 ;
-      RECT 4.395000 1.800000 5.605000 1.970000 ;
-      RECT 4.395000 1.970000 4.565000 2.240000 ;
-      RECT 4.650000 0.880000 6.125000 1.130000 ;
-      RECT 4.650000 1.130000 4.820000 1.300000 ;
-      RECT 4.845000 2.140000 6.125000 2.310000 ;
-      RECT 4.845000 2.310000 5.175000 2.980000 ;
-      RECT 4.920000 0.350000 5.125000 0.880000 ;
-      RECT 4.990000 1.320000 5.605000 1.800000 ;
-      RECT 5.795000 0.350000 6.125000 0.880000 ;
-      RECT 5.795000 1.130000 6.125000 2.140000 ;
-      RECT 5.845000 2.310000 6.125000 2.980000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.115000  1.950000 0.445000 2.240000 ;
+      RECT 0.115000  2.240000 4.565000 2.410000 ;
+      RECT 0.115000  2.410000 0.445000 2.980000 ;
+      RECT 0.130000  0.350000 0.380000 1.010000 ;
+      RECT 0.130000  1.010000 0.890000 1.180000 ;
+      RECT 0.560000  0.085000 0.890000 0.840000 ;
+      RECT 0.615000  2.580000 0.945000 3.245000 ;
+      RECT 0.720000  1.180000 0.890000 2.240000 ;
+      RECT 1.515000  2.580000 1.845000 3.245000 ;
+      RECT 1.560000  0.085000 1.890000 0.710000 ;
+      RECT 1.665000  1.300000 4.820000 1.630000 ;
+      RECT 2.415000  2.580000 2.745000 3.245000 ;
+      RECT 2.420000  0.085000 2.750000 0.710000 ;
+      RECT 3.315000  2.580000 3.645000 3.245000 ;
+      RECT 3.420000  0.085000 3.750000 0.790000 ;
+      RECT 4.345000  2.580000 4.675000 3.245000 ;
+      RECT 4.395000  1.800000 5.605000 1.970000 ;
+      RECT 4.395000  1.970000 4.565000 2.240000 ;
+      RECT 4.420000  0.085000 4.750000 0.710000 ;
+      RECT 4.650000  0.880000 6.125000 1.130000 ;
+      RECT 4.650000  1.130000 4.820000 1.300000 ;
+      RECT 4.845000  2.140000 6.125000 2.310000 ;
+      RECT 4.845000  2.310000 5.175000 2.980000 ;
+      RECT 4.920000  0.350000 5.125000 0.880000 ;
+      RECT 4.990000  1.320000 5.605000 1.800000 ;
+      RECT 5.295000  0.085000 5.625000 0.710000 ;
+      RECT 5.345000  2.480000 5.675000 3.245000 ;
+      RECT 5.795000  0.350000 6.125000 0.880000 ;
+      RECT 5.795000  1.130000 6.125000 2.140000 ;
+      RECT 5.845000  2.310000 6.125000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__bufinv_8
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef
index 0c54d0c..6be3b2c 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.615000  0.085000 1.305000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -70,25 +62,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.845000 2.290000 1.175000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.960000 ;
-      RECT 0.115000 0.960000 1.395000 1.130000 ;
-      RECT 0.345000 1.950000 1.175000 2.120000 ;
-      RECT 0.345000 2.120000 0.675000 2.980000 ;
-      RECT 1.005000 1.130000 1.395000 1.630000 ;
-      RECT 1.005000 1.630000 1.175000 1.950000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 0.960000 ;
+      RECT 0.115000  0.960000 1.395000 1.130000 ;
+      RECT 0.345000  1.950000 1.175000 2.120000 ;
+      RECT 0.345000  2.120000 0.675000 2.980000 ;
+      RECT 0.615000  0.085000 1.305000 0.680000 ;
+      RECT 0.845000  2.290000 1.175000 3.245000 ;
+      RECT 1.005000  1.130000 1.395000 1.630000 ;
+      RECT 1.005000  1.630000 1.175000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef
index 2a89c21..99c6b2e 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.magic.lef
@@ -44,40 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 2.390000 0.350000 2.660000 2.120000 ;
-        RECT 2.430000 2.120000 2.660000 2.980000 ;
-        RECT 3.275000 0.350000 3.500000 1.690000 ;
-        RECT 3.275000 1.690000 3.545000 1.860000 ;
-        RECT 3.340000 1.860000 3.545000 2.980000 ;
-        RECT 4.075000 0.350000 4.340000 0.745000 ;
-        RECT 4.170000 0.745000 4.340000 1.690000 ;
-        RECT 4.170000 1.690000 4.430000 1.860000 ;
-        RECT 4.230000 1.860000 4.430000 2.980000 ;
-        RECT 5.025000 0.350000 5.255000 1.690000 ;
-        RECT 5.025000 1.690000 5.350000 1.860000 ;
-        RECT 5.140000 1.860000 5.350000 2.980000 ;
-        RECT 5.935000 0.350000 6.185000 1.690000 ;
-        RECT 5.935000 1.690000 6.245000 1.860000 ;
-        RECT 6.040000 1.860000 6.245000 2.980000 ;
-        RECT 6.865000 0.350000 7.115000 1.690000 ;
-        RECT 6.865000 1.690000 7.150000 1.860000 ;
-        RECT 6.945000 1.860000 7.150000 2.980000 ;
-        RECT 7.795000 0.350000 8.045000 1.690000 ;
-        RECT 7.795000 1.690000 8.050000 1.860000 ;
-        RECT 7.840000 1.860000 8.050000 2.980000 ;
-        RECT 8.725000 0.350000 8.975000 1.830000 ;
-        RECT 8.725000 1.830000 8.970000 1.860000 ;
-        RECT 8.750000 1.860000 8.970000 2.980000 ;
-      LAYER mcon ;
-        RECT 2.460000 1.950000 2.630000 2.120000 ;
-        RECT 3.360000 1.950000 3.530000 2.120000 ;
-        RECT 4.245000 1.950000 4.415000 2.120000 ;
-        RECT 5.160000 1.950000 5.330000 2.120000 ;
-        RECT 6.060000 1.950000 6.230000 2.120000 ;
-        RECT 6.960000 1.950000 7.130000 2.120000 ;
-        RECT 7.860000 1.950000 8.030000 2.120000 ;
-        RECT 8.780000 1.950000 8.950000 2.120000 ;
       LAYER met1 ;
         RECT 2.390000 1.920000 9.090000 2.150000 ;
     END
@@ -86,40 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 0.810000 ;
-        RECT 0.975000  0.085000 1.225000 0.810000 ;
-        RECT 1.855000  0.085000 2.185000 0.810000 ;
-        RECT 2.865000  0.085000 3.035000 0.680000 ;
-        RECT 3.670000  0.085000 3.895000 0.725000 ;
-        RECT 4.510000  0.085000 4.835000 0.740000 ;
-        RECT 5.435000  0.085000 5.765000 0.680000 ;
-        RECT 6.365000  0.085000 6.695000 0.680000 ;
-        RECT 7.295000  0.085000 7.625000 0.680000 ;
-        RECT 8.225000  0.085000 8.555000 0.680000 ;
-        RECT 9.155000  0.085000 9.485000 0.745000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -128,71 +60,133 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.120000 1.950000 0.370000 3.245000 ;
-        RECT 1.100000 2.290000 1.270000 3.245000 ;
-        RECT 2.000000 2.290000 2.250000 3.245000 ;
-        RECT 2.830000 2.030000 3.160000 3.245000 ;
-        RECT 3.730000 2.030000 4.060000 3.245000 ;
-        RECT 4.630000 2.030000 4.960000 3.245000 ;
-        RECT 5.530000 2.030000 5.860000 3.245000 ;
-        RECT 6.430000 2.030000 6.760000 3.245000 ;
-        RECT 7.330000 2.030000 7.660000 3.245000 ;
-        RECT 8.230000 2.030000 8.560000 3.245000 ;
-        RECT 9.150000 2.030000 9.480000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.350000 0.795000 0.980000 ;
-      RECT 0.545000 0.980000 2.135000 1.150000 ;
-      RECT 0.570000 1.950000 2.135000 2.120000 ;
-      RECT 0.570000 2.120000 0.900000 2.980000 ;
-      RECT 1.425000 0.350000 1.675000 0.980000 ;
-      RECT 1.470000 2.120000 1.800000 2.980000 ;
-      RECT 1.965000 1.150000 2.135000 1.180000 ;
-      RECT 1.965000 1.180000 2.210000 1.410000 ;
-      RECT 1.965000 1.410000 2.135000 1.950000 ;
-      RECT 2.835000 1.190000 3.105000 1.520000 ;
-      RECT 3.670000 1.190000 4.000000 1.520000 ;
-      RECT 4.510000 1.190000 4.840000 1.520000 ;
-      RECT 5.425000 1.190000 5.755000 1.520000 ;
-      RECT 6.365000 1.190000 6.695000 1.520000 ;
-      RECT 7.295000 1.190000 7.625000 1.520000 ;
-      RECT 8.225000 1.190000 8.555000 1.520000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.115000  0.085000 0.365000 0.810000 ;
+      RECT 0.120000  1.950000 0.370000 3.245000 ;
+      RECT 0.545000  0.350000 0.795000 0.980000 ;
+      RECT 0.545000  0.980000 2.135000 1.150000 ;
+      RECT 0.570000  1.950000 2.135000 2.120000 ;
+      RECT 0.570000  2.120000 0.900000 2.980000 ;
+      RECT 0.975000  0.085000 1.225000 0.810000 ;
+      RECT 1.100000  2.290000 1.270000 3.245000 ;
+      RECT 1.425000  0.350000 1.675000 0.980000 ;
+      RECT 1.470000  2.120000 1.800000 2.980000 ;
+      RECT 1.855000  0.085000 2.185000 0.810000 ;
+      RECT 1.965000  1.150000 2.135000 1.180000 ;
+      RECT 1.965000  1.180000 2.210000 1.410000 ;
+      RECT 1.965000  1.410000 2.135000 1.950000 ;
+      RECT 2.000000  2.290000 2.250000 3.245000 ;
+      RECT 2.390000  0.350000 2.660000 2.120000 ;
+      RECT 2.430000  2.120000 2.660000 2.980000 ;
+      RECT 2.830000  2.030000 3.160000 3.245000 ;
+      RECT 2.835000  1.190000 3.105000 1.520000 ;
+      RECT 2.865000  0.085000 3.035000 0.680000 ;
+      RECT 3.275000  0.350000 3.500000 1.690000 ;
+      RECT 3.275000  1.690000 3.545000 1.860000 ;
+      RECT 3.340000  1.860000 3.545000 2.980000 ;
+      RECT 3.670000  0.085000 3.895000 0.725000 ;
+      RECT 3.670000  1.190000 4.000000 1.520000 ;
+      RECT 3.730000  2.030000 4.060000 3.245000 ;
+      RECT 4.075000  0.350000 4.340000 0.745000 ;
+      RECT 4.170000  0.745000 4.340000 1.690000 ;
+      RECT 4.170000  1.690000 4.430000 1.860000 ;
+      RECT 4.230000  1.860000 4.430000 2.980000 ;
+      RECT 4.510000  0.085000 4.835000 0.740000 ;
+      RECT 4.510000  1.190000 4.840000 1.520000 ;
+      RECT 4.630000  2.030000 4.960000 3.245000 ;
+      RECT 5.025000  0.350000 5.255000 1.690000 ;
+      RECT 5.025000  1.690000 5.350000 1.860000 ;
+      RECT 5.140000  1.860000 5.350000 2.980000 ;
+      RECT 5.425000  1.190000 5.755000 1.520000 ;
+      RECT 5.435000  0.085000 5.765000 0.680000 ;
+      RECT 5.530000  2.030000 5.860000 3.245000 ;
+      RECT 5.935000  0.350000 6.185000 1.690000 ;
+      RECT 5.935000  1.690000 6.245000 1.860000 ;
+      RECT 6.040000  1.860000 6.245000 2.980000 ;
+      RECT 6.365000  0.085000 6.695000 0.680000 ;
+      RECT 6.365000  1.190000 6.695000 1.520000 ;
+      RECT 6.430000  2.030000 6.760000 3.245000 ;
+      RECT 6.865000  0.350000 7.115000 1.690000 ;
+      RECT 6.865000  1.690000 7.150000 1.860000 ;
+      RECT 6.945000  1.860000 7.150000 2.980000 ;
+      RECT 7.295000  0.085000 7.625000 0.680000 ;
+      RECT 7.295000  1.190000 7.625000 1.520000 ;
+      RECT 7.330000  2.030000 7.660000 3.245000 ;
+      RECT 7.795000  0.350000 8.045000 1.690000 ;
+      RECT 7.795000  1.690000 8.050000 1.860000 ;
+      RECT 7.840000  1.860000 8.050000 2.980000 ;
+      RECT 8.225000  0.085000 8.555000 0.680000 ;
+      RECT 8.225000  1.190000 8.555000 1.520000 ;
+      RECT 8.230000  2.030000 8.560000 3.245000 ;
+      RECT 8.725000  0.350000 8.975000 1.830000 ;
+      RECT 8.725000  1.830000 8.970000 1.860000 ;
+      RECT 8.750000  1.860000 8.970000 2.980000 ;
+      RECT 9.150000  2.030000 9.480000 3.245000 ;
+      RECT 9.155000  0.085000 9.485000 0.745000 ;
     LAYER mcon ;
-      RECT 2.010000 1.210000 2.180000 1.380000 ;
-      RECT 2.890000 1.210000 3.060000 1.380000 ;
-      RECT 3.750000 1.210000 3.920000 1.380000 ;
-      RECT 4.590000 1.210000 4.760000 1.380000 ;
-      RECT 5.505000 1.210000 5.675000 1.380000 ;
-      RECT 6.445000 1.210000 6.615000 1.380000 ;
-      RECT 7.375000 1.210000 7.545000 1.380000 ;
-      RECT 8.305000 1.210000 8.475000 1.380000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.010000  1.210000 2.180000 1.380000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.460000  1.950000 2.630000 2.120000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.890000  1.210000 3.060000 1.380000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.360000  1.950000 3.530000 2.120000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.750000  1.210000 3.920000 1.380000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.245000  1.950000 4.415000 2.120000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.590000  1.210000 4.760000 1.380000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.160000  1.950000 5.330000 2.120000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.505000  1.210000 5.675000 1.380000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.060000  1.950000 6.230000 2.120000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.445000  1.210000 6.615000 1.380000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 6.960000  1.950000 7.130000 2.120000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.375000  1.210000 7.545000 1.380000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 7.860000  1.950000 8.030000 2.120000 ;
+      RECT 8.305000  1.210000 8.475000 1.380000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.780000  1.950000 8.950000 2.120000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
     LAYER met1 ;
       RECT 1.940000 1.180000 8.640000 1.410000 ;
   END
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef
index d544d5c..5d96d74 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.magic.lef
@@ -54,15 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 0.790000 ;
-        RECT 1.055000  0.085000 1.305000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -71,26 +62,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.105000 2.660000 0.435000 3.245000 ;
-        RECT 1.005000 2.660000 1.335000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.215000 0.960000 0.545000 1.630000 ;
-      RECT 0.215000 1.630000 0.385000 2.320000 ;
-      RECT 0.215000 2.320000 1.835000 2.490000 ;
-      RECT 1.475000 0.350000 1.835000 0.810000 ;
-      RECT 1.535000 2.490000 1.835000 2.980000 ;
-      RECT 1.665000 0.810000 1.835000 2.320000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.105000  2.660000 0.435000 3.245000 ;
+      RECT 0.115000  0.085000 0.365000 0.790000 ;
+      RECT 0.215000  0.960000 0.545000 1.630000 ;
+      RECT 0.215000  1.630000 0.385000 2.320000 ;
+      RECT 0.215000  2.320000 1.835000 2.490000 ;
+      RECT 1.005000  2.660000 1.335000 3.245000 ;
+      RECT 1.055000  0.085000 1.305000 0.810000 ;
+      RECT 1.475000  0.350000 1.835000 0.810000 ;
+      RECT 1.535000  2.490000 1.835000 2.980000 ;
+      RECT 1.665000  0.810000 1.835000 2.320000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef
index ec5b070..87388f3 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.magic.lef
@@ -58,18 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.130000  0.085000 0.380000 0.810000 ;
-        RECT 1.070000  0.085000 1.240000 0.810000 ;
-        RECT 1.920000  0.085000 2.250000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -78,28 +66,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.015000 2.260000 1.265000 3.245000 ;
-        RECT 1.995000 1.920000 2.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.875000 1.350000 1.885000 1.580000 ;
-      RECT 0.875000 1.580000 2.795000 1.750000 ;
-      RECT 2.415000 1.750000 2.795000 2.980000 ;
-      RECT 2.420000 0.480000 2.795000 0.810000 ;
-      RECT 2.625000 0.810000 2.795000 1.580000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.130000  0.085000 0.380000 0.810000 ;
+      RECT 0.875000  1.350000 1.885000 1.580000 ;
+      RECT 0.875000  1.580000 2.795000 1.750000 ;
+      RECT 1.015000  2.260000 1.265000 3.245000 ;
+      RECT 1.070000  0.085000 1.240000 0.810000 ;
+      RECT 1.920000  0.085000 2.250000 0.810000 ;
+      RECT 1.995000  1.920000 2.245000 3.245000 ;
+      RECT 2.415000  1.750000 2.795000 2.980000 ;
+      RECT 2.420000  0.480000 2.795000 0.810000 ;
+      RECT 2.625000  0.810000 2.795000 1.580000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef
index c08b20a..1df503a 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.magic.lef
@@ -63,26 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.810000 ;
-        RECT 1.115000  0.085000 1.445000 0.810000 ;
-        RECT 2.115000  0.085000 2.445000 0.680000 ;
-        RECT 3.045000  0.085000 3.375000 0.680000 ;
-        RECT 3.905000  0.085000 4.305000 0.680000 ;
-        RECT 4.835000  0.085000 5.165000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -91,38 +71,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.115000 1.950000 0.445000 3.245000 ;
-        RECT 1.115000 2.290000 1.445000 3.245000 ;
-        RECT 2.065000 2.030000 2.395000 3.245000 ;
-        RECT 3.045000 2.030000 3.215000 3.245000 ;
-        RECT 3.865000 2.030000 4.195000 3.245000 ;
-        RECT 4.830000 2.030000 5.160000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.350000 0.945000 0.980000 ;
-      RECT 0.615000 0.980000 1.445000 1.150000 ;
-      RECT 0.615000 1.950000 1.445000 2.120000 ;
-      RECT 0.615000 2.120000 0.945000 2.980000 ;
-      RECT 1.275000 1.150000 1.445000 1.190000 ;
-      RECT 1.275000 1.190000 4.515000 1.520000 ;
-      RECT 1.275000 1.520000 1.445000 1.950000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.810000 ;
+      RECT 0.115000  1.950000 0.445000 3.245000 ;
+      RECT 0.615000  0.350000 0.945000 0.980000 ;
+      RECT 0.615000  0.980000 1.445000 1.150000 ;
+      RECT 0.615000  1.950000 1.445000 2.120000 ;
+      RECT 0.615000  2.120000 0.945000 2.980000 ;
+      RECT 1.115000  0.085000 1.445000 0.810000 ;
+      RECT 1.115000  2.290000 1.445000 3.245000 ;
+      RECT 1.275000  1.150000 1.445000 1.190000 ;
+      RECT 1.275000  1.190000 4.515000 1.520000 ;
+      RECT 1.275000  1.520000 1.445000 1.950000 ;
+      RECT 2.065000  2.030000 2.395000 3.245000 ;
+      RECT 2.115000  0.085000 2.445000 0.680000 ;
+      RECT 3.045000  0.085000 3.375000 0.680000 ;
+      RECT 3.045000  2.030000 3.215000 3.245000 ;
+      RECT 3.865000  2.030000 4.195000 3.245000 ;
+      RECT 3.905000  0.085000 4.305000 0.680000 ;
+      RECT 4.830000  2.030000 5.160000 3.245000 ;
+      RECT 4.835000  0.085000 5.165000 0.680000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkbuf_8
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef
index de917fe..92eb1d7 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.magic.lef
@@ -54,17 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 1.935000  0.085000 2.265000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -73,31 +62,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 1.935000 1.900000 2.265000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 2.650000 1.745000 2.900000 ;
-      RECT 1.475000 0.305000 1.720000 1.295000 ;
-      RECT 1.475000 1.295000 2.360000 1.625000 ;
-      RECT 1.475000 1.625000 1.745000 2.650000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  2.650000 1.745000 2.900000 ;
+      RECT 1.475000  0.305000 1.720000 1.295000 ;
+      RECT 1.475000  1.295000 2.360000 1.625000 ;
+      RECT 1.475000  1.625000 1.745000 2.650000 ;
+      RECT 1.935000  0.085000 2.265000 0.750000 ;
+      RECT 1.935000  1.900000 2.265000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkdlyinv3sd1_1
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef
index 852fb12..6c41aad 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.magic.lef
@@ -54,17 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 1.935000  0.085000 2.265000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -73,31 +62,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 1.935000 1.900000 2.265000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 2.650000 1.745000 2.900000 ;
-      RECT 1.475000 0.305000 1.720000 1.295000 ;
-      RECT 1.475000 1.295000 2.360000 1.625000 ;
-      RECT 1.475000 1.625000 1.745000 2.650000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  2.650000 1.745000 2.900000 ;
+      RECT 1.475000  0.305000 1.720000 1.295000 ;
+      RECT 1.475000  1.295000 2.360000 1.625000 ;
+      RECT 1.475000  1.625000 1.745000 2.650000 ;
+      RECT 1.935000  0.085000 2.265000 0.750000 ;
+      RECT 1.935000  1.900000 2.265000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkdlyinv3sd2_1
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef
index f0828fa..a104d14 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.magic.lef
@@ -54,17 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 1.935000  0.085000 2.265000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -73,31 +62,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 1.935000 1.900000 2.265000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 2.650000 1.745000 2.900000 ;
-      RECT 1.475000 0.305000 1.720000 1.295000 ;
-      RECT 1.475000 1.295000 2.360000 1.625000 ;
-      RECT 1.475000 1.625000 1.745000 2.650000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  2.650000 1.745000 2.900000 ;
+      RECT 1.475000  0.305000 1.720000 1.295000 ;
+      RECT 1.475000  1.295000 2.360000 1.625000 ;
+      RECT 1.475000  1.625000 1.745000 2.650000 ;
+      RECT 1.935000  0.085000 2.265000 0.750000 ;
+      RECT 1.935000  1.900000 2.265000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkdlyinv3sd3_1
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef
index 9c36744..d179a16 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.magic.lef
@@ -54,23 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 1.915000  0.085000 2.265000 0.745000 ;
-        RECT 4.330000  0.085000 4.660000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -79,46 +62,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 1.915000 1.940000 2.265000 3.245000 ;
-        RECT 4.330000 1.900000 4.660000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 2.650000 1.745000 2.900000 ;
-      RECT 1.475000 0.305000 1.720000 1.140000 ;
-      RECT 1.475000 1.140000 2.510000 1.470000 ;
-      RECT 1.475000 1.470000 1.745000 2.650000 ;
-      RECT 2.800000 0.415000 2.970000 1.220000 ;
-      RECT 2.800000 1.220000 4.005000 1.390000 ;
-      RECT 2.800000 1.390000 2.970000 2.980000 ;
-      RECT 3.370000 0.400000 3.700000 0.880000 ;
-      RECT 3.370000 0.880000 4.700000 0.925000 ;
-      RECT 3.370000 0.925000 4.755000 1.050000 ;
-      RECT 3.415000 1.560000 4.755000 1.730000 ;
-      RECT 3.415000 1.730000 3.655000 2.980000 ;
-      RECT 4.530000 1.050000 4.755000 1.560000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  2.650000 1.745000 2.900000 ;
+      RECT 1.475000  0.305000 1.720000 1.140000 ;
+      RECT 1.475000  1.140000 2.510000 1.470000 ;
+      RECT 1.475000  1.470000 1.745000 2.650000 ;
+      RECT 1.915000  0.085000 2.265000 0.745000 ;
+      RECT 1.915000  1.940000 2.265000 3.245000 ;
+      RECT 2.800000  0.415000 2.970000 1.220000 ;
+      RECT 2.800000  1.220000 4.005000 1.390000 ;
+      RECT 2.800000  1.390000 2.970000 2.980000 ;
+      RECT 3.370000  0.400000 3.700000 0.880000 ;
+      RECT 3.370000  0.880000 4.700000 0.925000 ;
+      RECT 3.370000  0.925000 4.755000 1.050000 ;
+      RECT 3.415000  1.560000 4.755000 1.730000 ;
+      RECT 3.415000  1.730000 3.655000 2.980000 ;
+      RECT 4.330000  0.085000 4.660000 0.670000 ;
+      RECT 4.330000  1.900000 4.660000 3.245000 ;
+      RECT 4.530000  1.050000 4.755000 1.560000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkdlyinv5sd1_1
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef
index 20d05b3..a56f816 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.magic.lef
@@ -54,23 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 1.915000  0.085000 2.265000 0.745000 ;
-        RECT 4.330000  0.085000 4.660000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -79,46 +62,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 1.915000 1.940000 2.265000 3.245000 ;
-        RECT 4.330000 1.900000 4.660000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 2.650000 1.745000 2.900000 ;
-      RECT 1.475000 0.305000 1.720000 1.140000 ;
-      RECT 1.475000 1.140000 2.510000 1.470000 ;
-      RECT 1.475000 1.470000 1.745000 2.650000 ;
-      RECT 2.800000 0.415000 2.970000 1.220000 ;
-      RECT 2.800000 1.220000 4.005000 1.390000 ;
-      RECT 2.800000 1.390000 2.970000 2.980000 ;
-      RECT 3.370000 0.400000 3.700000 0.880000 ;
-      RECT 3.370000 0.880000 4.700000 0.925000 ;
-      RECT 3.370000 0.925000 4.755000 1.050000 ;
-      RECT 3.415000 1.560000 4.755000 1.730000 ;
-      RECT 3.415000 1.730000 3.655000 2.980000 ;
-      RECT 4.530000 1.050000 4.755000 1.560000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  2.650000 1.745000 2.900000 ;
+      RECT 1.475000  0.305000 1.720000 1.140000 ;
+      RECT 1.475000  1.140000 2.510000 1.470000 ;
+      RECT 1.475000  1.470000 1.745000 2.650000 ;
+      RECT 1.915000  0.085000 2.265000 0.745000 ;
+      RECT 1.915000  1.940000 2.265000 3.245000 ;
+      RECT 2.800000  0.415000 2.970000 1.220000 ;
+      RECT 2.800000  1.220000 4.005000 1.390000 ;
+      RECT 2.800000  1.390000 2.970000 2.980000 ;
+      RECT 3.370000  0.400000 3.700000 0.880000 ;
+      RECT 3.370000  0.880000 4.700000 0.925000 ;
+      RECT 3.370000  0.925000 4.755000 1.050000 ;
+      RECT 3.415000  1.560000 4.755000 1.730000 ;
+      RECT 3.415000  1.730000 3.655000 2.980000 ;
+      RECT 4.330000  0.085000 4.660000 0.670000 ;
+      RECT 4.330000  1.900000 4.660000 3.245000 ;
+      RECT 4.530000  1.050000 4.755000 1.560000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkdlyinv5sd2_1
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef
index 702f5de..891da0f 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.magic.lef
@@ -54,23 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 1.915000  0.085000 2.265000 0.745000 ;
-        RECT 4.330000  0.085000 4.660000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -79,46 +62,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 1.915000 1.940000 2.265000 3.245000 ;
-        RECT 4.330000 1.900000 4.660000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 2.650000 1.745000 2.900000 ;
-      RECT 1.475000 0.305000 1.720000 1.140000 ;
-      RECT 1.475000 1.140000 2.510000 1.470000 ;
-      RECT 1.475000 1.470000 1.745000 2.650000 ;
-      RECT 2.800000 0.415000 2.970000 1.220000 ;
-      RECT 2.800000 1.220000 4.005000 1.390000 ;
-      RECT 2.800000 1.390000 2.970000 2.980000 ;
-      RECT 3.370000 0.400000 3.700000 0.880000 ;
-      RECT 3.370000 0.880000 4.700000 0.925000 ;
-      RECT 3.370000 0.925000 4.755000 1.050000 ;
-      RECT 3.415000 1.560000 4.755000 1.730000 ;
-      RECT 3.415000 1.730000 3.655000 2.980000 ;
-      RECT 4.530000 1.050000 4.755000 1.560000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  2.650000 1.745000 2.900000 ;
+      RECT 1.475000  0.305000 1.720000 1.140000 ;
+      RECT 1.475000  1.140000 2.510000 1.470000 ;
+      RECT 1.475000  1.470000 1.745000 2.650000 ;
+      RECT 1.915000  0.085000 2.265000 0.745000 ;
+      RECT 1.915000  1.940000 2.265000 3.245000 ;
+      RECT 2.800000  0.415000 2.970000 1.220000 ;
+      RECT 2.800000  1.220000 4.005000 1.390000 ;
+      RECT 2.800000  1.390000 2.970000 2.980000 ;
+      RECT 3.370000  0.400000 3.700000 0.880000 ;
+      RECT 3.370000  0.880000 4.700000 0.925000 ;
+      RECT 3.370000  0.925000 4.755000 1.050000 ;
+      RECT 3.415000  1.560000 4.755000 1.730000 ;
+      RECT 3.415000  1.730000 3.655000 2.980000 ;
+      RECT 4.330000  0.085000 4.660000 0.670000 ;
+      RECT 4.330000  1.900000 4.660000 3.245000 ;
+      RECT 4.530000  1.050000 4.755000 1.560000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__clkdlyinv5sd3_1
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef
index eb62651..8f39bbb 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.magic.lef
@@ -57,13 +57,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -72,16 +65,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.105000 2.100000 0.355000 3.245000 ;
-        RECT 1.005000 2.600000 1.335000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.105000  2.100000 0.355000 3.245000 ;
+      RECT 0.115000  0.085000 0.445000 0.750000 ;
+      RECT 1.005000  2.600000 1.335000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_hs__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef
index a8a3033..b1600cc 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.magic.lef
@@ -35,32 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.975000 1.150000  1.295000 1.650000 ;
-        RECT 1.865000 1.150000  2.195000 1.650000 ;
-        RECT 2.835000 1.150000  3.165000 1.650000 ;
-        RECT 3.765000 1.150000  4.095000 1.650000 ;
-        RECT 4.755000 1.150000  5.085000 1.650000 ;
-        RECT 5.595000 1.150000  5.925000 1.650000 ;
-        RECT 6.545000 1.150000  6.875000 1.650000 ;
-        RECT 7.525000 1.150000 10.915000 1.650000 ;
-      LAYER mcon ;
-        RECT  1.045000 1.210000  1.215000 1.380000 ;
-        RECT  1.945000 1.210000  2.115000 1.380000 ;
-        RECT  2.915000 1.210000  3.085000 1.380000 ;
-        RECT  3.845000 1.210000  4.015000 1.380000 ;
-        RECT  4.835000 1.210000  5.005000 1.380000 ;
-        RECT  5.675000 1.210000  5.845000 1.380000 ;
-        RECT  6.625000 1.210000  6.795000 1.380000 ;
-        RECT  7.745000 1.210000  7.915000 1.380000 ;
-        RECT  8.105000 1.210000  8.275000 1.380000 ;
-        RECT  8.465000 1.210000  8.635000 1.380000 ;
-        RECT  8.825000 1.210000  8.995000 1.380000 ;
-        RECT  9.185000 1.210000  9.355000 1.380000 ;
-        RECT  9.545000 1.210000  9.715000 1.380000 ;
-        RECT  9.905000 1.210000 10.075000 1.380000 ;
-        RECT 10.265000 1.210000 10.435000 1.380000 ;
-        RECT 10.625000 1.210000 10.795000 1.380000 ;
       LAYER met1 ;
         RECT 0.985000 1.180000 10.935000 1.410000 ;
     END
@@ -70,48 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  0.615000 0.380000  0.805000 0.775000 ;
-        RECT  0.625000 0.775000  0.805000 1.820000 ;
-        RECT  0.625000 1.820000  0.815000 2.980000 ;
-        RECT  1.440000 0.380000  1.700000 0.775000 ;
-        RECT  1.465000 0.775000  1.695000 1.885000 ;
-        RECT  1.465000 1.885000  1.795000 2.980000 ;
-        RECT  2.350000 0.380000  2.665000 0.775000 ;
-        RECT  2.365000 0.775000  2.665000 1.885000 ;
-        RECT  2.365000 1.885000  2.695000 2.980000 ;
-        RECT  3.300000 0.380000  3.595000 0.775000 ;
-        RECT  3.335000 0.775000  3.595000 2.980000 ;
-        RECT  4.165000 1.850000  4.525000 1.900000 ;
-        RECT  4.165000 1.900000  4.495000 2.980000 ;
-        RECT  4.265000 0.380000  4.525000 1.850000 ;
-        RECT  5.065000 1.850000  5.425000 2.010000 ;
-        RECT  5.065000 2.010000  5.395000 2.980000 ;
-        RECT  5.255000 0.380000  5.525000 0.775000 ;
-        RECT  5.255000 0.775000  5.425000 1.850000 ;
-        RECT  6.015000 1.820000  6.330000 2.980000 ;
-        RECT  6.095000 1.010000  6.340000 1.760000 ;
-        RECT  6.095000 1.760000  6.330000 1.820000 ;
-        RECT  6.160000 0.380000  6.385000 0.785000 ;
-        RECT  6.160000 0.785000  6.340000 1.010000 ;
-        RECT  7.045000 0.380000  7.290000 2.980000 ;
-        RECT  8.005000 1.820000  8.175000 2.980000 ;
-        RECT  8.905000 1.820000  9.075000 2.980000 ;
-        RECT  9.805000 1.820000  9.975000 2.980000 ;
-        RECT 10.705000 1.820000 10.875000 2.980000 ;
-      LAYER mcon ;
-        RECT  0.635000 1.950000  0.805000 2.120000 ;
-        RECT  1.545000 1.950000  1.715000 2.120000 ;
-        RECT  2.445000 1.950000  2.615000 2.120000 ;
-        RECT  3.375000 1.950000  3.545000 2.120000 ;
-        RECT  4.245000 1.950000  4.415000 2.120000 ;
-        RECT  5.145000 1.950000  5.315000 2.120000 ;
-        RECT  6.095000 1.950000  6.265000 2.120000 ;
-        RECT  7.075000 1.950000  7.245000 2.120000 ;
-        RECT  8.005000 1.950000  8.175000 2.120000 ;
-        RECT  8.905000 1.950000  9.075000 2.120000 ;
-        RECT  9.805000 1.950000  9.975000 2.120000 ;
-        RECT 10.705000 1.950000 10.875000 2.120000 ;
       LAYER met1 ;
         RECT 0.575000 1.920000 10.935000 2.150000 ;
     END
@@ -120,42 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.520000 0.085000 ;
-        RECT 0.115000  0.085000  0.445000 0.840000 ;
-        RECT 0.975000  0.085000  1.260000 0.840000 ;
-        RECT 1.885000  0.085000  2.165000 0.840000 ;
-        RECT 2.845000  0.085000  3.095000 0.840000 ;
-        RECT 3.765000  0.085000  4.095000 0.840000 ;
-        RECT 4.765000  0.085000  5.085000 0.840000 ;
-        RECT 5.695000  0.085000  5.980000 0.840000 ;
-        RECT 6.555000  0.085000  6.875000 0.840000 ;
-        RECT 7.485000  0.085000  9.825000 0.710000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
@@ -164,48 +60,148 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.520000 3.415000 ;
-        RECT  0.115000 1.900000  0.445000 3.245000 ;
-        RECT  1.015000 1.820000  1.265000 3.245000 ;
-        RECT  1.995000 1.820000  2.165000 3.245000 ;
-        RECT  2.895000 1.820000  3.065000 3.245000 ;
-        RECT  3.795000 1.820000  3.965000 3.245000 ;
-        RECT  4.695000 1.820000  4.865000 3.245000 ;
-        RECT  5.595000 1.820000  5.845000 3.245000 ;
-        RECT  6.510000 1.820000  6.795000 3.245000 ;
-        RECT  7.475000 1.820000  7.805000 3.245000 ;
-        RECT  8.375000 1.820000  8.625000 3.245000 ;
-        RECT  9.275000 1.820000  9.605000 3.245000 ;
-        RECT 10.175000 1.820000 10.505000 3.245000 ;
-        RECT 11.075000 1.820000 11.405000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.520000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT  0.000000 -0.085000 11.520000 0.085000 ;
+      RECT  0.000000  3.245000 11.520000 3.415000 ;
+      RECT  0.115000  0.085000  0.445000 0.840000 ;
+      RECT  0.115000  1.900000  0.445000 3.245000 ;
+      RECT  0.615000  0.380000  0.805000 0.775000 ;
+      RECT  0.625000  0.775000  0.805000 1.820000 ;
+      RECT  0.625000  1.820000  0.815000 2.980000 ;
+      RECT  0.975000  0.085000  1.260000 0.840000 ;
+      RECT  0.975000  1.150000  1.295000 1.650000 ;
+      RECT  1.015000  1.820000  1.265000 3.245000 ;
+      RECT  1.440000  0.380000  1.700000 0.775000 ;
+      RECT  1.465000  0.775000  1.695000 1.885000 ;
+      RECT  1.465000  1.885000  1.795000 2.980000 ;
+      RECT  1.865000  1.150000  2.195000 1.650000 ;
+      RECT  1.885000  0.085000  2.165000 0.840000 ;
+      RECT  1.995000  1.820000  2.165000 3.245000 ;
+      RECT  2.350000  0.380000  2.665000 0.775000 ;
+      RECT  2.365000  0.775000  2.665000 1.885000 ;
+      RECT  2.365000  1.885000  2.695000 2.980000 ;
+      RECT  2.835000  1.150000  3.165000 1.650000 ;
+      RECT  2.845000  0.085000  3.095000 0.840000 ;
+      RECT  2.895000  1.820000  3.065000 3.245000 ;
+      RECT  3.300000  0.380000  3.595000 0.775000 ;
+      RECT  3.335000  0.775000  3.595000 2.980000 ;
+      RECT  3.765000  0.085000  4.095000 0.840000 ;
+      RECT  3.765000  1.150000  4.095000 1.650000 ;
+      RECT  3.795000  1.820000  3.965000 3.245000 ;
+      RECT  4.165000  1.850000  4.525000 1.900000 ;
+      RECT  4.165000  1.900000  4.495000 2.980000 ;
+      RECT  4.265000  0.380000  4.525000 1.850000 ;
+      RECT  4.695000  1.820000  4.865000 3.245000 ;
+      RECT  4.755000  1.150000  5.085000 1.650000 ;
+      RECT  4.765000  0.085000  5.085000 0.840000 ;
+      RECT  5.065000  1.850000  5.425000 2.010000 ;
+      RECT  5.065000  2.010000  5.395000 2.980000 ;
+      RECT  5.255000  0.380000  5.525000 0.775000 ;
+      RECT  5.255000  0.775000  5.425000 1.850000 ;
+      RECT  5.595000  1.150000  5.925000 1.650000 ;
+      RECT  5.595000  1.820000  5.845000 3.245000 ;
+      RECT  5.695000  0.085000  5.980000 0.840000 ;
+      RECT  6.015000  1.820000  6.330000 2.980000 ;
+      RECT  6.095000  1.010000  6.340000 1.760000 ;
+      RECT  6.095000  1.760000  6.330000 1.820000 ;
+      RECT  6.160000  0.380000  6.385000 0.785000 ;
+      RECT  6.160000  0.785000  6.340000 1.010000 ;
+      RECT  6.510000  1.820000  6.795000 3.245000 ;
+      RECT  6.545000  1.150000  6.875000 1.650000 ;
+      RECT  6.555000  0.085000  6.875000 0.840000 ;
+      RECT  7.045000  0.380000  7.290000 2.980000 ;
+      RECT  7.475000  1.820000  7.805000 3.245000 ;
+      RECT  7.485000  0.085000  9.825000 0.710000 ;
+      RECT  7.525000  1.150000 10.915000 1.650000 ;
+      RECT  8.005000  1.820000  8.175000 2.980000 ;
+      RECT  8.375000  1.820000  8.625000 3.245000 ;
+      RECT  8.905000  1.820000  9.075000 2.980000 ;
+      RECT  9.275000  1.820000  9.605000 3.245000 ;
+      RECT  9.805000  1.820000  9.975000 2.980000 ;
+      RECT 10.175000  1.820000 10.505000 3.245000 ;
+      RECT 10.705000  1.820000 10.875000 2.980000 ;
+      RECT 11.075000  1.820000 11.405000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  1.950000  0.805000 2.120000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.045000  1.210000  1.215000 1.380000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.545000  1.950000  1.715000 2.120000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  1.945000  1.210000  2.115000 1.380000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.445000  1.950000  2.615000 2.120000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  2.915000  1.210000  3.085000 1.380000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.375000  1.950000  3.545000 2.120000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.845000  1.210000  4.015000 1.380000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.245000  1.950000  4.415000 2.120000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.835000  1.210000  5.005000 1.380000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.145000  1.950000  5.315000 2.120000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.675000  1.210000  5.845000 1.380000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.095000  1.950000  6.265000 2.120000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.625000  1.210000  6.795000 1.380000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.075000  1.950000  7.245000 2.120000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.745000  1.210000  7.915000 1.380000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.005000  1.950000  8.175000 2.120000 ;
+      RECT  8.105000  1.210000  8.275000 1.380000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.465000  1.210000  8.635000 1.380000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  8.825000  1.210000  8.995000 1.380000 ;
+      RECT  8.905000  1.950000  9.075000 2.120000 ;
+      RECT  9.185000  1.210000  9.355000 1.380000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.545000  1.210000  9.715000 1.380000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT  9.805000  1.950000  9.975000 2.120000 ;
+      RECT  9.905000  1.210000 10.075000 1.380000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.265000  1.210000 10.435000 1.380000 ;
+      RECT 10.625000  1.210000 10.795000 1.380000 ;
+      RECT 10.705000  1.950000 10.875000 2.120000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+  END
 END sky130_fd_sc_hs__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef
index ee776d2..972a0e9 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.magic.lef
@@ -57,15 +57,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.840000 ;
-        RECT 1.475000  0.085000 1.805000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -74,17 +65,26 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.650000 2.290000 0.820000 3.245000 ;
-        RECT 1.550000 2.290000 1.800000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.840000 ;
+      RECT 0.650000  2.290000 0.820000 3.245000 ;
+      RECT 1.475000  0.085000 1.805000 0.840000 ;
+      RECT 1.550000  2.290000 1.800000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+  END
 END sky130_fd_sc_hs__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef
index abe2cd6..207796e 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.magic.lef
@@ -60,19 +60,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.115000  0.085000 0.820000 0.710000 ;
-        RECT 1.915000  0.085000 2.245000 0.840000 ;
-        RECT 2.915000  0.085000 3.245000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -81,22 +68,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 2.290000 0.365000 3.245000 ;
-        RECT 1.095000 2.290000 1.265000 3.245000 ;
-        RECT 1.995000 2.290000 2.245000 3.245000 ;
-        RECT 2.915000 2.290000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.085000 0.820000 0.710000 ;
+      RECT 0.115000  2.290000 0.365000 3.245000 ;
+      RECT 1.095000  2.290000 1.265000 3.245000 ;
+      RECT 1.915000  0.085000 2.245000 0.840000 ;
+      RECT 1.995000  2.290000 2.245000 3.245000 ;
+      RECT 2.915000  0.085000 3.245000 0.840000 ;
+      RECT 2.915000  2.290000 3.245000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+  END
 END sky130_fd_sc_hs__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef
index 4f9e826..67a4d90 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.magic.lef
@@ -65,27 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.775000 ;
-        RECT 2.795000  0.085000 3.125000 0.775000 ;
-        RECT 3.795000  0.085000 4.125000 0.775000 ;
-        RECT 4.795000  0.085000 5.125000 0.775000 ;
-        RECT 5.795000  0.085000 6.125000 0.775000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -94,31 +73,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.115000 2.290000 0.390000 3.245000 ;
-        RECT 1.120000 2.290000 1.370000 3.245000 ;
-        RECT 2.070000 2.290000 2.320000 3.245000 ;
-        RECT 3.020000 2.290000 3.270000 3.245000 ;
-        RECT 3.970000 2.290000 4.220000 3.245000 ;
-        RECT 4.920000 2.290000 5.170000 3.245000 ;
-        RECT 5.870000 2.290000 6.120000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.775000 ;
+      RECT 0.115000  2.290000 0.390000 3.245000 ;
+      RECT 1.120000  2.290000 1.370000 3.245000 ;
+      RECT 2.070000  2.290000 2.320000 3.245000 ;
+      RECT 2.795000  0.085000 3.125000 0.775000 ;
+      RECT 3.020000  2.290000 3.270000 3.245000 ;
+      RECT 3.795000  0.085000 4.125000 0.775000 ;
+      RECT 3.970000  2.290000 4.220000 3.245000 ;
+      RECT 4.795000  0.085000 5.125000 0.775000 ;
+      RECT 4.920000  2.290000 5.170000 3.245000 ;
+      RECT 5.795000  0.085000 6.125000 0.775000 ;
+      RECT 5.870000  2.290000 6.120000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+  END
 END sky130_fd_sc_hs__clkinv_8
diff --git a/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef
index 4494480..954ed56 100644
--- a/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hs__conb_1.magic.lef
@@ -52,13 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.825000  0.085000 1.155000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -67,15 +60,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.285000 2.505000 0.615000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.285000  2.505000 0.615000 3.245000 ;
+      RECT 0.825000  0.085000 1.155000 0.825000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_hs__conb_1
diff --git a/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef
index de5f98d..2085d1e 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hs__decap_4.magic.lef
@@ -34,15 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.170000  0.085000 0.740000 1.585000 ;
-        RECT 1.450000  0.085000 1.780000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -51,17 +42,26 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.095000 1.930000 0.425000 3.245000 ;
-        RECT 1.145000 1.250000 1.715000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.095000  1.930000 0.425000 3.245000 ;
+      RECT 0.170000  0.085000 0.740000 1.585000 ;
+      RECT 1.145000  1.250000 1.715000 3.245000 ;
+      RECT 1.450000  0.085000 1.780000 0.805000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+  END
 END sky130_fd_sc_hs__decap_4
diff --git a/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef
index 0bda338..106cbbc 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hs__decap_8.magic.lef
@@ -34,20 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.170000  0.085000 0.740000 1.585000 ;
-        RECT 1.450000  0.085000 1.780000 0.805000 ;
-        RECT 2.355000  0.085000 3.055000 1.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -56,22 +42,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.095000 1.930000 0.425000 3.245000 ;
-        RECT 1.145000 1.250000 2.080000 3.245000 ;
-        RECT 2.660000 1.940000 2.990000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  1.930000 0.425000 3.245000 ;
+      RECT 0.170000  0.085000 0.740000 1.585000 ;
+      RECT 1.145000  1.250000 2.080000 3.245000 ;
+      RECT 1.450000  0.085000 1.780000 0.805000 ;
+      RECT 2.355000  0.085000 3.055000 1.580000 ;
+      RECT 2.660000  1.940000 2.990000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+  END
 END sky130_fd_sc_hs__decap_8
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef
index 0dce030..b302e6e 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.magic.lef
@@ -73,13 +73,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.435000 1.675000 5.850000 1.960000 ;
-        RECT 5.435000 1.960000 5.635000 2.150000 ;
-        RECT 8.730000 1.275000 9.060000 2.120000 ;
-      LAYER mcon ;
-        RECT 5.435000 1.950000 5.605000 2.120000 ;
-        RECT 8.795000 1.950000 8.965000 2.120000 ;
       LAYER met1 ;
         RECT 5.375000 1.920000 5.665000 1.965000 ;
         RECT 5.375000 1.965000 9.025000 2.105000 ;
@@ -101,43 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.790000 ;
-        RECT  2.045000  0.085000  2.410000 0.670000 ;
-        RECT  5.815000  0.085000  6.145000 1.035000 ;
-        RECT  8.715000  0.085000  8.885000 0.765000 ;
-        RECT 11.055000  0.085000 11.385000 0.425000 ;
-        RECT 12.580000  0.085000 12.830000 0.810000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
@@ -146,139 +102,177 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  0.635000 2.290000  0.805000 3.245000 ;
-        RECT  2.295000 2.525000  2.465000 3.245000 ;
-        RECT  5.040000 2.660000  5.370000 3.245000 ;
-        RECT  6.020000 2.660000  6.350000 3.245000 ;
-        RECT  7.905000 2.970000  8.270000 3.245000 ;
-        RECT  9.035000 2.970000  9.365000 3.245000 ;
-        RECT 11.045000 2.630000 11.375000 3.245000 ;
-        RECT 12.555000 1.820000 12.805000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.105000 1.950000  0.835000 2.120000 ;
-      RECT  0.105000 2.120000  0.435000 2.980000 ;
-      RECT  0.115000 0.350000  0.365000 0.960000 ;
-      RECT  0.115000 0.960000  0.835000 1.130000 ;
-      RECT  0.665000 1.130000  0.835000 1.300000 ;
-      RECT  0.665000 1.300000  1.075000 1.630000 ;
-      RECT  0.665000 1.630000  0.835000 1.950000 ;
-      RECT  1.005000 1.820000  1.415000 2.905000 ;
-      RECT  1.005000 2.905000  2.125000 3.075000 ;
-      RECT  1.055000 0.350000  1.415000 1.130000 ;
-      RECT  1.245000 1.130000  1.415000 1.820000 ;
-      RECT  1.585000 0.575000  1.865000 0.840000 ;
-      RECT  1.585000 0.840000  2.750000 1.010000 ;
-      RECT  1.585000 1.010000  1.755000 2.405000 ;
-      RECT  1.585000 2.405000  1.785000 2.735000 ;
-      RECT  1.955000 1.685000  3.240000 1.855000 ;
-      RECT  1.955000 1.855000  2.125000 2.905000 ;
-      RECT  2.370000 2.025000  2.805000 2.355000 ;
-      RECT  2.580000 0.255000  4.145000 0.425000 ;
-      RECT  2.580000 0.425000  2.750000 0.840000 ;
-      RECT  2.635000 2.355000  2.805000 2.905000 ;
-      RECT  2.635000 2.905000  4.530000 3.075000 ;
-      RECT  2.950000 0.595000  3.280000 0.785000 ;
-      RECT  2.950000 0.785000  3.805000 0.955000 ;
-      RECT  2.975000 1.125000  3.465000 1.455000 ;
-      RECT  2.975000 1.455000  3.240000 1.685000 ;
-      RECT  2.975000 1.855000  3.240000 2.355000 ;
-      RECT  3.090000 2.565000  3.580000 2.735000 ;
-      RECT  3.410000 1.625000  4.135000 1.795000 ;
-      RECT  3.410000 1.795000  3.580000 2.565000 ;
-      RECT  3.460000 0.425000  4.145000 0.615000 ;
-      RECT  3.635000 0.955000  3.805000 1.395000 ;
-      RECT  3.635000 1.395000  4.135000 1.625000 ;
-      RECT  3.750000 1.965000  4.475000 2.135000 ;
-      RECT  3.750000 2.135000  4.000000 2.735000 ;
-      RECT  3.975000 0.615000  4.145000 0.995000 ;
-      RECT  3.975000 0.995000  4.475000 1.165000 ;
-      RECT  4.200000 2.305000  4.815000 2.320000 ;
-      RECT  4.200000 2.320000  6.450000 2.490000 ;
-      RECT  4.200000 2.490000  4.530000 2.905000 ;
-      RECT  4.305000 1.165000  4.475000 1.965000 ;
-      RECT  4.315000 0.255000  5.645000 0.425000 ;
-      RECT  4.315000 0.425000  4.645000 0.825000 ;
-      RECT  4.645000 0.995000  5.145000 1.165000 ;
-      RECT  4.645000 1.165000  4.815000 2.305000 ;
-      RECT  4.815000 0.715000  5.145000 0.995000 ;
-      RECT  4.985000 1.335000  6.485000 1.505000 ;
-      RECT  4.985000 1.505000  5.265000 1.665000 ;
-      RECT  5.315000 0.425000  5.645000 1.035000 ;
-      RECT  5.570000 2.490000  5.820000 2.980000 ;
-      RECT  6.120000 1.675000  6.450000 2.320000 ;
-      RECT  6.315000 0.340000  8.545000 0.510000 ;
-      RECT  6.315000 0.510000  6.485000 1.335000 ;
-      RECT  6.710000 1.180000  7.865000 1.560000 ;
-      RECT  6.710000 1.560000  7.075000 1.930000 ;
-      RECT  6.720000 0.680000  8.205000 1.010000 ;
-      RECT  6.860000 2.100000  7.415000 2.980000 ;
-      RECT  7.245000 1.730000  8.560000 1.900000 ;
-      RECT  7.245000 1.900000  7.415000 2.100000 ;
-      RECT  7.890000 2.070000  8.220000 2.630000 ;
-      RECT  7.890000 2.630000 10.320000 2.800000 ;
-      RECT  8.035000 1.010000  8.205000 1.730000 ;
-      RECT  8.375000 0.510000  8.545000 0.935000 ;
-      RECT  8.375000 0.935000 10.890000 1.105000 ;
-      RECT  8.390000 1.900000  8.560000 2.290000 ;
-      RECT  8.390000 2.290000  9.400000 2.460000 ;
-      RECT  8.500000 2.800000  8.830000 2.980000 ;
-      RECT  9.065000 0.255000 10.360000 0.425000 ;
-      RECT  9.065000 0.425000  9.315000 0.765000 ;
-      RECT  9.230000 1.950000 10.170000 2.120000 ;
-      RECT  9.230000 2.120000  9.400000 2.290000 ;
-      RECT  9.300000 1.105000  9.630000 1.560000 ;
-      RECT  9.495000 0.595000 11.385000 0.765000 ;
-      RECT  9.840000 1.420000 10.170000 1.950000 ;
-      RECT  9.990000 2.290000 11.385000 2.460000 ;
-      RECT  9.990000 2.460000 10.320000 2.630000 ;
-      RECT  9.990000 2.800000 10.320000 2.980000 ;
-      RECT 10.345000 1.105000 10.515000 1.950000 ;
-      RECT 10.345000 1.950000 10.850000 2.120000 ;
-      RECT 11.215000 0.765000 11.385000 1.320000 ;
-      RECT 11.215000 1.320000 11.585000 1.650000 ;
-      RECT 11.215000 1.650000 11.385000 2.290000 ;
-      RECT 12.110000 0.350000 12.360000 1.255000 ;
-      RECT 12.110000 1.255000 12.835000 1.585000 ;
-      RECT 12.110000 1.585000 12.360000 2.910000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.105000  1.950000  0.835000 2.120000 ;
+      RECT  0.105000  2.120000  0.435000 2.980000 ;
+      RECT  0.115000  0.350000  0.365000 0.960000 ;
+      RECT  0.115000  0.960000  0.835000 1.130000 ;
+      RECT  0.545000  0.085000  0.875000 0.790000 ;
+      RECT  0.635000  2.290000  0.805000 3.245000 ;
+      RECT  0.665000  1.130000  0.835000 1.300000 ;
+      RECT  0.665000  1.300000  1.075000 1.630000 ;
+      RECT  0.665000  1.630000  0.835000 1.950000 ;
+      RECT  1.005000  1.820000  1.415000 2.905000 ;
+      RECT  1.005000  2.905000  2.125000 3.075000 ;
+      RECT  1.055000  0.350000  1.415000 1.130000 ;
+      RECT  1.245000  1.130000  1.415000 1.820000 ;
+      RECT  1.585000  0.575000  1.865000 0.840000 ;
+      RECT  1.585000  0.840000  2.750000 1.010000 ;
+      RECT  1.585000  1.010000  1.755000 2.405000 ;
+      RECT  1.585000  2.405000  1.785000 2.735000 ;
+      RECT  1.955000  1.685000  3.240000 1.855000 ;
+      RECT  1.955000  1.855000  2.125000 2.905000 ;
+      RECT  2.045000  0.085000  2.410000 0.670000 ;
+      RECT  2.295000  2.525000  2.465000 3.245000 ;
+      RECT  2.370000  2.025000  2.805000 2.355000 ;
+      RECT  2.580000  0.255000  4.145000 0.425000 ;
+      RECT  2.580000  0.425000  2.750000 0.840000 ;
+      RECT  2.635000  2.355000  2.805000 2.905000 ;
+      RECT  2.635000  2.905000  4.530000 3.075000 ;
+      RECT  2.950000  0.595000  3.280000 0.785000 ;
+      RECT  2.950000  0.785000  3.805000 0.955000 ;
+      RECT  2.975000  1.125000  3.465000 1.455000 ;
+      RECT  2.975000  1.455000  3.240000 1.685000 ;
+      RECT  2.975000  1.855000  3.240000 2.355000 ;
+      RECT  3.090000  2.565000  3.580000 2.735000 ;
+      RECT  3.410000  1.625000  4.135000 1.795000 ;
+      RECT  3.410000  1.795000  3.580000 2.565000 ;
+      RECT  3.460000  0.425000  4.145000 0.615000 ;
+      RECT  3.635000  0.955000  3.805000 1.395000 ;
+      RECT  3.635000  1.395000  4.135000 1.625000 ;
+      RECT  3.750000  1.965000  4.475000 2.135000 ;
+      RECT  3.750000  2.135000  4.000000 2.735000 ;
+      RECT  3.975000  0.615000  4.145000 0.995000 ;
+      RECT  3.975000  0.995000  4.475000 1.165000 ;
+      RECT  4.200000  2.305000  4.815000 2.320000 ;
+      RECT  4.200000  2.320000  6.450000 2.490000 ;
+      RECT  4.200000  2.490000  4.530000 2.905000 ;
+      RECT  4.305000  1.165000  4.475000 1.965000 ;
+      RECT  4.315000  0.255000  5.645000 0.425000 ;
+      RECT  4.315000  0.425000  4.645000 0.825000 ;
+      RECT  4.645000  0.995000  5.145000 1.165000 ;
+      RECT  4.645000  1.165000  4.815000 2.305000 ;
+      RECT  4.815000  0.715000  5.145000 0.995000 ;
+      RECT  4.985000  1.335000  6.485000 1.505000 ;
+      RECT  4.985000  1.505000  5.265000 1.665000 ;
+      RECT  5.040000  2.660000  5.370000 3.245000 ;
+      RECT  5.315000  0.425000  5.645000 1.035000 ;
+      RECT  5.435000  1.675000  5.850000 1.960000 ;
+      RECT  5.435000  1.960000  5.635000 2.150000 ;
+      RECT  5.570000  2.490000  5.820000 2.980000 ;
+      RECT  5.815000  0.085000  6.145000 1.035000 ;
+      RECT  6.020000  2.660000  6.350000 3.245000 ;
+      RECT  6.120000  1.675000  6.450000 2.320000 ;
+      RECT  6.315000  0.340000  8.545000 0.510000 ;
+      RECT  6.315000  0.510000  6.485000 1.335000 ;
+      RECT  6.710000  1.180000  7.865000 1.560000 ;
+      RECT  6.710000  1.560000  7.075000 1.930000 ;
+      RECT  6.720000  0.680000  8.205000 1.010000 ;
+      RECT  6.860000  2.100000  7.415000 2.980000 ;
+      RECT  7.245000  1.730000  8.560000 1.900000 ;
+      RECT  7.245000  1.900000  7.415000 2.100000 ;
+      RECT  7.890000  2.070000  8.220000 2.630000 ;
+      RECT  7.890000  2.630000 10.320000 2.800000 ;
+      RECT  7.905000  2.970000  8.270000 3.245000 ;
+      RECT  8.035000  1.010000  8.205000 1.730000 ;
+      RECT  8.375000  0.510000  8.545000 0.935000 ;
+      RECT  8.375000  0.935000 10.890000 1.105000 ;
+      RECT  8.390000  1.900000  8.560000 2.290000 ;
+      RECT  8.390000  2.290000  9.400000 2.460000 ;
+      RECT  8.500000  2.800000  8.830000 2.980000 ;
+      RECT  8.715000  0.085000  8.885000 0.765000 ;
+      RECT  8.730000  1.275000  9.060000 2.120000 ;
+      RECT  9.035000  2.970000  9.365000 3.245000 ;
+      RECT  9.065000  0.255000 10.360000 0.425000 ;
+      RECT  9.065000  0.425000  9.315000 0.765000 ;
+      RECT  9.230000  1.950000 10.170000 2.120000 ;
+      RECT  9.230000  2.120000  9.400000 2.290000 ;
+      RECT  9.300000  1.105000  9.630000 1.560000 ;
+      RECT  9.495000  0.595000 11.385000 0.765000 ;
+      RECT  9.840000  1.420000 10.170000 1.950000 ;
+      RECT  9.990000  2.290000 11.385000 2.460000 ;
+      RECT  9.990000  2.460000 10.320000 2.630000 ;
+      RECT  9.990000  2.800000 10.320000 2.980000 ;
+      RECT 10.345000  1.105000 10.515000 1.950000 ;
+      RECT 10.345000  1.950000 10.850000 2.120000 ;
+      RECT 11.045000  2.630000 11.375000 3.245000 ;
+      RECT 11.055000  0.085000 11.385000 0.425000 ;
+      RECT 11.215000  0.765000 11.385000 1.320000 ;
+      RECT 11.215000  1.320000 11.585000 1.650000 ;
+      RECT 11.215000  1.650000 11.385000 2.290000 ;
+      RECT 12.110000  0.350000 12.360000 1.255000 ;
+      RECT 12.110000  1.255000 12.835000 1.585000 ;
+      RECT 12.110000  1.585000 12.360000 2.910000 ;
+      RECT 12.555000  1.820000 12.805000 3.245000 ;
+      RECT 12.580000  0.085000 12.830000 0.810000 ;
     LAYER mcon ;
-      RECT 3.035000 1.210000 3.205000 1.380000 ;
-      RECT 6.875000 1.210000 7.045000 1.380000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.210000  3.205000 1.380000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.950000  5.605000 2.120000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  1.210000  7.045000 1.380000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  1.950000  8.965000 2.120000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
     LAYER met1 ;
       RECT 2.975000 1.180000 3.265000 1.225000 ;
       RECT 2.975000 1.225000 7.105000 1.365000 ;
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef
index 59760e7..7feabab 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.magic.lef
@@ -78,13 +78,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.415000 1.630000 5.745000 2.150000 ;
-        RECT 8.765000 1.450000 9.160000 1.780000 ;
-        RECT 8.765000 1.780000 8.995000 2.120000 ;
-      LAYER mcon ;
-        RECT 5.435000 1.950000 5.605000 2.120000 ;
-        RECT 8.795000 1.950000 8.965000 2.120000 ;
       LAYER met1 ;
         RECT 5.375000 1.920000 5.665000 1.965000 ;
         RECT 5.375000 1.965000 9.025000 2.105000 ;
@@ -106,47 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.790000 ;
-        RECT  2.045000  0.085000  2.440000 0.670000 ;
-        RECT  5.745000  0.085000  6.075000 1.025000 ;
-        RECT  8.785000  0.085000  8.955000 0.840000 ;
-        RECT 10.665000  0.085000 11.450000 0.500000 ;
-        RECT 12.155000  0.085000 12.405000 1.260000 ;
-        RECT 13.095000  0.085000 13.370000 1.050000 ;
-        RECT 13.970000  0.085000 14.300000 0.680000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
@@ -155,148 +107,190 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.635000 2.290000  0.805000 3.245000 ;
-        RECT  2.295000 2.525000  2.465000 3.245000 ;
-        RECT  5.055000 2.660000  5.385000 3.245000 ;
-        RECT  6.095000 2.660000  6.425000 3.245000 ;
-        RECT  8.010000 2.970000  8.340000 3.245000 ;
-        RECT  9.105000 2.970000  9.435000 3.245000 ;
-        RECT 11.115000 2.630000 11.445000 3.245000 ;
-        RECT 12.015000 2.190000 12.345000 3.245000 ;
-        RECT 13.065000 1.820000 13.315000 3.245000 ;
-        RECT 14.045000 2.110000 14.295000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.105000 1.950000  0.835000 2.120000 ;
-      RECT  0.105000 2.120000  0.435000 2.980000 ;
-      RECT  0.115000 0.350000  0.365000 0.960000 ;
-      RECT  0.115000 0.960000  0.835000 1.130000 ;
-      RECT  0.665000 1.130000  0.835000 1.300000 ;
-      RECT  0.665000 1.300000  1.105000 1.630000 ;
-      RECT  0.665000 1.630000  0.835000 1.950000 ;
-      RECT  1.005000 1.820000  1.445000 2.905000 ;
-      RECT  1.005000 2.905000  2.125000 3.075000 ;
-      RECT  1.055000 0.350000  1.445000 1.130000 ;
-      RECT  1.275000 1.130000  1.445000 1.820000 ;
-      RECT  1.615000 0.575000  1.865000 0.840000 ;
-      RECT  1.615000 0.840000  2.780000 1.010000 ;
-      RECT  1.615000 1.010000  1.785000 2.735000 ;
-      RECT  1.955000 1.685000  3.230000 1.855000 ;
-      RECT  1.955000 1.855000  2.125000 2.905000 ;
-      RECT  2.365000 2.025000  2.805000 2.355000 ;
-      RECT  2.610000 0.255000  4.225000 0.425000 ;
-      RECT  2.610000 0.425000  2.780000 0.840000 ;
-      RECT  2.635000 2.355000  2.805000 2.905000 ;
-      RECT  2.635000 2.905000  4.605000 3.075000 ;
-      RECT  2.975000 1.855000  3.230000 2.355000 ;
-      RECT  2.980000 0.595000  3.310000 0.785000 ;
-      RECT  2.980000 0.785000  3.885000 0.955000 ;
-      RECT  3.005000 1.125000  3.545000 1.455000 ;
-      RECT  3.005000 1.455000  3.230000 1.685000 ;
-      RECT  3.085000 2.565000  3.570000 2.735000 ;
-      RECT  3.400000 1.625000  4.095000 1.795000 ;
-      RECT  3.400000 1.795000  3.570000 2.565000 ;
-      RECT  3.490000 0.425000  4.225000 0.615000 ;
-      RECT  3.715000 0.955000  3.885000 1.465000 ;
-      RECT  3.715000 1.465000  4.095000 1.625000 ;
-      RECT  3.740000 1.965000  4.435000 2.135000 ;
-      RECT  3.740000 2.135000  3.990000 2.735000 ;
-      RECT  4.055000 0.615000  4.225000 1.125000 ;
-      RECT  4.055000 1.125000  4.435000 1.295000 ;
-      RECT  4.185000 2.305000  4.775000 2.320000 ;
-      RECT  4.185000 2.320000  6.380000 2.490000 ;
-      RECT  4.185000 2.490000  4.605000 2.905000 ;
-      RECT  4.265000 1.295000  4.435000 1.965000 ;
-      RECT  4.395000 0.265000  5.575000 0.435000 ;
-      RECT  4.395000 0.435000  4.565000 0.955000 ;
-      RECT  4.605000 1.125000  4.905000 1.295000 ;
-      RECT  4.605000 1.295000  4.775000 2.305000 ;
-      RECT  4.735000 0.605000  5.075000 1.120000 ;
-      RECT  4.735000 1.120000  4.905000 1.125000 ;
-      RECT  4.945000 1.610000  5.245000 1.940000 ;
-      RECT  5.075000 1.290000  6.415000 1.460000 ;
-      RECT  5.075000 1.460000  5.245000 1.610000 ;
-      RECT  5.245000 0.435000  5.575000 1.025000 ;
-      RECT  5.565000 2.490000  5.895000 2.980000 ;
-      RECT  6.050000 1.630000  6.380000 2.320000 ;
-      RECT  6.245000 0.340000  8.615000 0.510000 ;
-      RECT  6.245000 0.510000  6.415000 1.290000 ;
-      RECT  6.650000 0.680000  8.275000 1.010000 ;
-      RECT  6.785000 1.180000  7.935000 1.410000 ;
-      RECT  6.785000 1.410000  7.115000 1.910000 ;
-      RECT  6.965000 2.100000  7.455000 2.980000 ;
-      RECT  7.285000 1.720000  8.595000 1.890000 ;
-      RECT  7.285000 1.890000  7.455000 2.100000 ;
-      RECT  7.685000 1.410000  7.935000 1.550000 ;
-      RECT  7.925000 2.060000  8.255000 2.630000 ;
-      RECT  7.925000 2.630000 10.390000 2.800000 ;
-      RECT  8.105000 1.010000  8.275000 1.720000 ;
-      RECT  8.425000 1.890000  8.595000 2.290000 ;
-      RECT  8.425000 2.290000  9.890000 2.460000 ;
-      RECT  8.445000 0.510000  8.615000 1.010000 ;
-      RECT  8.445000 1.010000 10.990000 1.180000 ;
-      RECT  8.570000 2.800000  8.900000 2.980000 ;
-      RECT  9.135000 0.255000 10.440000 0.425000 ;
-      RECT  9.135000 0.425000  9.385000 0.840000 ;
-      RECT  9.370000 1.180000  9.700000 1.550000 ;
-      RECT  9.605000 0.595000  9.935000 0.670000 ;
-      RECT  9.605000 0.670000 11.460000 0.840000 ;
-      RECT  9.720000 1.720000 10.205000 1.890000 ;
-      RECT  9.720000 1.890000  9.890000 2.290000 ;
-      RECT  9.910000 1.470000 10.205000 1.720000 ;
-      RECT 10.060000 2.290000 11.460000 2.460000 ;
-      RECT 10.060000 2.460000 10.390000 2.630000 ;
-      RECT 10.060000 2.800000 10.390000 2.980000 ;
-      RECT 10.110000 0.425000 10.440000 0.500000 ;
-      RECT 10.375000 1.180000 10.545000 1.950000 ;
-      RECT 10.375000 1.950000 10.920000 2.120000 ;
-      RECT 11.290000 0.840000 11.460000 1.350000 ;
-      RECT 11.290000 1.350000 11.645000 1.680000 ;
-      RECT 11.290000 1.680000 11.460000 2.290000 ;
-      RECT 12.545000 1.820000 12.875000 2.860000 ;
-      RECT 12.635000 0.350000 12.885000 1.270000 ;
-      RECT 12.635000 1.270000 13.695000 1.600000 ;
-      RECT 12.635000 1.600000 12.875000 1.820000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.105000  1.950000  0.835000 2.120000 ;
+      RECT  0.105000  2.120000  0.435000 2.980000 ;
+      RECT  0.115000  0.350000  0.365000 0.960000 ;
+      RECT  0.115000  0.960000  0.835000 1.130000 ;
+      RECT  0.545000  0.085000  0.875000 0.790000 ;
+      RECT  0.635000  2.290000  0.805000 3.245000 ;
+      RECT  0.665000  1.130000  0.835000 1.300000 ;
+      RECT  0.665000  1.300000  1.105000 1.630000 ;
+      RECT  0.665000  1.630000  0.835000 1.950000 ;
+      RECT  1.005000  1.820000  1.445000 2.905000 ;
+      RECT  1.005000  2.905000  2.125000 3.075000 ;
+      RECT  1.055000  0.350000  1.445000 1.130000 ;
+      RECT  1.275000  1.130000  1.445000 1.820000 ;
+      RECT  1.615000  0.575000  1.865000 0.840000 ;
+      RECT  1.615000  0.840000  2.780000 1.010000 ;
+      RECT  1.615000  1.010000  1.785000 2.735000 ;
+      RECT  1.955000  1.685000  3.230000 1.855000 ;
+      RECT  1.955000  1.855000  2.125000 2.905000 ;
+      RECT  2.045000  0.085000  2.440000 0.670000 ;
+      RECT  2.295000  2.525000  2.465000 3.245000 ;
+      RECT  2.365000  2.025000  2.805000 2.355000 ;
+      RECT  2.610000  0.255000  4.225000 0.425000 ;
+      RECT  2.610000  0.425000  2.780000 0.840000 ;
+      RECT  2.635000  2.355000  2.805000 2.905000 ;
+      RECT  2.635000  2.905000  4.605000 3.075000 ;
+      RECT  2.975000  1.855000  3.230000 2.355000 ;
+      RECT  2.980000  0.595000  3.310000 0.785000 ;
+      RECT  2.980000  0.785000  3.885000 0.955000 ;
+      RECT  3.005000  1.125000  3.545000 1.455000 ;
+      RECT  3.005000  1.455000  3.230000 1.685000 ;
+      RECT  3.085000  2.565000  3.570000 2.735000 ;
+      RECT  3.400000  1.625000  4.095000 1.795000 ;
+      RECT  3.400000  1.795000  3.570000 2.565000 ;
+      RECT  3.490000  0.425000  4.225000 0.615000 ;
+      RECT  3.715000  0.955000  3.885000 1.465000 ;
+      RECT  3.715000  1.465000  4.095000 1.625000 ;
+      RECT  3.740000  1.965000  4.435000 2.135000 ;
+      RECT  3.740000  2.135000  3.990000 2.735000 ;
+      RECT  4.055000  0.615000  4.225000 1.125000 ;
+      RECT  4.055000  1.125000  4.435000 1.295000 ;
+      RECT  4.185000  2.305000  4.775000 2.320000 ;
+      RECT  4.185000  2.320000  6.380000 2.490000 ;
+      RECT  4.185000  2.490000  4.605000 2.905000 ;
+      RECT  4.265000  1.295000  4.435000 1.965000 ;
+      RECT  4.395000  0.265000  5.575000 0.435000 ;
+      RECT  4.395000  0.435000  4.565000 0.955000 ;
+      RECT  4.605000  1.125000  4.905000 1.295000 ;
+      RECT  4.605000  1.295000  4.775000 2.305000 ;
+      RECT  4.735000  0.605000  5.075000 1.120000 ;
+      RECT  4.735000  1.120000  4.905000 1.125000 ;
+      RECT  4.945000  1.610000  5.245000 1.940000 ;
+      RECT  5.055000  2.660000  5.385000 3.245000 ;
+      RECT  5.075000  1.290000  6.415000 1.460000 ;
+      RECT  5.075000  1.460000  5.245000 1.610000 ;
+      RECT  5.245000  0.435000  5.575000 1.025000 ;
+      RECT  5.415000  1.630000  5.745000 2.150000 ;
+      RECT  5.565000  2.490000  5.895000 2.980000 ;
+      RECT  5.745000  0.085000  6.075000 1.025000 ;
+      RECT  6.050000  1.630000  6.380000 2.320000 ;
+      RECT  6.095000  2.660000  6.425000 3.245000 ;
+      RECT  6.245000  0.340000  8.615000 0.510000 ;
+      RECT  6.245000  0.510000  6.415000 1.290000 ;
+      RECT  6.650000  0.680000  8.275000 1.010000 ;
+      RECT  6.785000  1.180000  7.935000 1.410000 ;
+      RECT  6.785000  1.410000  7.115000 1.910000 ;
+      RECT  6.965000  2.100000  7.455000 2.980000 ;
+      RECT  7.285000  1.720000  8.595000 1.890000 ;
+      RECT  7.285000  1.890000  7.455000 2.100000 ;
+      RECT  7.685000  1.410000  7.935000 1.550000 ;
+      RECT  7.925000  2.060000  8.255000 2.630000 ;
+      RECT  7.925000  2.630000 10.390000 2.800000 ;
+      RECT  8.010000  2.970000  8.340000 3.245000 ;
+      RECT  8.105000  1.010000  8.275000 1.720000 ;
+      RECT  8.425000  1.890000  8.595000 2.290000 ;
+      RECT  8.425000  2.290000  9.890000 2.460000 ;
+      RECT  8.445000  0.510000  8.615000 1.010000 ;
+      RECT  8.445000  1.010000 10.990000 1.180000 ;
+      RECT  8.570000  2.800000  8.900000 2.980000 ;
+      RECT  8.765000  1.450000  9.160000 1.780000 ;
+      RECT  8.765000  1.780000  8.995000 2.120000 ;
+      RECT  8.785000  0.085000  8.955000 0.840000 ;
+      RECT  9.105000  2.970000  9.435000 3.245000 ;
+      RECT  9.135000  0.255000 10.440000 0.425000 ;
+      RECT  9.135000  0.425000  9.385000 0.840000 ;
+      RECT  9.370000  1.180000  9.700000 1.550000 ;
+      RECT  9.605000  0.595000  9.935000 0.670000 ;
+      RECT  9.605000  0.670000 11.460000 0.840000 ;
+      RECT  9.720000  1.720000 10.205000 1.890000 ;
+      RECT  9.720000  1.890000  9.890000 2.290000 ;
+      RECT  9.910000  1.470000 10.205000 1.720000 ;
+      RECT 10.060000  2.290000 11.460000 2.460000 ;
+      RECT 10.060000  2.460000 10.390000 2.630000 ;
+      RECT 10.060000  2.800000 10.390000 2.980000 ;
+      RECT 10.110000  0.425000 10.440000 0.500000 ;
+      RECT 10.375000  1.180000 10.545000 1.950000 ;
+      RECT 10.375000  1.950000 10.920000 2.120000 ;
+      RECT 10.665000  0.085000 11.450000 0.500000 ;
+      RECT 11.115000  2.630000 11.445000 3.245000 ;
+      RECT 11.290000  0.840000 11.460000 1.350000 ;
+      RECT 11.290000  1.350000 11.645000 1.680000 ;
+      RECT 11.290000  1.680000 11.460000 2.290000 ;
+      RECT 12.015000  2.190000 12.345000 3.245000 ;
+      RECT 12.155000  0.085000 12.405000 1.260000 ;
+      RECT 12.545000  1.820000 12.875000 2.860000 ;
+      RECT 12.635000  0.350000 12.885000 1.270000 ;
+      RECT 12.635000  1.270000 13.695000 1.600000 ;
+      RECT 12.635000  1.600000 12.875000 1.820000 ;
+      RECT 13.065000  1.820000 13.315000 3.245000 ;
+      RECT 13.095000  0.085000 13.370000 1.050000 ;
+      RECT 13.970000  0.085000 14.300000 0.680000 ;
+      RECT 14.045000  2.110000 14.295000 3.245000 ;
     LAYER mcon ;
-      RECT 3.035000 1.210000 3.205000 1.380000 ;
-      RECT 6.875000 1.210000 7.045000 1.380000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.210000  3.205000 1.380000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.950000  5.605000 2.120000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  1.210000  7.045000 1.380000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  1.950000  8.965000 2.120000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
     LAYER met1 ;
       RECT 2.975000 1.180000 3.265000 1.225000 ;
       RECT 2.975000 1.225000 7.105000 1.365000 ;
diff --git a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef
index afd6521..09b4b09 100644
--- a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.magic.lef
@@ -100,44 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.615000  0.085000  0.945000 1.010000 ;
-        RECT  1.655000  0.085000  1.905000 1.065000 ;
-        RECT  3.560000  0.085000  4.155000 0.560000 ;
-        RECT  6.060000  0.085000  6.430000 0.670000 ;
-        RECT  6.190000  0.670000  6.430000 1.085000 ;
-        RECT  8.085000  0.085000  8.415000 0.960000 ;
-        RECT 10.565000  0.085000 10.895000 0.810000 ;
-        RECT 12.055000  0.085000 12.305000 0.810000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
@@ -146,120 +108,154 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.705000 2.060000  1.035000 3.245000 ;
-        RECT  1.805000 2.425000  2.410000 3.245000 ;
-        RECT  3.940000 1.965000  4.190000 3.245000 ;
-        RECT  5.500000 2.505000  5.870000 3.245000 ;
-        RECT  7.620000 2.650000  8.420000 3.245000 ;
-        RECT  9.470000 2.580000  9.800000 3.245000 ;
-        RECT 10.590000 2.580000 10.920000 3.245000 ;
-        RECT 12.075000 1.820000 12.325000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.350000  0.445000 1.010000 ;
-      RECT  0.085000 1.010000  0.255000 1.720000 ;
-      RECT  0.085000 1.720000  1.145000 1.890000 ;
-      RECT  0.085000 1.890000  0.535000 2.980000 ;
-      RECT  0.975000 1.300000  1.145000 1.720000 ;
-      RECT  1.125000 0.350000  1.485000 1.130000 ;
-      RECT  1.315000 1.130000  1.485000 1.255000 ;
-      RECT  1.315000 1.255000  2.615000 1.585000 ;
-      RECT  1.315000 1.585000  1.565000 2.980000 ;
-      RECT  2.085000 0.605000  2.335000 0.915000 ;
-      RECT  2.085000 0.915000  2.955000 1.085000 ;
-      RECT  2.575000 0.415000  3.295000 0.745000 ;
-      RECT  2.580000 2.295000  2.955000 2.755000 ;
-      RECT  2.785000 1.085000  2.955000 2.295000 ;
-      RECT  3.125000 0.745000  3.295000 1.625000 ;
-      RECT  3.125000 1.625000  4.060000 1.795000 ;
-      RECT  3.125000 1.795000  3.430000 2.335000 ;
-      RECT  3.465000 0.730000  5.335000 0.840000 ;
-      RECT  3.465000 0.840000  6.020000 0.900000 ;
-      RECT  3.465000 0.900000  3.720000 1.455000 ;
-      RECT  3.890000 1.070000  4.915000 1.240000 ;
-      RECT  3.890000 1.240000  4.060000 1.625000 ;
-      RECT  4.415000 0.255000  5.840000 0.425000 ;
-      RECT  4.415000 0.425000  4.825000 0.560000 ;
-      RECT  4.700000 1.825000  6.020000 1.995000 ;
-      RECT  4.700000 1.995000  4.950000 2.735000 ;
-      RECT  4.745000 1.240000  4.915000 1.255000 ;
-      RECT  4.745000 1.255000  5.100000 1.585000 ;
-      RECT  5.015000 0.595000  5.335000 0.730000 ;
-      RECT  5.085000 0.900000  6.020000 1.010000 ;
-      RECT  5.310000 1.180000  5.640000 1.585000 ;
-      RECT  5.510000 0.425000  5.840000 0.670000 ;
-      RECT  5.850000 1.010000  6.020000 1.255000 ;
-      RECT  5.850000 1.255000  6.180000 1.585000 ;
-      RECT  5.850000 1.585000  6.020000 1.825000 ;
-      RECT  6.440000 1.610000  6.770000 1.940000 ;
-      RECT  6.540000 2.110000  7.110000 2.280000 ;
-      RECT  6.540000 2.280000  6.870000 2.735000 ;
-      RECT  6.600000 0.255000  7.670000 0.425000 ;
-      RECT  6.600000 0.425000  6.770000 1.610000 ;
-      RECT  6.940000 0.595000  7.175000 1.400000 ;
-      RECT  6.940000 1.400000  8.070000 1.570000 ;
-      RECT  6.940000 1.570000  7.110000 2.110000 ;
-      RECT  7.345000 0.425000  7.670000 1.230000 ;
-      RECT  7.620000 2.080000  9.385000 2.240000 ;
-      RECT  7.620000 2.240000 10.950000 2.380000 ;
-      RECT  7.900000 1.130000  9.045000 1.300000 ;
-      RECT  7.900000 1.300000  8.070000 1.400000 ;
-      RECT  8.585000 0.255000  9.725000 0.425000 ;
-      RECT  8.585000 0.425000  8.915000 0.960000 ;
-      RECT  8.685000 1.970000  9.385000 2.080000 ;
-      RECT  8.685000 2.380000 10.950000 2.410000 ;
-      RECT  8.685000 2.410000  8.935000 2.980000 ;
-      RECT  8.780000 1.300000  9.045000 1.550000 ;
-      RECT  9.085000 0.595000  9.385000 0.960000 ;
-      RECT  9.215000 0.960000  9.385000 1.970000 ;
-      RECT  9.555000 0.425000  9.725000 1.020000 ;
-      RECT  9.710000 1.190000 10.065000 1.820000 ;
-      RECT  9.710000 1.820000 10.405000 2.070000 ;
-      RECT  9.895000 0.350000 10.385000 0.810000 ;
-      RECT  9.895000 0.810000 10.065000 1.190000 ;
-      RECT 10.780000 1.320000 11.120000 1.650000 ;
-      RECT 10.780000 1.650000 10.950000 2.240000 ;
-      RECT 11.640000 0.350000 11.875000 1.255000 ;
-      RECT 11.640000 1.255000 12.355000 1.585000 ;
-      RECT 11.640000 1.585000 11.810000 2.030000 ;
-      RECT 11.640000 2.030000 11.890000 2.910000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.085000  0.350000  0.445000 1.010000 ;
+      RECT  0.085000  1.010000  0.255000 1.720000 ;
+      RECT  0.085000  1.720000  1.145000 1.890000 ;
+      RECT  0.085000  1.890000  0.535000 2.980000 ;
+      RECT  0.615000  0.085000  0.945000 1.010000 ;
+      RECT  0.705000  2.060000  1.035000 3.245000 ;
+      RECT  0.975000  1.300000  1.145000 1.720000 ;
+      RECT  1.125000  0.350000  1.485000 1.130000 ;
+      RECT  1.315000  1.130000  1.485000 1.255000 ;
+      RECT  1.315000  1.255000  2.615000 1.585000 ;
+      RECT  1.315000  1.585000  1.565000 2.980000 ;
+      RECT  1.655000  0.085000  1.905000 1.065000 ;
+      RECT  1.805000  2.425000  2.410000 3.245000 ;
+      RECT  2.085000  0.605000  2.335000 0.915000 ;
+      RECT  2.085000  0.915000  2.955000 1.085000 ;
+      RECT  2.575000  0.415000  3.295000 0.745000 ;
+      RECT  2.580000  2.295000  2.955000 2.755000 ;
+      RECT  2.785000  1.085000  2.955000 2.295000 ;
+      RECT  3.125000  0.745000  3.295000 1.625000 ;
+      RECT  3.125000  1.625000  4.060000 1.795000 ;
+      RECT  3.125000  1.795000  3.430000 2.335000 ;
+      RECT  3.465000  0.730000  5.335000 0.840000 ;
+      RECT  3.465000  0.840000  6.020000 0.900000 ;
+      RECT  3.465000  0.900000  3.720000 1.455000 ;
+      RECT  3.560000  0.085000  4.155000 0.560000 ;
+      RECT  3.890000  1.070000  4.915000 1.240000 ;
+      RECT  3.890000  1.240000  4.060000 1.625000 ;
+      RECT  3.940000  1.965000  4.190000 3.245000 ;
+      RECT  4.415000  0.255000  5.840000 0.425000 ;
+      RECT  4.415000  0.425000  4.825000 0.560000 ;
+      RECT  4.700000  1.825000  6.020000 1.995000 ;
+      RECT  4.700000  1.995000  4.950000 2.735000 ;
+      RECT  4.745000  1.240000  4.915000 1.255000 ;
+      RECT  4.745000  1.255000  5.100000 1.585000 ;
+      RECT  5.015000  0.595000  5.335000 0.730000 ;
+      RECT  5.085000  0.900000  6.020000 1.010000 ;
+      RECT  5.310000  1.180000  5.640000 1.585000 ;
+      RECT  5.500000  2.505000  5.870000 3.245000 ;
+      RECT  5.510000  0.425000  5.840000 0.670000 ;
+      RECT  5.850000  1.010000  6.020000 1.255000 ;
+      RECT  5.850000  1.255000  6.180000 1.585000 ;
+      RECT  5.850000  1.585000  6.020000 1.825000 ;
+      RECT  6.060000  0.085000  6.430000 0.670000 ;
+      RECT  6.190000  0.670000  6.430000 1.085000 ;
+      RECT  6.440000  1.610000  6.770000 1.940000 ;
+      RECT  6.540000  2.110000  7.110000 2.280000 ;
+      RECT  6.540000  2.280000  6.870000 2.735000 ;
+      RECT  6.600000  0.255000  7.670000 0.425000 ;
+      RECT  6.600000  0.425000  6.770000 1.610000 ;
+      RECT  6.940000  0.595000  7.175000 1.400000 ;
+      RECT  6.940000  1.400000  8.070000 1.570000 ;
+      RECT  6.940000  1.570000  7.110000 2.110000 ;
+      RECT  7.345000  0.425000  7.670000 1.230000 ;
+      RECT  7.620000  2.080000  9.385000 2.240000 ;
+      RECT  7.620000  2.240000 10.950000 2.380000 ;
+      RECT  7.620000  2.650000  8.420000 3.245000 ;
+      RECT  7.900000  1.130000  9.045000 1.300000 ;
+      RECT  7.900000  1.300000  8.070000 1.400000 ;
+      RECT  8.085000  0.085000  8.415000 0.960000 ;
+      RECT  8.585000  0.255000  9.725000 0.425000 ;
+      RECT  8.585000  0.425000  8.915000 0.960000 ;
+      RECT  8.685000  1.970000  9.385000 2.080000 ;
+      RECT  8.685000  2.380000 10.950000 2.410000 ;
+      RECT  8.685000  2.410000  8.935000 2.980000 ;
+      RECT  8.780000  1.300000  9.045000 1.550000 ;
+      RECT  9.085000  0.595000  9.385000 0.960000 ;
+      RECT  9.215000  0.960000  9.385000 1.970000 ;
+      RECT  9.470000  2.580000  9.800000 3.245000 ;
+      RECT  9.555000  0.425000  9.725000 1.020000 ;
+      RECT  9.710000  1.190000 10.065000 1.820000 ;
+      RECT  9.710000  1.820000 10.405000 2.070000 ;
+      RECT  9.895000  0.350000 10.385000 0.810000 ;
+      RECT  9.895000  0.810000 10.065000 1.190000 ;
+      RECT 10.565000  0.085000 10.895000 0.810000 ;
+      RECT 10.590000  2.580000 10.920000 3.245000 ;
+      RECT 10.780000  1.320000 11.120000 1.650000 ;
+      RECT 10.780000  1.650000 10.950000 2.240000 ;
+      RECT 11.640000  0.350000 11.875000 1.255000 ;
+      RECT 11.640000  1.255000 12.355000 1.585000 ;
+      RECT 11.640000  1.585000 11.810000 2.030000 ;
+      RECT 11.640000  2.030000 11.890000 2.910000 ;
+      RECT 12.055000  0.085000 12.305000 0.810000 ;
+      RECT 12.075000  1.820000 12.325000 3.245000 ;
     LAYER mcon ;
-      RECT 5.435000 1.210000 5.605000 1.380000 ;
-      RECT 9.755000 1.210000 9.925000 1.380000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.210000  5.605000 1.380000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  1.210000  9.925000 1.380000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
     LAYER met1 ;
       RECT 5.375000 1.180000 5.665000 1.225000 ;
       RECT 5.375000 1.225000 9.985000 1.365000 ;
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef
index 74f3d39..1567445 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.magic.lef
@@ -65,14 +65,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.030000 1.130000 1.300000 2.140000 ;
-        RECT 5.230000 1.825000 5.610000 2.155000 ;
-        RECT 7.835000 1.835000 8.300000 2.165000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.950000 1.285000 2.120000 ;
-        RECT 5.435000 1.950000 5.605000 2.120000 ;
-        RECT 7.835000 1.950000 8.005000 2.120000 ;
       LAYER met1 ;
         RECT 1.055000 1.920000 1.345000 1.965000 ;
         RECT 1.055000 1.965000 8.065000 2.105000 ;
@@ -97,39 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.520000 0.085000 ;
-        RECT  1.030000  0.085000  1.280000 0.830000 ;
-        RECT  2.090000  0.085000  2.420000 0.800000 ;
-        RECT  4.995000  0.085000  5.325000 0.410000 ;
-        RECT  7.535000  0.085000  7.995000 0.680000 ;
-        RECT  9.140000  0.085000  9.390000 1.130000 ;
-        RECT 10.645000  0.085000 10.895000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
@@ -138,105 +97,141 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.520000 3.415000 ;
-        RECT  0.115000 2.520000  0.365000 3.245000 ;
-        RECT  1.095000 2.650000  1.345000 3.245000 ;
-        RECT  2.025000 2.650000  2.355000 3.245000 ;
-        RECT  4.440000 2.755000  4.785000 3.245000 ;
-        RECT  5.780000 1.740000  6.030000 3.245000 ;
-        RECT  7.835000 2.335000  8.060000 3.245000 ;
-        RECT  8.810000 2.105000  9.025000 3.245000 ;
-        RECT 10.610000 1.820000 10.905000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.520000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.170000 0.370000  0.500000 0.660000 ;
-      RECT  0.170000 0.660000  0.860000 0.830000 ;
-      RECT  0.565000 2.520000  0.895000 2.980000 ;
-      RECT  0.690000 0.830000  0.860000 2.310000 ;
-      RECT  0.690000 2.310000  3.395000 2.480000 ;
-      RECT  0.690000 2.480000  0.895000 2.520000 ;
-      RECT  1.470000 0.350000  1.920000 0.970000 ;
-      RECT  1.470000 0.970000  2.775000 1.140000 ;
-      RECT  1.470000 1.140000  1.640000 1.810000 ;
-      RECT  1.470000 1.810000  1.825000 2.140000 ;
-      RECT  2.445000 1.140000  2.775000 1.550000 ;
-      RECT  2.475000 1.735000  3.500000 1.905000 ;
-      RECT  2.475000 1.905000  2.805000 2.140000 ;
-      RECT  2.590000 0.255000  4.520000 0.425000 ;
-      RECT  2.590000 0.425000  3.115000 0.800000 ;
-      RECT  2.945000 0.800000  3.115000 1.575000 ;
-      RECT  2.945000 1.575000  3.500000 1.735000 ;
-      RECT  3.065000 2.075000  3.840000 2.245000 ;
-      RECT  3.065000 2.245000  3.395000 2.310000 ;
-      RECT  3.065000 2.480000  3.395000 2.755000 ;
-      RECT  3.285000 0.595000  3.535000 1.200000 ;
-      RECT  3.285000 1.200000  3.840000 1.370000 ;
-      RECT  3.595000 2.415000  5.325000 2.585000 ;
-      RECT  3.595000 2.585000  3.845000 2.755000 ;
-      RECT  3.670000 1.370000  3.840000 2.075000 ;
-      RECT  3.705000 0.595000  4.180000 1.030000 ;
-      RECT  4.010000 1.030000  4.180000 2.415000 ;
-      RECT  4.350000 0.425000  4.520000 0.580000 ;
-      RECT  4.350000 0.580000  6.255000 0.750000 ;
-      RECT  4.350000 0.920000  5.915000 1.090000 ;
-      RECT  4.350000 1.090000  4.630000 2.155000 ;
-      RECT  4.890000 1.445000  5.560000 1.615000 ;
-      RECT  4.890000 1.615000  5.060000 2.350000 ;
-      RECT  4.890000 2.350000  5.325000 2.415000 ;
-      RECT  4.990000 2.585000  5.325000 2.680000 ;
-      RECT  5.230000 1.285000  5.560000 1.445000 ;
-      RECT  5.745000 1.090000  5.915000 1.400000 ;
-      RECT  5.745000 1.400000  6.480000 1.570000 ;
-      RECT  6.085000 0.750000  6.255000 0.900000 ;
-      RECT  6.085000 0.900000  6.820000 1.230000 ;
-      RECT  6.230000 1.570000  6.480000 2.755000 ;
-      RECT  6.425000 0.400000  7.160000 0.730000 ;
-      RECT  6.650000 1.230000  6.820000 1.865000 ;
-      RECT  6.650000 1.865000  7.325000 2.195000 ;
-      RECT  6.700000 2.365000  7.665000 2.695000 ;
-      RECT  6.990000 0.730000  7.160000 1.425000 ;
-      RECT  6.990000 1.425000  8.630000 1.595000 ;
-      RECT  7.430000 0.900000  8.970000 1.070000 ;
-      RECT  7.430000 1.070000  7.760000 1.230000 ;
-      RECT  7.495000 1.595000  7.665000 2.365000 ;
-      RECT  8.260000 2.335000  8.640000 2.730000 ;
-      RECT  8.330000 1.265000  8.630000 1.425000 ;
-      RECT  8.470000 1.765000  8.970000 1.935000 ;
-      RECT  8.470000 1.935000  8.640000 2.335000 ;
-      RECT  8.485000 0.350000  8.970000 0.900000 ;
-      RECT  8.800000 1.070000  8.970000 1.765000 ;
-      RECT 10.190000 0.350000 10.440000 1.300000 ;
-      RECT 10.190000 1.300000 11.095000 1.630000 ;
-      RECT 10.190000 1.630000 10.440000 2.975000 ;
+      RECT  0.000000 -0.085000 11.520000 0.085000 ;
+      RECT  0.000000  3.245000 11.520000 3.415000 ;
+      RECT  0.115000  2.520000  0.365000 3.245000 ;
+      RECT  0.170000  0.370000  0.500000 0.660000 ;
+      RECT  0.170000  0.660000  0.860000 0.830000 ;
+      RECT  0.565000  2.520000  0.895000 2.980000 ;
+      RECT  0.690000  0.830000  0.860000 2.310000 ;
+      RECT  0.690000  2.310000  3.395000 2.480000 ;
+      RECT  0.690000  2.480000  0.895000 2.520000 ;
+      RECT  1.030000  0.085000  1.280000 0.830000 ;
+      RECT  1.030000  1.130000  1.300000 2.140000 ;
+      RECT  1.095000  2.650000  1.345000 3.245000 ;
+      RECT  1.470000  0.350000  1.920000 0.970000 ;
+      RECT  1.470000  0.970000  2.775000 1.140000 ;
+      RECT  1.470000  1.140000  1.640000 1.810000 ;
+      RECT  1.470000  1.810000  1.825000 2.140000 ;
+      RECT  2.025000  2.650000  2.355000 3.245000 ;
+      RECT  2.090000  0.085000  2.420000 0.800000 ;
+      RECT  2.445000  1.140000  2.775000 1.550000 ;
+      RECT  2.475000  1.735000  3.500000 1.905000 ;
+      RECT  2.475000  1.905000  2.805000 2.140000 ;
+      RECT  2.590000  0.255000  4.520000 0.425000 ;
+      RECT  2.590000  0.425000  3.115000 0.800000 ;
+      RECT  2.945000  0.800000  3.115000 1.575000 ;
+      RECT  2.945000  1.575000  3.500000 1.735000 ;
+      RECT  3.065000  2.075000  3.840000 2.245000 ;
+      RECT  3.065000  2.245000  3.395000 2.310000 ;
+      RECT  3.065000  2.480000  3.395000 2.755000 ;
+      RECT  3.285000  0.595000  3.535000 1.200000 ;
+      RECT  3.285000  1.200000  3.840000 1.370000 ;
+      RECT  3.595000  2.415000  5.325000 2.585000 ;
+      RECT  3.595000  2.585000  3.845000 2.755000 ;
+      RECT  3.670000  1.370000  3.840000 2.075000 ;
+      RECT  3.705000  0.595000  4.180000 1.030000 ;
+      RECT  4.010000  1.030000  4.180000 2.415000 ;
+      RECT  4.350000  0.425000  4.520000 0.580000 ;
+      RECT  4.350000  0.580000  6.255000 0.750000 ;
+      RECT  4.350000  0.920000  5.915000 1.090000 ;
+      RECT  4.350000  1.090000  4.630000 2.155000 ;
+      RECT  4.440000  2.755000  4.785000 3.245000 ;
+      RECT  4.890000  1.445000  5.560000 1.615000 ;
+      RECT  4.890000  1.615000  5.060000 2.350000 ;
+      RECT  4.890000  2.350000  5.325000 2.415000 ;
+      RECT  4.990000  2.585000  5.325000 2.680000 ;
+      RECT  4.995000  0.085000  5.325000 0.410000 ;
+      RECT  5.230000  1.285000  5.560000 1.445000 ;
+      RECT  5.230000  1.825000  5.610000 2.155000 ;
+      RECT  5.745000  1.090000  5.915000 1.400000 ;
+      RECT  5.745000  1.400000  6.480000 1.570000 ;
+      RECT  5.780000  1.740000  6.030000 3.245000 ;
+      RECT  6.085000  0.750000  6.255000 0.900000 ;
+      RECT  6.085000  0.900000  6.820000 1.230000 ;
+      RECT  6.230000  1.570000  6.480000 2.755000 ;
+      RECT  6.425000  0.400000  7.160000 0.730000 ;
+      RECT  6.650000  1.230000  6.820000 1.865000 ;
+      RECT  6.650000  1.865000  7.325000 2.195000 ;
+      RECT  6.700000  2.365000  7.665000 2.695000 ;
+      RECT  6.990000  0.730000  7.160000 1.425000 ;
+      RECT  6.990000  1.425000  8.630000 1.595000 ;
+      RECT  7.430000  0.900000  8.970000 1.070000 ;
+      RECT  7.430000  1.070000  7.760000 1.230000 ;
+      RECT  7.495000  1.595000  7.665000 2.365000 ;
+      RECT  7.535000  0.085000  7.995000 0.680000 ;
+      RECT  7.835000  1.835000  8.300000 2.165000 ;
+      RECT  7.835000  2.335000  8.060000 3.245000 ;
+      RECT  8.260000  2.335000  8.640000 2.730000 ;
+      RECT  8.330000  1.265000  8.630000 1.425000 ;
+      RECT  8.470000  1.765000  8.970000 1.935000 ;
+      RECT  8.470000  1.935000  8.640000 2.335000 ;
+      RECT  8.485000  0.350000  8.970000 0.900000 ;
+      RECT  8.800000  1.070000  8.970000 1.765000 ;
+      RECT  8.810000  2.105000  9.025000 3.245000 ;
+      RECT  9.140000  0.085000  9.390000 1.130000 ;
+      RECT 10.190000  0.350000 10.440000 1.300000 ;
+      RECT 10.190000  1.300000 11.095000 1.630000 ;
+      RECT 10.190000  1.630000 10.440000 2.975000 ;
+      RECT 10.610000  1.820000 10.905000 3.245000 ;
+      RECT 10.645000  0.085000 10.895000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  1.950000  1.285000 2.120000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.950000  5.605000 2.120000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.950000  8.005000 2.120000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfrbp_1
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef
index 0420865..c9cfd74 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.magic.lef
@@ -68,14 +68,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.025000 1.450000 1.315000 1.780000 ;
-        RECT 2.385000 1.445000 2.755000 1.775000 ;
-        RECT 9.540000 1.450000 9.955000 1.780000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.580000 1.285000 1.750000 ;
-        RECT 2.555000 1.580000 2.725000 1.750000 ;
-        RECT 9.755000 1.580000 9.925000 1.750000 ;
       LAYER met1 ;
         RECT 1.055000 1.550000 1.345000 1.595000 ;
         RECT 1.055000 1.595000 9.985000 1.735000 ;
@@ -99,46 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  1.145000  0.085000  1.475000 0.810000 ;
-        RECT  2.205000  0.085000  2.535000 0.780000 ;
-        RECT  5.605000  0.085000  5.855000 0.490000 ;
-        RECT  9.415000  0.085000  9.745000 0.720000 ;
-        RECT 10.845000  0.085000 11.015000 1.100000 ;
-        RECT 11.625000  0.085000 11.965000 0.600000 ;
-        RECT 12.630000  0.085000 12.880000 1.130000 ;
-        RECT 13.560000  0.085000 13.820000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
@@ -147,124 +99,167 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.115000 1.940000  0.510000 2.965000 ;
-        RECT  0.115000 2.965000  1.435000 3.245000 ;
-        RECT  2.945000 2.625000  3.195000 3.245000 ;
-        RECT  5.990000 2.765000  6.500000 3.245000 ;
-        RECT  9.265000 2.290000  9.625000 3.245000 ;
-        RECT 10.365000 2.290000 10.695000 3.245000 ;
-        RECT 11.265000 1.740000 11.595000 3.245000 ;
-        RECT 12.475000 1.820000 12.805000 3.245000 ;
-        RECT 13.475000 1.820000 13.805000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.325000 0.390000  0.855000 0.640000 ;
-      RECT  0.680000 1.950000  1.010000 2.625000 ;
-      RECT  0.680000 2.625000  1.775000 2.795000 ;
-      RECT  0.685000 0.640000  0.855000 1.950000 ;
-      RECT  1.485000 1.015000  3.095000 1.185000 ;
-      RECT  1.485000 1.185000  1.655000 2.285000 ;
-      RECT  1.485000 2.285000  1.970000 2.455000 ;
-      RECT  1.605000 2.795000  1.775000 2.905000 ;
-      RECT  1.605000 2.905000  2.775000 3.075000 ;
-      RECT  1.645000 0.350000  1.975000 1.015000 ;
-      RECT  1.825000 1.470000  2.155000 1.945000 ;
-      RECT  1.825000 1.945000  4.120000 2.115000 ;
-      RECT  2.185000 2.115000  2.435000 2.735000 ;
-      RECT  2.605000 2.285000  3.535000 2.455000 ;
-      RECT  2.605000 2.455000  2.775000 2.905000 ;
-      RECT  2.705000 0.255000  5.235000 0.425000 ;
-      RECT  2.705000 0.425000  2.875000 1.015000 ;
-      RECT  2.925000 1.185000  3.095000 1.555000 ;
-      RECT  2.925000 1.555000  3.255000 1.775000 ;
-      RECT  3.045000 0.595000  4.895000 0.765000 ;
-      RECT  3.345000 0.935000  4.475000 1.105000 ;
-      RECT  3.345000 1.105000  3.715000 1.385000 ;
-      RECT  3.365000 2.455000  3.535000 2.905000 ;
-      RECT  3.365000 2.905000  4.460000 3.075000 ;
-      RECT  3.790000 2.115000  4.120000 2.735000 ;
-      RECT  3.885000 1.275000  4.135000 1.610000 ;
-      RECT  3.885000 1.610000  4.120000 1.945000 ;
-      RECT  4.290000 2.410000  4.475000 2.485000 ;
-      RECT  4.290000 2.485000  4.960000 2.815000 ;
-      RECT  4.290000 2.815000  4.460000 2.905000 ;
-      RECT  4.305000 1.105000  4.475000 2.410000 ;
-      RECT  4.645000 0.765000  4.895000 1.600000 ;
-      RECT  4.645000 1.910000  5.785000 2.240000 ;
-      RECT  5.065000 0.425000  5.235000 0.660000 ;
-      RECT  5.065000 0.660000  6.195000 0.830000 ;
-      RECT  5.095000 1.000000  5.425000 1.840000 ;
-      RECT  5.095000 1.840000  5.785000 1.910000 ;
-      RECT  5.425000 2.240000  5.785000 2.425000 ;
-      RECT  5.425000 2.425000  7.505000 2.595000 ;
-      RECT  5.425000 2.595000  5.785000 2.980000 ;
-      RECT  5.595000 1.340000  6.535000 1.670000 ;
-      RECT  6.025000 0.255000  8.780000 0.425000 ;
-      RECT  6.025000 0.425000  6.195000 0.660000 ;
-      RECT  6.095000 1.670000  6.265000 1.840000 ;
-      RECT  6.095000 1.840000  7.505000 2.170000 ;
-      RECT  6.365000 0.635000  6.960000 0.965000 ;
-      RECT  6.365000 0.965000  6.535000 1.340000 ;
-      RECT  6.705000 2.170000  7.035000 2.255000 ;
-      RECT  7.215000 0.425000  7.385000 1.355000 ;
-      RECT  7.215000 1.355000  7.880000 1.525000 ;
-      RECT  7.315000 2.595000  7.505000 2.905000 ;
-      RECT  7.315000 2.905000  8.220000 3.075000 ;
-      RECT  7.555000 0.595000  9.235000 0.765000 ;
-      RECT  7.555000 0.765000  7.725000 1.185000 ;
-      RECT  7.710000 1.525000  7.880000 2.735000 ;
-      RECT  7.905000 0.935000 10.335000 1.105000 ;
-      RECT  8.050000 1.275000  8.555000 1.605000 ;
-      RECT  8.050000 1.605000  8.220000 2.905000 ;
-      RECT  8.390000 1.925000  8.895000 2.095000 ;
-      RECT  8.390000 2.095000  8.640000 2.385000 ;
-      RECT  8.725000 1.105000 10.335000 1.265000 ;
-      RECT  8.725000 1.265000  8.895000 1.925000 ;
-      RECT  8.985000 0.350000  9.235000 0.595000 ;
-      RECT  9.065000 1.455000  9.330000 1.950000 ;
-      RECT  9.065000 1.950000 10.675000 2.120000 ;
-      RECT  9.830000 2.120000 10.160000 2.385000 ;
-      RECT 10.205000 0.350000 10.675000 0.765000 ;
-      RECT 10.505000 0.765000 10.675000 1.950000 ;
-      RECT 11.895000 1.740000 12.305000 2.780000 ;
-      RECT 12.135000 0.350000 12.430000 1.300000 ;
-      RECT 12.135000 1.300000 12.965000 1.630000 ;
-      RECT 12.135000 1.630000 12.305000 1.740000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.115000  1.940000  0.510000 2.965000 ;
+      RECT  0.115000  2.965000  1.435000 3.245000 ;
+      RECT  0.325000  0.390000  0.855000 0.640000 ;
+      RECT  0.680000  1.950000  1.010000 2.625000 ;
+      RECT  0.680000  2.625000  1.775000 2.795000 ;
+      RECT  0.685000  0.640000  0.855000 1.950000 ;
+      RECT  1.025000  1.450000  1.315000 1.780000 ;
+      RECT  1.145000  0.085000  1.475000 0.810000 ;
+      RECT  1.485000  1.015000  3.095000 1.185000 ;
+      RECT  1.485000  1.185000  1.655000 2.285000 ;
+      RECT  1.485000  2.285000  1.970000 2.455000 ;
+      RECT  1.605000  2.795000  1.775000 2.905000 ;
+      RECT  1.605000  2.905000  2.775000 3.075000 ;
+      RECT  1.645000  0.350000  1.975000 1.015000 ;
+      RECT  1.825000  1.470000  2.155000 1.945000 ;
+      RECT  1.825000  1.945000  4.120000 2.115000 ;
+      RECT  2.185000  2.115000  2.435000 2.735000 ;
+      RECT  2.205000  0.085000  2.535000 0.780000 ;
+      RECT  2.385000  1.445000  2.755000 1.775000 ;
+      RECT  2.605000  2.285000  3.535000 2.455000 ;
+      RECT  2.605000  2.455000  2.775000 2.905000 ;
+      RECT  2.705000  0.255000  5.235000 0.425000 ;
+      RECT  2.705000  0.425000  2.875000 1.015000 ;
+      RECT  2.925000  1.185000  3.095000 1.555000 ;
+      RECT  2.925000  1.555000  3.255000 1.775000 ;
+      RECT  2.945000  2.625000  3.195000 3.245000 ;
+      RECT  3.045000  0.595000  4.895000 0.765000 ;
+      RECT  3.345000  0.935000  4.475000 1.105000 ;
+      RECT  3.345000  1.105000  3.715000 1.385000 ;
+      RECT  3.365000  2.455000  3.535000 2.905000 ;
+      RECT  3.365000  2.905000  4.460000 3.075000 ;
+      RECT  3.790000  2.115000  4.120000 2.735000 ;
+      RECT  3.885000  1.275000  4.135000 1.610000 ;
+      RECT  3.885000  1.610000  4.120000 1.945000 ;
+      RECT  4.290000  2.410000  4.475000 2.485000 ;
+      RECT  4.290000  2.485000  4.960000 2.815000 ;
+      RECT  4.290000  2.815000  4.460000 2.905000 ;
+      RECT  4.305000  1.105000  4.475000 2.410000 ;
+      RECT  4.645000  0.765000  4.895000 1.600000 ;
+      RECT  4.645000  1.910000  5.785000 2.240000 ;
+      RECT  5.065000  0.425000  5.235000 0.660000 ;
+      RECT  5.065000  0.660000  6.195000 0.830000 ;
+      RECT  5.095000  1.000000  5.425000 1.840000 ;
+      RECT  5.095000  1.840000  5.785000 1.910000 ;
+      RECT  5.425000  2.240000  5.785000 2.425000 ;
+      RECT  5.425000  2.425000  7.505000 2.595000 ;
+      RECT  5.425000  2.595000  5.785000 2.980000 ;
+      RECT  5.595000  1.340000  6.535000 1.670000 ;
+      RECT  5.605000  0.085000  5.855000 0.490000 ;
+      RECT  5.990000  2.765000  6.500000 3.245000 ;
+      RECT  6.025000  0.255000  8.780000 0.425000 ;
+      RECT  6.025000  0.425000  6.195000 0.660000 ;
+      RECT  6.095000  1.670000  6.265000 1.840000 ;
+      RECT  6.095000  1.840000  7.505000 2.170000 ;
+      RECT  6.365000  0.635000  6.960000 0.965000 ;
+      RECT  6.365000  0.965000  6.535000 1.340000 ;
+      RECT  6.705000  2.170000  7.035000 2.255000 ;
+      RECT  7.215000  0.425000  7.385000 1.355000 ;
+      RECT  7.215000  1.355000  7.880000 1.525000 ;
+      RECT  7.315000  2.595000  7.505000 2.905000 ;
+      RECT  7.315000  2.905000  8.220000 3.075000 ;
+      RECT  7.555000  0.595000  9.235000 0.765000 ;
+      RECT  7.555000  0.765000  7.725000 1.185000 ;
+      RECT  7.710000  1.525000  7.880000 2.735000 ;
+      RECT  7.905000  0.935000 10.335000 1.105000 ;
+      RECT  8.050000  1.275000  8.555000 1.605000 ;
+      RECT  8.050000  1.605000  8.220000 2.905000 ;
+      RECT  8.390000  1.925000  8.895000 2.095000 ;
+      RECT  8.390000  2.095000  8.640000 2.385000 ;
+      RECT  8.725000  1.105000 10.335000 1.265000 ;
+      RECT  8.725000  1.265000  8.895000 1.925000 ;
+      RECT  8.985000  0.350000  9.235000 0.595000 ;
+      RECT  9.065000  1.455000  9.330000 1.950000 ;
+      RECT  9.065000  1.950000 10.675000 2.120000 ;
+      RECT  9.265000  2.290000  9.625000 3.245000 ;
+      RECT  9.415000  0.085000  9.745000 0.720000 ;
+      RECT  9.540000  1.450000  9.955000 1.780000 ;
+      RECT  9.830000  2.120000 10.160000 2.385000 ;
+      RECT 10.205000  0.350000 10.675000 0.765000 ;
+      RECT 10.365000  2.290000 10.695000 3.245000 ;
+      RECT 10.505000  0.765000 10.675000 1.950000 ;
+      RECT 10.845000  0.085000 11.015000 1.100000 ;
+      RECT 11.265000  1.740000 11.595000 3.245000 ;
+      RECT 11.625000  0.085000 11.965000 0.600000 ;
+      RECT 11.895000  1.740000 12.305000 2.780000 ;
+      RECT 12.135000  0.350000 12.430000 1.300000 ;
+      RECT 12.135000  1.300000 12.965000 1.630000 ;
+      RECT 12.135000  1.630000 12.305000 1.740000 ;
+      RECT 12.475000  1.820000 12.805000 3.245000 ;
+      RECT 12.630000  0.085000 12.880000 1.130000 ;
+      RECT 13.475000  1.820000 13.805000 3.245000 ;
+      RECT 13.560000  0.085000 13.820000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  1.580000  1.285000 1.750000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  1.580000  2.725000 1.750000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  1.580000  9.925000 1.750000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfrbp_2
diff --git a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef
index 4b23054..40edbc2 100644
--- a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.magic.lef
@@ -55,14 +55,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.880000 1.350000 1.285000 1.780000 ;
-        RECT 4.820000 1.470000 5.155000 1.800000 ;
-        RECT 8.285000 1.465000 8.710000 1.795000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.580000 1.285000 1.750000 ;
-        RECT 4.955000 1.580000 5.125000 1.750000 ;
-        RECT 8.315000 1.580000 8.485000 1.750000 ;
       LAYER met1 ;
         RECT 1.055000 1.550000 1.345000 1.595000 ;
         RECT 1.055000 1.595000 8.545000 1.735000 ;
@@ -86,37 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  1.045000  0.085000  1.295000 0.810000 ;
-        RECT  2.020000  0.085000  2.350000 0.465000 ;
-        RECT  5.025000  0.085000  5.355000 0.620000 ;
-        RECT  8.115000  0.085000  8.555000 0.905000 ;
-        RECT 10.160000  0.085000 10.410000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -125,106 +86,140 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.110000 2.520000  0.440000 3.245000 ;
-        RECT  1.060000 2.655000  1.390000 3.245000 ;
-        RECT  2.070000 2.655000  2.400000 3.245000 ;
-        RECT  4.460000 2.520000  4.790000 3.245000 ;
-        RECT  5.490000 2.360000  5.820000 3.245000 ;
-        RECT  8.140000 2.520000  8.470000 3.245000 ;
-        RECT  9.210000 2.520000  9.460000 3.245000 ;
-        RECT 10.150000 2.100000 10.400000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 0.350000  0.710000 0.790000 ;
-      RECT 0.540000 0.790000  0.710000 2.180000 ;
-      RECT 0.540000 2.180000  1.230000 2.315000 ;
-      RECT 0.540000 2.315000  3.420000 2.350000 ;
-      RECT 0.640000 2.350000  0.890000 2.980000 ;
-      RECT 1.060000 2.350000  3.420000 2.485000 ;
-      RECT 1.475000 0.350000  1.805000 0.635000 ;
-      RECT 1.475000 0.635000  2.165000 1.010000 ;
-      RECT 1.515000 1.820000  2.165000 2.145000 ;
-      RECT 1.935000 1.010000  2.165000 1.820000 ;
-      RECT 2.335000 0.635000  3.365000 0.805000 ;
-      RECT 2.335000 0.805000  2.505000 2.315000 ;
-      RECT 2.675000 0.975000  2.940000 1.245000 ;
-      RECT 2.675000 1.245000  3.705000 1.415000 ;
-      RECT 2.675000 1.415000  2.940000 1.775000 ;
-      RECT 2.675000 1.775000  3.715000 2.105000 ;
-      RECT 2.675000 2.105000  2.940000 2.145000 ;
-      RECT 3.035000 0.255000  4.465000 0.465000 ;
-      RECT 3.115000 0.805000  3.365000 1.075000 ;
-      RECT 3.170000 2.485000  3.420000 2.980000 ;
-      RECT 3.535000 0.465000  3.705000 1.245000 ;
-      RECT 3.620000 2.520000  4.055000 2.980000 ;
-      RECT 3.875000 0.635000  4.125000 1.075000 ;
-      RECT 3.885000 1.075000  4.055000 2.020000 ;
-      RECT 3.885000 2.020000  5.695000 2.190000 ;
-      RECT 3.885000 2.190000  4.055000 2.520000 ;
-      RECT 4.280000 1.520000  4.610000 1.850000 ;
-      RECT 4.295000 0.465000  4.465000 0.790000 ;
-      RECT 4.295000 0.790000  5.695000 0.960000 ;
-      RECT 4.440000 1.130000  6.195000 1.300000 ;
-      RECT 4.440000 1.300000  4.610000 1.520000 ;
-      RECT 4.970000 2.190000  5.300000 2.980000 ;
-      RECT 5.365000 1.470000  5.695000 2.020000 ;
-      RECT 5.525000 0.255000  6.535000 0.425000 ;
-      RECT 5.525000 0.425000  5.695000 0.790000 ;
-      RECT 5.865000 0.595000  6.195000 1.130000 ;
-      RECT 5.865000 1.300000  6.035000 1.970000 ;
-      RECT 5.865000 1.970000  6.700000 2.140000 ;
-      RECT 5.990000 2.140000  6.700000 2.980000 ;
-      RECT 6.205000 1.470000  6.510000 1.630000 ;
-      RECT 6.205000 1.630000  7.560000 1.800000 ;
-      RECT 6.365000 0.425000  6.535000 1.125000 ;
-      RECT 6.365000 1.125000  7.420000 1.295000 ;
-      RECT 6.705000 0.625000  7.900000 0.955000 ;
-      RECT 6.750000 1.295000  7.420000 1.455000 ;
-      RECT 6.870000 2.535000  7.900000 2.705000 ;
-      RECT 6.870000 2.705000  7.600000 2.865000 ;
-      RECT 7.310000 1.800000  7.560000 2.365000 ;
-      RECT 7.730000 0.955000  7.900000 1.125000 ;
-      RECT 7.730000 1.125000  9.220000 1.295000 ;
-      RECT 7.730000 1.295000  7.900000 2.535000 ;
-      RECT 8.070000 1.965000  9.560000 2.135000 ;
-      RECT 8.070000 2.135000  9.050000 2.335000 ;
-      RECT 8.680000 2.335000  9.010000 2.980000 ;
-      RECT 8.920000 1.295000  9.220000 1.795000 ;
-      RECT 9.045000 0.575000  9.560000 0.955000 ;
-      RECT 9.390000 0.955000  9.560000 1.965000 ;
-      RECT 9.650000 2.305000  9.980000 2.980000 ;
-      RECT 9.730000 0.530000  9.980000 1.320000 ;
-      RECT 9.730000 1.320000 10.615000 1.650000 ;
-      RECT 9.730000 1.650000  9.980000 2.305000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.110000  2.520000  0.440000 3.245000 ;
+      RECT  0.145000  0.350000  0.710000 0.790000 ;
+      RECT  0.540000  0.790000  0.710000 2.180000 ;
+      RECT  0.540000  2.180000  1.230000 2.315000 ;
+      RECT  0.540000  2.315000  3.420000 2.350000 ;
+      RECT  0.640000  2.350000  0.890000 2.980000 ;
+      RECT  0.880000  1.350000  1.285000 1.780000 ;
+      RECT  1.045000  0.085000  1.295000 0.810000 ;
+      RECT  1.060000  2.350000  3.420000 2.485000 ;
+      RECT  1.060000  2.655000  1.390000 3.245000 ;
+      RECT  1.475000  0.350000  1.805000 0.635000 ;
+      RECT  1.475000  0.635000  2.165000 1.010000 ;
+      RECT  1.515000  1.820000  2.165000 2.145000 ;
+      RECT  1.935000  1.010000  2.165000 1.820000 ;
+      RECT  2.020000  0.085000  2.350000 0.465000 ;
+      RECT  2.070000  2.655000  2.400000 3.245000 ;
+      RECT  2.335000  0.635000  3.365000 0.805000 ;
+      RECT  2.335000  0.805000  2.505000 2.315000 ;
+      RECT  2.675000  0.975000  2.940000 1.245000 ;
+      RECT  2.675000  1.245000  3.705000 1.415000 ;
+      RECT  2.675000  1.415000  2.940000 1.775000 ;
+      RECT  2.675000  1.775000  3.715000 2.105000 ;
+      RECT  2.675000  2.105000  2.940000 2.145000 ;
+      RECT  3.035000  0.255000  4.465000 0.465000 ;
+      RECT  3.115000  0.805000  3.365000 1.075000 ;
+      RECT  3.170000  2.485000  3.420000 2.980000 ;
+      RECT  3.535000  0.465000  3.705000 1.245000 ;
+      RECT  3.620000  2.520000  4.055000 2.980000 ;
+      RECT  3.875000  0.635000  4.125000 1.075000 ;
+      RECT  3.885000  1.075000  4.055000 2.020000 ;
+      RECT  3.885000  2.020000  5.695000 2.190000 ;
+      RECT  3.885000  2.190000  4.055000 2.520000 ;
+      RECT  4.280000  1.520000  4.610000 1.850000 ;
+      RECT  4.295000  0.465000  4.465000 0.790000 ;
+      RECT  4.295000  0.790000  5.695000 0.960000 ;
+      RECT  4.440000  1.130000  6.195000 1.300000 ;
+      RECT  4.440000  1.300000  4.610000 1.520000 ;
+      RECT  4.460000  2.520000  4.790000 3.245000 ;
+      RECT  4.820000  1.470000  5.155000 1.800000 ;
+      RECT  4.970000  2.190000  5.300000 2.980000 ;
+      RECT  5.025000  0.085000  5.355000 0.620000 ;
+      RECT  5.365000  1.470000  5.695000 2.020000 ;
+      RECT  5.490000  2.360000  5.820000 3.245000 ;
+      RECT  5.525000  0.255000  6.535000 0.425000 ;
+      RECT  5.525000  0.425000  5.695000 0.790000 ;
+      RECT  5.865000  0.595000  6.195000 1.130000 ;
+      RECT  5.865000  1.300000  6.035000 1.970000 ;
+      RECT  5.865000  1.970000  6.700000 2.140000 ;
+      RECT  5.990000  2.140000  6.700000 2.980000 ;
+      RECT  6.205000  1.470000  6.510000 1.630000 ;
+      RECT  6.205000  1.630000  7.560000 1.800000 ;
+      RECT  6.365000  0.425000  6.535000 1.125000 ;
+      RECT  6.365000  1.125000  7.420000 1.295000 ;
+      RECT  6.705000  0.625000  7.900000 0.955000 ;
+      RECT  6.750000  1.295000  7.420000 1.455000 ;
+      RECT  6.870000  2.535000  7.900000 2.705000 ;
+      RECT  6.870000  2.705000  7.600000 2.865000 ;
+      RECT  7.310000  1.800000  7.560000 2.365000 ;
+      RECT  7.730000  0.955000  7.900000 1.125000 ;
+      RECT  7.730000  1.125000  9.220000 1.295000 ;
+      RECT  7.730000  1.295000  7.900000 2.535000 ;
+      RECT  8.070000  1.965000  9.560000 2.135000 ;
+      RECT  8.070000  2.135000  9.050000 2.335000 ;
+      RECT  8.115000  0.085000  8.555000 0.905000 ;
+      RECT  8.140000  2.520000  8.470000 3.245000 ;
+      RECT  8.285000  1.465000  8.710000 1.795000 ;
+      RECT  8.680000  2.335000  9.010000 2.980000 ;
+      RECT  8.920000  1.295000  9.220000 1.795000 ;
+      RECT  9.045000  0.575000  9.560000 0.955000 ;
+      RECT  9.210000  2.520000  9.460000 3.245000 ;
+      RECT  9.390000  0.955000  9.560000 1.965000 ;
+      RECT  9.650000  2.305000  9.980000 2.980000 ;
+      RECT  9.730000  0.530000  9.980000 1.320000 ;
+      RECT  9.730000  1.320000 10.615000 1.650000 ;
+      RECT  9.730000  1.650000  9.980000 2.305000 ;
+      RECT 10.150000  2.100000 10.400000 3.245000 ;
+      RECT 10.160000  0.085000 10.410000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  1.580000  1.285000 1.750000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  1.580000  5.125000 1.750000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.580000  8.485000 1.750000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfrtn_1
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef
index 38ebe7d..50ef031 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.magic.lef
@@ -55,14 +55,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.025000 1.130000 1.285000 2.140000 ;
-        RECT 4.955000 1.795000 5.285000 2.150000 ;
-        RECT 7.805000 1.920000 8.345000 2.255000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.950000 1.285000 2.120000 ;
-        RECT 4.955000 1.950000 5.125000 2.120000 ;
-        RECT 7.835000 1.950000 8.005000 2.120000 ;
       LAYER met1 ;
         RECT 1.055000 1.920000 1.345000 1.965000 ;
         RECT 1.055000 1.965000 8.065000 2.105000 ;
@@ -87,38 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  1.030000  0.085000  1.280000 0.830000 ;
-        RECT  2.010000  0.085000  2.340000 0.800000 ;
-        RECT  4.915000  0.085000  5.310000 0.395000 ;
-        RECT  7.745000  0.085000  8.075000 0.845000 ;
-        RECT  9.175000  0.085000  9.425000 0.845000 ;
-        RECT 10.675000  0.085000 10.925000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -127,108 +87,143 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.105000 2.520000  0.355000 3.245000 ;
-        RECT  1.085000 2.650000  1.335000 3.245000 ;
-        RECT  1.985000 2.680000  2.315000 3.245000 ;
-        RECT  4.385000 2.740000  4.715000 3.245000 ;
-        RECT  5.480000 1.745000  5.810000 3.245000 ;
-        RECT  7.805000 2.445000  8.135000 3.245000 ;
-        RECT  8.855000 2.195000  9.185000 3.245000 ;
-        RECT 10.595000 1.820000 10.925000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.130000 0.370000 0.460000 0.660000 ;
-      RECT 0.130000 0.660000 0.855000 0.830000 ;
-      RECT 0.555000 2.520000 0.885000 2.980000 ;
-      RECT 0.685000 0.830000 0.855000 2.310000 ;
-      RECT 0.685000 2.310000 1.675000 2.340000 ;
-      RECT 0.685000 2.340000 3.260000 2.480000 ;
-      RECT 0.685000 2.480000 0.885000 2.520000 ;
-      RECT 1.455000 0.350000 1.840000 0.970000 ;
-      RECT 1.455000 0.970000 2.695000 1.140000 ;
-      RECT 1.455000 1.140000 1.625000 1.810000 ;
-      RECT 1.455000 1.810000 1.865000 2.140000 ;
-      RECT 1.505000 2.480000 3.260000 2.510000 ;
-      RECT 2.445000 1.140000 2.695000 1.550000 ;
-      RECT 2.510000 0.330000 4.435000 0.500000 ;
-      RECT 2.510000 0.500000 3.035000 0.800000 ;
-      RECT 2.515000 1.720000 3.415000 1.890000 ;
-      RECT 2.515000 1.890000 2.765000 2.170000 ;
-      RECT 2.865000 0.800000 3.035000 1.560000 ;
-      RECT 2.865000 1.560000 3.415000 1.720000 ;
-      RECT 3.010000 2.060000 3.755000 2.230000 ;
-      RECT 3.010000 2.230000 3.260000 2.340000 ;
-      RECT 3.010000 2.510000 3.260000 2.725000 ;
-      RECT 3.205000 0.670000 3.455000 1.220000 ;
-      RECT 3.205000 1.220000 3.755000 1.390000 ;
-      RECT 3.460000 2.400000 5.250000 2.570000 ;
-      RECT 3.460000 2.570000 3.790000 2.725000 ;
-      RECT 3.585000 1.390000 3.755000 2.060000 ;
-      RECT 3.625000 0.670000 4.095000 1.050000 ;
-      RECT 3.925000 1.050000 4.095000 2.400000 ;
-      RECT 4.265000 0.500000 4.435000 0.565000 ;
-      RECT 4.265000 0.565000 5.650000 0.735000 ;
-      RECT 4.265000 0.905000 6.150000 1.075000 ;
-      RECT 4.265000 1.075000 4.445000 2.125000 ;
-      RECT 4.615000 1.245000 5.650000 1.575000 ;
-      RECT 4.615000 1.575000 4.785000 2.320000 ;
-      RECT 4.615000 2.320000 5.250000 2.400000 ;
-      RECT 5.480000 0.255000 7.420000 0.425000 ;
-      RECT 5.480000 0.425000 5.650000 0.565000 ;
-      RECT 5.820000 0.665000 6.150000 0.905000 ;
-      RECT 5.820000 1.075000 6.150000 1.130000 ;
-      RECT 5.980000 1.130000 6.150000 1.865000 ;
-      RECT 5.980000 1.865000 6.310000 2.755000 ;
-      RECT 6.320000 0.595000 7.080000 0.845000 ;
-      RECT 6.320000 0.845000 6.490000 1.515000 ;
-      RECT 6.320000 1.515000 6.650000 1.685000 ;
-      RECT 6.480000 1.685000 6.650000 2.475000 ;
-      RECT 6.480000 2.475000 7.635000 2.805000 ;
-      RECT 6.690000 1.015000 7.420000 1.345000 ;
-      RECT 6.965000 1.345000 7.295000 2.305000 ;
-      RECT 7.250000 0.425000 7.420000 1.015000 ;
-      RECT 7.465000 1.515000 8.850000 1.685000 ;
-      RECT 7.465000 1.685000 7.635000 2.475000 ;
-      RECT 7.590000 1.015000 9.190000 1.185000 ;
-      RECT 7.590000 1.185000 7.920000 1.345000 ;
-      RECT 8.320000 2.445000 8.685000 2.905000 ;
-      RECT 8.515000 1.855000 9.190000 2.025000 ;
-      RECT 8.515000 2.025000 8.685000 2.445000 ;
-      RECT 8.520000 1.355000 8.850000 1.515000 ;
-      RECT 8.615000 0.385000 8.945000 1.015000 ;
-      RECT 9.020000 1.185000 9.190000 1.855000 ;
-      RECT 9.385000 1.385000 9.935000 1.715000 ;
-      RECT 9.385000 1.715000 9.555000 2.905000 ;
-      RECT 9.605000 0.350000 9.935000 1.385000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.105000  2.520000  0.355000 3.245000 ;
+      RECT  0.130000  0.370000  0.460000 0.660000 ;
+      RECT  0.130000  0.660000  0.855000 0.830000 ;
+      RECT  0.555000  2.520000  0.885000 2.980000 ;
+      RECT  0.685000  0.830000  0.855000 2.310000 ;
+      RECT  0.685000  2.310000  1.675000 2.340000 ;
+      RECT  0.685000  2.340000  3.260000 2.480000 ;
+      RECT  0.685000  2.480000  0.885000 2.520000 ;
+      RECT  1.025000  1.130000  1.285000 2.140000 ;
+      RECT  1.030000  0.085000  1.280000 0.830000 ;
+      RECT  1.085000  2.650000  1.335000 3.245000 ;
+      RECT  1.455000  0.350000  1.840000 0.970000 ;
+      RECT  1.455000  0.970000  2.695000 1.140000 ;
+      RECT  1.455000  1.140000  1.625000 1.810000 ;
+      RECT  1.455000  1.810000  1.865000 2.140000 ;
+      RECT  1.505000  2.480000  3.260000 2.510000 ;
+      RECT  1.985000  2.680000  2.315000 3.245000 ;
+      RECT  2.010000  0.085000  2.340000 0.800000 ;
+      RECT  2.445000  1.140000  2.695000 1.550000 ;
+      RECT  2.510000  0.330000  4.435000 0.500000 ;
+      RECT  2.510000  0.500000  3.035000 0.800000 ;
+      RECT  2.515000  1.720000  3.415000 1.890000 ;
+      RECT  2.515000  1.890000  2.765000 2.170000 ;
+      RECT  2.865000  0.800000  3.035000 1.560000 ;
+      RECT  2.865000  1.560000  3.415000 1.720000 ;
+      RECT  3.010000  2.060000  3.755000 2.230000 ;
+      RECT  3.010000  2.230000  3.260000 2.340000 ;
+      RECT  3.010000  2.510000  3.260000 2.725000 ;
+      RECT  3.205000  0.670000  3.455000 1.220000 ;
+      RECT  3.205000  1.220000  3.755000 1.390000 ;
+      RECT  3.460000  2.400000  5.250000 2.570000 ;
+      RECT  3.460000  2.570000  3.790000 2.725000 ;
+      RECT  3.585000  1.390000  3.755000 2.060000 ;
+      RECT  3.625000  0.670000  4.095000 1.050000 ;
+      RECT  3.925000  1.050000  4.095000 2.400000 ;
+      RECT  4.265000  0.500000  4.435000 0.565000 ;
+      RECT  4.265000  0.565000  5.650000 0.735000 ;
+      RECT  4.265000  0.905000  6.150000 1.075000 ;
+      RECT  4.265000  1.075000  4.445000 2.125000 ;
+      RECT  4.385000  2.740000  4.715000 3.245000 ;
+      RECT  4.615000  1.245000  5.650000 1.575000 ;
+      RECT  4.615000  1.575000  4.785000 2.320000 ;
+      RECT  4.615000  2.320000  5.250000 2.400000 ;
+      RECT  4.915000  0.085000  5.310000 0.395000 ;
+      RECT  4.955000  1.795000  5.285000 2.150000 ;
+      RECT  5.480000  0.255000  7.420000 0.425000 ;
+      RECT  5.480000  0.425000  5.650000 0.565000 ;
+      RECT  5.480000  1.745000  5.810000 3.245000 ;
+      RECT  5.820000  0.665000  6.150000 0.905000 ;
+      RECT  5.820000  1.075000  6.150000 1.130000 ;
+      RECT  5.980000  1.130000  6.150000 1.865000 ;
+      RECT  5.980000  1.865000  6.310000 2.755000 ;
+      RECT  6.320000  0.595000  7.080000 0.845000 ;
+      RECT  6.320000  0.845000  6.490000 1.515000 ;
+      RECT  6.320000  1.515000  6.650000 1.685000 ;
+      RECT  6.480000  1.685000  6.650000 2.475000 ;
+      RECT  6.480000  2.475000  7.635000 2.805000 ;
+      RECT  6.690000  1.015000  7.420000 1.345000 ;
+      RECT  6.965000  1.345000  7.295000 2.305000 ;
+      RECT  7.250000  0.425000  7.420000 1.015000 ;
+      RECT  7.465000  1.515000  8.850000 1.685000 ;
+      RECT  7.465000  1.685000  7.635000 2.475000 ;
+      RECT  7.590000  1.015000  9.190000 1.185000 ;
+      RECT  7.590000  1.185000  7.920000 1.345000 ;
+      RECT  7.745000  0.085000  8.075000 0.845000 ;
+      RECT  7.805000  1.920000  8.345000 2.255000 ;
+      RECT  7.805000  2.445000  8.135000 3.245000 ;
+      RECT  8.320000  2.445000  8.685000 2.905000 ;
+      RECT  8.515000  1.855000  9.190000 2.025000 ;
+      RECT  8.515000  2.025000  8.685000 2.445000 ;
+      RECT  8.520000  1.355000  8.850000 1.515000 ;
+      RECT  8.615000  0.385000  8.945000 1.015000 ;
+      RECT  8.855000  2.195000  9.185000 3.245000 ;
+      RECT  9.020000  1.185000  9.190000 1.855000 ;
+      RECT  9.175000  0.085000  9.425000 0.845000 ;
+      RECT  9.385000  1.385000  9.935000 1.715000 ;
+      RECT  9.385000  1.715000  9.555000 2.905000 ;
+      RECT  9.605000  0.350000  9.935000 1.385000 ;
+      RECT 10.595000  1.820000 10.925000 3.245000 ;
+      RECT 10.675000  0.085000 10.925000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  1.950000  1.285000 2.120000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  1.950000  5.125000 2.120000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.950000  8.005000 2.120000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfrtp_1
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef
index bc6e115..0ae1042 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.magic.lef
@@ -53,14 +53,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.005000 1.140000 1.285000 2.150000 ;
-        RECT 4.955000 1.795000 5.285000 2.150000 ;
-        RECT 7.805000 1.920000 8.395000 2.275000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.950000 1.285000 2.120000 ;
-        RECT 4.955000 1.950000 5.125000 2.120000 ;
-        RECT 7.835000 1.950000 8.005000 2.120000 ;
       LAYER met1 ;
         RECT 1.055000 1.920000 1.345000 1.965000 ;
         RECT 1.055000 1.965000 8.065000 2.105000 ;
@@ -85,40 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.520000 0.085000 ;
-        RECT  1.030000  0.085000  1.280000 0.830000 ;
-        RECT  2.010000  0.085000  2.340000 0.810000 ;
-        RECT  4.920000  0.085000  5.345000 0.445000 ;
-        RECT  7.770000  0.085000  8.190000 0.715000 ;
-        RECT  9.230000  0.085000  9.480000 1.050000 ;
-        RECT 10.220000  0.085000 10.470000 1.130000 ;
-        RECT 11.160000  0.085000 11.410000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
@@ -127,110 +85,147 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.520000 3.415000 ;
-        RECT  0.105000 2.520000  0.435000 3.245000 ;
-        RECT  1.005000 2.660000  1.335000 3.245000 ;
-        RECT  1.985000 2.660000  2.315000 3.245000 ;
-        RECT  4.420000 2.755000  4.750000 3.245000 ;
-        RECT  5.515000 1.745000  5.845000 3.245000 ;
-        RECT  7.795000 2.445000  8.125000 3.245000 ;
-        RECT  9.090000 2.445000  9.420000 3.245000 ;
-        RECT 10.150000 1.820000 10.480000 3.245000 ;
-        RECT 11.155000 1.820000 11.405000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.520000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.130000 0.370000  0.460000 0.660000 ;
-      RECT 0.130000 0.660000  0.835000 0.830000 ;
-      RECT 0.635000 2.520000  0.835000 2.980000 ;
-      RECT 0.665000 0.830000  0.835000 2.320000 ;
-      RECT 0.665000 2.320000  3.265000 2.490000 ;
-      RECT 0.665000 2.490000  0.835000 2.520000 ;
-      RECT 1.455000 0.350000  1.840000 0.980000 ;
-      RECT 1.455000 0.980000  2.700000 1.150000 ;
-      RECT 1.455000 1.150000  1.625000 1.820000 ;
-      RECT 1.455000 1.820000  1.865000 2.150000 ;
-      RECT 2.445000 1.150000  2.700000 1.550000 ;
-      RECT 2.510000 0.330000  4.440000 0.500000 ;
-      RECT 2.510000 0.500000  3.040000 0.810000 ;
-      RECT 2.515000 1.735000  3.420000 1.905000 ;
-      RECT 2.515000 1.905000  2.870000 2.120000 ;
-      RECT 2.870000 0.810000  3.040000 1.575000 ;
-      RECT 2.870000 1.575000  3.420000 1.735000 ;
-      RECT 3.015000 2.290000  3.265000 2.320000 ;
-      RECT 3.015000 2.490000  3.265000 2.725000 ;
-      RECT 3.095000 2.075000  3.760000 2.245000 ;
-      RECT 3.095000 2.245000  3.265000 2.290000 ;
-      RECT 3.210000 0.670000  3.460000 1.235000 ;
-      RECT 3.210000 1.235000  3.760000 1.405000 ;
-      RECT 3.465000 2.415000  5.285000 2.585000 ;
-      RECT 3.465000 2.585000  3.795000 2.725000 ;
-      RECT 3.590000 1.405000  3.760000 2.075000 ;
-      RECT 3.630000 0.670000  4.100000 1.065000 ;
-      RECT 3.930000 1.065000  4.100000 2.415000 ;
-      RECT 4.270000 0.500000  4.440000 0.615000 ;
-      RECT 4.270000 0.615000  5.685000 0.785000 ;
-      RECT 4.270000 0.955000  6.185000 1.125000 ;
-      RECT 4.270000 1.125000  4.445000 2.125000 ;
-      RECT 4.615000 1.295000  5.685000 1.575000 ;
-      RECT 4.615000 1.575000  4.785000 2.320000 ;
-      RECT 4.615000 2.320000  5.285000 2.415000 ;
-      RECT 5.515000 0.255000  7.455000 0.425000 ;
-      RECT 5.515000 0.425000  5.685000 0.615000 ;
-      RECT 5.855000 0.595000  6.185000 0.955000 ;
-      RECT 5.855000 1.125000  6.185000 1.130000 ;
-      RECT 6.015000 1.130000  6.185000 1.855000 ;
-      RECT 6.015000 1.855000  6.345000 2.755000 ;
-      RECT 6.355000 0.595000  7.115000 0.845000 ;
-      RECT 6.355000 0.845000  6.525000 1.515000 ;
-      RECT 6.355000 1.515000  6.685000 1.685000 ;
-      RECT 6.515000 1.685000  6.685000 2.475000 ;
-      RECT 6.515000 2.475000  7.625000 2.805000 ;
-      RECT 6.725000 1.015000  7.455000 1.345000 ;
-      RECT 6.955000 1.345000  7.285000 2.305000 ;
-      RECT 7.285000 0.425000  7.455000 1.015000 ;
-      RECT 7.455000 1.560000  9.035000 1.730000 ;
-      RECT 7.455000 1.730000  7.625000 2.475000 ;
-      RECT 7.625000 1.060000  7.955000 1.220000 ;
-      RECT 7.625000 1.220000  9.375000 1.390000 ;
-      RECT 8.295000 2.445000  8.885000 2.775000 ;
-      RECT 8.680000 0.385000  9.010000 1.220000 ;
-      RECT 8.705000 1.730000  9.035000 1.890000 ;
-      RECT 8.715000 2.105000  9.375000 2.275000 ;
-      RECT 8.715000 2.275000  8.885000 2.445000 ;
-      RECT 9.205000 1.390000  9.375000 2.105000 ;
-      RECT 9.590000 2.030000  9.920000 2.905000 ;
-      RECT 9.660000 0.350000  9.990000 1.300000 ;
-      RECT 9.660000 1.300000 10.190000 1.630000 ;
-      RECT 9.660000 1.630000  9.920000 2.030000 ;
+      RECT  0.000000 -0.085000 11.520000 0.085000 ;
+      RECT  0.000000  3.245000 11.520000 3.415000 ;
+      RECT  0.105000  2.520000  0.435000 3.245000 ;
+      RECT  0.130000  0.370000  0.460000 0.660000 ;
+      RECT  0.130000  0.660000  0.835000 0.830000 ;
+      RECT  0.635000  2.520000  0.835000 2.980000 ;
+      RECT  0.665000  0.830000  0.835000 2.320000 ;
+      RECT  0.665000  2.320000  3.265000 2.490000 ;
+      RECT  0.665000  2.490000  0.835000 2.520000 ;
+      RECT  1.005000  1.140000  1.285000 2.150000 ;
+      RECT  1.005000  2.660000  1.335000 3.245000 ;
+      RECT  1.030000  0.085000  1.280000 0.830000 ;
+      RECT  1.455000  0.350000  1.840000 0.980000 ;
+      RECT  1.455000  0.980000  2.700000 1.150000 ;
+      RECT  1.455000  1.150000  1.625000 1.820000 ;
+      RECT  1.455000  1.820000  1.865000 2.150000 ;
+      RECT  1.985000  2.660000  2.315000 3.245000 ;
+      RECT  2.010000  0.085000  2.340000 0.810000 ;
+      RECT  2.445000  1.150000  2.700000 1.550000 ;
+      RECT  2.510000  0.330000  4.440000 0.500000 ;
+      RECT  2.510000  0.500000  3.040000 0.810000 ;
+      RECT  2.515000  1.735000  3.420000 1.905000 ;
+      RECT  2.515000  1.905000  2.870000 2.120000 ;
+      RECT  2.870000  0.810000  3.040000 1.575000 ;
+      RECT  2.870000  1.575000  3.420000 1.735000 ;
+      RECT  3.015000  2.290000  3.265000 2.320000 ;
+      RECT  3.015000  2.490000  3.265000 2.725000 ;
+      RECT  3.095000  2.075000  3.760000 2.245000 ;
+      RECT  3.095000  2.245000  3.265000 2.290000 ;
+      RECT  3.210000  0.670000  3.460000 1.235000 ;
+      RECT  3.210000  1.235000  3.760000 1.405000 ;
+      RECT  3.465000  2.415000  5.285000 2.585000 ;
+      RECT  3.465000  2.585000  3.795000 2.725000 ;
+      RECT  3.590000  1.405000  3.760000 2.075000 ;
+      RECT  3.630000  0.670000  4.100000 1.065000 ;
+      RECT  3.930000  1.065000  4.100000 2.415000 ;
+      RECT  4.270000  0.500000  4.440000 0.615000 ;
+      RECT  4.270000  0.615000  5.685000 0.785000 ;
+      RECT  4.270000  0.955000  6.185000 1.125000 ;
+      RECT  4.270000  1.125000  4.445000 2.125000 ;
+      RECT  4.420000  2.755000  4.750000 3.245000 ;
+      RECT  4.615000  1.295000  5.685000 1.575000 ;
+      RECT  4.615000  1.575000  4.785000 2.320000 ;
+      RECT  4.615000  2.320000  5.285000 2.415000 ;
+      RECT  4.920000  0.085000  5.345000 0.445000 ;
+      RECT  4.955000  1.795000  5.285000 2.150000 ;
+      RECT  5.515000  0.255000  7.455000 0.425000 ;
+      RECT  5.515000  0.425000  5.685000 0.615000 ;
+      RECT  5.515000  1.745000  5.845000 3.245000 ;
+      RECT  5.855000  0.595000  6.185000 0.955000 ;
+      RECT  5.855000  1.125000  6.185000 1.130000 ;
+      RECT  6.015000  1.130000  6.185000 1.855000 ;
+      RECT  6.015000  1.855000  6.345000 2.755000 ;
+      RECT  6.355000  0.595000  7.115000 0.845000 ;
+      RECT  6.355000  0.845000  6.525000 1.515000 ;
+      RECT  6.355000  1.515000  6.685000 1.685000 ;
+      RECT  6.515000  1.685000  6.685000 2.475000 ;
+      RECT  6.515000  2.475000  7.625000 2.805000 ;
+      RECT  6.725000  1.015000  7.455000 1.345000 ;
+      RECT  6.955000  1.345000  7.285000 2.305000 ;
+      RECT  7.285000  0.425000  7.455000 1.015000 ;
+      RECT  7.455000  1.560000  9.035000 1.730000 ;
+      RECT  7.455000  1.730000  7.625000 2.475000 ;
+      RECT  7.625000  1.060000  7.955000 1.220000 ;
+      RECT  7.625000  1.220000  9.375000 1.390000 ;
+      RECT  7.770000  0.085000  8.190000 0.715000 ;
+      RECT  7.795000  2.445000  8.125000 3.245000 ;
+      RECT  7.805000  1.920000  8.395000 2.275000 ;
+      RECT  8.295000  2.445000  8.885000 2.775000 ;
+      RECT  8.680000  0.385000  9.010000 1.220000 ;
+      RECT  8.705000  1.730000  9.035000 1.890000 ;
+      RECT  8.715000  2.105000  9.375000 2.275000 ;
+      RECT  8.715000  2.275000  8.885000 2.445000 ;
+      RECT  9.090000  2.445000  9.420000 3.245000 ;
+      RECT  9.205000  1.390000  9.375000 2.105000 ;
+      RECT  9.230000  0.085000  9.480000 1.050000 ;
+      RECT  9.590000  2.030000  9.920000 2.905000 ;
+      RECT  9.660000  0.350000  9.990000 1.300000 ;
+      RECT  9.660000  1.300000 10.190000 1.630000 ;
+      RECT  9.660000  1.630000  9.920000 2.030000 ;
+      RECT 10.150000  1.820000 10.480000 3.245000 ;
+      RECT 10.220000  0.085000 10.470000 1.130000 ;
+      RECT 11.155000  1.820000 11.405000 3.245000 ;
+      RECT 11.160000  0.085000 11.410000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  1.950000  1.285000 2.120000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  1.950000  5.125000 2.120000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.950000  8.005000 2.120000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfrtp_2
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef
index 5decb86..d51d3ba 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.magic.lef
@@ -62,14 +62,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.025000 1.130000 1.285000 2.140000 ;
-        RECT 5.085000 1.670000 5.635000 2.120000 ;
-        RECT 8.765000 1.920000 9.140000 2.275000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.950000 1.285000 2.120000 ;
-        RECT 5.435000 1.950000 5.605000 2.120000 ;
-        RECT 8.795000 1.950000 8.965000 2.120000 ;
       LAYER met1 ;
         RECT 1.055000 1.920000 1.345000 1.965000 ;
         RECT 1.055000 1.965000 9.025000 2.105000 ;
@@ -94,45 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  1.065000  0.085000  1.235000 0.830000 ;
-        RECT  2.045000  0.085000  2.375000 0.800000 ;
-        RECT  4.895000  0.085000  5.225000 0.370000 ;
-        RECT  8.625000  0.085000  8.955000 0.845000 ;
-        RECT 10.115000  0.085000 10.390000 1.130000 ;
-        RECT 11.120000  0.085000 11.410000 1.130000 ;
-        RECT 12.080000  0.085000 12.405000 0.710000 ;
-        RECT 13.005000  0.085000 13.335000 1.100000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
@@ -141,119 +94,161 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  0.110000 2.520000  0.360000 3.245000 ;
-        RECT  1.090000 2.650000  1.340000 3.245000 ;
-        RECT  2.005000 2.680000  2.335000 3.245000 ;
-        RECT  4.400000 2.740000  4.730000 3.245000 ;
-        RECT  5.830000 2.745000  6.165000 3.245000 ;
-        RECT  8.580000 2.445000  8.910000 3.245000 ;
-        RECT  9.650000 2.445000  9.900000 3.245000 ;
-        RECT 10.535000 2.025000 10.865000 3.245000 ;
-        RECT 11.535000 2.140000 12.240000 3.245000 ;
-        RECT 12.910000 1.950000 13.240000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.165000 0.370000  0.495000 0.660000 ;
-      RECT  0.165000 0.660000  0.855000 0.830000 ;
-      RECT  0.560000 2.520000  0.890000 2.980000 ;
-      RECT  0.685000 0.830000  0.855000 2.310000 ;
-      RECT  0.685000 2.310000  1.680000 2.340000 ;
-      RECT  0.685000 2.340000  3.360000 2.480000 ;
-      RECT  0.685000 2.480000  0.890000 2.520000 ;
-      RECT  1.455000 0.350000  1.875000 0.970000 ;
-      RECT  1.455000 0.970000  2.675000 1.140000 ;
-      RECT  1.455000 1.140000  1.625000 1.810000 ;
-      RECT  1.455000 1.810000  1.805000 2.140000 ;
-      RECT  1.510000 2.480000  3.360000 2.510000 ;
-      RECT  2.445000 1.140000  2.675000 1.550000 ;
-      RECT  2.455000 1.720000  3.455000 1.890000 ;
-      RECT  2.455000 1.890000  2.845000 2.170000 ;
-      RECT  2.545000 0.330000  4.475000 0.500000 ;
-      RECT  2.545000 0.500000  3.015000 0.800000 ;
-      RECT  2.845000 0.800000  3.015000 1.720000 ;
-      RECT  3.030000 2.060000  3.795000 2.230000 ;
-      RECT  3.030000 2.230000  3.360000 2.340000 ;
-      RECT  3.030000 2.510000  3.360000 2.755000 ;
-      RECT  3.185000 0.670000  3.435000 1.220000 ;
-      RECT  3.185000 1.220000  3.795000 1.390000 ;
-      RECT  3.190000 1.560000  3.455000 1.720000 ;
-      RECT  3.560000 2.400000  5.180000 2.570000 ;
-      RECT  3.560000 2.570000  3.810000 2.755000 ;
-      RECT  3.605000 0.670000  3.935000 0.880000 ;
-      RECT  3.605000 0.880000  4.135000 1.050000 ;
-      RECT  3.625000 1.390000  3.795000 2.060000 ;
-      RECT  3.965000 1.050000  4.135000 2.400000 ;
-      RECT  4.305000 0.500000  4.475000 0.540000 ;
-      RECT  4.305000 0.540000  5.565000 0.710000 ;
-      RECT  4.305000 0.880000  6.990000 1.050000 ;
-      RECT  4.305000 1.050000  4.570000 2.105000 ;
-      RECT  4.745000 1.220000  5.985000 1.500000 ;
-      RECT  4.745000 1.500000  4.915000 2.295000 ;
-      RECT  4.745000 2.295000  5.180000 2.400000 ;
-      RECT  4.915000 2.570000  5.180000 2.755000 ;
-      RECT  5.395000 0.255000  8.275000 0.425000 ;
-      RECT  5.395000 0.425000  5.565000 0.540000 ;
-      RECT  5.395000 2.290000  5.725000 2.405000 ;
-      RECT  5.395000 2.405000  6.955000 2.575000 ;
-      RECT  5.735000 0.720000  6.990000 0.880000 ;
-      RECT  6.155000 1.050000  6.325000 1.940000 ;
-      RECT  6.155000 1.940000  6.615000 2.235000 ;
-      RECT  6.495000 1.260000  6.955000 1.590000 ;
-      RECT  6.785000 1.590000  6.955000 2.405000 ;
-      RECT  7.125000 2.475000  8.410000 2.805000 ;
-      RECT  7.160000 0.595000  7.935000 0.845000 ;
-      RECT  7.160000 0.845000  7.330000 2.475000 ;
-      RECT  7.545000 1.015000  8.275000 1.345000 ;
-      RECT  7.740000 1.345000  8.070000 2.305000 ;
-      RECT  8.105000 0.425000  8.275000 1.015000 ;
-      RECT  8.240000 1.535000  9.605000 1.705000 ;
-      RECT  8.240000 1.705000  8.410000 2.475000 ;
-      RECT  8.445000 1.035000  9.945000 1.205000 ;
-      RECT  8.445000 1.205000  8.775000 1.365000 ;
-      RECT  9.080000 2.445000  9.480000 2.905000 ;
-      RECT  9.310000 1.875000  9.945000 2.045000 ;
-      RECT  9.310000 2.045000  9.480000 2.445000 ;
-      RECT  9.345000 1.375000  9.605000 1.535000 ;
-      RECT  9.500000 0.385000  9.830000 1.035000 ;
-      RECT  9.775000 1.205000  9.945000 1.875000 ;
-      RECT 10.115000 1.460000 12.240000 1.630000 ;
-      RECT 10.115000 1.630000 10.365000 2.905000 ;
-      RECT 10.560000 0.350000 10.890000 1.300000 ;
-      RECT 10.560000 1.300000 12.240000 1.460000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.110000  2.520000  0.360000 3.245000 ;
+      RECT  0.165000  0.370000  0.495000 0.660000 ;
+      RECT  0.165000  0.660000  0.855000 0.830000 ;
+      RECT  0.560000  2.520000  0.890000 2.980000 ;
+      RECT  0.685000  0.830000  0.855000 2.310000 ;
+      RECT  0.685000  2.310000  1.680000 2.340000 ;
+      RECT  0.685000  2.340000  3.360000 2.480000 ;
+      RECT  0.685000  2.480000  0.890000 2.520000 ;
+      RECT  1.025000  1.130000  1.285000 2.140000 ;
+      RECT  1.065000  0.085000  1.235000 0.830000 ;
+      RECT  1.090000  2.650000  1.340000 3.245000 ;
+      RECT  1.455000  0.350000  1.875000 0.970000 ;
+      RECT  1.455000  0.970000  2.675000 1.140000 ;
+      RECT  1.455000  1.140000  1.625000 1.810000 ;
+      RECT  1.455000  1.810000  1.805000 2.140000 ;
+      RECT  1.510000  2.480000  3.360000 2.510000 ;
+      RECT  2.005000  2.680000  2.335000 3.245000 ;
+      RECT  2.045000  0.085000  2.375000 0.800000 ;
+      RECT  2.445000  1.140000  2.675000 1.550000 ;
+      RECT  2.455000  1.720000  3.455000 1.890000 ;
+      RECT  2.455000  1.890000  2.845000 2.170000 ;
+      RECT  2.545000  0.330000  4.475000 0.500000 ;
+      RECT  2.545000  0.500000  3.015000 0.800000 ;
+      RECT  2.845000  0.800000  3.015000 1.720000 ;
+      RECT  3.030000  2.060000  3.795000 2.230000 ;
+      RECT  3.030000  2.230000  3.360000 2.340000 ;
+      RECT  3.030000  2.510000  3.360000 2.755000 ;
+      RECT  3.185000  0.670000  3.435000 1.220000 ;
+      RECT  3.185000  1.220000  3.795000 1.390000 ;
+      RECT  3.190000  1.560000  3.455000 1.720000 ;
+      RECT  3.560000  2.400000  5.180000 2.570000 ;
+      RECT  3.560000  2.570000  3.810000 2.755000 ;
+      RECT  3.605000  0.670000  3.935000 0.880000 ;
+      RECT  3.605000  0.880000  4.135000 1.050000 ;
+      RECT  3.625000  1.390000  3.795000 2.060000 ;
+      RECT  3.965000  1.050000  4.135000 2.400000 ;
+      RECT  4.305000  0.500000  4.475000 0.540000 ;
+      RECT  4.305000  0.540000  5.565000 0.710000 ;
+      RECT  4.305000  0.880000  6.990000 1.050000 ;
+      RECT  4.305000  1.050000  4.570000 2.105000 ;
+      RECT  4.400000  2.740000  4.730000 3.245000 ;
+      RECT  4.745000  1.220000  5.985000 1.500000 ;
+      RECT  4.745000  1.500000  4.915000 2.295000 ;
+      RECT  4.745000  2.295000  5.180000 2.400000 ;
+      RECT  4.895000  0.085000  5.225000 0.370000 ;
+      RECT  4.915000  2.570000  5.180000 2.755000 ;
+      RECT  5.085000  1.670000  5.635000 2.120000 ;
+      RECT  5.395000  0.255000  8.275000 0.425000 ;
+      RECT  5.395000  0.425000  5.565000 0.540000 ;
+      RECT  5.395000  2.290000  5.725000 2.405000 ;
+      RECT  5.395000  2.405000  6.955000 2.575000 ;
+      RECT  5.735000  0.720000  6.990000 0.880000 ;
+      RECT  5.830000  2.745000  6.165000 3.245000 ;
+      RECT  6.155000  1.050000  6.325000 1.940000 ;
+      RECT  6.155000  1.940000  6.615000 2.235000 ;
+      RECT  6.495000  1.260000  6.955000 1.590000 ;
+      RECT  6.785000  1.590000  6.955000 2.405000 ;
+      RECT  7.125000  2.475000  8.410000 2.805000 ;
+      RECT  7.160000  0.595000  7.935000 0.845000 ;
+      RECT  7.160000  0.845000  7.330000 2.475000 ;
+      RECT  7.545000  1.015000  8.275000 1.345000 ;
+      RECT  7.740000  1.345000  8.070000 2.305000 ;
+      RECT  8.105000  0.425000  8.275000 1.015000 ;
+      RECT  8.240000  1.535000  9.605000 1.705000 ;
+      RECT  8.240000  1.705000  8.410000 2.475000 ;
+      RECT  8.445000  1.035000  9.945000 1.205000 ;
+      RECT  8.445000  1.205000  8.775000 1.365000 ;
+      RECT  8.580000  2.445000  8.910000 3.245000 ;
+      RECT  8.625000  0.085000  8.955000 0.845000 ;
+      RECT  8.765000  1.920000  9.140000 2.275000 ;
+      RECT  9.080000  2.445000  9.480000 2.905000 ;
+      RECT  9.310000  1.875000  9.945000 2.045000 ;
+      RECT  9.310000  2.045000  9.480000 2.445000 ;
+      RECT  9.345000  1.375000  9.605000 1.535000 ;
+      RECT  9.500000  0.385000  9.830000 1.035000 ;
+      RECT  9.650000  2.445000  9.900000 3.245000 ;
+      RECT  9.775000  1.205000  9.945000 1.875000 ;
+      RECT 10.115000  0.085000 10.390000 1.130000 ;
+      RECT 10.115000  1.460000 12.240000 1.630000 ;
+      RECT 10.115000  1.630000 10.365000 2.905000 ;
+      RECT 10.535000  2.025000 10.865000 3.245000 ;
+      RECT 10.560000  0.350000 10.890000 1.300000 ;
+      RECT 10.560000  1.300000 12.240000 1.460000 ;
+      RECT 11.120000  0.085000 11.410000 1.130000 ;
+      RECT 11.535000  2.140000 12.240000 3.245000 ;
+      RECT 12.080000  0.085000 12.405000 0.710000 ;
+      RECT 12.910000  1.950000 13.240000 3.245000 ;
+      RECT 13.005000  0.085000 13.335000 1.100000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  1.950000  1.285000 2.120000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.950000  5.605000 2.120000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  1.950000  8.965000 2.120000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfrtp_4
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef
index 88929b8..ed0adc4 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.magic.lef
@@ -66,12 +66,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.405000 1.550000 5.695000 1.955000 ;
-        RECT 8.285000 1.180000 8.670000 1.780000 ;
-      LAYER mcon ;
-        RECT 5.435000 1.580000 5.605000 1.750000 ;
-        RECT 8.315000 1.580000 8.485000 1.750000 ;
       LAYER met1 ;
         RECT 5.375000 1.550000 5.665000 1.595000 ;
         RECT 5.375000 1.595000 8.545000 1.735000 ;
@@ -93,41 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.545000  0.085000  0.795000 0.840000 ;
-        RECT  1.605000  0.085000  1.865000 1.010000 ;
-        RECT  4.105000  0.085000  4.435000 0.715000 ;
-        RECT  5.855000  0.085000  6.185000 0.950000 ;
-        RECT  8.065000  0.085000  8.755000 0.670000 ;
-        RECT  9.485000  0.085000  9.815000 0.670000 ;
-        RECT 11.055000  0.085000 11.385000 0.940000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
@@ -136,117 +95,153 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  0.565000 2.590000  0.895000 3.245000 ;
-        RECT  1.575000 2.530000  1.905000 3.245000 ;
-        RECT  4.045000 2.505000  4.440000 3.245000 ;
-        RECT  5.710000 2.465000  6.050000 3.245000 ;
-        RECT  8.070000 2.650000  8.240000 3.245000 ;
-        RECT  9.560000 2.730000  9.910000 3.245000 ;
-        RECT 11.050000 1.995000 11.380000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.000000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.380000  0.365000 0.840000 ;
-      RECT  0.115000 0.840000  0.285000 2.190000 ;
-      RECT  0.115000 2.190000  2.695000 2.230000 ;
-      RECT  0.115000 2.230000  1.795000 2.360000 ;
-      RECT  0.115000 2.360000  0.365000 2.980000 ;
-      RECT  0.975000 0.350000  1.435000 1.010000 ;
-      RECT  0.975000 1.010000  1.145000 1.720000 ;
-      RECT  0.975000 1.720000  2.355000 1.890000 ;
-      RECT  0.975000 1.890000  1.455000 2.020000 ;
-      RECT  1.625000 2.060000  2.695000 2.190000 ;
-      RECT  2.025000 1.300000  2.355000 1.720000 ;
-      RECT  2.045000 0.255000  3.195000 0.425000 ;
-      RECT  2.045000 0.425000  2.295000 1.130000 ;
-      RECT  2.105000 2.400000  2.355000 2.905000 ;
-      RECT  2.105000 2.905000  3.875000 3.075000 ;
-      RECT  2.525000 0.595000  2.855000 0.845000 ;
-      RECT  2.525000 0.845000  2.695000 2.060000 ;
-      RECT  2.525000 2.230000  2.695000 2.295000 ;
-      RECT  2.525000 2.295000  3.005000 2.735000 ;
-      RECT  2.865000 1.435000  3.195000 2.105000 ;
-      RECT  3.025000 0.425000  3.195000 1.435000 ;
-      RECT  3.175000 2.295000  3.535000 2.735000 ;
-      RECT  3.365000 0.385000  3.615000 0.885000 ;
-      RECT  3.365000 0.885000  4.285000 1.055000 ;
-      RECT  3.365000 1.055000  3.535000 2.295000 ;
-      RECT  3.705000 1.360000  3.945000 2.165000 ;
-      RECT  3.705000 2.165000  4.780000 2.335000 ;
-      RECT  3.705000 2.335000  3.875000 2.905000 ;
-      RECT  4.115000 1.055000  4.285000 1.435000 ;
-      RECT  4.115000 1.435000  5.235000 1.605000 ;
-      RECT  4.230000 1.775000  5.200000 1.995000 ;
-      RECT  4.455000 0.885000  4.775000 1.265000 ;
-      RECT  4.605000 0.435000  5.180000 0.885000 ;
-      RECT  4.610000 2.335000  4.780000 2.905000 ;
-      RECT  4.610000 2.905000  5.540000 3.075000 ;
-      RECT  4.950000 1.055000  5.235000 1.120000 ;
-      RECT  4.950000 1.120000  6.265000 1.290000 ;
-      RECT  4.950000 1.290000  5.235000 1.435000 ;
-      RECT  4.950000 1.995000  5.200000 2.735000 ;
-      RECT  5.370000 2.125000  6.035000 2.295000 ;
-      RECT  5.370000 2.295000  5.540000 2.905000 ;
-      RECT  5.865000 1.620000  6.605000 1.790000 ;
-      RECT  5.865000 1.790000  6.035000 2.125000 ;
-      RECT  5.935000 1.290000  6.265000 1.450000 ;
-      RECT  6.435000 0.255000  7.560000 0.425000 ;
-      RECT  6.435000 0.425000  6.605000 1.120000 ;
-      RECT  6.435000 1.120000  6.880000 1.450000 ;
-      RECT  6.435000 1.450000  6.605000 1.620000 ;
-      RECT  6.760000 1.960000  7.010000 2.480000 ;
-      RECT  6.760000 2.480000  7.900000 2.650000 ;
-      RECT  6.760000 2.650000  7.450000 2.905000 ;
-      RECT  6.775000 0.595000  7.220000 0.925000 ;
-      RECT  6.840000 1.680000  7.220000 1.850000 ;
-      RECT  6.840000 1.850000  7.010000 1.960000 ;
-      RECT  7.050000 0.925000  7.220000 1.680000 ;
-      RECT  7.230000 2.020000  7.560000 2.310000 ;
-      RECT  7.390000 0.425000  7.560000 2.020000 ;
-      RECT  7.730000 2.050000  9.395000 2.220000 ;
-      RECT  7.730000 2.220000  8.770000 2.480000 ;
-      RECT  7.770000 0.840000  9.735000 1.010000 ;
-      RECT  7.770000 1.010000  8.100000 1.880000 ;
-      RECT  8.440000 2.480000  8.770000 2.980000 ;
-      RECT  8.925000 0.415000  9.255000 0.840000 ;
-      RECT  9.000000 2.390000  9.735000 2.560000 ;
-      RECT  9.000000 2.560000  9.330000 2.980000 ;
-      RECT  9.065000 1.210000  9.395000 2.050000 ;
-      RECT  9.565000 1.010000  9.735000 2.390000 ;
-      RECT 10.545000 0.350000 10.875000 0.940000 ;
-      RECT 10.680000 0.940000 10.875000 1.220000 ;
-      RECT 10.680000 1.220000 11.540000 1.550000 ;
-      RECT 10.680000 1.550000 10.850000 2.875000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.115000  0.380000  0.365000 0.840000 ;
+      RECT  0.115000  0.840000  0.285000 2.190000 ;
+      RECT  0.115000  2.190000  2.695000 2.230000 ;
+      RECT  0.115000  2.230000  1.795000 2.360000 ;
+      RECT  0.115000  2.360000  0.365000 2.980000 ;
+      RECT  0.545000  0.085000  0.795000 0.840000 ;
+      RECT  0.565000  2.590000  0.895000 3.245000 ;
+      RECT  0.975000  0.350000  1.435000 1.010000 ;
+      RECT  0.975000  1.010000  1.145000 1.720000 ;
+      RECT  0.975000  1.720000  2.355000 1.890000 ;
+      RECT  0.975000  1.890000  1.455000 2.020000 ;
+      RECT  1.575000  2.530000  1.905000 3.245000 ;
+      RECT  1.605000  0.085000  1.865000 1.010000 ;
+      RECT  1.625000  2.060000  2.695000 2.190000 ;
+      RECT  2.025000  1.300000  2.355000 1.720000 ;
+      RECT  2.045000  0.255000  3.195000 0.425000 ;
+      RECT  2.045000  0.425000  2.295000 1.130000 ;
+      RECT  2.105000  2.400000  2.355000 2.905000 ;
+      RECT  2.105000  2.905000  3.875000 3.075000 ;
+      RECT  2.525000  0.595000  2.855000 0.845000 ;
+      RECT  2.525000  0.845000  2.695000 2.060000 ;
+      RECT  2.525000  2.230000  2.695000 2.295000 ;
+      RECT  2.525000  2.295000  3.005000 2.735000 ;
+      RECT  2.865000  1.435000  3.195000 2.105000 ;
+      RECT  3.025000  0.425000  3.195000 1.435000 ;
+      RECT  3.175000  2.295000  3.535000 2.735000 ;
+      RECT  3.365000  0.385000  3.615000 0.885000 ;
+      RECT  3.365000  0.885000  4.285000 1.055000 ;
+      RECT  3.365000  1.055000  3.535000 2.295000 ;
+      RECT  3.705000  1.360000  3.945000 2.165000 ;
+      RECT  3.705000  2.165000  4.780000 2.335000 ;
+      RECT  3.705000  2.335000  3.875000 2.905000 ;
+      RECT  4.045000  2.505000  4.440000 3.245000 ;
+      RECT  4.105000  0.085000  4.435000 0.715000 ;
+      RECT  4.115000  1.055000  4.285000 1.435000 ;
+      RECT  4.115000  1.435000  5.235000 1.605000 ;
+      RECT  4.230000  1.775000  5.200000 1.995000 ;
+      RECT  4.455000  0.885000  4.775000 1.265000 ;
+      RECT  4.605000  0.435000  5.180000 0.885000 ;
+      RECT  4.610000  2.335000  4.780000 2.905000 ;
+      RECT  4.610000  2.905000  5.540000 3.075000 ;
+      RECT  4.950000  1.055000  5.235000 1.120000 ;
+      RECT  4.950000  1.120000  6.265000 1.290000 ;
+      RECT  4.950000  1.290000  5.235000 1.435000 ;
+      RECT  4.950000  1.995000  5.200000 2.735000 ;
+      RECT  5.370000  2.125000  6.035000 2.295000 ;
+      RECT  5.370000  2.295000  5.540000 2.905000 ;
+      RECT  5.405000  1.550000  5.695000 1.955000 ;
+      RECT  5.710000  2.465000  6.050000 3.245000 ;
+      RECT  5.855000  0.085000  6.185000 0.950000 ;
+      RECT  5.865000  1.620000  6.605000 1.790000 ;
+      RECT  5.865000  1.790000  6.035000 2.125000 ;
+      RECT  5.935000  1.290000  6.265000 1.450000 ;
+      RECT  6.435000  0.255000  7.560000 0.425000 ;
+      RECT  6.435000  0.425000  6.605000 1.120000 ;
+      RECT  6.435000  1.120000  6.880000 1.450000 ;
+      RECT  6.435000  1.450000  6.605000 1.620000 ;
+      RECT  6.760000  1.960000  7.010000 2.480000 ;
+      RECT  6.760000  2.480000  7.900000 2.650000 ;
+      RECT  6.760000  2.650000  7.450000 2.905000 ;
+      RECT  6.775000  0.595000  7.220000 0.925000 ;
+      RECT  6.840000  1.680000  7.220000 1.850000 ;
+      RECT  6.840000  1.850000  7.010000 1.960000 ;
+      RECT  7.050000  0.925000  7.220000 1.680000 ;
+      RECT  7.230000  2.020000  7.560000 2.310000 ;
+      RECT  7.390000  0.425000  7.560000 2.020000 ;
+      RECT  7.730000  2.050000  9.395000 2.220000 ;
+      RECT  7.730000  2.220000  8.770000 2.480000 ;
+      RECT  7.770000  0.840000  9.735000 1.010000 ;
+      RECT  7.770000  1.010000  8.100000 1.880000 ;
+      RECT  8.065000  0.085000  8.755000 0.670000 ;
+      RECT  8.070000  2.650000  8.240000 3.245000 ;
+      RECT  8.285000  1.180000  8.670000 1.780000 ;
+      RECT  8.440000  2.480000  8.770000 2.980000 ;
+      RECT  8.925000  0.415000  9.255000 0.840000 ;
+      RECT  9.000000  2.390000  9.735000 2.560000 ;
+      RECT  9.000000  2.560000  9.330000 2.980000 ;
+      RECT  9.065000  1.210000  9.395000 2.050000 ;
+      RECT  9.485000  0.085000  9.815000 0.670000 ;
+      RECT  9.560000  2.730000  9.910000 3.245000 ;
+      RECT  9.565000  1.010000  9.735000 2.390000 ;
+      RECT 10.545000  0.350000 10.875000 0.940000 ;
+      RECT 10.680000  0.940000 10.875000 1.220000 ;
+      RECT 10.680000  1.220000 11.540000 1.550000 ;
+      RECT 10.680000  1.550000 10.850000 2.875000 ;
+      RECT 11.050000  1.995000 11.380000 3.245000 ;
+      RECT 11.055000  0.085000 11.385000 0.940000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.580000  5.605000 1.750000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.580000  8.485000 1.750000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfsbp_1
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef
index 86ed7e1..b831d43 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.magic.lef
@@ -65,12 +65,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.225000 1.580000 5.635000 2.020000 ;
-        RECT 8.285000 1.180000 8.640000 1.780000 ;
-      LAYER mcon ;
-        RECT 5.435000 1.580000 5.605000 1.750000 ;
-        RECT 8.315000 1.580000 8.485000 1.750000 ;
       LAYER met1 ;
         RECT 5.375000 1.550000 5.665000 1.595000 ;
         RECT 5.375000 1.595000 8.545000 1.735000 ;
@@ -92,45 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.545000  0.085000  0.795000 0.810000 ;
-        RECT  1.605000  0.085000  1.865000 1.010000 ;
-        RECT  3.990000  0.085000  4.240000 0.845000 ;
-        RECT  5.340000  0.085000  6.160000 0.680000 ;
-        RECT  8.100000  0.085000  8.845000 0.670000 ;
-        RECT  9.665000  0.085000  9.995000 0.840000 ;
-        RECT 10.605000  0.085000 10.855000 1.130000 ;
-        RECT 11.585000  0.085000 11.915000 1.030000 ;
-        RECT 12.595000  0.085000 12.845000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
@@ -139,121 +94,161 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.565000 2.530000  0.895000 3.245000 ;
-        RECT  1.575000 2.530000  1.905000 3.245000 ;
-        RECT  4.020000 2.735000  4.350000 3.245000 ;
-        RECT  5.700000 2.530000  6.070000 3.245000 ;
-        RECT  8.090000 2.650000  8.260000 3.245000 ;
-        RECT  9.630000 2.630000  9.960000 3.245000 ;
-        RECT 10.605000 1.820000 10.860000 3.245000 ;
-        RECT 11.615000 1.820000 11.865000 3.245000 ;
-        RECT 12.595000 1.820000 12.845000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.365000 0.810000 ;
-      RECT  0.115000 0.810000  0.285000 2.190000 ;
-      RECT  0.115000 2.190000  2.615000 2.230000 ;
-      RECT  0.115000 2.230000  1.795000 2.360000 ;
-      RECT  0.115000 2.360000  0.365000 2.980000 ;
-      RECT  0.975000 0.350000  1.435000 1.010000 ;
-      RECT  0.975000 1.010000  1.145000 1.720000 ;
-      RECT  0.975000 1.720000  2.275000 1.890000 ;
-      RECT  0.975000 1.890000  1.455000 2.020000 ;
-      RECT  1.625000 2.060000  2.615000 2.190000 ;
-      RECT  1.945000 1.300000  2.275000 1.720000 ;
-      RECT  2.045000 0.255000  3.110000 0.425000 ;
-      RECT  2.045000 0.425000  2.215000 1.130000 ;
-      RECT  2.105000 2.400000  2.275000 2.905000 ;
-      RECT  2.105000 2.905000  3.845000 3.075000 ;
-      RECT  2.445000 0.595000  2.770000 0.925000 ;
-      RECT  2.445000 0.925000  2.615000 2.060000 ;
-      RECT  2.445000 2.230000  2.615000 2.295000 ;
-      RECT  2.445000 2.295000  2.865000 2.735000 ;
-      RECT  2.785000 1.435000  3.115000 2.105000 ;
-      RECT  2.940000 0.425000  3.110000 1.435000 ;
-      RECT  3.065000 2.295000  3.455000 2.735000 ;
-      RECT  3.280000 0.465000  3.530000 0.925000 ;
-      RECT  3.285000 0.925000  3.530000 1.095000 ;
-      RECT  3.285000 1.095000  4.185000 1.265000 ;
-      RECT  3.285000 1.265000  3.455000 2.295000 ;
-      RECT  3.625000 1.435000  3.845000 2.395000 ;
-      RECT  3.625000 2.395000  4.690000 2.565000 ;
-      RECT  3.625000 2.565000  3.845000 2.905000 ;
-      RECT  4.015000 1.265000  4.185000 1.515000 ;
-      RECT  4.015000 1.515000  5.015000 1.685000 ;
-      RECT  4.140000 1.855000  4.470000 2.055000 ;
-      RECT  4.140000 2.055000  5.030000 2.225000 ;
-      RECT  4.355000 1.015000  4.580000 1.345000 ;
-      RECT  4.410000 0.350000  4.880000 1.015000 ;
-      RECT  4.520000 2.565000  4.690000 2.905000 ;
-      RECT  4.520000 2.905000  5.530000 3.075000 ;
-      RECT  4.750000 1.240000  5.915000 1.410000 ;
-      RECT  4.750000 1.410000  5.015000 1.515000 ;
-      RECT  4.750000 1.685000  5.015000 1.885000 ;
-      RECT  4.860000 2.225000  5.030000 2.295000 ;
-      RECT  4.860000 2.295000  5.190000 2.735000 ;
-      RECT  5.360000 2.190000  6.500000 2.360000 ;
-      RECT  5.360000 2.360000  5.530000 2.905000 ;
-      RECT  5.585000 1.120000  5.915000 1.240000 ;
-      RECT  6.330000 0.280000  7.555000 0.450000 ;
-      RECT  6.330000 0.450000  6.500000 1.120000 ;
-      RECT  6.330000 1.120000  6.875000 1.450000 ;
-      RECT  6.330000 1.450000  6.500000 2.190000 ;
-      RECT  6.670000 0.620000  7.215000 0.950000 ;
-      RECT  6.780000 1.680000  7.215000 1.850000 ;
-      RECT  6.780000 1.850000  7.030000 2.480000 ;
-      RECT  6.780000 2.480000  7.920000 2.650000 ;
-      RECT  6.780000 2.650000  7.470000 2.980000 ;
-      RECT  7.045000 0.950000  7.215000 1.680000 ;
-      RECT  7.250000 2.020000  7.580000 2.310000 ;
-      RECT  7.385000 0.450000  7.555000 2.020000 ;
-      RECT  7.725000 0.840000  9.435000 1.010000 ;
-      RECT  7.725000 1.010000  8.055000 1.780000 ;
-      RECT  7.750000 1.950000  9.570000 2.120000 ;
-      RECT  7.750000 2.120000  8.790000 2.480000 ;
-      RECT  8.460000 2.480000  8.790000 2.915000 ;
-      RECT  8.900000 1.350000  9.570000 1.950000 ;
-      RECT  9.015000 2.290000  9.910000 2.460000 ;
-      RECT  9.015000 2.460000  9.345000 2.620000 ;
-      RECT  9.105000 0.635000  9.435000 0.840000 ;
-      RECT  9.105000 1.010000  9.910000 1.180000 ;
-      RECT  9.740000 1.180000  9.910000 2.290000 ;
-      RECT 11.085000 0.350000 11.415000 1.300000 ;
-      RECT 11.085000 1.300000 12.085000 1.630000 ;
-      RECT 11.085000 1.630000 11.415000 2.860000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.115000  0.350000  0.365000 0.810000 ;
+      RECT  0.115000  0.810000  0.285000 2.190000 ;
+      RECT  0.115000  2.190000  2.615000 2.230000 ;
+      RECT  0.115000  2.230000  1.795000 2.360000 ;
+      RECT  0.115000  2.360000  0.365000 2.980000 ;
+      RECT  0.545000  0.085000  0.795000 0.810000 ;
+      RECT  0.565000  2.530000  0.895000 3.245000 ;
+      RECT  0.975000  0.350000  1.435000 1.010000 ;
+      RECT  0.975000  1.010000  1.145000 1.720000 ;
+      RECT  0.975000  1.720000  2.275000 1.890000 ;
+      RECT  0.975000  1.890000  1.455000 2.020000 ;
+      RECT  1.575000  2.530000  1.905000 3.245000 ;
+      RECT  1.605000  0.085000  1.865000 1.010000 ;
+      RECT  1.625000  2.060000  2.615000 2.190000 ;
+      RECT  1.945000  1.300000  2.275000 1.720000 ;
+      RECT  2.045000  0.255000  3.110000 0.425000 ;
+      RECT  2.045000  0.425000  2.215000 1.130000 ;
+      RECT  2.105000  2.400000  2.275000 2.905000 ;
+      RECT  2.105000  2.905000  3.845000 3.075000 ;
+      RECT  2.445000  0.595000  2.770000 0.925000 ;
+      RECT  2.445000  0.925000  2.615000 2.060000 ;
+      RECT  2.445000  2.230000  2.615000 2.295000 ;
+      RECT  2.445000  2.295000  2.865000 2.735000 ;
+      RECT  2.785000  1.435000  3.115000 2.105000 ;
+      RECT  2.940000  0.425000  3.110000 1.435000 ;
+      RECT  3.065000  2.295000  3.455000 2.735000 ;
+      RECT  3.280000  0.465000  3.530000 0.925000 ;
+      RECT  3.285000  0.925000  3.530000 1.095000 ;
+      RECT  3.285000  1.095000  4.185000 1.265000 ;
+      RECT  3.285000  1.265000  3.455000 2.295000 ;
+      RECT  3.625000  1.435000  3.845000 2.395000 ;
+      RECT  3.625000  2.395000  4.690000 2.565000 ;
+      RECT  3.625000  2.565000  3.845000 2.905000 ;
+      RECT  3.990000  0.085000  4.240000 0.845000 ;
+      RECT  4.015000  1.265000  4.185000 1.515000 ;
+      RECT  4.015000  1.515000  5.015000 1.685000 ;
+      RECT  4.020000  2.735000  4.350000 3.245000 ;
+      RECT  4.140000  1.855000  4.470000 2.055000 ;
+      RECT  4.140000  2.055000  5.030000 2.225000 ;
+      RECT  4.355000  1.015000  4.580000 1.345000 ;
+      RECT  4.410000  0.350000  4.880000 1.015000 ;
+      RECT  4.520000  2.565000  4.690000 2.905000 ;
+      RECT  4.520000  2.905000  5.530000 3.075000 ;
+      RECT  4.750000  1.240000  5.915000 1.410000 ;
+      RECT  4.750000  1.410000  5.015000 1.515000 ;
+      RECT  4.750000  1.685000  5.015000 1.885000 ;
+      RECT  4.860000  2.225000  5.030000 2.295000 ;
+      RECT  4.860000  2.295000  5.190000 2.735000 ;
+      RECT  5.225000  1.580000  5.635000 2.020000 ;
+      RECT  5.340000  0.085000  6.160000 0.680000 ;
+      RECT  5.360000  2.190000  6.500000 2.360000 ;
+      RECT  5.360000  2.360000  5.530000 2.905000 ;
+      RECT  5.585000  1.120000  5.915000 1.240000 ;
+      RECT  5.700000  2.530000  6.070000 3.245000 ;
+      RECT  6.330000  0.280000  7.555000 0.450000 ;
+      RECT  6.330000  0.450000  6.500000 1.120000 ;
+      RECT  6.330000  1.120000  6.875000 1.450000 ;
+      RECT  6.330000  1.450000  6.500000 2.190000 ;
+      RECT  6.670000  0.620000  7.215000 0.950000 ;
+      RECT  6.780000  1.680000  7.215000 1.850000 ;
+      RECT  6.780000  1.850000  7.030000 2.480000 ;
+      RECT  6.780000  2.480000  7.920000 2.650000 ;
+      RECT  6.780000  2.650000  7.470000 2.980000 ;
+      RECT  7.045000  0.950000  7.215000 1.680000 ;
+      RECT  7.250000  2.020000  7.580000 2.310000 ;
+      RECT  7.385000  0.450000  7.555000 2.020000 ;
+      RECT  7.725000  0.840000  9.435000 1.010000 ;
+      RECT  7.725000  1.010000  8.055000 1.780000 ;
+      RECT  7.750000  1.950000  9.570000 2.120000 ;
+      RECT  7.750000  2.120000  8.790000 2.480000 ;
+      RECT  8.090000  2.650000  8.260000 3.245000 ;
+      RECT  8.100000  0.085000  8.845000 0.670000 ;
+      RECT  8.285000  1.180000  8.640000 1.780000 ;
+      RECT  8.460000  2.480000  8.790000 2.915000 ;
+      RECT  8.900000  1.350000  9.570000 1.950000 ;
+      RECT  9.015000  2.290000  9.910000 2.460000 ;
+      RECT  9.015000  2.460000  9.345000 2.620000 ;
+      RECT  9.105000  0.635000  9.435000 0.840000 ;
+      RECT  9.105000  1.010000  9.910000 1.180000 ;
+      RECT  9.630000  2.630000  9.960000 3.245000 ;
+      RECT  9.665000  0.085000  9.995000 0.840000 ;
+      RECT  9.740000  1.180000  9.910000 2.290000 ;
+      RECT 10.605000  0.085000 10.855000 1.130000 ;
+      RECT 10.605000  1.820000 10.860000 3.245000 ;
+      RECT 11.085000  0.350000 11.415000 1.300000 ;
+      RECT 11.085000  1.300000 12.085000 1.630000 ;
+      RECT 11.085000  1.630000 11.415000 2.860000 ;
+      RECT 11.585000  0.085000 11.915000 1.030000 ;
+      RECT 11.615000  1.820000 11.865000 3.245000 ;
+      RECT 12.595000  0.085000 12.845000 1.130000 ;
+      RECT 12.595000  1.820000 12.845000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.580000  5.605000 1.750000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.580000  8.485000 1.750000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfsbp_2
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef
index 2c8968f..43d69c9 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.magic.lef
@@ -54,12 +54,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.080000 1.820000 5.635000 2.150000 ;
-        RECT 8.185000 1.130000 8.515000 2.140000 ;
-      LAYER mcon ;
-        RECT 5.435000 1.950000 5.605000 2.120000 ;
-        RECT 8.315000 1.950000 8.485000 2.120000 ;
       LAYER met1 ;
         RECT 5.375000 1.920000 5.665000 1.965000 ;
         RECT 5.375000 1.965000 8.545000 2.105000 ;
@@ -81,38 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.545000  0.085000  0.795000 0.810000 ;
-        RECT  1.615000  0.085000  1.785000 1.010000 ;
-        RECT  4.065000  0.085000  4.455000 0.680000 ;
-        RECT  5.620000  0.085000  5.950000 1.030000 ;
-        RECT  7.870000  0.085000  8.760000 0.600000 ;
-        RECT 10.000000  0.085000 10.330000 1.030000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -121,116 +83,149 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.555000 2.570000  0.885000 3.245000 ;
-        RECT  1.540000 2.570000  1.870000 3.245000 ;
-        RECT  3.950000 2.425000  4.230000 3.245000 ;
-        RECT  5.535000 2.660000  5.785000 3.245000 ;
-        RECT  7.770000 2.650000  7.940000 3.245000 ;
-        RECT  8.665000 2.650000  8.915000 3.245000 ;
-        RECT 10.155000 1.820000 10.485000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.350000  0.365000 0.810000 ;
-      RECT 0.105000 0.810000  0.275000 2.230000 ;
-      RECT 0.105000 2.230000  1.760000 2.400000 ;
-      RECT 0.105000 2.400000  0.355000 2.980000 ;
-      RECT 0.975000 0.350000  1.435000 1.010000 ;
-      RECT 0.975000 1.010000  1.145000 1.720000 ;
-      RECT 0.975000 1.720000  2.315000 1.890000 ;
-      RECT 0.975000 1.890000  1.420000 2.060000 ;
-      RECT 1.590000 2.060000  2.660000 2.230000 ;
-      RECT 1.965000 0.255000  3.075000 0.425000 ;
-      RECT 1.965000 0.425000  2.295000 1.090000 ;
-      RECT 1.985000 1.260000  2.315000 1.720000 ;
-      RECT 2.070000 2.400000  2.320000 2.905000 ;
-      RECT 2.070000 2.905000  3.755000 3.075000 ;
-      RECT 2.485000 0.595000  2.735000 0.925000 ;
-      RECT 2.485000 0.925000  2.660000 2.060000 ;
-      RECT 2.490000 2.230000  2.660000 2.295000 ;
-      RECT 2.490000 2.295000  2.910000 2.735000 ;
-      RECT 2.830000 1.435000  3.075000 2.105000 ;
-      RECT 2.905000 0.425000  3.075000 1.435000 ;
-      RECT 3.080000 2.295000  3.415000 2.735000 ;
-      RECT 3.245000 0.415000  3.575000 0.850000 ;
-      RECT 3.245000 0.850000  4.095000 1.020000 ;
-      RECT 3.245000 1.020000  3.415000 2.295000 ;
-      RECT 3.585000 1.435000  3.755000 2.085000 ;
-      RECT 3.585000 2.085000  4.570000 2.255000 ;
-      RECT 3.585000 2.255000  3.755000 2.905000 ;
-      RECT 3.925000 1.020000  4.095000 1.345000 ;
-      RECT 3.925000 1.345000  6.065000 1.515000 ;
-      RECT 4.055000 1.685000  4.385000 1.745000 ;
-      RECT 4.055000 1.745000  4.910000 1.915000 ;
-      RECT 4.265000 0.860000  5.010000 1.030000 ;
-      RECT 4.265000 1.030000  4.625000 1.175000 ;
-      RECT 4.400000 2.255000  4.570000 2.905000 ;
-      RECT 4.400000 2.905000  5.365000 3.075000 ;
-      RECT 4.625000 0.570000  5.010000 0.860000 ;
-      RECT 4.740000 1.915000  4.910000 2.320000 ;
-      RECT 4.740000 2.320000  5.025000 2.735000 ;
-      RECT 4.805000 1.215000  6.065000 1.345000 ;
-      RECT 4.805000 1.515000  6.065000 1.545000 ;
-      RECT 5.195000 2.320000  5.975000 2.490000 ;
-      RECT 5.195000 2.490000  5.365000 2.905000 ;
-      RECT 5.805000 1.715000  6.405000 1.885000 ;
-      RECT 5.805000 1.885000  5.975000 2.320000 ;
-      RECT 6.235000 0.255000  7.325000 0.425000 ;
-      RECT 6.235000 0.425000  6.405000 1.120000 ;
-      RECT 6.235000 1.120000  6.645000 1.450000 ;
-      RECT 6.235000 1.450000  6.405000 1.715000 ;
-      RECT 6.475000 2.050000  6.810000 2.625000 ;
-      RECT 6.475000 2.625000  7.600000 2.980000 ;
-      RECT 6.575000 0.595000  6.985000 0.925000 ;
-      RECT 6.575000 1.630000  6.985000 1.800000 ;
-      RECT 6.575000 1.800000  6.810000 2.050000 ;
-      RECT 6.815000 0.925000  6.985000 1.630000 ;
-      RECT 6.980000 1.970000  7.325000 2.140000 ;
-      RECT 6.980000 2.140000  7.260000 2.355000 ;
-      RECT 7.155000 0.425000  7.325000 1.970000 ;
-      RECT 7.430000 2.310000  9.105000 2.480000 ;
-      RECT 7.430000 2.480000  7.600000 2.625000 ;
-      RECT 7.495000 0.790000  9.260000 0.960000 ;
-      RECT 7.495000 0.960000  7.730000 1.555000 ;
-      RECT 8.140000 2.480000  8.470000 2.930000 ;
-      RECT 8.775000 1.370000  9.105000 2.310000 ;
-      RECT 8.930000 0.350000  9.260000 0.790000 ;
-      RECT 9.090000 0.960000  9.260000 1.030000 ;
-      RECT 9.090000 1.030000  9.445000 1.200000 ;
-      RECT 9.115000 2.650000  9.445000 2.980000 ;
-      RECT 9.275000 1.200000  9.445000 2.650000 ;
-      RECT 9.490000 0.350000  9.820000 0.860000 ;
-      RECT 9.635000 0.860000  9.820000 1.220000 ;
-      RECT 9.635000 1.220000 10.515000 1.550000 ;
-      RECT 9.635000 1.550000  9.965000 2.875000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.105000  0.350000  0.365000 0.810000 ;
+      RECT  0.105000  0.810000  0.275000 2.230000 ;
+      RECT  0.105000  2.230000  1.760000 2.400000 ;
+      RECT  0.105000  2.400000  0.355000 2.980000 ;
+      RECT  0.545000  0.085000  0.795000 0.810000 ;
+      RECT  0.555000  2.570000  0.885000 3.245000 ;
+      RECT  0.975000  0.350000  1.435000 1.010000 ;
+      RECT  0.975000  1.010000  1.145000 1.720000 ;
+      RECT  0.975000  1.720000  2.315000 1.890000 ;
+      RECT  0.975000  1.890000  1.420000 2.060000 ;
+      RECT  1.540000  2.570000  1.870000 3.245000 ;
+      RECT  1.590000  2.060000  2.660000 2.230000 ;
+      RECT  1.615000  0.085000  1.785000 1.010000 ;
+      RECT  1.965000  0.255000  3.075000 0.425000 ;
+      RECT  1.965000  0.425000  2.295000 1.090000 ;
+      RECT  1.985000  1.260000  2.315000 1.720000 ;
+      RECT  2.070000  2.400000  2.320000 2.905000 ;
+      RECT  2.070000  2.905000  3.755000 3.075000 ;
+      RECT  2.485000  0.595000  2.735000 0.925000 ;
+      RECT  2.485000  0.925000  2.660000 2.060000 ;
+      RECT  2.490000  2.230000  2.660000 2.295000 ;
+      RECT  2.490000  2.295000  2.910000 2.735000 ;
+      RECT  2.830000  1.435000  3.075000 2.105000 ;
+      RECT  2.905000  0.425000  3.075000 1.435000 ;
+      RECT  3.080000  2.295000  3.415000 2.735000 ;
+      RECT  3.245000  0.415000  3.575000 0.850000 ;
+      RECT  3.245000  0.850000  4.095000 1.020000 ;
+      RECT  3.245000  1.020000  3.415000 2.295000 ;
+      RECT  3.585000  1.435000  3.755000 2.085000 ;
+      RECT  3.585000  2.085000  4.570000 2.255000 ;
+      RECT  3.585000  2.255000  3.755000 2.905000 ;
+      RECT  3.925000  1.020000  4.095000 1.345000 ;
+      RECT  3.925000  1.345000  6.065000 1.515000 ;
+      RECT  3.950000  2.425000  4.230000 3.245000 ;
+      RECT  4.055000  1.685000  4.385000 1.745000 ;
+      RECT  4.055000  1.745000  4.910000 1.915000 ;
+      RECT  4.065000  0.085000  4.455000 0.680000 ;
+      RECT  4.265000  0.860000  5.010000 1.030000 ;
+      RECT  4.265000  1.030000  4.625000 1.175000 ;
+      RECT  4.400000  2.255000  4.570000 2.905000 ;
+      RECT  4.400000  2.905000  5.365000 3.075000 ;
+      RECT  4.625000  0.570000  5.010000 0.860000 ;
+      RECT  4.740000  1.915000  4.910000 2.320000 ;
+      RECT  4.740000  2.320000  5.025000 2.735000 ;
+      RECT  4.805000  1.215000  6.065000 1.345000 ;
+      RECT  4.805000  1.515000  6.065000 1.545000 ;
+      RECT  5.080000  1.820000  5.635000 2.150000 ;
+      RECT  5.195000  2.320000  5.975000 2.490000 ;
+      RECT  5.195000  2.490000  5.365000 2.905000 ;
+      RECT  5.535000  2.660000  5.785000 3.245000 ;
+      RECT  5.620000  0.085000  5.950000 1.030000 ;
+      RECT  5.805000  1.715000  6.405000 1.885000 ;
+      RECT  5.805000  1.885000  5.975000 2.320000 ;
+      RECT  6.235000  0.255000  7.325000 0.425000 ;
+      RECT  6.235000  0.425000  6.405000 1.120000 ;
+      RECT  6.235000  1.120000  6.645000 1.450000 ;
+      RECT  6.235000  1.450000  6.405000 1.715000 ;
+      RECT  6.475000  2.050000  6.810000 2.625000 ;
+      RECT  6.475000  2.625000  7.600000 2.980000 ;
+      RECT  6.575000  0.595000  6.985000 0.925000 ;
+      RECT  6.575000  1.630000  6.985000 1.800000 ;
+      RECT  6.575000  1.800000  6.810000 2.050000 ;
+      RECT  6.815000  0.925000  6.985000 1.630000 ;
+      RECT  6.980000  1.970000  7.325000 2.140000 ;
+      RECT  6.980000  2.140000  7.260000 2.355000 ;
+      RECT  7.155000  0.425000  7.325000 1.970000 ;
+      RECT  7.430000  2.310000  9.105000 2.480000 ;
+      RECT  7.430000  2.480000  7.600000 2.625000 ;
+      RECT  7.495000  0.790000  9.260000 0.960000 ;
+      RECT  7.495000  0.960000  7.730000 1.555000 ;
+      RECT  7.770000  2.650000  7.940000 3.245000 ;
+      RECT  7.870000  0.085000  8.760000 0.600000 ;
+      RECT  8.140000  2.480000  8.470000 2.930000 ;
+      RECT  8.185000  1.130000  8.515000 2.140000 ;
+      RECT  8.665000  2.650000  8.915000 3.245000 ;
+      RECT  8.775000  1.370000  9.105000 2.310000 ;
+      RECT  8.930000  0.350000  9.260000 0.790000 ;
+      RECT  9.090000  0.960000  9.260000 1.030000 ;
+      RECT  9.090000  1.030000  9.445000 1.200000 ;
+      RECT  9.115000  2.650000  9.445000 2.980000 ;
+      RECT  9.275000  1.200000  9.445000 2.650000 ;
+      RECT  9.490000  0.350000  9.820000 0.860000 ;
+      RECT  9.635000  0.860000  9.820000 1.220000 ;
+      RECT  9.635000  1.220000 10.515000 1.550000 ;
+      RECT  9.635000  1.550000  9.965000 2.875000 ;
+      RECT 10.000000  0.085000 10.330000 1.030000 ;
+      RECT 10.155000  1.820000 10.485000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.950000  5.605000 2.120000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.950000  8.485000 2.120000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfstp_1
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef
index e23f1c3..03e6455 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.magic.lef
@@ -56,12 +56,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.425000 1.790000 6.115000 2.150000 ;
-        RECT 8.315000 1.480000 8.730000 2.150000 ;
-      LAYER mcon ;
-        RECT 5.915000 1.950000 6.085000 2.120000 ;
-        RECT 8.315000 1.950000 8.485000 2.120000 ;
       LAYER met1 ;
         RECT 5.855000 1.920000 6.145000 1.965000 ;
         RECT 5.855000 1.965000 8.545000 2.105000 ;
@@ -83,41 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.545000  0.085000  0.795000 0.765000 ;
-        RECT  1.615000  0.085000  1.865000 1.010000 ;
-        RECT  4.270000  0.085000  4.600000 0.710000 ;
-        RECT  5.650000  0.085000  6.245000 1.030000 ;
-        RECT  8.525000  0.085000  9.360000 0.900000 ;
-        RECT 10.600000  0.085000 10.930000 1.130000 ;
-        RECT 11.635000  0.085000 11.885000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
@@ -126,114 +85,150 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  0.565000 2.530000  0.895000 3.245000 ;
-        RECT  1.575000 2.530000  1.905000 3.245000 ;
-        RECT  4.070000 2.580000  4.575000 2.910000 ;
-        RECT  4.070000 2.910000  4.240000 3.245000 ;
-        RECT  5.860000 2.660000  6.110000 3.245000 ;
-        RECT  8.100000 2.720000  8.430000 3.245000 ;
-        RECT  9.110000 2.660000  9.440000 3.245000 ;
-        RECT 10.655000 2.320000 10.985000 3.245000 ;
-        RECT 11.635000 1.820000 11.885000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.000000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.395000  0.365000 0.765000 ;
-      RECT  0.115000 0.765000  0.285000 2.190000 ;
-      RECT  0.115000 2.190000  2.615000 2.230000 ;
-      RECT  0.115000 2.230000  1.795000 2.360000 ;
-      RECT  0.115000 2.360000  0.365000 2.980000 ;
-      RECT  0.975000 0.350000  1.435000 1.010000 ;
-      RECT  0.975000 1.010000  1.145000 1.720000 ;
-      RECT  0.975000 1.720000  2.275000 1.890000 ;
-      RECT  0.975000 1.890000  1.455000 2.020000 ;
-      RECT  1.625000 2.060000  2.615000 2.190000 ;
-      RECT  1.945000 1.300000  2.275000 1.720000 ;
-      RECT  2.045000 0.255000  3.115000 0.425000 ;
-      RECT  2.045000 0.425000  2.215000 1.130000 ;
-      RECT  2.105000 2.400000  2.275000 2.890000 ;
-      RECT  2.105000 2.890000  3.795000 3.060000 ;
-      RECT  2.445000 0.595000  2.775000 0.925000 ;
-      RECT  2.445000 0.925000  2.615000 2.060000 ;
-      RECT  2.445000 2.230000  2.615000 2.260000 ;
-      RECT  2.445000 2.260000  2.945000 2.720000 ;
-      RECT  2.785000 1.380000  3.115000 2.050000 ;
-      RECT  2.945000 0.425000  3.115000 1.380000 ;
-      RECT  3.115000 2.260000  3.455000 2.720000 ;
-      RECT  3.285000 0.400000  3.615000 1.040000 ;
-      RECT  3.285000 1.040000  4.255000 1.210000 ;
-      RECT  3.285000 1.210000  3.455000 2.260000 ;
-      RECT  3.625000 1.380000  3.915000 2.240000 ;
-      RECT  3.625000 2.240000  4.915000 2.410000 ;
-      RECT  3.625000 2.410000  3.795000 2.890000 ;
-      RECT  4.085000 1.210000  4.255000 1.400000 ;
-      RECT  4.085000 1.400000  6.245000 1.570000 ;
-      RECT  4.230000 1.740000  5.255000 2.070000 ;
-      RECT  4.425000 0.880000  5.160000 1.050000 ;
-      RECT  4.425000 1.050000  4.770000 1.230000 ;
-      RECT  4.745000 2.410000  4.915000 2.890000 ;
-      RECT  4.745000 2.890000  5.690000 3.060000 ;
-      RECT  4.770000 0.570000  5.160000 0.880000 ;
-      RECT  4.950000 1.220000  6.245000 1.400000 ;
-      RECT  5.085000 2.070000  5.255000 2.320000 ;
-      RECT  5.085000 2.320000  5.350000 2.720000 ;
-      RECT  5.520000 2.320000  6.585000 2.490000 ;
-      RECT  5.520000 2.490000  5.690000 2.890000 ;
-      RECT  5.915000 1.215000  6.245000 1.220000 ;
-      RECT  6.415000 0.280000  7.660000 0.450000 ;
-      RECT  6.415000 0.450000  6.585000 1.120000 ;
-      RECT  6.415000 1.120000  6.960000 1.450000 ;
-      RECT  6.415000 1.450000  6.585000 2.320000 ;
-      RECT  6.820000 1.620000  7.320000 1.790000 ;
-      RECT  6.820000 1.790000  7.070000 2.550000 ;
-      RECT  6.820000 2.550000  7.930000 2.730000 ;
-      RECT  6.820000 2.730000  7.470000 2.980000 ;
-      RECT  6.825000 0.620000  7.320000 0.950000 ;
-      RECT  7.150000 0.950000  7.320000 1.620000 ;
-      RECT  7.290000 1.980000  7.660000 2.150000 ;
-      RECT  7.290000 2.150000  7.590000 2.380000 ;
-      RECT  7.490000 0.450000  7.660000 1.980000 ;
-      RECT  7.760000 2.320000  9.470000 2.490000 ;
-      RECT  7.760000 2.490000  8.880000 2.550000 ;
-      RECT  7.830000 1.070000  9.890000 1.240000 ;
-      RECT  7.830000 1.240000  8.145000 2.130000 ;
-      RECT  8.630000 2.550000  8.880000 2.980000 ;
-      RECT  9.140000 1.615000  9.470000 2.320000 ;
-      RECT  9.530000 0.635000  9.890000 1.070000 ;
-      RECT  9.640000 1.240000  9.890000 2.980000 ;
-      RECT 10.090000 0.450000 10.420000 1.300000 ;
-      RECT 10.090000 1.300000 11.125000 1.630000 ;
-      RECT 10.090000 1.630000 10.450000 2.860000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.115000  0.395000  0.365000 0.765000 ;
+      RECT  0.115000  0.765000  0.285000 2.190000 ;
+      RECT  0.115000  2.190000  2.615000 2.230000 ;
+      RECT  0.115000  2.230000  1.795000 2.360000 ;
+      RECT  0.115000  2.360000  0.365000 2.980000 ;
+      RECT  0.545000  0.085000  0.795000 0.765000 ;
+      RECT  0.565000  2.530000  0.895000 3.245000 ;
+      RECT  0.975000  0.350000  1.435000 1.010000 ;
+      RECT  0.975000  1.010000  1.145000 1.720000 ;
+      RECT  0.975000  1.720000  2.275000 1.890000 ;
+      RECT  0.975000  1.890000  1.455000 2.020000 ;
+      RECT  1.575000  2.530000  1.905000 3.245000 ;
+      RECT  1.615000  0.085000  1.865000 1.010000 ;
+      RECT  1.625000  2.060000  2.615000 2.190000 ;
+      RECT  1.945000  1.300000  2.275000 1.720000 ;
+      RECT  2.045000  0.255000  3.115000 0.425000 ;
+      RECT  2.045000  0.425000  2.215000 1.130000 ;
+      RECT  2.105000  2.400000  2.275000 2.890000 ;
+      RECT  2.105000  2.890000  3.795000 3.060000 ;
+      RECT  2.445000  0.595000  2.775000 0.925000 ;
+      RECT  2.445000  0.925000  2.615000 2.060000 ;
+      RECT  2.445000  2.230000  2.615000 2.260000 ;
+      RECT  2.445000  2.260000  2.945000 2.720000 ;
+      RECT  2.785000  1.380000  3.115000 2.050000 ;
+      RECT  2.945000  0.425000  3.115000 1.380000 ;
+      RECT  3.115000  2.260000  3.455000 2.720000 ;
+      RECT  3.285000  0.400000  3.615000 1.040000 ;
+      RECT  3.285000  1.040000  4.255000 1.210000 ;
+      RECT  3.285000  1.210000  3.455000 2.260000 ;
+      RECT  3.625000  1.380000  3.915000 2.240000 ;
+      RECT  3.625000  2.240000  4.915000 2.410000 ;
+      RECT  3.625000  2.410000  3.795000 2.890000 ;
+      RECT  4.070000  2.580000  4.575000 2.910000 ;
+      RECT  4.070000  2.910000  4.240000 3.245000 ;
+      RECT  4.085000  1.210000  4.255000 1.400000 ;
+      RECT  4.085000  1.400000  6.245000 1.570000 ;
+      RECT  4.230000  1.740000  5.255000 2.070000 ;
+      RECT  4.270000  0.085000  4.600000 0.710000 ;
+      RECT  4.425000  0.880000  5.160000 1.050000 ;
+      RECT  4.425000  1.050000  4.770000 1.230000 ;
+      RECT  4.745000  2.410000  4.915000 2.890000 ;
+      RECT  4.745000  2.890000  5.690000 3.060000 ;
+      RECT  4.770000  0.570000  5.160000 0.880000 ;
+      RECT  4.950000  1.220000  6.245000 1.400000 ;
+      RECT  5.085000  2.070000  5.255000 2.320000 ;
+      RECT  5.085000  2.320000  5.350000 2.720000 ;
+      RECT  5.425000  1.790000  6.115000 2.150000 ;
+      RECT  5.520000  2.320000  6.585000 2.490000 ;
+      RECT  5.520000  2.490000  5.690000 2.890000 ;
+      RECT  5.650000  0.085000  6.245000 1.030000 ;
+      RECT  5.860000  2.660000  6.110000 3.245000 ;
+      RECT  5.915000  1.215000  6.245000 1.220000 ;
+      RECT  6.415000  0.280000  7.660000 0.450000 ;
+      RECT  6.415000  0.450000  6.585000 1.120000 ;
+      RECT  6.415000  1.120000  6.960000 1.450000 ;
+      RECT  6.415000  1.450000  6.585000 2.320000 ;
+      RECT  6.820000  1.620000  7.320000 1.790000 ;
+      RECT  6.820000  1.790000  7.070000 2.550000 ;
+      RECT  6.820000  2.550000  7.930000 2.730000 ;
+      RECT  6.820000  2.730000  7.470000 2.980000 ;
+      RECT  6.825000  0.620000  7.320000 0.950000 ;
+      RECT  7.150000  0.950000  7.320000 1.620000 ;
+      RECT  7.290000  1.980000  7.660000 2.150000 ;
+      RECT  7.290000  2.150000  7.590000 2.380000 ;
+      RECT  7.490000  0.450000  7.660000 1.980000 ;
+      RECT  7.760000  2.320000  9.470000 2.490000 ;
+      RECT  7.760000  2.490000  8.880000 2.550000 ;
+      RECT  7.830000  1.070000  9.890000 1.240000 ;
+      RECT  7.830000  1.240000  8.145000 2.130000 ;
+      RECT  8.100000  2.720000  8.430000 3.245000 ;
+      RECT  8.315000  1.480000  8.730000 2.150000 ;
+      RECT  8.525000  0.085000  9.360000 0.900000 ;
+      RECT  8.630000  2.550000  8.880000 2.980000 ;
+      RECT  9.110000  2.660000  9.440000 3.245000 ;
+      RECT  9.140000  1.615000  9.470000 2.320000 ;
+      RECT  9.530000  0.635000  9.890000 1.070000 ;
+      RECT  9.640000  1.240000  9.890000 2.980000 ;
+      RECT 10.090000  0.450000 10.420000 1.300000 ;
+      RECT 10.090000  1.300000 11.125000 1.630000 ;
+      RECT 10.090000  1.630000 10.450000 2.860000 ;
+      RECT 10.600000  0.085000 10.930000 1.130000 ;
+      RECT 10.655000  2.320000 10.985000 3.245000 ;
+      RECT 11.635000  0.085000 11.885000 1.130000 ;
+      RECT 11.635000  1.820000 11.885000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  1.950000  6.085000 2.120000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.950000  8.485000 2.120000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfstp_2
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef
index 6a3b68b..1a7691f 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.magic.lef
@@ -60,12 +60,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.195000 1.550000 5.635000 1.925000 ;
-        RECT 8.185000 1.180000 8.515000 1.850000 ;
-      LAYER mcon ;
-        RECT 5.435000 1.580000 5.605000 1.750000 ;
-        RECT 8.315000 1.580000 8.485000 1.750000 ;
       LAYER met1 ;
         RECT 5.375000 1.550000 5.665000 1.595000 ;
         RECT 5.375000 1.595000 8.545000 1.735000 ;
@@ -87,44 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.545000  0.085000  0.795000 0.810000 ;
-        RECT  1.615000  0.085000  1.865000 1.010000 ;
-        RECT  4.025000  0.085000  4.420000 0.600000 ;
-        RECT  5.670000  0.085000  6.000000 1.030000 ;
-        RECT  7.935000  0.085000  8.950000 0.670000 ;
-        RECT 10.180000  0.085000 10.510000 1.130000 ;
-        RECT 11.180000  0.085000 11.845000 0.800000 ;
-        RECT 12.515000  0.085000 12.845000 0.810000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
@@ -133,119 +89,158 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.565000 2.580000  0.895000 3.245000 ;
-        RECT  1.575000 2.580000  1.905000 3.245000 ;
-        RECT  3.985000 2.505000  4.345000 2.755000 ;
-        RECT  3.985000 2.755000  4.155000 3.245000 ;
-        RECT  5.680000 2.435000  5.940000 3.245000 ;
-        RECT  7.885000 2.650000  8.055000 3.245000 ;
-        RECT  8.780000 2.650000  9.030000 3.245000 ;
-        RECT  9.755000 1.820000 10.005000 3.245000 ;
-        RECT 10.725000 1.820000 11.005000 3.245000 ;
-        RECT 11.625000 2.250000 11.955000 3.245000 ;
-        RECT 12.525000 2.320000 12.855000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.365000 0.810000 ;
-      RECT  0.115000 0.810000  0.285000 2.240000 ;
-      RECT  0.115000 2.240000  1.795000 2.410000 ;
-      RECT  0.115000 2.410000  0.365000 2.960000 ;
-      RECT  0.975000 0.340000  1.435000 1.010000 ;
-      RECT  0.975000 1.010000  1.145000 1.720000 ;
-      RECT  0.975000 1.720000  2.275000 1.890000 ;
-      RECT  0.975000 1.890000  1.455000 2.070000 ;
-      RECT  1.625000 2.070000  2.615000 2.240000 ;
-      RECT  1.945000 1.350000  2.275000 1.720000 ;
-      RECT  2.045000 0.255000  3.115000 0.425000 ;
-      RECT  2.045000 0.425000  2.215000 1.130000 ;
-      RECT  2.105000 2.410000  2.275000 2.905000 ;
-      RECT  2.105000 2.905000  3.795000 3.075000 ;
-      RECT  2.445000 0.595000  2.775000 0.925000 ;
-      RECT  2.445000 0.925000  2.615000 2.070000 ;
-      RECT  2.445000 2.240000  2.615000 2.295000 ;
-      RECT  2.445000 2.295000  2.945000 2.735000 ;
-      RECT  2.785000 1.455000  3.115000 2.125000 ;
-      RECT  2.945000 0.425000  3.115000 1.455000 ;
-      RECT  3.115000 2.295000  3.455000 2.735000 ;
-      RECT  3.285000 0.350000  3.535000 1.130000 ;
-      RECT  3.285000 1.130000  4.135000 1.300000 ;
-      RECT  3.285000 1.300000  3.455000 2.295000 ;
-      RECT  3.625000 1.470000  3.795000 2.165000 ;
-      RECT  3.625000 2.165000  4.685000 2.335000 ;
-      RECT  3.625000 2.335000  3.795000 2.905000 ;
-      RECT  3.965000 1.300000  4.135000 1.400000 ;
-      RECT  3.965000 1.400000  5.025000 1.570000 ;
-      RECT  4.115000 1.740000  5.025000 1.995000 ;
-      RECT  4.305000 0.780000  5.050000 0.950000 ;
-      RECT  4.305000 0.950000  4.590000 1.230000 ;
-      RECT  4.515000 2.335000  4.685000 2.905000 ;
-      RECT  4.515000 2.905000  5.510000 3.075000 ;
-      RECT  4.590000 0.620000  5.050000 0.780000 ;
-      RECT  4.770000 1.120000  5.025000 1.200000 ;
-      RECT  4.770000 1.200000  6.135000 1.370000 ;
-      RECT  4.770000 1.370000  5.025000 1.400000 ;
-      RECT  4.855000 1.995000  5.025000 2.295000 ;
-      RECT  4.855000 2.295000  5.170000 2.735000 ;
-      RECT  5.340000 2.095000  6.475000 2.265000 ;
-      RECT  5.340000 2.265000  5.510000 2.905000 ;
-      RECT  5.805000 1.370000  6.135000 1.490000 ;
-      RECT  6.305000 0.255000  7.375000 0.425000 ;
-      RECT  6.305000 0.425000  6.475000 1.120000 ;
-      RECT  6.305000 1.120000  6.695000 1.450000 ;
-      RECT  6.305000 1.450000  6.475000 2.095000 ;
-      RECT  6.590000 2.650000  7.265000 2.980000 ;
-      RECT  6.645000 0.595000  7.035000 0.925000 ;
-      RECT  6.670000 1.620000  7.035000 1.790000 ;
-      RECT  6.670000 1.790000  6.840000 2.480000 ;
-      RECT  6.670000 2.480000  7.715000 2.650000 ;
-      RECT  6.865000 0.925000  7.035000 1.620000 ;
-      RECT  7.045000 2.020000  7.375000 2.310000 ;
-      RECT  7.205000 0.425000  7.375000 2.020000 ;
-      RECT  7.545000 0.840000  9.450000 1.010000 ;
-      RECT  7.545000 1.010000  7.875000 1.655000 ;
-      RECT  7.545000 2.310000  9.110000 2.480000 ;
-      RECT  8.255000 2.480000  8.585000 2.980000 ;
-      RECT  8.780000 1.370000  9.110000 2.310000 ;
-      RECT  9.120000 0.420000  9.450000 0.840000 ;
-      RECT  9.230000 2.650000  9.560000 2.980000 ;
-      RECT  9.280000 1.010000  9.450000 2.650000 ;
-      RECT  9.680000 0.350000 10.010000 1.320000 ;
-      RECT  9.680000 1.320000 11.995000 1.490000 ;
-      RECT 10.205000 1.490000 11.995000 1.650000 ;
-      RECT 10.205000 1.650000 10.535000 2.700000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.115000  0.350000  0.365000 0.810000 ;
+      RECT  0.115000  0.810000  0.285000 2.240000 ;
+      RECT  0.115000  2.240000  1.795000 2.410000 ;
+      RECT  0.115000  2.410000  0.365000 2.960000 ;
+      RECT  0.545000  0.085000  0.795000 0.810000 ;
+      RECT  0.565000  2.580000  0.895000 3.245000 ;
+      RECT  0.975000  0.340000  1.435000 1.010000 ;
+      RECT  0.975000  1.010000  1.145000 1.720000 ;
+      RECT  0.975000  1.720000  2.275000 1.890000 ;
+      RECT  0.975000  1.890000  1.455000 2.070000 ;
+      RECT  1.575000  2.580000  1.905000 3.245000 ;
+      RECT  1.615000  0.085000  1.865000 1.010000 ;
+      RECT  1.625000  2.070000  2.615000 2.240000 ;
+      RECT  1.945000  1.350000  2.275000 1.720000 ;
+      RECT  2.045000  0.255000  3.115000 0.425000 ;
+      RECT  2.045000  0.425000  2.215000 1.130000 ;
+      RECT  2.105000  2.410000  2.275000 2.905000 ;
+      RECT  2.105000  2.905000  3.795000 3.075000 ;
+      RECT  2.445000  0.595000  2.775000 0.925000 ;
+      RECT  2.445000  0.925000  2.615000 2.070000 ;
+      RECT  2.445000  2.240000  2.615000 2.295000 ;
+      RECT  2.445000  2.295000  2.945000 2.735000 ;
+      RECT  2.785000  1.455000  3.115000 2.125000 ;
+      RECT  2.945000  0.425000  3.115000 1.455000 ;
+      RECT  3.115000  2.295000  3.455000 2.735000 ;
+      RECT  3.285000  0.350000  3.535000 1.130000 ;
+      RECT  3.285000  1.130000  4.135000 1.300000 ;
+      RECT  3.285000  1.300000  3.455000 2.295000 ;
+      RECT  3.625000  1.470000  3.795000 2.165000 ;
+      RECT  3.625000  2.165000  4.685000 2.335000 ;
+      RECT  3.625000  2.335000  3.795000 2.905000 ;
+      RECT  3.965000  1.300000  4.135000 1.400000 ;
+      RECT  3.965000  1.400000  5.025000 1.570000 ;
+      RECT  3.985000  2.505000  4.345000 2.755000 ;
+      RECT  3.985000  2.755000  4.155000 3.245000 ;
+      RECT  4.025000  0.085000  4.420000 0.600000 ;
+      RECT  4.115000  1.740000  5.025000 1.995000 ;
+      RECT  4.305000  0.780000  5.050000 0.950000 ;
+      RECT  4.305000  0.950000  4.590000 1.230000 ;
+      RECT  4.515000  2.335000  4.685000 2.905000 ;
+      RECT  4.515000  2.905000  5.510000 3.075000 ;
+      RECT  4.590000  0.620000  5.050000 0.780000 ;
+      RECT  4.770000  1.120000  5.025000 1.200000 ;
+      RECT  4.770000  1.200000  6.135000 1.370000 ;
+      RECT  4.770000  1.370000  5.025000 1.400000 ;
+      RECT  4.855000  1.995000  5.025000 2.295000 ;
+      RECT  4.855000  2.295000  5.170000 2.735000 ;
+      RECT  5.195000  1.550000  5.635000 1.925000 ;
+      RECT  5.340000  2.095000  6.475000 2.265000 ;
+      RECT  5.340000  2.265000  5.510000 2.905000 ;
+      RECT  5.670000  0.085000  6.000000 1.030000 ;
+      RECT  5.680000  2.435000  5.940000 3.245000 ;
+      RECT  5.805000  1.370000  6.135000 1.490000 ;
+      RECT  6.305000  0.255000  7.375000 0.425000 ;
+      RECT  6.305000  0.425000  6.475000 1.120000 ;
+      RECT  6.305000  1.120000  6.695000 1.450000 ;
+      RECT  6.305000  1.450000  6.475000 2.095000 ;
+      RECT  6.590000  2.650000  7.265000 2.980000 ;
+      RECT  6.645000  0.595000  7.035000 0.925000 ;
+      RECT  6.670000  1.620000  7.035000 1.790000 ;
+      RECT  6.670000  1.790000  6.840000 2.480000 ;
+      RECT  6.670000  2.480000  7.715000 2.650000 ;
+      RECT  6.865000  0.925000  7.035000 1.620000 ;
+      RECT  7.045000  2.020000  7.375000 2.310000 ;
+      RECT  7.205000  0.425000  7.375000 2.020000 ;
+      RECT  7.545000  0.840000  9.450000 1.010000 ;
+      RECT  7.545000  1.010000  7.875000 1.655000 ;
+      RECT  7.545000  2.310000  9.110000 2.480000 ;
+      RECT  7.885000  2.650000  8.055000 3.245000 ;
+      RECT  7.935000  0.085000  8.950000 0.670000 ;
+      RECT  8.185000  1.180000  8.515000 1.850000 ;
+      RECT  8.255000  2.480000  8.585000 2.980000 ;
+      RECT  8.780000  1.370000  9.110000 2.310000 ;
+      RECT  8.780000  2.650000  9.030000 3.245000 ;
+      RECT  9.120000  0.420000  9.450000 0.840000 ;
+      RECT  9.230000  2.650000  9.560000 2.980000 ;
+      RECT  9.280000  1.010000  9.450000 2.650000 ;
+      RECT  9.680000  0.350000 10.010000 1.320000 ;
+      RECT  9.680000  1.320000 11.995000 1.490000 ;
+      RECT  9.755000  1.820000 10.005000 3.245000 ;
+      RECT 10.180000  0.085000 10.510000 1.130000 ;
+      RECT 10.205000  1.490000 11.995000 1.650000 ;
+      RECT 10.205000  1.650000 10.535000 2.700000 ;
+      RECT 10.725000  1.820000 11.005000 3.245000 ;
+      RECT 11.180000  0.085000 11.845000 0.800000 ;
+      RECT 11.625000  2.250000 11.955000 3.245000 ;
+      RECT 12.515000  0.085000 12.845000 0.810000 ;
+      RECT 12.525000  2.320000 12.855000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.580000  5.605000 1.750000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.580000  8.485000 1.750000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfstp_4
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef
index b227e89..b324d0d 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.magic.lef
@@ -76,35 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.625000  0.085000 1.005000 0.560000 ;
-        RECT 1.855000  0.085000 2.205000 0.560000 ;
-        RECT 3.980000  0.085000 4.310000 0.410000 ;
-        RECT 6.080000  0.085000 6.410000 1.040000 ;
-        RECT 7.140000  0.085000 7.470000 0.680000 ;
-        RECT 8.710000  0.085000 8.960000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -113,104 +84,130 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.560000 2.060000 0.810000 3.245000 ;
-        RECT 1.555000 2.885000 1.885000 3.245000 ;
-        RECT 3.740000 2.925000 4.130000 3.245000 ;
-        RECT 6.165000 2.390000 6.495000 3.245000 ;
-        RECT 7.240000 2.030000 7.490000 3.245000 ;
-        RECT 8.655000 1.820000 8.985000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 1.720000 0.840000 1.890000 ;
-      RECT 0.110000 1.890000 0.360000 2.980000 ;
-      RECT 0.115000 0.350000 0.445000 0.730000 ;
-      RECT 0.115000 0.730000 2.545000 0.900000 ;
-      RECT 0.115000 0.900000 0.445000 1.010000 ;
-      RECT 0.670000 0.900000 1.090000 1.550000 ;
-      RECT 0.670000 1.550000 0.840000 1.720000 ;
-      RECT 1.010000 1.815000 1.435000 2.545000 ;
-      RECT 1.010000 2.545000 2.225000 2.715000 ;
-      RECT 1.010000 2.715000 1.340000 2.980000 ;
-      RECT 1.265000 1.070000 1.595000 1.485000 ;
-      RECT 1.265000 1.485000 1.740000 1.815000 ;
-      RECT 2.055000 2.715000 4.470000 2.755000 ;
-      RECT 2.055000 2.755000 3.290000 2.885000 ;
-      RECT 2.250000 2.045000 2.610000 2.375000 ;
-      RECT 2.375000 0.255000 3.655000 0.425000 ;
-      RECT 2.375000 0.425000 2.545000 0.730000 ;
-      RECT 2.440000 1.070000 2.885000 1.240000 ;
-      RECT 2.440000 1.240000 2.610000 2.045000 ;
-      RECT 2.715000 0.595000 2.885000 1.070000 ;
-      RECT 2.780000 1.410000 3.315000 1.580000 ;
-      RECT 2.780000 1.580000 2.950000 2.245000 ;
-      RECT 2.780000 2.245000 4.280000 2.415000 ;
-      RECT 2.780000 2.415000 2.950000 2.545000 ;
-      RECT 3.065000 0.595000 3.315000 1.410000 ;
-      RECT 3.120000 1.750000 3.655000 2.075000 ;
-      RECT 3.120000 2.585000 4.470000 2.715000 ;
-      RECT 3.485000 0.425000 3.655000 0.580000 ;
-      RECT 3.485000 0.580000 5.715000 0.620000 ;
-      RECT 3.485000 0.620000 4.650000 0.750000 ;
-      RECT 3.485000 0.750000 3.655000 1.750000 ;
-      RECT 3.825000 1.015000 4.900000 1.185000 ;
-      RECT 3.825000 1.185000 4.620000 1.370000 ;
-      RECT 4.020000 1.630000 4.280000 2.245000 ;
-      RECT 4.300000 2.755000 4.470000 2.800000 ;
-      RECT 4.300000 2.800000 5.150000 2.905000 ;
-      RECT 4.300000 2.905000 5.990000 3.075000 ;
-      RECT 4.450000 1.370000 4.620000 1.855000 ;
-      RECT 4.450000 1.855000 4.810000 2.025000 ;
-      RECT 4.480000 0.290000 5.715000 0.580000 ;
-      RECT 4.570000 0.920000 4.900000 1.015000 ;
-      RECT 4.640000 2.025000 4.810000 2.615000 ;
-      RECT 4.790000 1.355000 5.150000 1.685000 ;
-      RECT 4.980000 1.685000 5.150000 2.800000 ;
-      RECT 5.125000 0.790000 5.590000 1.120000 ;
-      RECT 5.320000 1.120000 5.590000 1.210000 ;
-      RECT 5.320000 1.210000 7.130000 1.380000 ;
-      RECT 5.320000 1.380000 5.490000 2.115000 ;
-      RECT 5.320000 2.115000 5.570000 2.735000 ;
-      RECT 5.660000 1.615000 5.990000 1.945000 ;
-      RECT 5.820000 1.945000 5.990000 2.905000 ;
-      RECT 6.230000 1.550000 6.560000 1.690000 ;
-      RECT 6.230000 1.690000 7.730000 1.860000 ;
-      RECT 6.230000 1.860000 7.040000 2.220000 ;
-      RECT 6.640000 0.440000 6.970000 0.850000 ;
-      RECT 6.640000 0.850000 7.470000 1.020000 ;
-      RECT 6.710000 2.220000 7.040000 2.860000 ;
-      RECT 6.800000 1.190000 7.130000 1.210000 ;
-      RECT 6.800000 1.380000 7.130000 1.520000 ;
-      RECT 7.300000 1.020000 7.470000 1.350000 ;
-      RECT 7.300000 1.350000 7.730000 1.690000 ;
-      RECT 8.280000 0.625000 8.530000 1.300000 ;
-      RECT 8.280000 1.300000 9.175000 1.630000 ;
-      RECT 8.280000 1.630000 8.455000 2.700000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.110000  1.720000 0.840000 1.890000 ;
+      RECT 0.110000  1.890000 0.360000 2.980000 ;
+      RECT 0.115000  0.350000 0.445000 0.730000 ;
+      RECT 0.115000  0.730000 2.545000 0.900000 ;
+      RECT 0.115000  0.900000 0.445000 1.010000 ;
+      RECT 0.560000  2.060000 0.810000 3.245000 ;
+      RECT 0.625000  0.085000 1.005000 0.560000 ;
+      RECT 0.670000  0.900000 1.090000 1.550000 ;
+      RECT 0.670000  1.550000 0.840000 1.720000 ;
+      RECT 1.010000  1.815000 1.435000 2.545000 ;
+      RECT 1.010000  2.545000 2.225000 2.715000 ;
+      RECT 1.010000  2.715000 1.340000 2.980000 ;
+      RECT 1.265000  1.070000 1.595000 1.485000 ;
+      RECT 1.265000  1.485000 1.740000 1.815000 ;
+      RECT 1.555000  2.885000 1.885000 3.245000 ;
+      RECT 1.855000  0.085000 2.205000 0.560000 ;
+      RECT 2.055000  2.715000 4.470000 2.755000 ;
+      RECT 2.055000  2.755000 3.290000 2.885000 ;
+      RECT 2.250000  2.045000 2.610000 2.375000 ;
+      RECT 2.375000  0.255000 3.655000 0.425000 ;
+      RECT 2.375000  0.425000 2.545000 0.730000 ;
+      RECT 2.440000  1.070000 2.885000 1.240000 ;
+      RECT 2.440000  1.240000 2.610000 2.045000 ;
+      RECT 2.715000  0.595000 2.885000 1.070000 ;
+      RECT 2.780000  1.410000 3.315000 1.580000 ;
+      RECT 2.780000  1.580000 2.950000 2.245000 ;
+      RECT 2.780000  2.245000 4.280000 2.415000 ;
+      RECT 2.780000  2.415000 2.950000 2.545000 ;
+      RECT 3.065000  0.595000 3.315000 1.410000 ;
+      RECT 3.120000  1.750000 3.655000 2.075000 ;
+      RECT 3.120000  2.585000 4.470000 2.715000 ;
+      RECT 3.485000  0.425000 3.655000 0.580000 ;
+      RECT 3.485000  0.580000 5.715000 0.620000 ;
+      RECT 3.485000  0.620000 4.650000 0.750000 ;
+      RECT 3.485000  0.750000 3.655000 1.750000 ;
+      RECT 3.740000  2.925000 4.130000 3.245000 ;
+      RECT 3.825000  1.015000 4.900000 1.185000 ;
+      RECT 3.825000  1.185000 4.620000 1.370000 ;
+      RECT 3.980000  0.085000 4.310000 0.410000 ;
+      RECT 4.020000  1.630000 4.280000 2.245000 ;
+      RECT 4.300000  2.755000 4.470000 2.800000 ;
+      RECT 4.300000  2.800000 5.150000 2.905000 ;
+      RECT 4.300000  2.905000 5.990000 3.075000 ;
+      RECT 4.450000  1.370000 4.620000 1.855000 ;
+      RECT 4.450000  1.855000 4.810000 2.025000 ;
+      RECT 4.480000  0.290000 5.715000 0.580000 ;
+      RECT 4.570000  0.920000 4.900000 1.015000 ;
+      RECT 4.640000  2.025000 4.810000 2.615000 ;
+      RECT 4.790000  1.355000 5.150000 1.685000 ;
+      RECT 4.980000  1.685000 5.150000 2.800000 ;
+      RECT 5.125000  0.790000 5.590000 1.120000 ;
+      RECT 5.320000  1.120000 5.590000 1.210000 ;
+      RECT 5.320000  1.210000 7.130000 1.380000 ;
+      RECT 5.320000  1.380000 5.490000 2.115000 ;
+      RECT 5.320000  2.115000 5.570000 2.735000 ;
+      RECT 5.660000  1.615000 5.990000 1.945000 ;
+      RECT 5.820000  1.945000 5.990000 2.905000 ;
+      RECT 6.080000  0.085000 6.410000 1.040000 ;
+      RECT 6.165000  2.390000 6.495000 3.245000 ;
+      RECT 6.230000  1.550000 6.560000 1.690000 ;
+      RECT 6.230000  1.690000 7.730000 1.860000 ;
+      RECT 6.230000  1.860000 7.040000 2.220000 ;
+      RECT 6.640000  0.440000 6.970000 0.850000 ;
+      RECT 6.640000  0.850000 7.470000 1.020000 ;
+      RECT 6.710000  2.220000 7.040000 2.860000 ;
+      RECT 6.800000  1.190000 7.130000 1.210000 ;
+      RECT 6.800000  1.380000 7.130000 1.520000 ;
+      RECT 7.140000  0.085000 7.470000 0.680000 ;
+      RECT 7.240000  2.030000 7.490000 3.245000 ;
+      RECT 7.300000  1.020000 7.470000 1.350000 ;
+      RECT 7.300000  1.350000 7.730000 1.690000 ;
+      RECT 8.280000  0.625000 8.530000 1.300000 ;
+      RECT 8.280000  1.300000 9.175000 1.630000 ;
+      RECT 8.280000  1.630000 8.455000 2.700000 ;
+      RECT 8.655000  1.820000 8.985000 3.245000 ;
+      RECT 8.710000  0.085000 8.960000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfxbp_1
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef
index b3feed1..fc600d7 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.magic.lef
@@ -75,40 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.625000  0.085000  1.010000 0.560000 ;
-        RECT  1.860000  0.085000  2.190000 0.560000 ;
-        RECT  4.030000  0.085000  4.370000 0.610000 ;
-        RECT  6.655000  0.085000  6.985000 1.000000 ;
-        RECT  7.645000  0.085000  7.975000 1.150000 ;
-        RECT  8.620000  0.085000  8.950000 1.150000 ;
-        RECT  9.735000  0.085000  9.985000 1.130000 ;
-        RECT 10.675000  0.085000 10.925000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -117,101 +83,132 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.645000 2.060000  0.895000 3.245000 ;
-        RECT  1.575000 2.965000  2.035000 3.245000 ;
-        RECT  4.000000 2.965000  4.330000 3.245000 ;
-        RECT  6.600000 2.375000  6.930000 3.245000 ;
-        RECT  7.695000 2.580000  8.025000 3.245000 ;
-        RECT  8.595000 2.580000  8.925000 3.245000 ;
-        RECT  9.690000 1.820000  9.940000 3.245000 ;
-        RECT 10.675000 1.820000 10.925000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000  0.445000 0.730000 ;
-      RECT 0.115000 0.730000  2.530000 0.900000 ;
-      RECT 0.115000 0.900000  1.100000 1.010000 ;
-      RECT 0.115000 1.720000  0.925000 1.890000 ;
-      RECT 0.115000 1.890000  0.445000 2.980000 ;
-      RECT 0.755000 1.010000  1.100000 1.550000 ;
-      RECT 0.755000 1.550000  0.925000 1.720000 ;
-      RECT 1.095000 1.815000  1.440000 2.625000 ;
-      RECT 1.095000 2.625000  5.205000 2.795000 ;
-      RECT 1.095000 2.795000  1.345000 2.980000 ;
-      RECT 1.270000 1.070000  1.600000 1.485000 ;
-      RECT 1.270000 1.485000  1.815000 1.815000 ;
-      RECT 2.325000 2.205000  2.715000 2.455000 ;
-      RECT 2.360000 0.255000  3.640000 0.425000 ;
-      RECT 2.360000 0.425000  2.530000 0.730000 ;
-      RECT 2.545000 1.070000  2.870000 1.240000 ;
-      RECT 2.545000 1.240000  2.715000 2.205000 ;
-      RECT 2.700000 0.595000  2.870000 1.070000 ;
-      RECT 2.885000 1.410000  3.300000 1.580000 ;
-      RECT 2.885000 1.580000  3.055000 2.285000 ;
-      RECT 2.885000 2.285000  4.325000 2.455000 ;
-      RECT 3.050000 0.595000  3.300000 1.410000 ;
-      RECT 3.225000 1.750000  3.640000 2.065000 ;
-      RECT 3.470000 0.425000  3.640000 0.780000 ;
-      RECT 3.470000 0.780000  4.815000 0.950000 ;
-      RECT 3.470000 0.950000  3.640000 1.750000 ;
-      RECT 3.810000 1.120000  4.815000 1.450000 ;
-      RECT 4.155000 1.630000  4.475000 1.960000 ;
-      RECT 4.155000 1.960000  4.325000 2.285000 ;
-      RECT 4.535000 2.180000  4.865000 2.455000 ;
-      RECT 4.645000 0.255000  6.240000 0.530000 ;
-      RECT 4.645000 0.530000  4.815000 0.780000 ;
-      RECT 4.645000 1.450000  4.815000 2.180000 ;
-      RECT 4.985000 1.120000  5.275000 1.450000 ;
-      RECT 5.035000 1.450000  5.205000 2.625000 ;
-      RECT 5.035000 2.795000  6.205000 2.965000 ;
-      RECT 5.375000 1.620000  6.545000 1.670000 ;
-      RECT 5.375000 1.670000  7.585000 1.790000 ;
-      RECT 5.375000 1.790000  5.705000 2.625000 ;
-      RECT 5.445000 0.530000  5.615000 1.170000 ;
-      RECT 5.445000 1.170000  5.845000 1.450000 ;
-      RECT 5.785000 0.700000  6.185000 0.950000 ;
-      RECT 5.875000 1.960000  6.205000 2.795000 ;
-      RECT 6.015000 0.950000  6.185000 1.620000 ;
-      RECT 6.375000 1.790000  7.585000 1.960000 ;
-      RECT 6.715000 1.170000  7.465000 1.330000 ;
-      RECT 6.715000 1.330000  7.925000 1.500000 ;
-      RECT 7.160000 2.130000  7.925000 2.240000 ;
-      RECT 7.160000 2.240000  9.015000 2.410000 ;
-      RECT 7.160000 2.410000  7.490000 2.980000 ;
-      RECT 7.215000 0.370000  7.465000 1.170000 ;
-      RECT 7.755000 1.500000  7.925000 2.130000 ;
-      RECT 8.685000 1.320000  9.015000 2.240000 ;
-      RECT 9.235000 0.450000  9.510000 1.300000 ;
-      RECT 9.235000 1.300000 10.165000 1.630000 ;
-      RECT 9.235000 1.630000  9.485000 2.860000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.115000  0.350000  0.445000 0.730000 ;
+      RECT  0.115000  0.730000  2.530000 0.900000 ;
+      RECT  0.115000  0.900000  1.100000 1.010000 ;
+      RECT  0.115000  1.720000  0.925000 1.890000 ;
+      RECT  0.115000  1.890000  0.445000 2.980000 ;
+      RECT  0.625000  0.085000  1.010000 0.560000 ;
+      RECT  0.645000  2.060000  0.895000 3.245000 ;
+      RECT  0.755000  1.010000  1.100000 1.550000 ;
+      RECT  0.755000  1.550000  0.925000 1.720000 ;
+      RECT  1.095000  1.815000  1.440000 2.625000 ;
+      RECT  1.095000  2.625000  5.205000 2.795000 ;
+      RECT  1.095000  2.795000  1.345000 2.980000 ;
+      RECT  1.270000  1.070000  1.600000 1.485000 ;
+      RECT  1.270000  1.485000  1.815000 1.815000 ;
+      RECT  1.575000  2.965000  2.035000 3.245000 ;
+      RECT  1.860000  0.085000  2.190000 0.560000 ;
+      RECT  2.325000  2.205000  2.715000 2.455000 ;
+      RECT  2.360000  0.255000  3.640000 0.425000 ;
+      RECT  2.360000  0.425000  2.530000 0.730000 ;
+      RECT  2.545000  1.070000  2.870000 1.240000 ;
+      RECT  2.545000  1.240000  2.715000 2.205000 ;
+      RECT  2.700000  0.595000  2.870000 1.070000 ;
+      RECT  2.885000  1.410000  3.300000 1.580000 ;
+      RECT  2.885000  1.580000  3.055000 2.285000 ;
+      RECT  2.885000  2.285000  4.325000 2.455000 ;
+      RECT  3.050000  0.595000  3.300000 1.410000 ;
+      RECT  3.225000  1.750000  3.640000 2.065000 ;
+      RECT  3.470000  0.425000  3.640000 0.780000 ;
+      RECT  3.470000  0.780000  4.815000 0.950000 ;
+      RECT  3.470000  0.950000  3.640000 1.750000 ;
+      RECT  3.810000  1.120000  4.815000 1.450000 ;
+      RECT  4.000000  2.965000  4.330000 3.245000 ;
+      RECT  4.030000  0.085000  4.370000 0.610000 ;
+      RECT  4.155000  1.630000  4.475000 1.960000 ;
+      RECT  4.155000  1.960000  4.325000 2.285000 ;
+      RECT  4.535000  2.180000  4.865000 2.455000 ;
+      RECT  4.645000  0.255000  6.240000 0.530000 ;
+      RECT  4.645000  0.530000  4.815000 0.780000 ;
+      RECT  4.645000  1.450000  4.815000 2.180000 ;
+      RECT  4.985000  1.120000  5.275000 1.450000 ;
+      RECT  5.035000  1.450000  5.205000 2.625000 ;
+      RECT  5.035000  2.795000  6.205000 2.965000 ;
+      RECT  5.375000  1.620000  6.545000 1.670000 ;
+      RECT  5.375000  1.670000  7.585000 1.790000 ;
+      RECT  5.375000  1.790000  5.705000 2.625000 ;
+      RECT  5.445000  0.530000  5.615000 1.170000 ;
+      RECT  5.445000  1.170000  5.845000 1.450000 ;
+      RECT  5.785000  0.700000  6.185000 0.950000 ;
+      RECT  5.875000  1.960000  6.205000 2.795000 ;
+      RECT  6.015000  0.950000  6.185000 1.620000 ;
+      RECT  6.375000  1.790000  7.585000 1.960000 ;
+      RECT  6.600000  2.375000  6.930000 3.245000 ;
+      RECT  6.655000  0.085000  6.985000 1.000000 ;
+      RECT  6.715000  1.170000  7.465000 1.330000 ;
+      RECT  6.715000  1.330000  7.925000 1.500000 ;
+      RECT  7.160000  2.130000  7.925000 2.240000 ;
+      RECT  7.160000  2.240000  9.015000 2.410000 ;
+      RECT  7.160000  2.410000  7.490000 2.980000 ;
+      RECT  7.215000  0.370000  7.465000 1.170000 ;
+      RECT  7.645000  0.085000  7.975000 1.150000 ;
+      RECT  7.695000  2.580000  8.025000 3.245000 ;
+      RECT  7.755000  1.500000  7.925000 2.130000 ;
+      RECT  8.595000  2.580000  8.925000 3.245000 ;
+      RECT  8.620000  0.085000  8.950000 1.150000 ;
+      RECT  8.685000  1.320000  9.015000 2.240000 ;
+      RECT  9.235000  0.450000  9.510000 1.300000 ;
+      RECT  9.235000  1.300000 10.165000 1.630000 ;
+      RECT  9.235000  1.630000  9.485000 2.860000 ;
+      RECT  9.690000  1.820000  9.940000 3.245000 ;
+      RECT  9.735000  0.085000  9.985000 1.130000 ;
+      RECT 10.675000  0.085000 10.925000 1.130000 ;
+      RECT 10.675000  1.820000 10.925000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfxbp_2
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef
index 31be49d..c715eb7 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.magic.lef
@@ -64,31 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.545000  0.085000 0.795000 0.790000 ;
-        RECT 1.985000  0.085000 2.315000 0.560000 ;
-        RECT 4.070000  0.085000 4.320000 0.520000 ;
-        RECT 6.230000  0.085000 6.560000 1.060000 ;
-        RECT 7.220000  0.085000 7.535000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -97,99 +72,121 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.645000 2.290000 0.815000 3.245000 ;
-        RECT 1.575000 2.965000 1.910000 3.245000 ;
-        RECT 3.800000 2.965000 4.130000 3.245000 ;
-        RECT 6.200000 2.520000 6.530000 3.245000 ;
-        RECT 7.210000 2.030000 7.540000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.960000 ;
-      RECT 0.115000 0.960000 1.135000 1.130000 ;
-      RECT 0.115000 1.950000 0.845000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.980000 ;
-      RECT 0.675000 1.130000 1.135000 1.550000 ;
-      RECT 0.675000 1.550000 0.845000 1.950000 ;
-      RECT 0.965000 0.255000 1.815000 0.425000 ;
-      RECT 0.965000 0.425000 1.135000 0.960000 ;
-      RECT 1.015000 1.820000 1.475000 2.625000 ;
-      RECT 1.015000 2.625000 2.250000 2.795000 ;
-      RECT 1.015000 2.795000 1.345000 2.980000 ;
-      RECT 1.305000 0.595000 1.475000 1.350000 ;
-      RECT 1.305000 1.350000 1.760000 1.680000 ;
-      RECT 1.305000 1.680000 1.475000 1.820000 ;
-      RECT 1.645000 0.425000 1.815000 0.730000 ;
-      RECT 1.645000 0.730000 2.655000 0.900000 ;
-      RECT 2.080000 2.795000 3.460000 2.965000 ;
-      RECT 2.420000 1.070000 2.975000 1.240000 ;
-      RECT 2.420000 1.240000 2.590000 2.625000 ;
-      RECT 2.485000 0.275000 3.760000 0.445000 ;
-      RECT 2.485000 0.445000 2.655000 0.730000 ;
-      RECT 2.760000 1.410000 3.420000 1.580000 ;
-      RECT 2.760000 1.580000 2.930000 2.285000 ;
-      RECT 2.760000 2.285000 4.140000 2.455000 ;
-      RECT 2.760000 2.455000 3.120000 2.625000 ;
-      RECT 3.100000 1.750000 3.760000 2.080000 ;
-      RECT 3.155000 0.615000 3.420000 1.410000 ;
-      RECT 3.290000 2.625000 4.950000 2.795000 ;
-      RECT 3.590000 0.445000 3.760000 0.690000 ;
-      RECT 3.590000 0.690000 4.660000 0.860000 ;
-      RECT 3.590000 0.860000 3.760000 1.750000 ;
-      RECT 3.930000 1.030000 5.000000 1.200000 ;
-      RECT 3.930000 1.200000 4.260000 1.415000 ;
-      RECT 3.970000 1.625000 4.270000 1.955000 ;
-      RECT 3.970000 1.955000 4.140000 2.285000 ;
-      RECT 4.335000 2.125000 4.610000 2.455000 ;
-      RECT 4.440000 1.200000 4.610000 2.125000 ;
-      RECT 4.490000 0.255000 5.895000 0.425000 ;
-      RECT 4.490000 0.425000 4.660000 0.690000 ;
-      RECT 4.780000 1.370000 5.480000 1.540000 ;
-      RECT 4.780000 1.540000 4.950000 2.625000 ;
-      RECT 4.780000 2.795000 4.950000 2.905000 ;
-      RECT 4.780000 2.905000 5.840000 3.075000 ;
-      RECT 4.830000 0.595000 5.000000 1.030000 ;
-      RECT 5.120000 1.710000 5.820000 1.880000 ;
-      RECT 5.120000 1.880000 5.290000 2.735000 ;
-      RECT 5.170000 1.150000 5.480000 1.370000 ;
-      RECT 5.220000 0.730000 5.820000 0.980000 ;
-      RECT 5.510000 2.050000 5.840000 2.905000 ;
-      RECT 5.565000 0.425000 5.895000 0.510000 ;
-      RECT 5.650000 0.980000 5.820000 1.230000 ;
-      RECT 5.650000 1.230000 7.205000 1.400000 ;
-      RECT 5.650000 1.400000 5.820000 1.710000 ;
-      RECT 6.050000 1.570000 6.380000 1.690000 ;
-      RECT 6.050000 1.690000 7.735000 1.860000 ;
-      RECT 6.050000 1.860000 6.380000 2.240000 ;
-      RECT 6.760000 1.860000 7.010000 2.700000 ;
-      RECT 6.790000 0.350000 7.040000 0.850000 ;
-      RECT 6.790000 0.850000 7.545000 1.020000 ;
-      RECT 6.875000 1.190000 7.205000 1.230000 ;
-      RECT 6.875000 1.400000 7.205000 1.520000 ;
-      RECT 7.375000 1.020000 7.545000 1.350000 ;
-      RECT 7.375000 1.350000 7.735000 1.690000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.960000 ;
+      RECT 0.115000  0.960000 1.135000 1.130000 ;
+      RECT 0.115000  1.950000 0.845000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.980000 ;
+      RECT 0.545000  0.085000 0.795000 0.790000 ;
+      RECT 0.645000  2.290000 0.815000 3.245000 ;
+      RECT 0.675000  1.130000 1.135000 1.550000 ;
+      RECT 0.675000  1.550000 0.845000 1.950000 ;
+      RECT 0.965000  0.255000 1.815000 0.425000 ;
+      RECT 0.965000  0.425000 1.135000 0.960000 ;
+      RECT 1.015000  1.820000 1.475000 2.625000 ;
+      RECT 1.015000  2.625000 2.250000 2.795000 ;
+      RECT 1.015000  2.795000 1.345000 2.980000 ;
+      RECT 1.305000  0.595000 1.475000 1.350000 ;
+      RECT 1.305000  1.350000 1.760000 1.680000 ;
+      RECT 1.305000  1.680000 1.475000 1.820000 ;
+      RECT 1.575000  2.965000 1.910000 3.245000 ;
+      RECT 1.645000  0.425000 1.815000 0.730000 ;
+      RECT 1.645000  0.730000 2.655000 0.900000 ;
+      RECT 1.985000  0.085000 2.315000 0.560000 ;
+      RECT 2.080000  2.795000 3.460000 2.965000 ;
+      RECT 2.420000  1.070000 2.975000 1.240000 ;
+      RECT 2.420000  1.240000 2.590000 2.625000 ;
+      RECT 2.485000  0.275000 3.760000 0.445000 ;
+      RECT 2.485000  0.445000 2.655000 0.730000 ;
+      RECT 2.760000  1.410000 3.420000 1.580000 ;
+      RECT 2.760000  1.580000 2.930000 2.285000 ;
+      RECT 2.760000  2.285000 4.140000 2.455000 ;
+      RECT 2.760000  2.455000 3.120000 2.625000 ;
+      RECT 3.100000  1.750000 3.760000 2.080000 ;
+      RECT 3.155000  0.615000 3.420000 1.410000 ;
+      RECT 3.290000  2.625000 4.950000 2.795000 ;
+      RECT 3.590000  0.445000 3.760000 0.690000 ;
+      RECT 3.590000  0.690000 4.660000 0.860000 ;
+      RECT 3.590000  0.860000 3.760000 1.750000 ;
+      RECT 3.800000  2.965000 4.130000 3.245000 ;
+      RECT 3.930000  1.030000 5.000000 1.200000 ;
+      RECT 3.930000  1.200000 4.260000 1.415000 ;
+      RECT 3.970000  1.625000 4.270000 1.955000 ;
+      RECT 3.970000  1.955000 4.140000 2.285000 ;
+      RECT 4.070000  0.085000 4.320000 0.520000 ;
+      RECT 4.335000  2.125000 4.610000 2.455000 ;
+      RECT 4.440000  1.200000 4.610000 2.125000 ;
+      RECT 4.490000  0.255000 5.895000 0.425000 ;
+      RECT 4.490000  0.425000 4.660000 0.690000 ;
+      RECT 4.780000  1.370000 5.480000 1.540000 ;
+      RECT 4.780000  1.540000 4.950000 2.625000 ;
+      RECT 4.780000  2.795000 4.950000 2.905000 ;
+      RECT 4.780000  2.905000 5.840000 3.075000 ;
+      RECT 4.830000  0.595000 5.000000 1.030000 ;
+      RECT 5.120000  1.710000 5.820000 1.880000 ;
+      RECT 5.120000  1.880000 5.290000 2.735000 ;
+      RECT 5.170000  1.150000 5.480000 1.370000 ;
+      RECT 5.220000  0.730000 5.820000 0.980000 ;
+      RECT 5.510000  2.050000 5.840000 2.905000 ;
+      RECT 5.565000  0.425000 5.895000 0.510000 ;
+      RECT 5.650000  0.980000 5.820000 1.230000 ;
+      RECT 5.650000  1.230000 7.205000 1.400000 ;
+      RECT 5.650000  1.400000 5.820000 1.710000 ;
+      RECT 6.050000  1.570000 6.380000 1.690000 ;
+      RECT 6.050000  1.690000 7.735000 1.860000 ;
+      RECT 6.050000  1.860000 6.380000 2.240000 ;
+      RECT 6.200000  2.520000 6.530000 3.245000 ;
+      RECT 6.230000  0.085000 6.560000 1.060000 ;
+      RECT 6.760000  1.860000 7.010000 2.700000 ;
+      RECT 6.790000  0.350000 7.040000 0.850000 ;
+      RECT 6.790000  0.850000 7.545000 1.020000 ;
+      RECT 6.875000  1.190000 7.205000 1.230000 ;
+      RECT 6.875000  1.400000 7.205000 1.520000 ;
+      RECT 7.210000  2.030000 7.540000 3.245000 ;
+      RECT 7.220000  0.085000 7.535000 0.680000 ;
+      RECT 7.375000  1.020000 7.545000 1.350000 ;
+      RECT 7.375000  1.350000 7.735000 1.690000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfxtp_1
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef
index cd09863..f0c5d58 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.magic.lef
@@ -65,33 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.545000  0.085000 0.795000 0.790000 ;
-        RECT 1.985000  0.085000 2.180000 0.640000 ;
-        RECT 3.985000  0.085000 4.235000 0.520000 ;
-        RECT 6.225000  0.085000 6.555000 1.060000 ;
-        RECT 7.300000  0.085000 7.595000 0.680000 ;
-        RECT 8.275000  0.085000 8.525000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -100,109 +73,133 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.645000 2.290000 0.815000 3.245000 ;
-        RECT 1.575000 2.965000 1.935000 3.245000 ;
-        RECT 3.710000 2.965000 4.100000 3.245000 ;
-        RECT 6.235000 2.520000 6.565000 3.245000 ;
-        RECT 7.240000 2.030000 7.570000 3.245000 ;
-        RECT 8.275000 1.820000 8.525000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.960000 ;
-      RECT 0.115000 0.960000 1.135000 1.130000 ;
-      RECT 0.115000 1.950000 0.845000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.980000 ;
-      RECT 0.675000 1.130000 1.135000 1.550000 ;
-      RECT 0.675000 1.550000 0.845000 1.950000 ;
-      RECT 0.965000 0.255000 1.815000 0.425000 ;
-      RECT 0.965000 0.425000 1.135000 0.960000 ;
-      RECT 1.015000 1.720000 1.475000 2.625000 ;
-      RECT 1.015000 2.625000 2.275000 2.755000 ;
-      RECT 1.015000 2.755000 4.990000 2.795000 ;
-      RECT 1.015000 2.795000 1.345000 2.980000 ;
-      RECT 1.305000 0.595000 1.475000 1.350000 ;
-      RECT 1.305000 1.350000 1.715000 1.720000 ;
-      RECT 1.645000 0.425000 1.815000 0.810000 ;
-      RECT 1.645000 0.810000 2.520000 0.980000 ;
-      RECT 2.105000 2.795000 3.540000 2.925000 ;
-      RECT 2.225000 1.650000 2.615000 1.820000 ;
-      RECT 2.225000 1.820000 2.555000 2.455000 ;
-      RECT 2.350000 0.255000 3.755000 0.425000 ;
-      RECT 2.350000 0.425000 2.520000 0.810000 ;
-      RECT 2.445000 1.150000 2.860000 1.320000 ;
-      RECT 2.445000 1.320000 2.615000 1.650000 ;
-      RECT 2.690000 0.595000 2.860000 1.150000 ;
-      RECT 2.755000 2.125000 2.955000 2.255000 ;
-      RECT 2.755000 2.255000 4.135000 2.425000 ;
-      RECT 2.755000 2.425000 2.955000 2.585000 ;
-      RECT 2.785000 1.490000 3.200000 1.660000 ;
-      RECT 2.785000 1.660000 2.955000 2.125000 ;
-      RECT 3.030000 0.615000 3.415000 0.945000 ;
-      RECT 3.030000 0.945000 3.200000 1.490000 ;
-      RECT 3.140000 1.830000 3.540000 2.085000 ;
-      RECT 3.370000 1.285000 3.755000 1.455000 ;
-      RECT 3.370000 1.455000 3.540000 1.830000 ;
-      RECT 3.370000 2.625000 4.990000 2.755000 ;
-      RECT 3.585000 0.425000 3.755000 0.690000 ;
-      RECT 3.585000 0.690000 4.575000 0.860000 ;
-      RECT 3.585000 0.860000 3.755000 1.285000 ;
-      RECT 3.925000 1.030000 4.915000 1.200000 ;
-      RECT 3.925000 1.200000 4.650000 1.415000 ;
-      RECT 3.965000 1.625000 4.310000 1.955000 ;
-      RECT 3.965000 1.955000 4.135000 2.255000 ;
-      RECT 4.305000 2.125000 4.650000 2.455000 ;
-      RECT 4.405000 0.255000 5.890000 0.425000 ;
-      RECT 4.405000 0.425000 4.575000 0.690000 ;
-      RECT 4.480000 1.415000 4.650000 2.125000 ;
-      RECT 4.745000 0.595000 5.075000 0.945000 ;
-      RECT 4.745000 0.945000 4.915000 1.030000 ;
-      RECT 4.820000 1.370000 5.415000 1.540000 ;
-      RECT 4.820000 1.540000 4.990000 2.625000 ;
-      RECT 4.820000 2.795000 4.990000 2.905000 ;
-      RECT 4.820000 2.905000 5.875000 3.075000 ;
-      RECT 5.085000 1.150000 5.415000 1.370000 ;
-      RECT 5.160000 1.710000 5.755000 1.880000 ;
-      RECT 5.160000 1.880000 5.330000 2.735000 ;
-      RECT 5.245000 0.695000 5.755000 0.945000 ;
-      RECT 5.545000 2.050000 5.875000 2.905000 ;
-      RECT 5.560000 0.425000 5.890000 0.510000 ;
-      RECT 5.585000 0.945000 5.755000 1.230000 ;
-      RECT 5.585000 1.230000 7.240000 1.400000 ;
-      RECT 5.585000 1.400000 5.755000 1.710000 ;
-      RECT 6.085000 1.570000 6.415000 1.690000 ;
-      RECT 6.085000 1.690000 7.765000 1.860000 ;
-      RECT 6.085000 1.860000 6.415000 2.240000 ;
-      RECT 6.785000 0.350000 7.115000 0.850000 ;
-      RECT 6.785000 0.850000 7.595000 1.020000 ;
-      RECT 6.790000 1.860000 7.040000 2.860000 ;
-      RECT 6.910000 1.190000 7.240000 1.230000 ;
-      RECT 6.910000 1.400000 7.240000 1.520000 ;
-      RECT 7.425000 1.020000 7.595000 1.350000 ;
-      RECT 7.425000 1.350000 7.765000 1.690000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.960000 ;
+      RECT 0.115000  0.960000 1.135000 1.130000 ;
+      RECT 0.115000  1.950000 0.845000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.980000 ;
+      RECT 0.545000  0.085000 0.795000 0.790000 ;
+      RECT 0.645000  2.290000 0.815000 3.245000 ;
+      RECT 0.675000  1.130000 1.135000 1.550000 ;
+      RECT 0.675000  1.550000 0.845000 1.950000 ;
+      RECT 0.965000  0.255000 1.815000 0.425000 ;
+      RECT 0.965000  0.425000 1.135000 0.960000 ;
+      RECT 1.015000  1.720000 1.475000 2.625000 ;
+      RECT 1.015000  2.625000 2.275000 2.755000 ;
+      RECT 1.015000  2.755000 4.990000 2.795000 ;
+      RECT 1.015000  2.795000 1.345000 2.980000 ;
+      RECT 1.305000  0.595000 1.475000 1.350000 ;
+      RECT 1.305000  1.350000 1.715000 1.720000 ;
+      RECT 1.575000  2.965000 1.935000 3.245000 ;
+      RECT 1.645000  0.425000 1.815000 0.810000 ;
+      RECT 1.645000  0.810000 2.520000 0.980000 ;
+      RECT 1.985000  0.085000 2.180000 0.640000 ;
+      RECT 2.105000  2.795000 3.540000 2.925000 ;
+      RECT 2.225000  1.650000 2.615000 1.820000 ;
+      RECT 2.225000  1.820000 2.555000 2.455000 ;
+      RECT 2.350000  0.255000 3.755000 0.425000 ;
+      RECT 2.350000  0.425000 2.520000 0.810000 ;
+      RECT 2.445000  1.150000 2.860000 1.320000 ;
+      RECT 2.445000  1.320000 2.615000 1.650000 ;
+      RECT 2.690000  0.595000 2.860000 1.150000 ;
+      RECT 2.755000  2.125000 2.955000 2.255000 ;
+      RECT 2.755000  2.255000 4.135000 2.425000 ;
+      RECT 2.755000  2.425000 2.955000 2.585000 ;
+      RECT 2.785000  1.490000 3.200000 1.660000 ;
+      RECT 2.785000  1.660000 2.955000 2.125000 ;
+      RECT 3.030000  0.615000 3.415000 0.945000 ;
+      RECT 3.030000  0.945000 3.200000 1.490000 ;
+      RECT 3.140000  1.830000 3.540000 2.085000 ;
+      RECT 3.370000  1.285000 3.755000 1.455000 ;
+      RECT 3.370000  1.455000 3.540000 1.830000 ;
+      RECT 3.370000  2.625000 4.990000 2.755000 ;
+      RECT 3.585000  0.425000 3.755000 0.690000 ;
+      RECT 3.585000  0.690000 4.575000 0.860000 ;
+      RECT 3.585000  0.860000 3.755000 1.285000 ;
+      RECT 3.710000  2.965000 4.100000 3.245000 ;
+      RECT 3.925000  1.030000 4.915000 1.200000 ;
+      RECT 3.925000  1.200000 4.650000 1.415000 ;
+      RECT 3.965000  1.625000 4.310000 1.955000 ;
+      RECT 3.965000  1.955000 4.135000 2.255000 ;
+      RECT 3.985000  0.085000 4.235000 0.520000 ;
+      RECT 4.305000  2.125000 4.650000 2.455000 ;
+      RECT 4.405000  0.255000 5.890000 0.425000 ;
+      RECT 4.405000  0.425000 4.575000 0.690000 ;
+      RECT 4.480000  1.415000 4.650000 2.125000 ;
+      RECT 4.745000  0.595000 5.075000 0.945000 ;
+      RECT 4.745000  0.945000 4.915000 1.030000 ;
+      RECT 4.820000  1.370000 5.415000 1.540000 ;
+      RECT 4.820000  1.540000 4.990000 2.625000 ;
+      RECT 4.820000  2.795000 4.990000 2.905000 ;
+      RECT 4.820000  2.905000 5.875000 3.075000 ;
+      RECT 5.085000  1.150000 5.415000 1.370000 ;
+      RECT 5.160000  1.710000 5.755000 1.880000 ;
+      RECT 5.160000  1.880000 5.330000 2.735000 ;
+      RECT 5.245000  0.695000 5.755000 0.945000 ;
+      RECT 5.545000  2.050000 5.875000 2.905000 ;
+      RECT 5.560000  0.425000 5.890000 0.510000 ;
+      RECT 5.585000  0.945000 5.755000 1.230000 ;
+      RECT 5.585000  1.230000 7.240000 1.400000 ;
+      RECT 5.585000  1.400000 5.755000 1.710000 ;
+      RECT 6.085000  1.570000 6.415000 1.690000 ;
+      RECT 6.085000  1.690000 7.765000 1.860000 ;
+      RECT 6.085000  1.860000 6.415000 2.240000 ;
+      RECT 6.225000  0.085000 6.555000 1.060000 ;
+      RECT 6.235000  2.520000 6.565000 3.245000 ;
+      RECT 6.785000  0.350000 7.115000 0.850000 ;
+      RECT 6.785000  0.850000 7.595000 1.020000 ;
+      RECT 6.790000  1.860000 7.040000 2.860000 ;
+      RECT 6.910000  1.190000 7.240000 1.230000 ;
+      RECT 6.910000  1.400000 7.240000 1.520000 ;
+      RECT 7.240000  2.030000 7.570000 3.245000 ;
+      RECT 7.300000  0.085000 7.595000 0.680000 ;
+      RECT 7.425000  1.020000 7.595000 1.350000 ;
+      RECT 7.425000  1.350000 7.765000 1.690000 ;
+      RECT 8.275000  0.085000 8.525000 1.130000 ;
+      RECT 8.275000  1.820000 8.525000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfxtp_2
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef
index 68bab4d..9598b7f 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.magic.lef
@@ -69,36 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.625000  0.085000 0.795000 0.790000 ;
-        RECT 1.985000  0.085000 2.315000 0.560000 ;
-        RECT 4.090000  0.085000 4.340000 0.520000 ;
-        RECT 6.410000  0.085000 6.660000 0.970000 ;
-        RECT 7.320000  0.085000 7.650000 0.710000 ;
-        RECT 8.330000  0.085000 8.500000 0.790000 ;
-        RECT 9.210000  0.085000 9.460000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -107,113 +77,140 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.645000 2.290000 0.815000 3.245000 ;
-        RECT 1.655000 2.865000 1.825000 3.245000 ;
-        RECT 3.715000 2.930000 4.045000 3.245000 ;
-        RECT 6.315000 2.450000 6.650000 3.245000 ;
-        RECT 7.355000 2.060000 7.605000 3.245000 ;
-        RECT 8.335000 2.140000 8.505000 3.245000 ;
-        RECT 9.235000 1.820000 9.485000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.960000 ;
-      RECT 0.115000 0.960000 1.135000 1.130000 ;
-      RECT 0.115000 1.950000 0.845000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.980000 ;
-      RECT 0.675000 1.130000 1.135000 1.550000 ;
-      RECT 0.675000 1.550000 0.845000 1.950000 ;
-      RECT 0.965000 0.255000 1.815000 0.425000 ;
-      RECT 0.965000 0.425000 1.135000 0.960000 ;
-      RECT 1.015000 1.820000 1.475000 2.525000 ;
-      RECT 1.015000 2.525000 2.165000 2.695000 ;
-      RECT 1.015000 2.695000 1.475000 2.980000 ;
-      RECT 1.305000 0.595000 1.475000 1.220000 ;
-      RECT 1.305000 1.220000 1.765000 1.550000 ;
-      RECT 1.305000 1.550000 1.475000 1.820000 ;
-      RECT 1.645000 0.425000 1.815000 0.730000 ;
-      RECT 1.645000 0.730000 2.655000 0.900000 ;
-      RECT 1.995000 2.695000 2.165000 2.905000 ;
-      RECT 1.995000 2.905000 3.375000 3.075000 ;
-      RECT 2.335000 1.950000 2.645000 2.120000 ;
-      RECT 2.335000 2.120000 2.505000 2.735000 ;
-      RECT 2.475000 1.070000 2.995000 1.240000 ;
-      RECT 2.475000 1.240000 2.645000 1.950000 ;
-      RECT 2.485000 0.255000 3.875000 0.425000 ;
-      RECT 2.485000 0.425000 2.655000 0.730000 ;
-      RECT 2.705000 2.485000 3.035000 2.735000 ;
-      RECT 2.815000 1.410000 3.345000 1.580000 ;
-      RECT 2.815000 1.580000 2.985000 2.250000 ;
-      RECT 2.815000 2.250000 4.385000 2.420000 ;
-      RECT 2.815000 2.420000 3.035000 2.485000 ;
-      RECT 2.825000 0.595000 2.995000 1.070000 ;
-      RECT 3.155000 1.750000 3.875000 2.080000 ;
-      RECT 3.175000 0.620000 3.535000 0.950000 ;
-      RECT 3.175000 0.950000 3.345000 1.410000 ;
-      RECT 3.205000 2.590000 4.385000 2.760000 ;
-      RECT 3.205000 2.760000 3.375000 2.905000 ;
-      RECT 3.705000 0.425000 3.875000 0.690000 ;
-      RECT 3.705000 0.690000 4.680000 0.860000 ;
-      RECT 3.705000 0.860000 3.875000 1.750000 ;
-      RECT 4.045000 1.030000 5.020000 1.200000 ;
-      RECT 4.045000 1.200000 4.725000 1.370000 ;
-      RECT 4.055000 1.630000 4.385000 2.250000 ;
-      RECT 4.215000 2.760000 4.385000 2.905000 ;
-      RECT 4.215000 2.905000 5.955000 3.075000 ;
-      RECT 4.510000 0.255000 5.995000 0.425000 ;
-      RECT 4.510000 0.425000 4.680000 0.690000 ;
-      RECT 4.555000 1.370000 4.725000 2.735000 ;
-      RECT 4.850000 0.595000 5.180000 0.950000 ;
-      RECT 4.850000 0.950000 5.020000 1.030000 ;
-      RECT 4.895000 1.370000 5.520000 1.540000 ;
-      RECT 4.895000 1.540000 5.065000 2.905000 ;
-      RECT 5.190000 1.150000 5.520000 1.370000 ;
-      RECT 5.235000 1.710000 5.860000 1.880000 ;
-      RECT 5.235000 1.880000 5.405000 2.735000 ;
-      RECT 5.350000 0.720000 5.860000 0.970000 ;
-      RECT 5.625000 2.050000 5.955000 2.905000 ;
-      RECT 5.665000 0.425000 5.995000 0.510000 ;
-      RECT 5.690000 0.970000 5.860000 1.140000 ;
-      RECT 5.690000 1.140000 6.800000 1.220000 ;
-      RECT 5.690000 1.220000 7.130000 1.310000 ;
-      RECT 5.690000 1.310000 5.860000 1.710000 ;
-      RECT 6.130000 1.480000 6.460000 1.720000 ;
-      RECT 6.130000 1.720000 7.470000 1.810000 ;
-      RECT 6.290000 1.810000 7.470000 1.890000 ;
-      RECT 6.630000 1.310000 7.130000 1.390000 ;
-      RECT 6.800000 1.390000 7.130000 1.550000 ;
-      RECT 6.820000 1.890000 7.150000 2.980000 ;
-      RECT 6.890000 0.350000 7.140000 0.880000 ;
-      RECT 6.890000 0.880000 7.470000 0.970000 ;
-      RECT 6.970000 0.970000 7.470000 1.050000 ;
-      RECT 7.300000 1.050000 7.470000 1.300000 ;
-      RECT 7.300000 1.300000 8.665000 1.630000 ;
-      RECT 7.300000 1.630000 7.470000 1.720000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 0.960000 ;
+      RECT 0.115000  0.960000 1.135000 1.130000 ;
+      RECT 0.115000  1.950000 0.845000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.980000 ;
+      RECT 0.625000  0.085000 0.795000 0.790000 ;
+      RECT 0.645000  2.290000 0.815000 3.245000 ;
+      RECT 0.675000  1.130000 1.135000 1.550000 ;
+      RECT 0.675000  1.550000 0.845000 1.950000 ;
+      RECT 0.965000  0.255000 1.815000 0.425000 ;
+      RECT 0.965000  0.425000 1.135000 0.960000 ;
+      RECT 1.015000  1.820000 1.475000 2.525000 ;
+      RECT 1.015000  2.525000 2.165000 2.695000 ;
+      RECT 1.015000  2.695000 1.475000 2.980000 ;
+      RECT 1.305000  0.595000 1.475000 1.220000 ;
+      RECT 1.305000  1.220000 1.765000 1.550000 ;
+      RECT 1.305000  1.550000 1.475000 1.820000 ;
+      RECT 1.645000  0.425000 1.815000 0.730000 ;
+      RECT 1.645000  0.730000 2.655000 0.900000 ;
+      RECT 1.655000  2.865000 1.825000 3.245000 ;
+      RECT 1.985000  0.085000 2.315000 0.560000 ;
+      RECT 1.995000  2.695000 2.165000 2.905000 ;
+      RECT 1.995000  2.905000 3.375000 3.075000 ;
+      RECT 2.335000  1.950000 2.645000 2.120000 ;
+      RECT 2.335000  2.120000 2.505000 2.735000 ;
+      RECT 2.475000  1.070000 2.995000 1.240000 ;
+      RECT 2.475000  1.240000 2.645000 1.950000 ;
+      RECT 2.485000  0.255000 3.875000 0.425000 ;
+      RECT 2.485000  0.425000 2.655000 0.730000 ;
+      RECT 2.705000  2.485000 3.035000 2.735000 ;
+      RECT 2.815000  1.410000 3.345000 1.580000 ;
+      RECT 2.815000  1.580000 2.985000 2.250000 ;
+      RECT 2.815000  2.250000 4.385000 2.420000 ;
+      RECT 2.815000  2.420000 3.035000 2.485000 ;
+      RECT 2.825000  0.595000 2.995000 1.070000 ;
+      RECT 3.155000  1.750000 3.875000 2.080000 ;
+      RECT 3.175000  0.620000 3.535000 0.950000 ;
+      RECT 3.175000  0.950000 3.345000 1.410000 ;
+      RECT 3.205000  2.590000 4.385000 2.760000 ;
+      RECT 3.205000  2.760000 3.375000 2.905000 ;
+      RECT 3.705000  0.425000 3.875000 0.690000 ;
+      RECT 3.705000  0.690000 4.680000 0.860000 ;
+      RECT 3.705000  0.860000 3.875000 1.750000 ;
+      RECT 3.715000  2.930000 4.045000 3.245000 ;
+      RECT 4.045000  1.030000 5.020000 1.200000 ;
+      RECT 4.045000  1.200000 4.725000 1.370000 ;
+      RECT 4.055000  1.630000 4.385000 2.250000 ;
+      RECT 4.090000  0.085000 4.340000 0.520000 ;
+      RECT 4.215000  2.760000 4.385000 2.905000 ;
+      RECT 4.215000  2.905000 5.955000 3.075000 ;
+      RECT 4.510000  0.255000 5.995000 0.425000 ;
+      RECT 4.510000  0.425000 4.680000 0.690000 ;
+      RECT 4.555000  1.370000 4.725000 2.735000 ;
+      RECT 4.850000  0.595000 5.180000 0.950000 ;
+      RECT 4.850000  0.950000 5.020000 1.030000 ;
+      RECT 4.895000  1.370000 5.520000 1.540000 ;
+      RECT 4.895000  1.540000 5.065000 2.905000 ;
+      RECT 5.190000  1.150000 5.520000 1.370000 ;
+      RECT 5.235000  1.710000 5.860000 1.880000 ;
+      RECT 5.235000  1.880000 5.405000 2.735000 ;
+      RECT 5.350000  0.720000 5.860000 0.970000 ;
+      RECT 5.625000  2.050000 5.955000 2.905000 ;
+      RECT 5.665000  0.425000 5.995000 0.510000 ;
+      RECT 5.690000  0.970000 5.860000 1.140000 ;
+      RECT 5.690000  1.140000 6.800000 1.220000 ;
+      RECT 5.690000  1.220000 7.130000 1.310000 ;
+      RECT 5.690000  1.310000 5.860000 1.710000 ;
+      RECT 6.130000  1.480000 6.460000 1.720000 ;
+      RECT 6.130000  1.720000 7.470000 1.810000 ;
+      RECT 6.290000  1.810000 7.470000 1.890000 ;
+      RECT 6.315000  2.450000 6.650000 3.245000 ;
+      RECT 6.410000  0.085000 6.660000 0.970000 ;
+      RECT 6.630000  1.310000 7.130000 1.390000 ;
+      RECT 6.800000  1.390000 7.130000 1.550000 ;
+      RECT 6.820000  1.890000 7.150000 2.980000 ;
+      RECT 6.890000  0.350000 7.140000 0.880000 ;
+      RECT 6.890000  0.880000 7.470000 0.970000 ;
+      RECT 6.970000  0.970000 7.470000 1.050000 ;
+      RECT 7.300000  1.050000 7.470000 1.300000 ;
+      RECT 7.300000  1.300000 8.665000 1.630000 ;
+      RECT 7.300000  1.630000 7.470000 1.720000 ;
+      RECT 7.320000  0.085000 7.650000 0.710000 ;
+      RECT 7.355000  2.060000 7.605000 3.245000 ;
+      RECT 8.330000  0.085000 8.500000 0.790000 ;
+      RECT 8.335000  2.140000 8.505000 3.245000 ;
+      RECT 9.210000  0.085000 9.460000 1.130000 ;
+      RECT 9.235000  1.820000 9.485000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
   END
 END sky130_fd_sc_hs__dfxtp_4
diff --git a/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef
index c822a93..6ee5bcc 100644
--- a/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hs__diode_2.magic.lef
@@ -42,11 +42,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
@@ -55,13 +50,18 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.960000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.960000 0.085000 ;
+      RECT 0.000000  3.245000 0.960000 3.415000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+  END
 END sky130_fd_sc_hs__diode_2
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef
index c669e65..9048562 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.magic.lef
@@ -62,28 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.625000  0.085000 0.875000 0.620000 ;
-        RECT 2.750000  0.685000 3.295000 0.935000 ;
-        RECT 3.125000  0.085000 3.295000 0.685000 ;
-        RECT 4.385000  0.085000 4.715000 1.305000 ;
-        RECT 5.845000  0.085000 6.095000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -92,68 +70,87 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.615000 2.310000 0.945000 3.245000 ;
-        RECT 2.835000 2.730000 3.165000 3.245000 ;
-        RECT 4.430000 1.975000 4.760000 3.245000 ;
-        RECT 5.705000 1.945000 6.035000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.350000 0.445000 0.790000 ;
-      RECT 0.095000 0.790000 1.215000 0.960000 ;
-      RECT 0.095000 0.960000 0.445000 1.130000 ;
-      RECT 0.095000 1.130000 0.265000 1.820000 ;
-      RECT 0.095000 1.820000 0.445000 2.980000 ;
-      RECT 0.435000 1.300000 0.785000 1.630000 ;
-      RECT 0.615000 1.130000 1.555000 1.300000 ;
-      RECT 0.615000 1.630000 0.785000 1.970000 ;
-      RECT 0.615000 1.970000 1.555000 2.140000 ;
-      RECT 1.045000 0.255000 2.955000 0.425000 ;
-      RECT 1.045000 0.425000 1.215000 0.790000 ;
-      RECT 1.385000 0.650000 2.260000 0.980000 ;
-      RECT 1.385000 0.980000 1.555000 1.130000 ;
-      RECT 1.385000 2.140000 1.555000 2.550000 ;
-      RECT 1.385000 2.550000 2.285000 2.880000 ;
-      RECT 1.725000 1.150000 1.995000 2.050000 ;
-      RECT 1.725000 2.050000 3.200000 2.380000 ;
-      RECT 2.205000 1.160000 3.775000 1.330000 ;
-      RECT 2.205000 1.330000 2.535000 1.840000 ;
-      RECT 2.625000 0.425000 2.955000 0.510000 ;
-      RECT 3.030000 1.500000 3.435000 1.830000 ;
-      RECT 3.030000 1.830000 3.200000 2.050000 ;
-      RECT 3.030000 2.380000 3.200000 2.390000 ;
-      RECT 3.030000 2.390000 4.260000 2.560000 ;
-      RECT 3.370000 2.050000 3.775000 2.220000 ;
-      RECT 3.465000 0.605000 3.775000 1.160000 ;
-      RECT 3.605000 1.330000 3.775000 2.050000 ;
-      RECT 3.945000 1.055000 4.205000 1.945000 ;
-      RECT 3.945000 1.945000 4.260000 2.390000 ;
-      RECT 3.945000 2.560000 4.260000 2.825000 ;
-      RECT 4.930000 1.975000 5.535000 2.145000 ;
-      RECT 4.930000 2.145000 5.260000 2.825000 ;
-      RECT 5.285000 0.605000 5.615000 1.285000 ;
-      RECT 5.365000 1.285000 5.615000 1.300000 ;
-      RECT 5.365000 1.300000 6.035000 1.630000 ;
-      RECT 5.365000 1.630000 5.535000 1.975000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.095000  0.350000 0.445000 0.790000 ;
+      RECT 0.095000  0.790000 1.215000 0.960000 ;
+      RECT 0.095000  0.960000 0.445000 1.130000 ;
+      RECT 0.095000  1.130000 0.265000 1.820000 ;
+      RECT 0.095000  1.820000 0.445000 2.980000 ;
+      RECT 0.435000  1.300000 0.785000 1.630000 ;
+      RECT 0.615000  1.130000 1.555000 1.300000 ;
+      RECT 0.615000  1.630000 0.785000 1.970000 ;
+      RECT 0.615000  1.970000 1.555000 2.140000 ;
+      RECT 0.615000  2.310000 0.945000 3.245000 ;
+      RECT 0.625000  0.085000 0.875000 0.620000 ;
+      RECT 1.045000  0.255000 2.955000 0.425000 ;
+      RECT 1.045000  0.425000 1.215000 0.790000 ;
+      RECT 1.385000  0.650000 2.260000 0.980000 ;
+      RECT 1.385000  0.980000 1.555000 1.130000 ;
+      RECT 1.385000  2.140000 1.555000 2.550000 ;
+      RECT 1.385000  2.550000 2.285000 2.880000 ;
+      RECT 1.725000  1.150000 1.995000 2.050000 ;
+      RECT 1.725000  2.050000 3.200000 2.380000 ;
+      RECT 2.205000  1.160000 3.775000 1.330000 ;
+      RECT 2.205000  1.330000 2.535000 1.840000 ;
+      RECT 2.625000  0.425000 2.955000 0.510000 ;
+      RECT 2.750000  0.685000 3.295000 0.935000 ;
+      RECT 2.835000  2.730000 3.165000 3.245000 ;
+      RECT 3.030000  1.500000 3.435000 1.830000 ;
+      RECT 3.030000  1.830000 3.200000 2.050000 ;
+      RECT 3.030000  2.380000 3.200000 2.390000 ;
+      RECT 3.030000  2.390000 4.260000 2.560000 ;
+      RECT 3.125000  0.085000 3.295000 0.685000 ;
+      RECT 3.370000  2.050000 3.775000 2.220000 ;
+      RECT 3.465000  0.605000 3.775000 1.160000 ;
+      RECT 3.605000  1.330000 3.775000 2.050000 ;
+      RECT 3.945000  1.055000 4.205000 1.945000 ;
+      RECT 3.945000  1.945000 4.260000 2.390000 ;
+      RECT 3.945000  2.560000 4.260000 2.825000 ;
+      RECT 4.385000  0.085000 4.715000 1.305000 ;
+      RECT 4.430000  1.975000 4.760000 3.245000 ;
+      RECT 4.930000  1.975000 5.535000 2.145000 ;
+      RECT 4.930000  2.145000 5.260000 2.825000 ;
+      RECT 5.285000  0.605000 5.615000 1.285000 ;
+      RECT 5.365000  1.285000 5.615000 1.300000 ;
+      RECT 5.365000  1.300000 6.035000 1.630000 ;
+      RECT 5.365000  1.630000 5.535000 1.975000 ;
+      RECT 5.705000  1.945000 6.035000 3.245000 ;
+      RECT 5.845000  0.085000 6.095000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlclkp_1
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef
index f954b71..2c90a01 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.magic.lef
@@ -61,31 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.545000  0.085000 0.880000 0.600000 ;
-        RECT 2.920000  0.755000 3.535000 1.005000 ;
-        RECT 3.340000  0.085000 3.535000 0.755000 ;
-        RECT 4.765000  0.085000 5.095000 1.275000 ;
-        RECT 6.305000  0.085000 6.635000 0.770000 ;
-        RECT 7.315000  0.085000 7.565000 1.220000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -94,70 +69,92 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.685000 2.290000 1.075000 3.245000 ;
-        RECT 2.945000 2.650000 3.485000 3.245000 ;
-        RECT 4.715000 2.075000 5.045000 3.245000 ;
-        RECT 5.730000 1.950000 6.635000 3.245000 ;
-        RECT 7.315000 1.820000 7.565000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.350000 0.365000 0.770000 ;
-      RECT 0.095000 0.770000 1.220000 0.940000 ;
-      RECT 0.095000 0.940000 0.265000 1.820000 ;
-      RECT 0.095000 1.820000 0.445000 2.980000 ;
-      RECT 0.435000 1.110000 1.560000 1.280000 ;
-      RECT 0.435000 1.280000 0.785000 1.550000 ;
-      RECT 0.615000 1.550000 0.785000 1.950000 ;
-      RECT 0.615000 1.950000 1.705000 2.120000 ;
-      RECT 1.050000 0.255000 3.160000 0.425000 ;
-      RECT 1.050000 0.425000 1.220000 0.770000 ;
-      RECT 1.390000 0.620000 2.245000 0.950000 ;
-      RECT 1.390000 0.950000 1.560000 1.110000 ;
-      RECT 1.535000 2.120000 1.705000 2.550000 ;
-      RECT 1.535000 2.550000 2.405000 2.880000 ;
-      RECT 1.730000 1.120000 2.045000 1.450000 ;
-      RECT 1.875000 1.450000 2.045000 2.050000 ;
-      RECT 1.875000 2.050000 3.325000 2.220000 ;
-      RECT 2.225000 2.220000 2.555000 2.380000 ;
-      RECT 2.255000 1.215000 4.035000 1.385000 ;
-      RECT 2.255000 1.385000 2.585000 1.840000 ;
-      RECT 2.830000 0.425000 3.160000 0.585000 ;
-      RECT 3.155000 1.555000 3.485000 1.885000 ;
-      RECT 3.155000 1.885000 3.325000 2.050000 ;
-      RECT 3.655000 1.385000 3.825000 2.100000 ;
-      RECT 3.655000 2.100000 3.985000 2.980000 ;
-      RECT 3.705000 0.605000 4.035000 1.215000 ;
-      RECT 3.995000 1.555000 4.380000 1.885000 ;
-      RECT 4.210000 0.575000 4.595000 1.275000 ;
-      RECT 4.210000 1.275000 4.380000 1.555000 ;
-      RECT 4.210000 1.885000 4.380000 2.075000 ;
-      RECT 4.210000 2.075000 4.545000 2.955000 ;
-      RECT 5.215000 1.950000 5.560000 2.955000 ;
-      RECT 5.390000 0.940000 6.305000 1.610000 ;
-      RECT 5.390000 1.610000 5.560000 1.950000 ;
-      RECT 5.555000 0.575000 5.885000 0.940000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.095000  0.350000 0.365000 0.770000 ;
+      RECT 0.095000  0.770000 1.220000 0.940000 ;
+      RECT 0.095000  0.940000 0.265000 1.820000 ;
+      RECT 0.095000  1.820000 0.445000 2.980000 ;
+      RECT 0.435000  1.110000 1.560000 1.280000 ;
+      RECT 0.435000  1.280000 0.785000 1.550000 ;
+      RECT 0.545000  0.085000 0.880000 0.600000 ;
+      RECT 0.615000  1.550000 0.785000 1.950000 ;
+      RECT 0.615000  1.950000 1.705000 2.120000 ;
+      RECT 0.685000  2.290000 1.075000 3.245000 ;
+      RECT 1.050000  0.255000 3.160000 0.425000 ;
+      RECT 1.050000  0.425000 1.220000 0.770000 ;
+      RECT 1.390000  0.620000 2.245000 0.950000 ;
+      RECT 1.390000  0.950000 1.560000 1.110000 ;
+      RECT 1.535000  2.120000 1.705000 2.550000 ;
+      RECT 1.535000  2.550000 2.405000 2.880000 ;
+      RECT 1.730000  1.120000 2.045000 1.450000 ;
+      RECT 1.875000  1.450000 2.045000 2.050000 ;
+      RECT 1.875000  2.050000 3.325000 2.220000 ;
+      RECT 2.225000  2.220000 2.555000 2.380000 ;
+      RECT 2.255000  1.215000 4.035000 1.385000 ;
+      RECT 2.255000  1.385000 2.585000 1.840000 ;
+      RECT 2.830000  0.425000 3.160000 0.585000 ;
+      RECT 2.920000  0.755000 3.535000 1.005000 ;
+      RECT 2.945000  2.650000 3.485000 3.245000 ;
+      RECT 3.155000  1.555000 3.485000 1.885000 ;
+      RECT 3.155000  1.885000 3.325000 2.050000 ;
+      RECT 3.340000  0.085000 3.535000 0.755000 ;
+      RECT 3.655000  1.385000 3.825000 2.100000 ;
+      RECT 3.655000  2.100000 3.985000 2.980000 ;
+      RECT 3.705000  0.605000 4.035000 1.215000 ;
+      RECT 3.995000  1.555000 4.380000 1.885000 ;
+      RECT 4.210000  0.575000 4.595000 1.275000 ;
+      RECT 4.210000  1.275000 4.380000 1.555000 ;
+      RECT 4.210000  1.885000 4.380000 2.075000 ;
+      RECT 4.210000  2.075000 4.545000 2.955000 ;
+      RECT 4.715000  2.075000 5.045000 3.245000 ;
+      RECT 4.765000  0.085000 5.095000 1.275000 ;
+      RECT 5.215000  1.950000 5.560000 2.955000 ;
+      RECT 5.390000  0.940000 6.305000 1.610000 ;
+      RECT 5.390000  1.610000 5.560000 1.950000 ;
+      RECT 5.555000  0.575000 5.885000 0.940000 ;
+      RECT 5.730000  1.950000 6.635000 3.245000 ;
+      RECT 6.305000  0.085000 6.635000 0.770000 ;
+      RECT 7.315000  0.085000 7.565000 1.220000 ;
+      RECT 7.315000  1.820000 7.565000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlclkp_2
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef
index 3050cb1..5be7000 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.magic.lef
@@ -68,33 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.550000  0.085000 0.925000 0.680000 ;
-        RECT 3.315000  0.085000 3.645000 0.850000 ;
-        RECT 4.780000  0.085000 5.110000 0.850000 ;
-        RECT 6.160000  0.085000 6.655000 0.500000 ;
-        RECT 7.335000  0.085000 7.585000 1.040000 ;
-        RECT 8.195000  0.085000 8.525000 1.040000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -103,76 +76,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.785000 2.310000 1.160000 3.245000 ;
-        RECT 3.110000 2.860000 3.440000 3.245000 ;
-        RECT 4.740000 2.090000 5.070000 3.245000 ;
-        RECT 5.740000 2.160000 6.625000 3.245000 ;
-        RECT 7.295000 1.890000 7.545000 3.245000 ;
-        RECT 8.195000 1.950000 8.525000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.850000 ;
-      RECT 0.115000 0.850000 1.265000 1.020000 ;
-      RECT 0.115000 1.020000 0.365000 1.820000 ;
-      RECT 0.115000 1.820000 0.540000 2.980000 ;
-      RECT 0.535000 1.190000 1.605000 1.360000 ;
-      RECT 0.535000 1.360000 0.880000 1.550000 ;
-      RECT 0.710000 1.550000 0.880000 1.970000 ;
-      RECT 0.710000 1.970000 1.605000 2.140000 ;
-      RECT 1.095000 0.255000 3.145000 0.425000 ;
-      RECT 1.095000 0.425000 1.265000 0.850000 ;
-      RECT 1.435000 0.650000 2.330000 0.980000 ;
-      RECT 1.435000 0.980000 1.605000 1.190000 ;
-      RECT 1.435000 2.140000 1.605000 2.520000 ;
-      RECT 1.435000 2.520000 2.485000 2.850000 ;
-      RECT 1.775000 1.150000 2.065000 2.050000 ;
-      RECT 1.775000 2.050000 3.475000 2.350000 ;
-      RECT 2.305000 1.360000 4.155000 1.530000 ;
-      RECT 2.305000 1.530000 2.635000 1.805000 ;
-      RECT 2.815000 0.425000 3.145000 1.020000 ;
-      RECT 2.815000 1.020000 5.430000 1.190000 ;
-      RECT 3.305000 1.700000 3.655000 1.960000 ;
-      RECT 3.305000 1.960000 3.475000 2.050000 ;
-      RECT 3.305000 2.350000 3.475000 2.520000 ;
-      RECT 3.305000 2.520000 4.535000 2.690000 ;
-      RECT 3.645000 2.180000 3.995000 2.350000 ;
-      RECT 3.815000 0.255000 4.610000 0.515000 ;
-      RECT 3.825000 1.530000 4.155000 1.610000 ;
-      RECT 3.825000 1.610000 3.995000 2.180000 ;
-      RECT 4.205000 2.090000 4.535000 2.520000 ;
-      RECT 4.205000 2.690000 4.535000 2.970000 ;
-      RECT 4.280000 0.515000 4.610000 0.850000 ;
-      RECT 5.240000 1.820000 6.350000 1.990000 ;
-      RECT 5.240000 1.990000 5.570000 2.980000 ;
-      RECT 5.260000 1.190000 5.430000 1.300000 ;
-      RECT 5.260000 1.300000 5.805000 1.630000 ;
-      RECT 5.600000 0.350000 5.975000 0.670000 ;
-      RECT 5.600000 0.670000 6.350000 1.130000 ;
-      RECT 5.975000 1.130000 6.350000 1.820000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.850000 ;
+      RECT 0.115000  0.850000 1.265000 1.020000 ;
+      RECT 0.115000  1.020000 0.365000 1.820000 ;
+      RECT 0.115000  1.820000 0.540000 2.980000 ;
+      RECT 0.535000  1.190000 1.605000 1.360000 ;
+      RECT 0.535000  1.360000 0.880000 1.550000 ;
+      RECT 0.550000  0.085000 0.925000 0.680000 ;
+      RECT 0.710000  1.550000 0.880000 1.970000 ;
+      RECT 0.710000  1.970000 1.605000 2.140000 ;
+      RECT 0.785000  2.310000 1.160000 3.245000 ;
+      RECT 1.095000  0.255000 3.145000 0.425000 ;
+      RECT 1.095000  0.425000 1.265000 0.850000 ;
+      RECT 1.435000  0.650000 2.330000 0.980000 ;
+      RECT 1.435000  0.980000 1.605000 1.190000 ;
+      RECT 1.435000  2.140000 1.605000 2.520000 ;
+      RECT 1.435000  2.520000 2.485000 2.850000 ;
+      RECT 1.775000  1.150000 2.065000 2.050000 ;
+      RECT 1.775000  2.050000 3.475000 2.350000 ;
+      RECT 2.305000  1.360000 4.155000 1.530000 ;
+      RECT 2.305000  1.530000 2.635000 1.805000 ;
+      RECT 2.815000  0.425000 3.145000 1.020000 ;
+      RECT 2.815000  1.020000 5.430000 1.190000 ;
+      RECT 3.110000  2.860000 3.440000 3.245000 ;
+      RECT 3.305000  1.700000 3.655000 1.960000 ;
+      RECT 3.305000  1.960000 3.475000 2.050000 ;
+      RECT 3.305000  2.350000 3.475000 2.520000 ;
+      RECT 3.305000  2.520000 4.535000 2.690000 ;
+      RECT 3.315000  0.085000 3.645000 0.850000 ;
+      RECT 3.645000  2.180000 3.995000 2.350000 ;
+      RECT 3.815000  0.255000 4.610000 0.515000 ;
+      RECT 3.825000  1.530000 4.155000 1.610000 ;
+      RECT 3.825000  1.610000 3.995000 2.180000 ;
+      RECT 4.205000  2.090000 4.535000 2.520000 ;
+      RECT 4.205000  2.690000 4.535000 2.970000 ;
+      RECT 4.280000  0.515000 4.610000 0.850000 ;
+      RECT 4.740000  2.090000 5.070000 3.245000 ;
+      RECT 4.780000  0.085000 5.110000 0.850000 ;
+      RECT 5.240000  1.820000 6.350000 1.990000 ;
+      RECT 5.240000  1.990000 5.570000 2.980000 ;
+      RECT 5.260000  1.190000 5.430000 1.300000 ;
+      RECT 5.260000  1.300000 5.805000 1.630000 ;
+      RECT 5.600000  0.350000 5.975000 0.670000 ;
+      RECT 5.600000  0.670000 6.350000 1.130000 ;
+      RECT 5.740000  2.160000 6.625000 3.245000 ;
+      RECT 5.975000  1.130000 6.350000 1.820000 ;
+      RECT 6.160000  0.085000 6.655000 0.500000 ;
+      RECT 7.295000  1.890000 7.545000 3.245000 ;
+      RECT 7.335000  0.085000 7.585000 1.040000 ;
+      RECT 8.195000  0.085000 8.525000 1.040000 ;
+      RECT 8.195000  1.950000 8.525000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlclkp_4
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef
index 6c5ee11..e4f43c6 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.magic.lef
@@ -83,32 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.630000  0.085000 0.960000 1.090000 ;
-        RECT 2.345000  0.085000 2.915000 0.600000 ;
-        RECT 4.730000  0.085000 4.980000 1.030000 ;
-        RECT 6.030000  0.085000 6.360000 1.010000 ;
-        RECT 7.745000  0.085000 8.075000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -117,85 +91,108 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.565000 2.410000 0.895000 3.245000 ;
-        RECT 2.505000 2.900000 2.835000 3.245000 ;
-        RECT 4.680000 2.520000 5.445000 3.245000 ;
-        RECT 6.115000 2.060000 6.445000 3.245000 ;
-        RECT 7.745000 1.820000 8.010000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.540000 0.450000 1.090000 ;
-      RECT 0.095000 1.090000 0.265000 2.070000 ;
-      RECT 0.095000 2.070000 1.235000 2.240000 ;
-      RECT 0.095000 2.240000 0.365000 2.980000 ;
-      RECT 1.065000 2.240000 1.235000 2.730000 ;
-      RECT 1.065000 2.730000 2.015000 2.900000 ;
-      RECT 1.130000 0.350000 1.675000 1.090000 ;
-      RECT 1.405000 2.100000 1.675000 2.220000 ;
-      RECT 1.405000 2.220000 2.555000 2.390000 ;
-      RECT 1.405000 2.390000 1.675000 2.560000 ;
-      RECT 1.505000 1.090000 1.675000 2.100000 ;
-      RECT 1.845000 0.350000 2.175000 0.780000 ;
-      RECT 1.845000 0.780000 4.205000 0.950000 ;
-      RECT 1.845000 0.950000 2.175000 0.960000 ;
-      RECT 1.845000 0.960000 2.015000 1.720000 ;
-      RECT 1.845000 1.720000 2.215000 2.050000 ;
-      RECT 1.845000 2.560000 2.910000 2.730000 ;
-      RECT 2.185000 1.130000 3.610000 1.300000 ;
-      RECT 2.185000 1.300000 2.555000 1.550000 ;
-      RECT 2.385000 1.550000 2.555000 2.220000 ;
-      RECT 2.740000 1.470000 3.070000 1.800000 ;
-      RECT 2.740000 1.800000 2.910000 2.560000 ;
-      RECT 3.120000 1.970000 3.450000 2.140000 ;
-      RECT 3.120000 2.140000 3.290000 2.905000 ;
-      RECT 3.120000 2.905000 4.290000 3.075000 ;
-      RECT 3.280000 1.120000 3.610000 1.130000 ;
-      RECT 3.280000 1.300000 3.610000 1.450000 ;
-      RECT 3.280000 1.450000 3.450000 1.970000 ;
-      RECT 3.405000 0.360000 4.545000 0.610000 ;
-      RECT 3.460000 2.405000 3.790000 2.735000 ;
-      RECT 3.620000 1.620000 4.725000 1.790000 ;
-      RECT 3.620000 1.790000 3.790000 2.405000 ;
-      RECT 3.875000 0.950000 4.205000 1.450000 ;
-      RECT 3.960000 2.050000 4.290000 2.905000 ;
-      RECT 4.375000 0.610000 4.545000 1.220000 ;
-      RECT 4.375000 1.220000 5.120000 1.550000 ;
-      RECT 4.375000 1.550000 4.725000 1.620000 ;
-      RECT 4.530000 1.960000 5.945000 2.290000 ;
-      RECT 5.210000 0.350000 5.460000 1.050000 ;
-      RECT 5.290000 1.050000 5.460000 1.720000 ;
-      RECT 5.290000 1.720000 6.520000 1.890000 ;
-      RECT 5.290000 1.890000 5.945000 1.960000 ;
-      RECT 5.615000 2.290000 5.945000 2.850000 ;
-      RECT 6.350000 1.220000 6.775000 1.550000 ;
-      RECT 6.350000 1.550000 6.520000 1.720000 ;
-      RECT 7.285000 0.540000 7.560000 1.300000 ;
-      RECT 7.285000 1.300000 8.190000 1.630000 ;
-      RECT 7.285000 1.630000 7.535000 2.780000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.095000  0.540000 0.450000 1.090000 ;
+      RECT 0.095000  1.090000 0.265000 2.070000 ;
+      RECT 0.095000  2.070000 1.235000 2.240000 ;
+      RECT 0.095000  2.240000 0.365000 2.980000 ;
+      RECT 0.565000  2.410000 0.895000 3.245000 ;
+      RECT 0.630000  0.085000 0.960000 1.090000 ;
+      RECT 1.065000  2.240000 1.235000 2.730000 ;
+      RECT 1.065000  2.730000 2.015000 2.900000 ;
+      RECT 1.130000  0.350000 1.675000 1.090000 ;
+      RECT 1.405000  2.100000 1.675000 2.220000 ;
+      RECT 1.405000  2.220000 2.555000 2.390000 ;
+      RECT 1.405000  2.390000 1.675000 2.560000 ;
+      RECT 1.505000  1.090000 1.675000 2.100000 ;
+      RECT 1.845000  0.350000 2.175000 0.780000 ;
+      RECT 1.845000  0.780000 4.205000 0.950000 ;
+      RECT 1.845000  0.950000 2.175000 0.960000 ;
+      RECT 1.845000  0.960000 2.015000 1.720000 ;
+      RECT 1.845000  1.720000 2.215000 2.050000 ;
+      RECT 1.845000  2.560000 2.910000 2.730000 ;
+      RECT 2.185000  1.130000 3.610000 1.300000 ;
+      RECT 2.185000  1.300000 2.555000 1.550000 ;
+      RECT 2.345000  0.085000 2.915000 0.600000 ;
+      RECT 2.385000  1.550000 2.555000 2.220000 ;
+      RECT 2.505000  2.900000 2.835000 3.245000 ;
+      RECT 2.740000  1.470000 3.070000 1.800000 ;
+      RECT 2.740000  1.800000 2.910000 2.560000 ;
+      RECT 3.120000  1.970000 3.450000 2.140000 ;
+      RECT 3.120000  2.140000 3.290000 2.905000 ;
+      RECT 3.120000  2.905000 4.290000 3.075000 ;
+      RECT 3.280000  1.120000 3.610000 1.130000 ;
+      RECT 3.280000  1.300000 3.610000 1.450000 ;
+      RECT 3.280000  1.450000 3.450000 1.970000 ;
+      RECT 3.405000  0.360000 4.545000 0.610000 ;
+      RECT 3.460000  2.405000 3.790000 2.735000 ;
+      RECT 3.620000  1.620000 4.725000 1.790000 ;
+      RECT 3.620000  1.790000 3.790000 2.405000 ;
+      RECT 3.875000  0.950000 4.205000 1.450000 ;
+      RECT 3.960000  2.050000 4.290000 2.905000 ;
+      RECT 4.375000  0.610000 4.545000 1.220000 ;
+      RECT 4.375000  1.220000 5.120000 1.550000 ;
+      RECT 4.375000  1.550000 4.725000 1.620000 ;
+      RECT 4.530000  1.960000 5.945000 2.290000 ;
+      RECT 4.680000  2.520000 5.445000 3.245000 ;
+      RECT 4.730000  0.085000 4.980000 1.030000 ;
+      RECT 5.210000  0.350000 5.460000 1.050000 ;
+      RECT 5.290000  1.050000 5.460000 1.720000 ;
+      RECT 5.290000  1.720000 6.520000 1.890000 ;
+      RECT 5.290000  1.890000 5.945000 1.960000 ;
+      RECT 5.615000  2.290000 5.945000 2.850000 ;
+      RECT 6.030000  0.085000 6.360000 1.010000 ;
+      RECT 6.115000  2.060000 6.445000 3.245000 ;
+      RECT 6.350000  1.220000 6.775000 1.550000 ;
+      RECT 6.350000  1.550000 6.520000 1.720000 ;
+      RECT 7.285000  0.540000 7.560000 1.300000 ;
+      RECT 7.285000  1.300000 8.190000 1.630000 ;
+      RECT 7.285000  1.630000 7.535000 2.780000 ;
+      RECT 7.745000  0.085000 8.075000 1.130000 ;
+      RECT 7.745000  1.820000 8.010000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrbn_1
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef
index bb1b784..4f81699 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.magic.lef
@@ -83,35 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 1.090000 ;
-        RECT 2.295000  0.085000 2.835000 0.600000 ;
-        RECT 4.395000  0.085000 4.645000 0.715000 ;
-        RECT 5.695000  0.085000 6.025000 1.010000 ;
-        RECT 6.785000  0.085000 7.045000 1.050000 ;
-        RECT 7.775000  0.085000 8.035000 1.050000 ;
-        RECT 8.745000  0.085000 9.005000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -120,91 +91,117 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.645000 2.440000 0.815000 3.245000 ;
-        RECT 2.425000 2.820000 2.755000 3.245000 ;
-        RECT 4.525000 2.650000 5.140000 3.245000 ;
-        RECT 5.810000 2.580000 6.140000 3.245000 ;
-        RECT 6.710000 2.580000 7.040000 3.245000 ;
-        RECT 7.775000 1.820000 8.025000 3.245000 ;
-        RECT 8.755000 1.820000 9.005000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.540000 0.445000 1.090000 ;
-      RECT 0.085000 1.090000 0.255000 2.100000 ;
-      RECT 0.085000 2.100000 1.155000 2.270000 ;
-      RECT 0.085000 2.270000 0.445000 2.980000 ;
-      RECT 0.985000 2.270000 1.155000 2.650000 ;
-      RECT 0.985000 2.650000 1.965000 2.820000 ;
-      RECT 1.125000 0.350000 1.625000 1.090000 ;
-      RECT 1.325000 2.100000 1.625000 2.140000 ;
-      RECT 1.325000 2.140000 2.475000 2.310000 ;
-      RECT 1.325000 2.310000 1.625000 2.480000 ;
-      RECT 1.455000 1.090000 1.625000 2.100000 ;
-      RECT 1.795000 0.350000 2.125000 0.780000 ;
-      RECT 1.795000 0.780000 3.885000 0.950000 ;
-      RECT 1.795000 0.950000 2.125000 0.960000 ;
-      RECT 1.795000 0.960000 1.965000 1.720000 ;
-      RECT 1.795000 1.720000 2.135000 1.970000 ;
-      RECT 1.795000 2.480000 2.830000 2.650000 ;
-      RECT 2.135000 1.130000 3.530000 1.300000 ;
-      RECT 2.135000 1.300000 2.475000 1.550000 ;
-      RECT 2.305000 1.550000 2.475000 2.140000 ;
-      RECT 2.660000 1.470000 2.985000 1.800000 ;
-      RECT 2.660000 1.800000 2.830000 2.480000 ;
-      RECT 3.010000 1.970000 3.325000 2.140000 ;
-      RECT 3.010000 2.140000 3.180000 2.905000 ;
-      RECT 3.010000 2.905000 4.165000 3.075000 ;
-      RECT 3.155000 1.120000 3.530000 1.130000 ;
-      RECT 3.155000 1.300000 3.530000 1.450000 ;
-      RECT 3.155000 1.450000 3.325000 1.970000 ;
-      RECT 3.325000 0.360000 4.225000 0.610000 ;
-      RECT 3.350000 2.405000 3.665000 2.735000 ;
-      RECT 3.495000 1.710000 5.060000 1.880000 ;
-      RECT 3.495000 1.880000 3.665000 2.405000 ;
-      RECT 3.715000 0.950000 3.885000 1.225000 ;
-      RECT 3.715000 1.225000 4.130000 1.540000 ;
-      RECT 3.835000 2.050000 4.165000 2.905000 ;
-      RECT 4.055000 0.610000 4.225000 0.885000 ;
-      RECT 4.055000 0.885000 4.470000 1.055000 ;
-      RECT 4.300000 1.055000 4.470000 1.710000 ;
-      RECT 4.375000 2.050000 5.640000 2.240000 ;
-      RECT 4.375000 2.240000 6.955000 2.350000 ;
-      RECT 4.735000 1.350000 5.060000 1.710000 ;
-      RECT 4.875000 0.350000 5.400000 1.130000 ;
-      RECT 5.230000 1.130000 5.400000 1.820000 ;
-      RECT 5.230000 1.820000 5.640000 2.050000 ;
-      RECT 5.310000 2.350000 6.955000 2.410000 ;
-      RECT 5.310000 2.410000 5.640000 2.980000 ;
-      RECT 6.625000 1.320000 6.955000 1.650000 ;
-      RECT 6.785000 1.650000 6.955000 2.240000 ;
-      RECT 7.215000 0.350000 7.545000 1.220000 ;
-      RECT 7.215000 1.220000 8.230000 1.550000 ;
-      RECT 7.215000 1.550000 7.545000 2.860000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.085000  0.540000 0.445000 1.090000 ;
+      RECT 0.085000  1.090000 0.255000 2.100000 ;
+      RECT 0.085000  2.100000 1.155000 2.270000 ;
+      RECT 0.085000  2.270000 0.445000 2.980000 ;
+      RECT 0.625000  0.085000 0.955000 1.090000 ;
+      RECT 0.645000  2.440000 0.815000 3.245000 ;
+      RECT 0.985000  2.270000 1.155000 2.650000 ;
+      RECT 0.985000  2.650000 1.965000 2.820000 ;
+      RECT 1.125000  0.350000 1.625000 1.090000 ;
+      RECT 1.325000  2.100000 1.625000 2.140000 ;
+      RECT 1.325000  2.140000 2.475000 2.310000 ;
+      RECT 1.325000  2.310000 1.625000 2.480000 ;
+      RECT 1.455000  1.090000 1.625000 2.100000 ;
+      RECT 1.795000  0.350000 2.125000 0.780000 ;
+      RECT 1.795000  0.780000 3.885000 0.950000 ;
+      RECT 1.795000  0.950000 2.125000 0.960000 ;
+      RECT 1.795000  0.960000 1.965000 1.720000 ;
+      RECT 1.795000  1.720000 2.135000 1.970000 ;
+      RECT 1.795000  2.480000 2.830000 2.650000 ;
+      RECT 2.135000  1.130000 3.530000 1.300000 ;
+      RECT 2.135000  1.300000 2.475000 1.550000 ;
+      RECT 2.295000  0.085000 2.835000 0.600000 ;
+      RECT 2.305000  1.550000 2.475000 2.140000 ;
+      RECT 2.425000  2.820000 2.755000 3.245000 ;
+      RECT 2.660000  1.470000 2.985000 1.800000 ;
+      RECT 2.660000  1.800000 2.830000 2.480000 ;
+      RECT 3.010000  1.970000 3.325000 2.140000 ;
+      RECT 3.010000  2.140000 3.180000 2.905000 ;
+      RECT 3.010000  2.905000 4.165000 3.075000 ;
+      RECT 3.155000  1.120000 3.530000 1.130000 ;
+      RECT 3.155000  1.300000 3.530000 1.450000 ;
+      RECT 3.155000  1.450000 3.325000 1.970000 ;
+      RECT 3.325000  0.360000 4.225000 0.610000 ;
+      RECT 3.350000  2.405000 3.665000 2.735000 ;
+      RECT 3.495000  1.710000 5.060000 1.880000 ;
+      RECT 3.495000  1.880000 3.665000 2.405000 ;
+      RECT 3.715000  0.950000 3.885000 1.225000 ;
+      RECT 3.715000  1.225000 4.130000 1.540000 ;
+      RECT 3.835000  2.050000 4.165000 2.905000 ;
+      RECT 4.055000  0.610000 4.225000 0.885000 ;
+      RECT 4.055000  0.885000 4.470000 1.055000 ;
+      RECT 4.300000  1.055000 4.470000 1.710000 ;
+      RECT 4.375000  2.050000 5.640000 2.240000 ;
+      RECT 4.375000  2.240000 6.955000 2.350000 ;
+      RECT 4.395000  0.085000 4.645000 0.715000 ;
+      RECT 4.525000  2.650000 5.140000 3.245000 ;
+      RECT 4.735000  1.350000 5.060000 1.710000 ;
+      RECT 4.875000  0.350000 5.400000 1.130000 ;
+      RECT 5.230000  1.130000 5.400000 1.820000 ;
+      RECT 5.230000  1.820000 5.640000 2.050000 ;
+      RECT 5.310000  2.350000 6.955000 2.410000 ;
+      RECT 5.310000  2.410000 5.640000 2.980000 ;
+      RECT 5.695000  0.085000 6.025000 1.010000 ;
+      RECT 5.810000  2.580000 6.140000 3.245000 ;
+      RECT 6.625000  1.320000 6.955000 1.650000 ;
+      RECT 6.710000  2.580000 7.040000 3.245000 ;
+      RECT 6.785000  0.085000 7.045000 1.050000 ;
+      RECT 6.785000  1.650000 6.955000 2.240000 ;
+      RECT 7.215000  0.350000 7.545000 1.220000 ;
+      RECT 7.215000  1.220000 8.230000 1.550000 ;
+      RECT 7.215000  1.550000 7.545000 2.860000 ;
+      RECT 7.775000  0.085000 8.035000 1.050000 ;
+      RECT 7.775000  1.820000 8.025000 3.245000 ;
+      RECT 8.745000  0.085000 9.005000 1.130000 ;
+      RECT 8.755000  1.820000 9.005000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrbn_2
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef
index cb40ba7..eb83361 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.magic.lef
@@ -84,31 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 1.280000 ;
-        RECT 2.320000  0.085000 2.650000 0.410000 ;
-        RECT 4.240000  0.085000 4.570000 1.060000 ;
-        RECT 5.620000  0.085000 5.950000 1.010000 ;
-        RECT 7.200000  0.085000 7.530000 0.940000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -117,80 +92,102 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.650000 2.730000 0.980000 3.245000 ;
-        RECT 2.350000 2.730000 2.685000 3.245000 ;
-        RECT 4.405000 2.650000 5.080000 3.245000 ;
-        RECT 5.780000 2.060000 6.030000 3.245000 ;
-        RECT 7.210000 2.100000 7.540000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.690000 0.445000 1.280000 ;
-      RECT 0.095000 1.280000 0.265000 1.970000 ;
-      RECT 0.095000 1.970000 0.445000 2.390000 ;
-      RECT 0.095000 2.390000 2.675000 2.560000 ;
-      RECT 0.095000 2.560000 0.445000 2.850000 ;
-      RECT 1.185000 0.500000 1.645000 0.580000 ;
-      RECT 1.185000 0.580000 2.990000 0.750000 ;
-      RECT 1.185000 0.750000 1.645000 1.280000 ;
-      RECT 1.185000 1.970000 1.645000 2.220000 ;
-      RECT 1.475000 1.280000 1.645000 1.420000 ;
-      RECT 1.475000 1.420000 1.875000 1.750000 ;
-      RECT 1.475000 1.750000 1.645000 1.970000 ;
-      RECT 1.815000 1.940000 2.215000 2.220000 ;
-      RECT 1.825000 0.920000 2.215000 1.130000 ;
-      RECT 1.825000 1.130000 3.395000 1.250000 ;
-      RECT 2.045000 1.250000 3.395000 1.300000 ;
-      RECT 2.045000 1.300000 2.215000 1.940000 ;
-      RECT 2.505000 1.470000 2.835000 1.800000 ;
-      RECT 2.505000 1.800000 2.675000 2.390000 ;
-      RECT 2.820000 0.255000 3.905000 0.510000 ;
-      RECT 2.820000 0.510000 2.990000 0.580000 ;
-      RECT 2.855000 1.970000 3.175000 2.140000 ;
-      RECT 2.855000 2.140000 3.025000 2.905000 ;
-      RECT 2.855000 2.905000 4.015000 3.075000 ;
-      RECT 3.005000 1.300000 3.395000 1.480000 ;
-      RECT 3.005000 1.480000 3.175000 1.970000 ;
-      RECT 3.190000 0.710000 3.750000 0.960000 ;
-      RECT 3.195000 2.405000 3.515000 2.735000 ;
-      RECT 3.345000 1.650000 4.915000 1.820000 ;
-      RECT 3.345000 1.820000 3.515000 2.405000 ;
-      RECT 3.580000 0.960000 3.750000 1.650000 ;
-      RECT 3.685000 2.050000 4.015000 2.905000 ;
-      RECT 4.225000 1.990000 5.580000 2.320000 ;
-      RECT 4.585000 1.350000 4.915000 1.650000 ;
-      RECT 4.800000 0.350000 5.255000 1.130000 ;
-      RECT 5.085000 1.130000 5.255000 1.720000 ;
-      RECT 5.085000 1.720000 6.330000 1.890000 ;
-      RECT 5.085000 1.890000 5.580000 1.990000 ;
-      RECT 5.250000 2.320000 5.580000 2.980000 ;
-      RECT 6.005000 1.350000 6.330000 1.720000 ;
-      RECT 6.690000 0.350000 7.020000 0.840000 ;
-      RECT 6.840000 0.840000 7.020000 1.320000 ;
-      RECT 6.840000 1.320000 7.715000 1.650000 ;
-      RECT 6.840000 1.650000 7.010000 2.980000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.690000 0.445000 1.280000 ;
+      RECT 0.095000  1.280000 0.265000 1.970000 ;
+      RECT 0.095000  1.970000 0.445000 2.390000 ;
+      RECT 0.095000  2.390000 2.675000 2.560000 ;
+      RECT 0.095000  2.560000 0.445000 2.850000 ;
+      RECT 0.625000  0.085000 0.955000 1.280000 ;
+      RECT 0.650000  2.730000 0.980000 3.245000 ;
+      RECT 1.185000  0.500000 1.645000 0.580000 ;
+      RECT 1.185000  0.580000 2.990000 0.750000 ;
+      RECT 1.185000  0.750000 1.645000 1.280000 ;
+      RECT 1.185000  1.970000 1.645000 2.220000 ;
+      RECT 1.475000  1.280000 1.645000 1.420000 ;
+      RECT 1.475000  1.420000 1.875000 1.750000 ;
+      RECT 1.475000  1.750000 1.645000 1.970000 ;
+      RECT 1.815000  1.940000 2.215000 2.220000 ;
+      RECT 1.825000  0.920000 2.215000 1.130000 ;
+      RECT 1.825000  1.130000 3.395000 1.250000 ;
+      RECT 2.045000  1.250000 3.395000 1.300000 ;
+      RECT 2.045000  1.300000 2.215000 1.940000 ;
+      RECT 2.320000  0.085000 2.650000 0.410000 ;
+      RECT 2.350000  2.730000 2.685000 3.245000 ;
+      RECT 2.505000  1.470000 2.835000 1.800000 ;
+      RECT 2.505000  1.800000 2.675000 2.390000 ;
+      RECT 2.820000  0.255000 3.905000 0.510000 ;
+      RECT 2.820000  0.510000 2.990000 0.580000 ;
+      RECT 2.855000  1.970000 3.175000 2.140000 ;
+      RECT 2.855000  2.140000 3.025000 2.905000 ;
+      RECT 2.855000  2.905000 4.015000 3.075000 ;
+      RECT 3.005000  1.300000 3.395000 1.480000 ;
+      RECT 3.005000  1.480000 3.175000 1.970000 ;
+      RECT 3.190000  0.710000 3.750000 0.960000 ;
+      RECT 3.195000  2.405000 3.515000 2.735000 ;
+      RECT 3.345000  1.650000 4.915000 1.820000 ;
+      RECT 3.345000  1.820000 3.515000 2.405000 ;
+      RECT 3.580000  0.960000 3.750000 1.650000 ;
+      RECT 3.685000  2.050000 4.015000 2.905000 ;
+      RECT 4.225000  1.990000 5.580000 2.320000 ;
+      RECT 4.240000  0.085000 4.570000 1.060000 ;
+      RECT 4.405000  2.650000 5.080000 3.245000 ;
+      RECT 4.585000  1.350000 4.915000 1.650000 ;
+      RECT 4.800000  0.350000 5.255000 1.130000 ;
+      RECT 5.085000  1.130000 5.255000 1.720000 ;
+      RECT 5.085000  1.720000 6.330000 1.890000 ;
+      RECT 5.085000  1.890000 5.580000 1.990000 ;
+      RECT 5.250000  2.320000 5.580000 2.980000 ;
+      RECT 5.620000  0.085000 5.950000 1.010000 ;
+      RECT 5.780000  2.060000 6.030000 3.245000 ;
+      RECT 6.005000  1.350000 6.330000 1.720000 ;
+      RECT 6.690000  0.350000 7.020000 0.840000 ;
+      RECT 6.840000  0.840000 7.020000 1.320000 ;
+      RECT 6.840000  1.320000 7.715000 1.650000 ;
+      RECT 6.840000  1.650000 7.010000 2.980000 ;
+      RECT 7.200000  0.085000 7.530000 0.940000 ;
+      RECT 7.210000  2.100000 7.540000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrbp_1
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef
index e851165..0a518c7 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.magic.lef
@@ -85,35 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 1.010000 ;
-        RECT 2.305000  0.085000 2.640000 0.410000 ;
-        RECT 4.230000  0.085000 4.560000 1.060000 ;
-        RECT 5.610000  0.085000 5.940000 1.010000 ;
-        RECT 6.650000  0.085000 6.980000 0.790000 ;
-        RECT 7.745000  0.085000 8.075000 1.130000 ;
-        RECT 8.755000  0.085000 9.005000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -122,81 +93,107 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.650000 2.700000 0.980000 3.245000 ;
-        RECT 2.330000 2.700000 2.695000 3.245000 ;
-        RECT 4.425000 2.650000 5.065000 3.245000 ;
-        RECT 5.735000 2.060000 6.065000 3.245000 ;
-        RECT 6.665000 2.140000 6.995000 3.245000 ;
-        RECT 7.725000 1.820000 8.055000 3.245000 ;
-        RECT 8.755000 1.820000 9.005000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.540000 0.445000 1.130000 ;
-      RECT 0.085000 1.130000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.445000 2.360000 ;
-      RECT 0.085000 2.360000 2.805000 2.530000 ;
-      RECT 0.085000 2.530000 0.445000 2.820000 ;
-      RECT 1.125000 0.350000 1.625000 0.580000 ;
-      RECT 1.125000 0.580000 2.980000 0.750000 ;
-      RECT 1.125000 0.750000 1.625000 1.010000 ;
-      RECT 1.185000 1.940000 1.625000 2.190000 ;
-      RECT 1.455000 1.010000 1.625000 1.340000 ;
-      RECT 1.455000 1.340000 1.865000 1.670000 ;
-      RECT 1.455000 1.670000 1.625000 1.940000 ;
-      RECT 1.795000 0.920000 2.205000 1.130000 ;
-      RECT 1.795000 1.130000 3.385000 1.170000 ;
-      RECT 1.795000 1.940000 2.205000 2.190000 ;
-      RECT 2.035000 1.170000 3.385000 1.300000 ;
-      RECT 2.035000 1.300000 2.205000 1.940000 ;
-      RECT 2.485000 1.470000 2.805000 2.360000 ;
-      RECT 2.810000 0.255000 3.895000 0.510000 ;
-      RECT 2.810000 0.510000 2.980000 0.580000 ;
-      RECT 2.975000 1.300000 3.385000 1.480000 ;
-      RECT 2.975000 1.480000 3.145000 2.905000 ;
-      RECT 2.975000 2.905000 4.035000 3.075000 ;
-      RECT 3.180000 0.790000 3.740000 0.960000 ;
-      RECT 3.315000 1.650000 4.925000 1.820000 ;
-      RECT 3.315000 1.820000 3.485000 2.735000 ;
-      RECT 3.570000 0.960000 3.740000 1.650000 ;
-      RECT 3.705000 2.050000 4.035000 2.905000 ;
-      RECT 4.245000 1.990000 5.565000 2.320000 ;
-      RECT 4.605000 1.350000 4.925000 1.650000 ;
-      RECT 4.790000 0.350000 5.265000 1.130000 ;
-      RECT 5.095000 1.130000 5.265000 1.720000 ;
-      RECT 5.095000 1.720000 6.125000 1.890000 ;
-      RECT 5.095000 1.890000 5.565000 1.990000 ;
-      RECT 5.235000 2.320000 5.565000 2.980000 ;
-      RECT 5.955000 1.300000 6.650000 1.630000 ;
-      RECT 5.955000 1.630000 6.125000 1.720000 ;
-      RECT 7.245000 0.450000 7.575000 1.130000 ;
-      RECT 7.245000 1.130000 7.555000 1.300000 ;
-      RECT 7.245000 1.300000 8.245000 1.630000 ;
-      RECT 7.245000 1.630000 7.555000 2.860000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.085000  0.540000 0.445000 1.130000 ;
+      RECT 0.085000  1.130000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.445000 2.360000 ;
+      RECT 0.085000  2.360000 2.805000 2.530000 ;
+      RECT 0.085000  2.530000 0.445000 2.820000 ;
+      RECT 0.625000  0.085000 0.955000 1.010000 ;
+      RECT 0.650000  2.700000 0.980000 3.245000 ;
+      RECT 1.125000  0.350000 1.625000 0.580000 ;
+      RECT 1.125000  0.580000 2.980000 0.750000 ;
+      RECT 1.125000  0.750000 1.625000 1.010000 ;
+      RECT 1.185000  1.940000 1.625000 2.190000 ;
+      RECT 1.455000  1.010000 1.625000 1.340000 ;
+      RECT 1.455000  1.340000 1.865000 1.670000 ;
+      RECT 1.455000  1.670000 1.625000 1.940000 ;
+      RECT 1.795000  0.920000 2.205000 1.130000 ;
+      RECT 1.795000  1.130000 3.385000 1.170000 ;
+      RECT 1.795000  1.940000 2.205000 2.190000 ;
+      RECT 2.035000  1.170000 3.385000 1.300000 ;
+      RECT 2.035000  1.300000 2.205000 1.940000 ;
+      RECT 2.305000  0.085000 2.640000 0.410000 ;
+      RECT 2.330000  2.700000 2.695000 3.245000 ;
+      RECT 2.485000  1.470000 2.805000 2.360000 ;
+      RECT 2.810000  0.255000 3.895000 0.510000 ;
+      RECT 2.810000  0.510000 2.980000 0.580000 ;
+      RECT 2.975000  1.300000 3.385000 1.480000 ;
+      RECT 2.975000  1.480000 3.145000 2.905000 ;
+      RECT 2.975000  2.905000 4.035000 3.075000 ;
+      RECT 3.180000  0.790000 3.740000 0.960000 ;
+      RECT 3.315000  1.650000 4.925000 1.820000 ;
+      RECT 3.315000  1.820000 3.485000 2.735000 ;
+      RECT 3.570000  0.960000 3.740000 1.650000 ;
+      RECT 3.705000  2.050000 4.035000 2.905000 ;
+      RECT 4.230000  0.085000 4.560000 1.060000 ;
+      RECT 4.245000  1.990000 5.565000 2.320000 ;
+      RECT 4.425000  2.650000 5.065000 3.245000 ;
+      RECT 4.605000  1.350000 4.925000 1.650000 ;
+      RECT 4.790000  0.350000 5.265000 1.130000 ;
+      RECT 5.095000  1.130000 5.265000 1.720000 ;
+      RECT 5.095000  1.720000 6.125000 1.890000 ;
+      RECT 5.095000  1.890000 5.565000 1.990000 ;
+      RECT 5.235000  2.320000 5.565000 2.980000 ;
+      RECT 5.610000  0.085000 5.940000 1.010000 ;
+      RECT 5.735000  2.060000 6.065000 3.245000 ;
+      RECT 5.955000  1.300000 6.650000 1.630000 ;
+      RECT 5.955000  1.630000 6.125000 1.720000 ;
+      RECT 6.650000  0.085000 6.980000 0.790000 ;
+      RECT 6.665000  2.140000 6.995000 3.245000 ;
+      RECT 7.245000  0.450000 7.575000 1.130000 ;
+      RECT 7.245000  1.130000 7.555000 1.300000 ;
+      RECT 7.245000  1.300000 8.245000 1.630000 ;
+      RECT 7.245000  1.630000 7.555000 2.860000 ;
+      RECT 7.725000  1.820000 8.055000 3.245000 ;
+      RECT 7.745000  0.085000 8.075000 1.130000 ;
+      RECT 8.755000  0.085000 9.005000 1.130000 ;
+      RECT 8.755000  1.820000 9.005000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrbp_2
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef
index 6542760..645267b 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.magic.lef
@@ -72,28 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.410000 ;
-        RECT 2.355000  0.085000 3.200000 0.410000 ;
-        RECT 4.670000  0.085000 5.010000 0.680000 ;
-        RECT 6.140000  0.085000 6.470000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -102,68 +80,87 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.655000 1.950000 0.985000 3.245000 ;
-        RECT 2.300000 2.860000 2.630000 3.245000 ;
-        RECT 4.635000 2.530000 5.430000 3.245000 ;
-        RECT 6.255000 2.060000 6.585000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.580000 2.865000 0.750000 ;
-      RECT 0.095000 0.750000 0.445000 1.250000 ;
-      RECT 0.095000 1.250000 0.265000 1.950000 ;
-      RECT 0.095000 1.950000 0.450000 2.830000 ;
-      RECT 1.065000 0.920000 1.675000 1.250000 ;
-      RECT 1.190000 1.950000 1.675000 2.520000 ;
-      RECT 1.190000 2.520000 4.245000 2.690000 ;
-      RECT 1.190000 2.690000 1.675000 2.830000 ;
-      RECT 1.505000 1.250000 1.675000 1.340000 ;
-      RECT 1.505000 1.340000 1.905000 1.670000 ;
-      RECT 1.505000 1.670000 1.675000 1.950000 ;
-      RECT 1.845000 0.920000 2.245000 1.170000 ;
-      RECT 1.845000 1.840000 3.405000 2.010000 ;
-      RECT 1.845000 2.010000 2.245000 2.350000 ;
-      RECT 2.075000 1.170000 2.245000 1.840000 ;
-      RECT 2.535000 0.750000 2.865000 1.590000 ;
-      RECT 3.075000 1.190000 4.335000 1.520000 ;
-      RECT 3.075000 1.520000 3.405000 1.840000 ;
-      RECT 3.255000 2.180000 3.745000 2.350000 ;
-      RECT 3.575000 1.690000 5.070000 1.860000 ;
-      RECT 3.575000 1.860000 3.745000 2.180000 ;
-      RECT 3.815000 0.350000 4.145000 0.850000 ;
-      RECT 3.815000 0.850000 5.070000 1.020000 ;
-      RECT 3.915000 2.030000 4.245000 2.520000 ;
-      RECT 4.485000 2.030000 5.965000 2.360000 ;
-      RECT 4.900000 1.020000 5.070000 1.300000 ;
-      RECT 4.900000 1.300000 5.295000 1.630000 ;
-      RECT 4.900000 1.630000 5.070000 1.690000 ;
-      RECT 5.240000 0.350000 5.635000 1.130000 ;
-      RECT 5.465000 1.130000 5.635000 1.720000 ;
-      RECT 5.465000 1.720000 6.585000 1.890000 ;
-      RECT 5.465000 1.890000 5.965000 2.030000 ;
-      RECT 5.635000 2.360000 5.965000 2.860000 ;
-      RECT 6.415000 1.320000 6.775000 1.650000 ;
-      RECT 6.415000 1.650000 6.585000 1.720000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.095000  0.580000 2.865000 0.750000 ;
+      RECT 0.095000  0.750000 0.445000 1.250000 ;
+      RECT 0.095000  1.250000 0.265000 1.950000 ;
+      RECT 0.095000  1.950000 0.450000 2.830000 ;
+      RECT 0.625000  0.085000 0.955000 0.410000 ;
+      RECT 0.655000  1.950000 0.985000 3.245000 ;
+      RECT 1.065000  0.920000 1.675000 1.250000 ;
+      RECT 1.190000  1.950000 1.675000 2.520000 ;
+      RECT 1.190000  2.520000 4.245000 2.690000 ;
+      RECT 1.190000  2.690000 1.675000 2.830000 ;
+      RECT 1.505000  1.250000 1.675000 1.340000 ;
+      RECT 1.505000  1.340000 1.905000 1.670000 ;
+      RECT 1.505000  1.670000 1.675000 1.950000 ;
+      RECT 1.845000  0.920000 2.245000 1.170000 ;
+      RECT 1.845000  1.840000 3.405000 2.010000 ;
+      RECT 1.845000  2.010000 2.245000 2.350000 ;
+      RECT 2.075000  1.170000 2.245000 1.840000 ;
+      RECT 2.300000  2.860000 2.630000 3.245000 ;
+      RECT 2.355000  0.085000 3.200000 0.410000 ;
+      RECT 2.535000  0.750000 2.865000 1.590000 ;
+      RECT 3.075000  1.190000 4.335000 1.520000 ;
+      RECT 3.075000  1.520000 3.405000 1.840000 ;
+      RECT 3.255000  2.180000 3.745000 2.350000 ;
+      RECT 3.575000  1.690000 5.070000 1.860000 ;
+      RECT 3.575000  1.860000 3.745000 2.180000 ;
+      RECT 3.815000  0.350000 4.145000 0.850000 ;
+      RECT 3.815000  0.850000 5.070000 1.020000 ;
+      RECT 3.915000  2.030000 4.245000 2.520000 ;
+      RECT 4.485000  2.030000 5.965000 2.360000 ;
+      RECT 4.635000  2.530000 5.430000 3.245000 ;
+      RECT 4.670000  0.085000 5.010000 0.680000 ;
+      RECT 4.900000  1.020000 5.070000 1.300000 ;
+      RECT 4.900000  1.300000 5.295000 1.630000 ;
+      RECT 4.900000  1.630000 5.070000 1.690000 ;
+      RECT 5.240000  0.350000 5.635000 1.130000 ;
+      RECT 5.465000  1.130000 5.635000 1.720000 ;
+      RECT 5.465000  1.720000 6.585000 1.890000 ;
+      RECT 5.465000  1.890000 5.965000 2.030000 ;
+      RECT 5.635000  2.360000 5.965000 2.860000 ;
+      RECT 6.140000  0.085000 6.470000 1.010000 ;
+      RECT 6.255000  2.060000 6.585000 3.245000 ;
+      RECT 6.415000  1.320000 6.775000 1.650000 ;
+      RECT 6.415000  1.650000 6.585000 1.720000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrtn_1
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef
index 6c36d34..3b7b2d3 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.magic.lef
@@ -72,31 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.410000 ;
-        RECT 2.380000  0.085000 3.280000 0.410000 ;
-        RECT 4.750000  0.085000 5.080000 0.680000 ;
-        RECT 6.130000  0.085000 7.035000 1.010000 ;
-        RECT 7.705000  0.085000 8.035000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -105,70 +80,92 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.785000 1.950000 1.115000 3.245000 ;
-        RECT 2.380000 2.860000 2.710000 3.245000 ;
-        RECT 4.715000 2.630000 5.545000 3.245000 ;
-        RECT 6.320000 2.060000 6.650000 3.245000 ;
-        RECT 7.705000 1.820000 8.045000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.580000 2.945000 0.750000 ;
-      RECT 0.095000 0.750000 0.445000 1.250000 ;
-      RECT 0.095000 1.250000 0.265000 1.950000 ;
-      RECT 0.095000 1.950000 0.615000 2.830000 ;
-      RECT 1.135000 0.920000 1.675000 1.250000 ;
-      RECT 1.285000 1.950000 1.675000 2.520000 ;
-      RECT 1.285000 2.520000 4.325000 2.690000 ;
-      RECT 1.285000 2.690000 1.675000 2.830000 ;
-      RECT 1.505000 1.250000 1.675000 1.340000 ;
-      RECT 1.505000 1.340000 1.905000 1.670000 ;
-      RECT 1.505000 1.670000 1.675000 1.950000 ;
-      RECT 1.845000 0.920000 2.245000 1.170000 ;
-      RECT 1.845000 1.840000 3.485000 2.010000 ;
-      RECT 1.845000 2.010000 2.245000 2.350000 ;
-      RECT 2.075000 1.170000 2.245000 1.840000 ;
-      RECT 2.615000 0.750000 2.945000 1.590000 ;
-      RECT 3.155000 1.190000 4.415000 1.520000 ;
-      RECT 3.155000 1.520000 3.485000 1.840000 ;
-      RECT 3.335000 2.180000 3.825000 2.350000 ;
-      RECT 3.655000 1.690000 5.375000 1.860000 ;
-      RECT 3.655000 1.860000 3.825000 2.180000 ;
-      RECT 3.895000 0.350000 4.225000 0.850000 ;
-      RECT 3.895000 0.850000 5.140000 1.020000 ;
-      RECT 3.995000 2.030000 4.325000 2.520000 ;
-      RECT 4.565000 2.030000 6.045000 2.360000 ;
-      RECT 4.970000 1.020000 5.140000 1.350000 ;
-      RECT 4.970000 1.350000 5.375000 1.690000 ;
-      RECT 5.310000 0.350000 5.715000 1.130000 ;
-      RECT 5.545000 1.130000 5.715000 1.720000 ;
-      RECT 5.545000 1.720000 6.675000 1.890000 ;
-      RECT 5.545000 1.890000 6.045000 2.030000 ;
-      RECT 5.715000 2.360000 6.045000 2.980000 ;
-      RECT 6.505000 1.320000 6.845000 1.650000 ;
-      RECT 6.505000 1.650000 6.675000 1.720000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.580000 2.945000 0.750000 ;
+      RECT 0.095000  0.750000 0.445000 1.250000 ;
+      RECT 0.095000  1.250000 0.265000 1.950000 ;
+      RECT 0.095000  1.950000 0.615000 2.830000 ;
+      RECT 0.625000  0.085000 0.955000 0.410000 ;
+      RECT 0.785000  1.950000 1.115000 3.245000 ;
+      RECT 1.135000  0.920000 1.675000 1.250000 ;
+      RECT 1.285000  1.950000 1.675000 2.520000 ;
+      RECT 1.285000  2.520000 4.325000 2.690000 ;
+      RECT 1.285000  2.690000 1.675000 2.830000 ;
+      RECT 1.505000  1.250000 1.675000 1.340000 ;
+      RECT 1.505000  1.340000 1.905000 1.670000 ;
+      RECT 1.505000  1.670000 1.675000 1.950000 ;
+      RECT 1.845000  0.920000 2.245000 1.170000 ;
+      RECT 1.845000  1.840000 3.485000 2.010000 ;
+      RECT 1.845000  2.010000 2.245000 2.350000 ;
+      RECT 2.075000  1.170000 2.245000 1.840000 ;
+      RECT 2.380000  0.085000 3.280000 0.410000 ;
+      RECT 2.380000  2.860000 2.710000 3.245000 ;
+      RECT 2.615000  0.750000 2.945000 1.590000 ;
+      RECT 3.155000  1.190000 4.415000 1.520000 ;
+      RECT 3.155000  1.520000 3.485000 1.840000 ;
+      RECT 3.335000  2.180000 3.825000 2.350000 ;
+      RECT 3.655000  1.690000 5.375000 1.860000 ;
+      RECT 3.655000  1.860000 3.825000 2.180000 ;
+      RECT 3.895000  0.350000 4.225000 0.850000 ;
+      RECT 3.895000  0.850000 5.140000 1.020000 ;
+      RECT 3.995000  2.030000 4.325000 2.520000 ;
+      RECT 4.565000  2.030000 6.045000 2.360000 ;
+      RECT 4.715000  2.630000 5.545000 3.245000 ;
+      RECT 4.750000  0.085000 5.080000 0.680000 ;
+      RECT 4.970000  1.020000 5.140000 1.350000 ;
+      RECT 4.970000  1.350000 5.375000 1.690000 ;
+      RECT 5.310000  0.350000 5.715000 1.130000 ;
+      RECT 5.545000  1.130000 5.715000 1.720000 ;
+      RECT 5.545000  1.720000 6.675000 1.890000 ;
+      RECT 5.545000  1.890000 6.045000 2.030000 ;
+      RECT 5.715000  2.360000 6.045000 2.980000 ;
+      RECT 6.130000  0.085000 7.035000 1.010000 ;
+      RECT 6.320000  2.060000 6.650000 3.245000 ;
+      RECT 6.505000  1.320000 6.845000 1.650000 ;
+      RECT 6.505000  1.650000 6.675000 1.720000 ;
+      RECT 7.705000  0.085000 8.035000 1.130000 ;
+      RECT 7.705000  1.820000 8.045000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrtn_2
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef
index fbc9ac2..17d3beb 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.magic.lef
@@ -79,36 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.490000 ;
-        RECT 2.310000  0.085000 3.125000 0.490000 ;
-        RECT 4.595000  0.085000 4.925000 0.680000 ;
-        RECT 6.445000  0.085000 6.775000 0.600000 ;
-        RECT 7.435000  0.085000 7.765000 0.950000 ;
-        RECT 8.295000  0.085000 8.625000 0.790000 ;
-        RECT 9.155000  0.085000 9.485000 0.630000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -117,80 +87,107 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.645000 1.950000 0.975000 3.245000 ;
-        RECT 2.255000 2.940000 2.585000 3.245000 ;
-        RECT 4.590000 2.630000 5.320000 3.245000 ;
-        RECT 5.990000 2.080000 6.320000 3.245000 ;
-        RECT 7.045000 2.080000 7.375000 3.245000 ;
-        RECT 8.045000 2.300000 8.375000 3.245000 ;
-        RECT 9.045000 2.140000 9.375000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.660000 2.820000 0.830000 ;
-      RECT 0.085000 0.830000 0.445000 1.250000 ;
-      RECT 0.085000 1.250000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.475000 2.830000 ;
-      RECT 1.135000 1.000000 1.630000 1.250000 ;
-      RECT 1.145000 1.950000 1.630000 2.600000 ;
-      RECT 1.145000 2.600000 4.200000 2.770000 ;
-      RECT 1.145000 2.770000 1.630000 2.830000 ;
-      RECT 1.460000 1.250000 1.630000 1.420000 ;
-      RECT 1.460000 1.420000 1.865000 1.750000 ;
-      RECT 1.460000 1.750000 1.630000 1.950000 ;
-      RECT 1.800000 1.000000 2.205000 1.250000 ;
-      RECT 1.800000 1.920000 3.360000 2.090000 ;
-      RECT 1.800000 2.090000 2.205000 2.430000 ;
-      RECT 2.035000 1.250000 2.205000 1.920000 ;
-      RECT 2.490000 0.830000 2.820000 1.670000 ;
-      RECT 3.030000 1.190000 4.260000 1.520000 ;
-      RECT 3.030000 1.520000 3.360000 1.920000 ;
-      RECT 3.180000 2.260000 3.700000 2.430000 ;
-      RECT 3.530000 1.690000 5.220000 1.860000 ;
-      RECT 3.530000 1.860000 3.700000 2.260000 ;
-      RECT 3.740000 0.400000 4.070000 0.850000 ;
-      RECT 3.740000 0.850000 4.985000 1.020000 ;
-      RECT 3.870000 2.030000 4.200000 2.600000 ;
-      RECT 4.440000 2.030000 5.820000 2.360000 ;
-      RECT 4.815000 1.020000 4.985000 1.120000 ;
-      RECT 4.815000 1.120000 5.220000 1.690000 ;
-      RECT 5.155000 0.255000 6.265000 0.425000 ;
-      RECT 5.155000 0.425000 5.485000 0.950000 ;
-      RECT 5.490000 1.620000 9.075000 1.630000 ;
-      RECT 5.490000 1.630000 7.895000 1.790000 ;
-      RECT 5.490000 1.790000 5.820000 2.030000 ;
-      RECT 5.490000 2.360000 5.820000 2.960000 ;
-      RECT 5.665000 0.595000 5.835000 1.620000 ;
-      RECT 6.015000 0.425000 6.265000 0.770000 ;
-      RECT 6.015000 0.770000 7.205000 0.950000 ;
-      RECT 6.490000 1.790000 6.820000 2.960000 ;
-      RECT 6.945000 0.355000 7.205000 0.770000 ;
-      RECT 7.725000 1.300000 9.075000 1.620000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.085000  0.660000 2.820000 0.830000 ;
+      RECT 0.085000  0.830000 0.445000 1.250000 ;
+      RECT 0.085000  1.250000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.475000 2.830000 ;
+      RECT 0.625000  0.085000 0.955000 0.490000 ;
+      RECT 0.645000  1.950000 0.975000 3.245000 ;
+      RECT 1.135000  1.000000 1.630000 1.250000 ;
+      RECT 1.145000  1.950000 1.630000 2.600000 ;
+      RECT 1.145000  2.600000 4.200000 2.770000 ;
+      RECT 1.145000  2.770000 1.630000 2.830000 ;
+      RECT 1.460000  1.250000 1.630000 1.420000 ;
+      RECT 1.460000  1.420000 1.865000 1.750000 ;
+      RECT 1.460000  1.750000 1.630000 1.950000 ;
+      RECT 1.800000  1.000000 2.205000 1.250000 ;
+      RECT 1.800000  1.920000 3.360000 2.090000 ;
+      RECT 1.800000  2.090000 2.205000 2.430000 ;
+      RECT 2.035000  1.250000 2.205000 1.920000 ;
+      RECT 2.255000  2.940000 2.585000 3.245000 ;
+      RECT 2.310000  0.085000 3.125000 0.490000 ;
+      RECT 2.490000  0.830000 2.820000 1.670000 ;
+      RECT 3.030000  1.190000 4.260000 1.520000 ;
+      RECT 3.030000  1.520000 3.360000 1.920000 ;
+      RECT 3.180000  2.260000 3.700000 2.430000 ;
+      RECT 3.530000  1.690000 5.220000 1.860000 ;
+      RECT 3.530000  1.860000 3.700000 2.260000 ;
+      RECT 3.740000  0.400000 4.070000 0.850000 ;
+      RECT 3.740000  0.850000 4.985000 1.020000 ;
+      RECT 3.870000  2.030000 4.200000 2.600000 ;
+      RECT 4.440000  2.030000 5.820000 2.360000 ;
+      RECT 4.590000  2.630000 5.320000 3.245000 ;
+      RECT 4.595000  0.085000 4.925000 0.680000 ;
+      RECT 4.815000  1.020000 4.985000 1.120000 ;
+      RECT 4.815000  1.120000 5.220000 1.690000 ;
+      RECT 5.155000  0.255000 6.265000 0.425000 ;
+      RECT 5.155000  0.425000 5.485000 0.950000 ;
+      RECT 5.490000  1.620000 9.075000 1.630000 ;
+      RECT 5.490000  1.630000 7.895000 1.790000 ;
+      RECT 5.490000  1.790000 5.820000 2.030000 ;
+      RECT 5.490000  2.360000 5.820000 2.960000 ;
+      RECT 5.665000  0.595000 5.835000 1.620000 ;
+      RECT 5.990000  2.080000 6.320000 3.245000 ;
+      RECT 6.015000  0.425000 6.265000 0.770000 ;
+      RECT 6.015000  0.770000 7.205000 0.950000 ;
+      RECT 6.445000  0.085000 6.775000 0.600000 ;
+      RECT 6.490000  1.790000 6.820000 2.960000 ;
+      RECT 6.945000  0.355000 7.205000 0.770000 ;
+      RECT 7.045000  2.080000 7.375000 3.245000 ;
+      RECT 7.435000  0.085000 7.765000 0.950000 ;
+      RECT 7.725000  1.300000 9.075000 1.620000 ;
+      RECT 8.045000  2.300000 8.375000 3.245000 ;
+      RECT 8.295000  0.085000 8.625000 0.790000 ;
+      RECT 9.045000  2.140000 9.375000 3.245000 ;
+      RECT 9.155000  0.085000 9.485000 0.630000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrtn_4
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef
index 662472b..49753e5 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.magic.lef
@@ -72,27 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.885000  0.085000 1.055000 1.130000 ;
-        RECT 2.295000  0.085000 2.680000 0.600000 ;
-        RECT 4.210000  0.085000 4.540000 0.810000 ;
-        RECT 5.590000  0.085000 5.920000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -101,72 +80,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.615000 2.730000 0.945000 3.245000 ;
-        RECT 2.330000 2.730000 2.705000 3.245000 ;
-        RECT 4.435000 2.650000 5.075000 3.245000 ;
-        RECT 5.745000 1.950000 6.075000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 2.100000 0.715000 2.390000 ;
-      RECT 0.115000 2.390000 2.695000 2.560000 ;
-      RECT 0.115000 2.560000 0.445000 2.980000 ;
-      RECT 0.220000 0.540000 0.715000 1.130000 ;
-      RECT 0.545000 1.130000 0.715000 2.100000 ;
-      RECT 1.150000 1.970000 1.625000 2.220000 ;
-      RECT 1.235000 0.350000 1.625000 0.770000 ;
-      RECT 1.235000 0.770000 3.020000 0.940000 ;
-      RECT 1.235000 0.940000 1.625000 1.130000 ;
-      RECT 1.455000 1.130000 1.625000 1.450000 ;
-      RECT 1.455000 1.450000 1.830000 1.780000 ;
-      RECT 1.455000 1.780000 1.625000 1.970000 ;
-      RECT 1.795000 1.110000 3.325000 1.280000 ;
-      RECT 1.795000 2.020000 2.170000 2.220000 ;
-      RECT 2.000000 1.280000 2.170000 2.020000 ;
-      RECT 2.525000 1.470000 2.855000 1.800000 ;
-      RECT 2.525000 1.800000 2.695000 2.390000 ;
-      RECT 2.850000 0.255000 4.005000 0.425000 ;
-      RECT 2.850000 0.425000 3.020000 0.770000 ;
-      RECT 2.905000 1.970000 3.195000 2.140000 ;
-      RECT 2.905000 2.140000 3.075000 2.905000 ;
-      RECT 2.905000 2.905000 4.045000 3.075000 ;
-      RECT 3.025000 1.280000 3.325000 1.450000 ;
-      RECT 3.025000 1.450000 3.195000 1.970000 ;
-      RECT 3.190000 0.595000 3.665000 0.925000 ;
-      RECT 3.245000 2.405000 3.535000 2.735000 ;
-      RECT 3.365000 1.725000 4.925000 1.895000 ;
-      RECT 3.365000 1.895000 3.535000 2.405000 ;
-      RECT 3.495000 0.925000 3.665000 1.725000 ;
-      RECT 3.715000 2.065000 4.045000 2.905000 ;
-      RECT 3.835000 0.425000 4.005000 1.225000 ;
-      RECT 3.835000 1.225000 4.095000 1.555000 ;
-      RECT 4.305000 2.065000 5.575000 2.380000 ;
-      RECT 4.665000 1.470000 4.925000 1.725000 ;
-      RECT 4.770000 0.350000 5.100000 1.010000 ;
-      RECT 4.770000 1.010000 6.295000 1.180000 ;
-      RECT 5.095000 1.180000 5.265000 1.950000 ;
-      RECT 5.095000 1.950000 5.575000 2.065000 ;
-      RECT 5.245000 2.380000 5.575000 2.980000 ;
-      RECT 5.975000 1.180000 6.295000 1.550000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  2.100000 0.715000 2.390000 ;
+      RECT 0.115000  2.390000 2.695000 2.560000 ;
+      RECT 0.115000  2.560000 0.445000 2.980000 ;
+      RECT 0.220000  0.540000 0.715000 1.130000 ;
+      RECT 0.545000  1.130000 0.715000 2.100000 ;
+      RECT 0.615000  2.730000 0.945000 3.245000 ;
+      RECT 0.885000  0.085000 1.055000 1.130000 ;
+      RECT 1.150000  1.970000 1.625000 2.220000 ;
+      RECT 1.235000  0.350000 1.625000 0.770000 ;
+      RECT 1.235000  0.770000 3.020000 0.940000 ;
+      RECT 1.235000  0.940000 1.625000 1.130000 ;
+      RECT 1.455000  1.130000 1.625000 1.450000 ;
+      RECT 1.455000  1.450000 1.830000 1.780000 ;
+      RECT 1.455000  1.780000 1.625000 1.970000 ;
+      RECT 1.795000  1.110000 3.325000 1.280000 ;
+      RECT 1.795000  2.020000 2.170000 2.220000 ;
+      RECT 2.000000  1.280000 2.170000 2.020000 ;
+      RECT 2.295000  0.085000 2.680000 0.600000 ;
+      RECT 2.330000  2.730000 2.705000 3.245000 ;
+      RECT 2.525000  1.470000 2.855000 1.800000 ;
+      RECT 2.525000  1.800000 2.695000 2.390000 ;
+      RECT 2.850000  0.255000 4.005000 0.425000 ;
+      RECT 2.850000  0.425000 3.020000 0.770000 ;
+      RECT 2.905000  1.970000 3.195000 2.140000 ;
+      RECT 2.905000  2.140000 3.075000 2.905000 ;
+      RECT 2.905000  2.905000 4.045000 3.075000 ;
+      RECT 3.025000  1.280000 3.325000 1.450000 ;
+      RECT 3.025000  1.450000 3.195000 1.970000 ;
+      RECT 3.190000  0.595000 3.665000 0.925000 ;
+      RECT 3.245000  2.405000 3.535000 2.735000 ;
+      RECT 3.365000  1.725000 4.925000 1.895000 ;
+      RECT 3.365000  1.895000 3.535000 2.405000 ;
+      RECT 3.495000  0.925000 3.665000 1.725000 ;
+      RECT 3.715000  2.065000 4.045000 2.905000 ;
+      RECT 3.835000  0.425000 4.005000 1.225000 ;
+      RECT 3.835000  1.225000 4.095000 1.555000 ;
+      RECT 4.210000  0.085000 4.540000 0.810000 ;
+      RECT 4.305000  2.065000 5.575000 2.380000 ;
+      RECT 4.435000  2.650000 5.075000 3.245000 ;
+      RECT 4.665000  1.470000 4.925000 1.725000 ;
+      RECT 4.770000  0.350000 5.100000 1.010000 ;
+      RECT 4.770000  1.010000 6.295000 1.180000 ;
+      RECT 5.095000  1.180000 5.265000 1.950000 ;
+      RECT 5.095000  1.950000 5.575000 2.065000 ;
+      RECT 5.245000  2.380000 5.575000 2.980000 ;
+      RECT 5.590000  0.085000 5.920000 0.840000 ;
+      RECT 5.745000  1.950000 6.075000 3.245000 ;
+      RECT 5.975000  1.180000 6.295000 1.550000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef
index 6657f39..cfd6010 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.magic.lef
@@ -75,29 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.650000  0.085000 0.980000 0.940000 ;
-        RECT 2.305000  0.085000 2.635000 0.410000 ;
-        RECT 4.285000  0.085000 4.615000 0.845000 ;
-        RECT 5.755000  0.085000 6.085000 1.010000 ;
-        RECT 6.755000  0.085000 7.085000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -106,77 +83,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.650000 2.780000 0.980000 3.245000 ;
-        RECT 2.280000 2.780000 2.610000 3.245000 ;
-        RECT 4.450000 2.650000 5.085000 3.245000 ;
-        RECT 5.755000 2.060000 6.085000 3.245000 ;
-        RECT 6.755000 2.140000 7.085000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.855000 2.440000 ;
-      RECT 0.115000 2.440000 2.680000 2.610000 ;
-      RECT 0.115000 2.610000 0.445000 2.820000 ;
-      RECT 0.140000 0.540000 0.470000 1.110000 ;
-      RECT 0.140000 1.110000 0.855000 1.280000 ;
-      RECT 0.685000 1.280000 0.855000 1.950000 ;
-      RECT 1.150000 0.350000 1.625000 0.580000 ;
-      RECT 1.150000 0.580000 2.975000 0.750000 ;
-      RECT 1.150000 0.750000 1.625000 1.010000 ;
-      RECT 1.185000 1.940000 1.625000 2.270000 ;
-      RECT 1.455000 1.010000 1.625000 1.420000 ;
-      RECT 1.455000 1.420000 1.890000 1.750000 ;
-      RECT 1.455000 1.750000 1.625000 1.940000 ;
-      RECT 1.795000 0.920000 2.230000 1.080000 ;
-      RECT 1.795000 1.080000 3.315000 1.250000 ;
-      RECT 1.825000 1.940000 2.230000 2.270000 ;
-      RECT 2.060000 1.250000 2.230000 1.940000 ;
-      RECT 2.510000 1.440000 2.840000 1.770000 ;
-      RECT 2.510000 1.770000 2.680000 2.440000 ;
-      RECT 2.805000 0.255000 4.090000 0.425000 ;
-      RECT 2.805000 0.425000 2.975000 0.580000 ;
-      RECT 2.890000 1.940000 3.220000 2.110000 ;
-      RECT 2.890000 2.110000 3.060000 2.905000 ;
-      RECT 2.890000 2.905000 4.060000 3.075000 ;
-      RECT 3.050000 1.250000 3.315000 1.450000 ;
-      RECT 3.050000 1.450000 3.220000 1.940000 ;
-      RECT 3.205000 0.595000 3.715000 0.845000 ;
-      RECT 3.230000 2.405000 3.560000 2.735000 ;
-      RECT 3.390000 1.760000 4.925000 1.930000 ;
-      RECT 3.390000 1.930000 3.560000 2.405000 ;
-      RECT 3.485000 0.845000 3.655000 1.760000 ;
-      RECT 3.730000 2.100000 4.060000 2.905000 ;
-      RECT 3.825000 1.260000 4.090000 1.590000 ;
-      RECT 3.920000 0.425000 4.090000 1.260000 ;
-      RECT 4.300000 2.100000 5.585000 2.380000 ;
-      RECT 4.660000 1.350000 4.925000 1.760000 ;
-      RECT 4.845000 0.350000 5.265000 1.130000 ;
-      RECT 5.095000 1.130000 5.265000 1.720000 ;
-      RECT 5.095000 1.720000 6.220000 1.890000 ;
-      RECT 5.095000 1.890000 5.585000 2.100000 ;
-      RECT 5.255000 2.380000 5.585000 2.980000 ;
-      RECT 6.050000 1.300000 6.675000 1.630000 ;
-      RECT 6.050000 1.630000 6.220000 1.720000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  1.950000 0.855000 2.440000 ;
+      RECT 0.115000  2.440000 2.680000 2.610000 ;
+      RECT 0.115000  2.610000 0.445000 2.820000 ;
+      RECT 0.140000  0.540000 0.470000 1.110000 ;
+      RECT 0.140000  1.110000 0.855000 1.280000 ;
+      RECT 0.650000  0.085000 0.980000 0.940000 ;
+      RECT 0.650000  2.780000 0.980000 3.245000 ;
+      RECT 0.685000  1.280000 0.855000 1.950000 ;
+      RECT 1.150000  0.350000 1.625000 0.580000 ;
+      RECT 1.150000  0.580000 2.975000 0.750000 ;
+      RECT 1.150000  0.750000 1.625000 1.010000 ;
+      RECT 1.185000  1.940000 1.625000 2.270000 ;
+      RECT 1.455000  1.010000 1.625000 1.420000 ;
+      RECT 1.455000  1.420000 1.890000 1.750000 ;
+      RECT 1.455000  1.750000 1.625000 1.940000 ;
+      RECT 1.795000  0.920000 2.230000 1.080000 ;
+      RECT 1.795000  1.080000 3.315000 1.250000 ;
+      RECT 1.825000  1.940000 2.230000 2.270000 ;
+      RECT 2.060000  1.250000 2.230000 1.940000 ;
+      RECT 2.280000  2.780000 2.610000 3.245000 ;
+      RECT 2.305000  0.085000 2.635000 0.410000 ;
+      RECT 2.510000  1.440000 2.840000 1.770000 ;
+      RECT 2.510000  1.770000 2.680000 2.440000 ;
+      RECT 2.805000  0.255000 4.090000 0.425000 ;
+      RECT 2.805000  0.425000 2.975000 0.580000 ;
+      RECT 2.890000  1.940000 3.220000 2.110000 ;
+      RECT 2.890000  2.110000 3.060000 2.905000 ;
+      RECT 2.890000  2.905000 4.060000 3.075000 ;
+      RECT 3.050000  1.250000 3.315000 1.450000 ;
+      RECT 3.050000  1.450000 3.220000 1.940000 ;
+      RECT 3.205000  0.595000 3.715000 0.845000 ;
+      RECT 3.230000  2.405000 3.560000 2.735000 ;
+      RECT 3.390000  1.760000 4.925000 1.930000 ;
+      RECT 3.390000  1.930000 3.560000 2.405000 ;
+      RECT 3.485000  0.845000 3.655000 1.760000 ;
+      RECT 3.730000  2.100000 4.060000 2.905000 ;
+      RECT 3.825000  1.260000 4.090000 1.590000 ;
+      RECT 3.920000  0.425000 4.090000 1.260000 ;
+      RECT 4.285000  0.085000 4.615000 0.845000 ;
+      RECT 4.300000  2.100000 5.585000 2.380000 ;
+      RECT 4.450000  2.650000 5.085000 3.245000 ;
+      RECT 4.660000  1.350000 4.925000 1.760000 ;
+      RECT 4.845000  0.350000 5.265000 1.130000 ;
+      RECT 5.095000  1.130000 5.265000 1.720000 ;
+      RECT 5.095000  1.720000 6.220000 1.890000 ;
+      RECT 5.095000  1.890000 5.585000 2.100000 ;
+      RECT 5.255000  2.380000 5.585000 2.980000 ;
+      RECT 5.755000  0.085000 6.085000 1.010000 ;
+      RECT 5.755000  2.060000 6.085000 3.245000 ;
+      RECT 6.050000  1.300000 6.675000 1.630000 ;
+      RECT 6.050000  1.630000 6.220000 1.720000 ;
+      RECT 6.755000  0.085000 7.085000 0.790000 ;
+      RECT 6.755000  2.140000 7.085000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrtp_2
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef
index 592aa1e..4b7cf23 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.magic.lef
@@ -76,35 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.680000  0.085000 1.010000 0.940000 ;
-        RECT 2.335000  0.085000 2.665000 0.600000 ;
-        RECT 4.190000  0.085000 4.440000 0.810000 ;
-        RECT 5.965000  0.085000 6.295000 0.600000 ;
-        RECT 6.955000  0.085000 7.215000 1.130000 ;
-        RECT 7.815000  0.085000 8.145000 0.710000 ;
-        RECT 8.675000  0.085000 9.005000 0.710000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -113,88 +84,114 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.650000 2.710000 0.980000 3.245000 ;
-        RECT 2.335000 2.710000 2.665000 3.245000 ;
-        RECT 4.345000 2.650000 4.905000 3.245000 ;
-        RECT 5.610000 1.960000 5.940000 3.245000 ;
-        RECT 6.645000 1.960000 6.975000 3.245000 ;
-        RECT 7.595000 2.140000 7.925000 3.245000 ;
-        RECT 8.595000 2.140000 8.925000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.610000 0.445000 1.110000 ;
-      RECT 0.115000 1.110000 0.855000 1.280000 ;
-      RECT 0.115000 1.950000 0.855000 2.370000 ;
-      RECT 0.115000 2.370000 2.665000 2.540000 ;
-      RECT 0.115000 2.540000 0.445000 2.830000 ;
-      RECT 0.685000 1.280000 0.855000 1.950000 ;
-      RECT 1.185000 1.950000 1.630000 2.200000 ;
-      RECT 1.240000 0.420000 1.630000 0.770000 ;
-      RECT 1.240000 0.770000 3.005000 0.940000 ;
-      RECT 1.240000 0.940000 1.630000 1.200000 ;
-      RECT 1.460000 1.200000 1.630000 1.450000 ;
-      RECT 1.460000 1.450000 1.900000 1.780000 ;
-      RECT 1.460000 1.780000 1.630000 1.950000 ;
-      RECT 1.800000 1.110000 3.340000 1.280000 ;
-      RECT 1.800000 2.020000 2.240000 2.200000 ;
-      RECT 2.070000 1.280000 2.240000 2.020000 ;
-      RECT 2.495000 1.470000 2.785000 1.800000 ;
-      RECT 2.495000 1.800000 2.665000 2.370000 ;
-      RECT 2.835000 0.255000 4.020000 0.425000 ;
-      RECT 2.835000 0.425000 3.005000 0.770000 ;
-      RECT 2.845000 1.970000 3.125000 2.140000 ;
-      RECT 2.845000 2.140000 3.015000 2.905000 ;
-      RECT 2.845000 2.905000 3.985000 3.075000 ;
-      RECT 2.955000 1.280000 3.340000 1.450000 ;
-      RECT 2.955000 1.450000 3.125000 1.970000 ;
-      RECT 3.175000 0.595000 3.680000 0.925000 ;
-      RECT 3.185000 2.405000 3.465000 2.735000 ;
-      RECT 3.295000 1.725000 5.020000 1.895000 ;
-      RECT 3.295000 1.895000 3.465000 2.405000 ;
-      RECT 3.510000 0.925000 3.680000 1.725000 ;
-      RECT 3.655000 2.065000 3.985000 2.905000 ;
-      RECT 3.850000 0.425000 4.020000 1.225000 ;
-      RECT 3.850000 1.225000 4.150000 1.555000 ;
-      RECT 4.195000 2.065000 5.440000 2.480000 ;
-      RECT 4.670000 0.280000 5.785000 0.450000 ;
-      RECT 4.670000 0.450000 5.000000 1.030000 ;
-      RECT 4.720000 1.350000 5.020000 1.725000 ;
-      RECT 5.110000 2.480000 5.440000 2.700000 ;
-      RECT 5.180000 0.620000 5.360000 0.950000 ;
-      RECT 5.190000 0.950000 5.360000 1.620000 ;
-      RECT 5.190000 1.620000 8.595000 1.630000 ;
-      RECT 5.190000 1.630000 6.935000 1.790000 ;
-      RECT 5.190000 1.790000 5.440000 2.065000 ;
-      RECT 5.535000 0.450000 5.785000 0.770000 ;
-      RECT 5.535000 0.770000 6.725000 0.950000 ;
-      RECT 6.110000 1.790000 6.440000 2.700000 ;
-      RECT 6.465000 0.345000 6.725000 0.770000 ;
-      RECT 6.765000 1.300000 8.595000 1.620000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.115000  0.610000 0.445000 1.110000 ;
+      RECT 0.115000  1.110000 0.855000 1.280000 ;
+      RECT 0.115000  1.950000 0.855000 2.370000 ;
+      RECT 0.115000  2.370000 2.665000 2.540000 ;
+      RECT 0.115000  2.540000 0.445000 2.830000 ;
+      RECT 0.650000  2.710000 0.980000 3.245000 ;
+      RECT 0.680000  0.085000 1.010000 0.940000 ;
+      RECT 0.685000  1.280000 0.855000 1.950000 ;
+      RECT 1.185000  1.950000 1.630000 2.200000 ;
+      RECT 1.240000  0.420000 1.630000 0.770000 ;
+      RECT 1.240000  0.770000 3.005000 0.940000 ;
+      RECT 1.240000  0.940000 1.630000 1.200000 ;
+      RECT 1.460000  1.200000 1.630000 1.450000 ;
+      RECT 1.460000  1.450000 1.900000 1.780000 ;
+      RECT 1.460000  1.780000 1.630000 1.950000 ;
+      RECT 1.800000  1.110000 3.340000 1.280000 ;
+      RECT 1.800000  2.020000 2.240000 2.200000 ;
+      RECT 2.070000  1.280000 2.240000 2.020000 ;
+      RECT 2.335000  0.085000 2.665000 0.600000 ;
+      RECT 2.335000  2.710000 2.665000 3.245000 ;
+      RECT 2.495000  1.470000 2.785000 1.800000 ;
+      RECT 2.495000  1.800000 2.665000 2.370000 ;
+      RECT 2.835000  0.255000 4.020000 0.425000 ;
+      RECT 2.835000  0.425000 3.005000 0.770000 ;
+      RECT 2.845000  1.970000 3.125000 2.140000 ;
+      RECT 2.845000  2.140000 3.015000 2.905000 ;
+      RECT 2.845000  2.905000 3.985000 3.075000 ;
+      RECT 2.955000  1.280000 3.340000 1.450000 ;
+      RECT 2.955000  1.450000 3.125000 1.970000 ;
+      RECT 3.175000  0.595000 3.680000 0.925000 ;
+      RECT 3.185000  2.405000 3.465000 2.735000 ;
+      RECT 3.295000  1.725000 5.020000 1.895000 ;
+      RECT 3.295000  1.895000 3.465000 2.405000 ;
+      RECT 3.510000  0.925000 3.680000 1.725000 ;
+      RECT 3.655000  2.065000 3.985000 2.905000 ;
+      RECT 3.850000  0.425000 4.020000 1.225000 ;
+      RECT 3.850000  1.225000 4.150000 1.555000 ;
+      RECT 4.190000  0.085000 4.440000 0.810000 ;
+      RECT 4.195000  2.065000 5.440000 2.480000 ;
+      RECT 4.345000  2.650000 4.905000 3.245000 ;
+      RECT 4.670000  0.280000 5.785000 0.450000 ;
+      RECT 4.670000  0.450000 5.000000 1.030000 ;
+      RECT 4.720000  1.350000 5.020000 1.725000 ;
+      RECT 5.110000  2.480000 5.440000 2.700000 ;
+      RECT 5.180000  0.620000 5.360000 0.950000 ;
+      RECT 5.190000  0.950000 5.360000 1.620000 ;
+      RECT 5.190000  1.620000 8.595000 1.630000 ;
+      RECT 5.190000  1.630000 6.935000 1.790000 ;
+      RECT 5.190000  1.790000 5.440000 2.065000 ;
+      RECT 5.535000  0.450000 5.785000 0.770000 ;
+      RECT 5.535000  0.770000 6.725000 0.950000 ;
+      RECT 5.610000  1.960000 5.940000 3.245000 ;
+      RECT 5.965000  0.085000 6.295000 0.600000 ;
+      RECT 6.110000  1.790000 6.440000 2.700000 ;
+      RECT 6.465000  0.345000 6.725000 0.770000 ;
+      RECT 6.645000  1.960000 6.975000 3.245000 ;
+      RECT 6.765000  1.300000 8.595000 1.620000 ;
+      RECT 6.955000  0.085000 7.215000 1.130000 ;
+      RECT 7.595000  2.140000 7.925000 3.245000 ;
+      RECT 7.815000  0.085000 8.145000 0.710000 ;
+      RECT 8.595000  2.140000 8.925000 3.245000 ;
+      RECT 8.675000  0.085000 9.005000 0.710000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlrtp_4
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef
index 1419f91..7d8422b 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.magic.lef
@@ -72,31 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.410000 ;
-        RECT 2.340000  0.085000 2.675000 0.410000 ;
-        RECT 4.705000  0.085000 5.035000 0.960000 ;
-        RECT 6.300000  0.085000 6.550000 1.130000 ;
-        RECT 7.290000  0.085000 7.540000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -105,72 +80,94 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.735000 2.320000 1.065000 3.245000 ;
-        RECT 2.380000 2.730000 2.710000 3.245000 ;
-        RECT 4.480000 2.060000 5.020000 3.245000 ;
-        RECT 6.300000 2.100000 6.550000 3.245000 ;
-        RECT 7.265000 1.820000 7.515000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.580000 2.865000 0.750000 ;
-      RECT 0.095000 0.750000 0.445000 1.090000 ;
-      RECT 0.095000 1.090000 0.265000 2.100000 ;
-      RECT 0.095000 2.100000 0.545000 2.980000 ;
-      RECT 1.135000 0.920000 1.465000 1.260000 ;
-      RECT 1.135000 1.260000 1.905000 1.520000 ;
-      RECT 1.235000 2.320000 1.675000 2.390000 ;
-      RECT 1.235000 2.390000 4.145000 2.560000 ;
-      RECT 1.235000 2.560000 1.565000 2.980000 ;
-      RECT 1.505000 1.520000 1.675000 2.320000 ;
-      RECT 1.695000 0.920000 2.245000 1.090000 ;
-      RECT 1.845000 1.880000 2.910000 2.220000 ;
-      RECT 2.075000 1.090000 2.245000 1.710000 ;
-      RECT 2.075000 1.710000 3.340000 1.880000 ;
-      RECT 2.535000 0.750000 2.865000 1.510000 ;
-      RECT 3.035000 0.255000 4.260000 0.505000 ;
-      RECT 3.035000 0.505000 3.205000 1.470000 ;
-      RECT 3.035000 1.470000 3.340000 1.710000 ;
-      RECT 3.260000 2.050000 3.805000 2.220000 ;
-      RECT 3.375000 0.725000 4.135000 1.055000 ;
-      RECT 3.510000 1.055000 4.135000 1.130000 ;
-      RECT 3.510000 1.130000 5.220000 1.300000 ;
-      RECT 3.510000 1.300000 3.680000 2.050000 ;
-      RECT 3.850000 1.470000 4.145000 1.800000 ;
-      RECT 3.975000 1.800000 4.145000 2.390000 ;
-      RECT 4.315000 1.470000 4.645000 1.720000 ;
-      RECT 4.315000 1.720000 5.560000 1.890000 ;
-      RECT 4.890000 1.300000 5.220000 1.550000 ;
-      RECT 5.205000 0.350000 5.560000 0.960000 ;
-      RECT 5.220000 1.890000 5.560000 2.900000 ;
-      RECT 5.390000 0.960000 5.560000 1.270000 ;
-      RECT 5.390000 1.270000 5.790000 1.600000 ;
-      RECT 5.390000 1.600000 5.560000 1.720000 ;
-      RECT 6.720000 0.540000 7.060000 1.300000 ;
-      RECT 6.720000 1.300000 7.500000 1.630000 ;
-      RECT 6.720000 1.630000 7.065000 2.980000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.580000 2.865000 0.750000 ;
+      RECT 0.095000  0.750000 0.445000 1.090000 ;
+      RECT 0.095000  1.090000 0.265000 2.100000 ;
+      RECT 0.095000  2.100000 0.545000 2.980000 ;
+      RECT 0.625000  0.085000 0.955000 0.410000 ;
+      RECT 0.735000  2.320000 1.065000 3.245000 ;
+      RECT 1.135000  0.920000 1.465000 1.260000 ;
+      RECT 1.135000  1.260000 1.905000 1.520000 ;
+      RECT 1.235000  2.320000 1.675000 2.390000 ;
+      RECT 1.235000  2.390000 4.145000 2.560000 ;
+      RECT 1.235000  2.560000 1.565000 2.980000 ;
+      RECT 1.505000  1.520000 1.675000 2.320000 ;
+      RECT 1.695000  0.920000 2.245000 1.090000 ;
+      RECT 1.845000  1.880000 2.910000 2.220000 ;
+      RECT 2.075000  1.090000 2.245000 1.710000 ;
+      RECT 2.075000  1.710000 3.340000 1.880000 ;
+      RECT 2.340000  0.085000 2.675000 0.410000 ;
+      RECT 2.380000  2.730000 2.710000 3.245000 ;
+      RECT 2.535000  0.750000 2.865000 1.510000 ;
+      RECT 3.035000  0.255000 4.260000 0.505000 ;
+      RECT 3.035000  0.505000 3.205000 1.470000 ;
+      RECT 3.035000  1.470000 3.340000 1.710000 ;
+      RECT 3.260000  2.050000 3.805000 2.220000 ;
+      RECT 3.375000  0.725000 4.135000 1.055000 ;
+      RECT 3.510000  1.055000 4.135000 1.130000 ;
+      RECT 3.510000  1.130000 5.220000 1.300000 ;
+      RECT 3.510000  1.300000 3.680000 2.050000 ;
+      RECT 3.850000  1.470000 4.145000 1.800000 ;
+      RECT 3.975000  1.800000 4.145000 2.390000 ;
+      RECT 4.315000  1.470000 4.645000 1.720000 ;
+      RECT 4.315000  1.720000 5.560000 1.890000 ;
+      RECT 4.480000  2.060000 5.020000 3.245000 ;
+      RECT 4.705000  0.085000 5.035000 0.960000 ;
+      RECT 4.890000  1.300000 5.220000 1.550000 ;
+      RECT 5.205000  0.350000 5.560000 0.960000 ;
+      RECT 5.220000  1.890000 5.560000 2.900000 ;
+      RECT 5.390000  0.960000 5.560000 1.270000 ;
+      RECT 5.390000  1.270000 5.790000 1.600000 ;
+      RECT 5.390000  1.600000 5.560000 1.720000 ;
+      RECT 6.300000  0.085000 6.550000 1.130000 ;
+      RECT 6.300000  2.100000 6.550000 3.245000 ;
+      RECT 6.720000  0.540000 7.060000 1.300000 ;
+      RECT 6.720000  1.300000 7.500000 1.630000 ;
+      RECT 6.720000  1.630000 7.065000 2.980000 ;
+      RECT 7.265000  1.820000 7.515000 3.245000 ;
+      RECT 7.290000  0.085000 7.540000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlxbn_1
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef
index feb8715..50b8046 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.magic.lef
@@ -75,35 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.410000 ;
-        RECT 2.285000  0.085000 2.640000 0.410000 ;
-        RECT 4.630000  0.085000 5.015000 0.845000 ;
-        RECT 5.825000  0.085000 6.075000 0.680000 ;
-        RECT 6.675000  0.085000 7.005000 1.130000 ;
-        RECT 7.745000  0.085000 8.075000 1.130000 ;
-        RECT 8.675000  0.085000 9.005000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -112,79 +83,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.650000 2.320000 0.980000 3.245000 ;
-        RECT 2.360000 2.730000 2.690000 3.245000 ;
-        RECT 4.670000 2.070000 5.080000 3.245000 ;
-        RECT 5.890000 2.580000 6.140000 3.245000 ;
-        RECT 6.710000 2.580000 7.040000 3.245000 ;
-        RECT 7.775000 1.820000 8.025000 3.245000 ;
-        RECT 8.755000 1.820000 9.005000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.580000 2.845000 0.750000 ;
-      RECT 0.100000 0.750000 0.445000 1.250000 ;
-      RECT 0.100000 1.250000 0.270000 2.100000 ;
-      RECT 0.100000 2.100000 0.445000 2.980000 ;
-      RECT 1.135000 0.920000 1.465000 1.260000 ;
-      RECT 1.135000 1.260000 1.885000 1.525000 ;
-      RECT 1.150000 2.320000 1.655000 2.390000 ;
-      RECT 1.150000 2.390000 4.275000 2.560000 ;
-      RECT 1.150000 2.560000 1.485000 2.980000 ;
-      RECT 1.485000 1.525000 1.655000 2.320000 ;
-      RECT 1.695000 0.920000 2.225000 1.090000 ;
-      RECT 1.825000 1.710000 3.385000 1.880000 ;
-      RECT 1.825000 1.880000 2.155000 2.220000 ;
-      RECT 2.055000 1.090000 2.225000 1.710000 ;
-      RECT 2.515000 0.750000 2.845000 1.540000 ;
-      RECT 3.015000 0.255000 4.265000 0.505000 ;
-      RECT 3.015000 0.505000 3.185000 1.470000 ;
-      RECT 3.015000 1.470000 3.385000 1.710000 ;
-      RECT 3.230000 2.050000 3.935000 2.220000 ;
-      RECT 3.355000 0.725000 4.070000 1.015000 ;
-      RECT 3.355000 1.015000 5.315000 1.055000 ;
-      RECT 3.555000 1.055000 5.315000 1.185000 ;
-      RECT 3.555000 1.185000 3.725000 2.050000 ;
-      RECT 3.895000 1.420000 4.275000 1.750000 ;
-      RECT 4.105000 1.750000 4.275000 2.390000 ;
-      RECT 4.445000 1.355000 4.775000 1.720000 ;
-      RECT 4.445000 1.720000 5.655000 1.890000 ;
-      RECT 4.985000 1.185000 5.315000 1.550000 ;
-      RECT 5.185000 0.350000 5.655000 0.845000 ;
-      RECT 5.250000 1.890000 5.655000 2.240000 ;
-      RECT 5.250000 2.240000 6.955000 2.410000 ;
-      RECT 5.250000 2.410000 5.655000 2.980000 ;
-      RECT 5.485000 0.845000 5.655000 1.720000 ;
-      RECT 6.285000 1.300000 6.955000 1.630000 ;
-      RECT 6.785000 1.630000 6.955000 2.240000 ;
-      RECT 7.185000 0.450000 7.515000 1.130000 ;
-      RECT 7.215000 1.130000 7.515000 1.320000 ;
-      RECT 7.215000 1.320000 8.155000 1.650000 ;
-      RECT 7.215000 1.650000 7.545000 2.980000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.100000  0.580000 2.845000 0.750000 ;
+      RECT 0.100000  0.750000 0.445000 1.250000 ;
+      RECT 0.100000  1.250000 0.270000 2.100000 ;
+      RECT 0.100000  2.100000 0.445000 2.980000 ;
+      RECT 0.625000  0.085000 0.955000 0.410000 ;
+      RECT 0.650000  2.320000 0.980000 3.245000 ;
+      RECT 1.135000  0.920000 1.465000 1.260000 ;
+      RECT 1.135000  1.260000 1.885000 1.525000 ;
+      RECT 1.150000  2.320000 1.655000 2.390000 ;
+      RECT 1.150000  2.390000 4.275000 2.560000 ;
+      RECT 1.150000  2.560000 1.485000 2.980000 ;
+      RECT 1.485000  1.525000 1.655000 2.320000 ;
+      RECT 1.695000  0.920000 2.225000 1.090000 ;
+      RECT 1.825000  1.710000 3.385000 1.880000 ;
+      RECT 1.825000  1.880000 2.155000 2.220000 ;
+      RECT 2.055000  1.090000 2.225000 1.710000 ;
+      RECT 2.285000  0.085000 2.640000 0.410000 ;
+      RECT 2.360000  2.730000 2.690000 3.245000 ;
+      RECT 2.515000  0.750000 2.845000 1.540000 ;
+      RECT 3.015000  0.255000 4.265000 0.505000 ;
+      RECT 3.015000  0.505000 3.185000 1.470000 ;
+      RECT 3.015000  1.470000 3.385000 1.710000 ;
+      RECT 3.230000  2.050000 3.935000 2.220000 ;
+      RECT 3.355000  0.725000 4.070000 1.015000 ;
+      RECT 3.355000  1.015000 5.315000 1.055000 ;
+      RECT 3.555000  1.055000 5.315000 1.185000 ;
+      RECT 3.555000  1.185000 3.725000 2.050000 ;
+      RECT 3.895000  1.420000 4.275000 1.750000 ;
+      RECT 4.105000  1.750000 4.275000 2.390000 ;
+      RECT 4.445000  1.355000 4.775000 1.720000 ;
+      RECT 4.445000  1.720000 5.655000 1.890000 ;
+      RECT 4.630000  0.085000 5.015000 0.845000 ;
+      RECT 4.670000  2.070000 5.080000 3.245000 ;
+      RECT 4.985000  1.185000 5.315000 1.550000 ;
+      RECT 5.185000  0.350000 5.655000 0.845000 ;
+      RECT 5.250000  1.890000 5.655000 2.240000 ;
+      RECT 5.250000  2.240000 6.955000 2.410000 ;
+      RECT 5.250000  2.410000 5.655000 2.980000 ;
+      RECT 5.485000  0.845000 5.655000 1.720000 ;
+      RECT 5.825000  0.085000 6.075000 0.680000 ;
+      RECT 5.890000  2.580000 6.140000 3.245000 ;
+      RECT 6.285000  1.300000 6.955000 1.630000 ;
+      RECT 6.675000  0.085000 7.005000 1.130000 ;
+      RECT 6.710000  2.580000 7.040000 3.245000 ;
+      RECT 6.785000  1.630000 6.955000 2.240000 ;
+      RECT 7.185000  0.450000 7.515000 1.130000 ;
+      RECT 7.215000  1.130000 7.515000 1.320000 ;
+      RECT 7.215000  1.320000 8.155000 1.650000 ;
+      RECT 7.215000  1.650000 7.545000 2.980000 ;
+      RECT 7.745000  0.085000 8.075000 1.130000 ;
+      RECT 7.775000  1.820000 8.025000 3.245000 ;
+      RECT 8.675000  0.085000 9.005000 1.130000 ;
+      RECT 8.755000  1.820000 9.005000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlxbn_2
diff --git a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef
index d873e7a..23364c0 100644
--- a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.magic.lef
@@ -72,31 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.630000  0.085000 0.960000 1.010000 ;
-        RECT 2.355000  0.085000 2.740000 0.410000 ;
-        RECT 4.520000  0.085000 4.850000 1.060000 ;
-        RECT 6.295000  0.085000 6.545000 1.150000 ;
-        RECT 7.285000  0.085000 7.535000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -105,75 +80,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.640000 2.885000 0.970000 3.245000 ;
-        RECT 2.380000 2.780000 2.710000 3.245000 ;
-        RECT 4.490000 2.545000 5.035000 3.245000 ;
-        RECT 6.295000 2.100000 6.545000 3.245000 ;
-        RECT 7.270000 1.820000 7.520000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.540000 0.450000 1.050000 ;
-      RECT 0.095000 1.050000 0.265000 2.060000 ;
-      RECT 0.095000 2.060000 0.440000 2.545000 ;
-      RECT 0.095000 2.545000 1.760000 2.715000 ;
-      RECT 0.095000 2.715000 0.440000 2.925000 ;
-      RECT 1.130000 0.350000 1.675000 0.580000 ;
-      RECT 1.130000 0.580000 3.080000 0.750000 ;
-      RECT 1.130000 0.750000 1.675000 1.010000 ;
-      RECT 1.170000 1.720000 2.330000 1.890000 ;
-      RECT 1.170000 1.890000 1.420000 2.375000 ;
-      RECT 1.505000 1.010000 1.675000 1.470000 ;
-      RECT 1.505000 1.470000 2.330000 1.720000 ;
-      RECT 1.590000 2.060000 2.875000 2.230000 ;
-      RECT 1.590000 2.230000 1.760000 2.545000 ;
-      RECT 1.845000 0.920000 2.175000 1.020000 ;
-      RECT 1.845000 1.020000 3.515000 1.190000 ;
-      RECT 1.930000 2.400000 2.180000 2.440000 ;
-      RECT 1.930000 2.440000 4.100000 2.610000 ;
-      RECT 1.930000 2.610000 2.180000 2.820000 ;
-      RECT 2.545000 1.470000 2.875000 2.060000 ;
-      RECT 2.910000 0.255000 4.075000 0.510000 ;
-      RECT 2.910000 0.510000 3.080000 0.580000 ;
-      RECT 3.045000 1.190000 3.515000 1.480000 ;
-      RECT 3.045000 1.480000 3.215000 2.440000 ;
-      RECT 3.310000 0.680000 3.950000 0.850000 ;
-      RECT 3.385000 1.650000 5.035000 1.820000 ;
-      RECT 3.385000 1.820000 3.555000 2.270000 ;
-      RECT 3.770000 2.050000 4.100000 2.440000 ;
-      RECT 3.780000 0.850000 3.950000 1.650000 ;
-      RECT 4.315000 1.990000 5.535000 2.320000 ;
-      RECT 4.705000 1.240000 5.035000 1.650000 ;
-      RECT 5.020000 0.350000 5.375000 1.070000 ;
-      RECT 5.205000 1.070000 5.375000 1.320000 ;
-      RECT 5.205000 1.320000 5.775000 1.650000 ;
-      RECT 5.205000 1.650000 5.535000 1.990000 ;
-      RECT 5.205000 2.320000 5.535000 2.980000 ;
-      RECT 6.720000 0.560000 7.055000 1.320000 ;
-      RECT 6.720000 1.320000 7.320000 1.650000 ;
-      RECT 6.720000 1.650000 7.050000 2.980000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.540000 0.450000 1.050000 ;
+      RECT 0.095000  1.050000 0.265000 2.060000 ;
+      RECT 0.095000  2.060000 0.440000 2.545000 ;
+      RECT 0.095000  2.545000 1.760000 2.715000 ;
+      RECT 0.095000  2.715000 0.440000 2.925000 ;
+      RECT 0.630000  0.085000 0.960000 1.010000 ;
+      RECT 0.640000  2.885000 0.970000 3.245000 ;
+      RECT 1.130000  0.350000 1.675000 0.580000 ;
+      RECT 1.130000  0.580000 3.080000 0.750000 ;
+      RECT 1.130000  0.750000 1.675000 1.010000 ;
+      RECT 1.170000  1.720000 2.330000 1.890000 ;
+      RECT 1.170000  1.890000 1.420000 2.375000 ;
+      RECT 1.505000  1.010000 1.675000 1.470000 ;
+      RECT 1.505000  1.470000 2.330000 1.720000 ;
+      RECT 1.590000  2.060000 2.875000 2.230000 ;
+      RECT 1.590000  2.230000 1.760000 2.545000 ;
+      RECT 1.845000  0.920000 2.175000 1.020000 ;
+      RECT 1.845000  1.020000 3.515000 1.190000 ;
+      RECT 1.930000  2.400000 2.180000 2.440000 ;
+      RECT 1.930000  2.440000 4.100000 2.610000 ;
+      RECT 1.930000  2.610000 2.180000 2.820000 ;
+      RECT 2.355000  0.085000 2.740000 0.410000 ;
+      RECT 2.380000  2.780000 2.710000 3.245000 ;
+      RECT 2.545000  1.470000 2.875000 2.060000 ;
+      RECT 2.910000  0.255000 4.075000 0.510000 ;
+      RECT 2.910000  0.510000 3.080000 0.580000 ;
+      RECT 3.045000  1.190000 3.515000 1.480000 ;
+      RECT 3.045000  1.480000 3.215000 2.440000 ;
+      RECT 3.310000  0.680000 3.950000 0.850000 ;
+      RECT 3.385000  1.650000 5.035000 1.820000 ;
+      RECT 3.385000  1.820000 3.555000 2.270000 ;
+      RECT 3.770000  2.050000 4.100000 2.440000 ;
+      RECT 3.780000  0.850000 3.950000 1.650000 ;
+      RECT 4.315000  1.990000 5.535000 2.320000 ;
+      RECT 4.490000  2.545000 5.035000 3.245000 ;
+      RECT 4.520000  0.085000 4.850000 1.060000 ;
+      RECT 4.705000  1.240000 5.035000 1.650000 ;
+      RECT 5.020000  0.350000 5.375000 1.070000 ;
+      RECT 5.205000  1.070000 5.375000 1.320000 ;
+      RECT 5.205000  1.320000 5.775000 1.650000 ;
+      RECT 5.205000  1.650000 5.535000 1.990000 ;
+      RECT 5.205000  2.320000 5.535000 2.980000 ;
+      RECT 6.295000  0.085000 6.545000 1.150000 ;
+      RECT 6.295000  2.100000 6.545000 3.245000 ;
+      RECT 6.720000  0.560000 7.055000 1.320000 ;
+      RECT 6.720000  1.320000 7.320000 1.650000 ;
+      RECT 6.720000  1.650000 7.050000 2.980000 ;
+      RECT 7.270000  1.820000 7.520000 3.245000 ;
+      RECT 7.285000  0.085000 7.535000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlxbp_1
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef
index 76445d1..79f94d6 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.magic.lef
@@ -61,27 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.490000 ;
-        RECT 2.815000  0.085000 3.145000 1.055000 ;
-        RECT 4.850000  0.085000 5.100000 1.135000 ;
-        RECT 5.840000  0.085000 6.090000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -90,72 +69,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.620000 2.075000 0.950000 3.245000 ;
-        RECT 2.360000 2.780000 2.705000 3.245000 ;
-        RECT 4.470000 2.525000 5.065000 3.245000 ;
-        RECT 5.825000 1.820000 6.075000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.555000 0.445000 0.660000 ;
-      RECT 0.115000 0.660000 1.315000 0.830000 ;
-      RECT 0.115000 0.830000 0.775000 1.010000 ;
-      RECT 0.120000 1.735000 0.775000 1.905000 ;
-      RECT 0.120000 1.905000 0.450000 2.955000 ;
-      RECT 0.605000 1.010000 0.775000 1.735000 ;
-      RECT 1.135000 1.000000 1.885000 1.330000 ;
-      RECT 1.145000 0.255000 2.645000 0.425000 ;
-      RECT 1.145000 0.425000 1.315000 0.660000 ;
-      RECT 1.155000 2.075000 1.655000 2.440000 ;
-      RECT 1.155000 2.440000 3.045000 2.610000 ;
-      RECT 1.155000 2.610000 1.655000 2.955000 ;
-      RECT 1.485000 0.760000 1.885000 1.000000 ;
-      RECT 1.485000 1.330000 1.885000 1.770000 ;
-      RECT 1.485000 1.770000 1.655000 2.075000 ;
-      RECT 1.825000 1.940000 2.225000 2.270000 ;
-      RECT 2.055000 0.595000 2.305000 1.725000 ;
-      RECT 2.055000 1.725000 3.500000 1.895000 ;
-      RECT 2.055000 1.895000 2.225000 1.940000 ;
-      RECT 2.475000 0.425000 2.645000 1.225000 ;
-      RECT 2.475000 1.225000 2.970000 1.555000 ;
-      RECT 2.875000 2.610000 3.045000 2.905000 ;
-      RECT 2.875000 2.905000 4.180000 3.075000 ;
-      RECT 3.180000 1.470000 3.500000 1.725000 ;
-      RECT 3.315000 0.255000 4.355000 0.585000 ;
-      RECT 3.315000 0.585000 3.485000 1.470000 ;
-      RECT 3.330000 2.065000 3.840000 2.735000 ;
-      RECT 3.655000 0.805000 4.680000 1.055000 ;
-      RECT 3.670000 1.055000 3.840000 2.065000 ;
-      RECT 4.010000 1.455000 4.340000 1.785000 ;
-      RECT 4.010000 1.785000 4.180000 2.905000 ;
-      RECT 4.350000 2.025000 5.655000 2.355000 ;
-      RECT 4.510000 1.055000 4.680000 1.305000 ;
-      RECT 4.510000 1.305000 5.315000 1.635000 ;
-      RECT 5.265000 1.940000 5.655000 2.025000 ;
-      RECT 5.265000 2.355000 5.655000 2.980000 ;
-      RECT 5.280000 0.455000 5.655000 1.135000 ;
-      RECT 5.485000 1.135000 5.655000 1.300000 ;
-      RECT 5.485000 1.300000 5.885000 1.630000 ;
-      RECT 5.485000 1.630000 5.655000 1.940000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  0.555000 0.445000 0.660000 ;
+      RECT 0.115000  0.660000 1.315000 0.830000 ;
+      RECT 0.115000  0.830000 0.775000 1.010000 ;
+      RECT 0.120000  1.735000 0.775000 1.905000 ;
+      RECT 0.120000  1.905000 0.450000 2.955000 ;
+      RECT 0.605000  1.010000 0.775000 1.735000 ;
+      RECT 0.620000  2.075000 0.950000 3.245000 ;
+      RECT 0.625000  0.085000 0.955000 0.490000 ;
+      RECT 1.135000  1.000000 1.885000 1.330000 ;
+      RECT 1.145000  0.255000 2.645000 0.425000 ;
+      RECT 1.145000  0.425000 1.315000 0.660000 ;
+      RECT 1.155000  2.075000 1.655000 2.440000 ;
+      RECT 1.155000  2.440000 3.045000 2.610000 ;
+      RECT 1.155000  2.610000 1.655000 2.955000 ;
+      RECT 1.485000  0.760000 1.885000 1.000000 ;
+      RECT 1.485000  1.330000 1.885000 1.770000 ;
+      RECT 1.485000  1.770000 1.655000 2.075000 ;
+      RECT 1.825000  1.940000 2.225000 2.270000 ;
+      RECT 2.055000  0.595000 2.305000 1.725000 ;
+      RECT 2.055000  1.725000 3.500000 1.895000 ;
+      RECT 2.055000  1.895000 2.225000 1.940000 ;
+      RECT 2.360000  2.780000 2.705000 3.245000 ;
+      RECT 2.475000  0.425000 2.645000 1.225000 ;
+      RECT 2.475000  1.225000 2.970000 1.555000 ;
+      RECT 2.815000  0.085000 3.145000 1.055000 ;
+      RECT 2.875000  2.610000 3.045000 2.905000 ;
+      RECT 2.875000  2.905000 4.180000 3.075000 ;
+      RECT 3.180000  1.470000 3.500000 1.725000 ;
+      RECT 3.315000  0.255000 4.355000 0.585000 ;
+      RECT 3.315000  0.585000 3.485000 1.470000 ;
+      RECT 3.330000  2.065000 3.840000 2.735000 ;
+      RECT 3.655000  0.805000 4.680000 1.055000 ;
+      RECT 3.670000  1.055000 3.840000 2.065000 ;
+      RECT 4.010000  1.455000 4.340000 1.785000 ;
+      RECT 4.010000  1.785000 4.180000 2.905000 ;
+      RECT 4.350000  2.025000 5.655000 2.355000 ;
+      RECT 4.470000  2.525000 5.065000 3.245000 ;
+      RECT 4.510000  1.055000 4.680000 1.305000 ;
+      RECT 4.510000  1.305000 5.315000 1.635000 ;
+      RECT 4.850000  0.085000 5.100000 1.135000 ;
+      RECT 5.265000  1.940000 5.655000 2.025000 ;
+      RECT 5.265000  2.355000 5.655000 2.980000 ;
+      RECT 5.280000  0.455000 5.655000 1.135000 ;
+      RECT 5.485000  1.135000 5.655000 1.300000 ;
+      RECT 5.485000  1.300000 5.885000 1.630000 ;
+      RECT 5.485000  1.630000 5.655000 1.940000 ;
+      RECT 5.825000  1.820000 6.075000 3.245000 ;
+      RECT 5.840000  0.085000 6.090000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlxtn_1
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef
index c8901e0..418f216 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.magic.lef
@@ -63,29 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.410000 ;
-        RECT 2.815000  0.085000 3.145000 1.055000 ;
-        RECT 4.820000  0.085000 5.150000 0.975000 ;
-        RECT 5.845000  0.085000 6.140000 1.125000 ;
-        RECT 6.755000  0.085000 7.085000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -94,77 +71,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.765000 2.290000 1.095000 3.245000 ;
-        RECT 2.360000 2.780000 2.705000 3.245000 ;
-        RECT 4.360000 2.625000 5.080000 3.245000 ;
-        RECT 5.845000 1.820000 6.060000 3.245000 ;
-        RECT 6.835000 1.820000 7.085000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.580000 1.315000 0.750000 ;
-      RECT 0.115000 0.750000 0.795000 1.130000 ;
-      RECT 0.265000 1.950000 0.795000 2.120000 ;
-      RECT 0.265000 2.120000 0.595000 2.980000 ;
-      RECT 0.625000 1.130000 0.795000 1.950000 ;
-      RECT 1.135000 0.920000 1.885000 1.170000 ;
-      RECT 1.145000 0.255000 2.645000 0.425000 ;
-      RECT 1.145000 0.425000 1.315000 0.580000 ;
-      RECT 1.265000 2.100000 1.655000 2.440000 ;
-      RECT 1.265000 2.440000 3.045000 2.610000 ;
-      RECT 1.265000 2.610000 1.655000 2.980000 ;
-      RECT 1.485000 0.760000 1.885000 0.920000 ;
-      RECT 1.485000 1.170000 1.885000 1.770000 ;
-      RECT 1.485000 1.770000 1.655000 2.100000 ;
-      RECT 1.825000 1.940000 3.510000 1.970000 ;
-      RECT 1.825000 1.970000 2.225000 2.270000 ;
-      RECT 2.055000 0.595000 2.305000 1.800000 ;
-      RECT 2.055000 1.800000 3.510000 1.940000 ;
-      RECT 2.475000 0.425000 2.645000 1.300000 ;
-      RECT 2.475000 1.300000 2.970000 1.630000 ;
-      RECT 2.875000 2.610000 3.045000 2.905000 ;
-      RECT 2.875000 2.905000 4.190000 3.075000 ;
-      RECT 3.180000 1.470000 3.510000 1.800000 ;
-      RECT 3.315000 0.255000 4.375000 0.585000 ;
-      RECT 3.315000 0.585000 3.485000 1.470000 ;
-      RECT 3.330000 2.140000 3.850000 2.735000 ;
-      RECT 3.655000 0.805000 4.250000 1.055000 ;
-      RECT 3.680000 1.055000 3.850000 2.140000 ;
-      RECT 4.020000 1.485000 4.350000 1.815000 ;
-      RECT 4.020000 1.815000 4.190000 2.905000 ;
-      RECT 4.080000 1.055000 4.250000 1.145000 ;
-      RECT 4.080000 1.145000 5.160000 1.295000 ;
-      RECT 4.080000 1.295000 5.335000 1.315000 ;
-      RECT 4.360000 2.025000 5.580000 2.355000 ;
-      RECT 4.990000 1.315000 5.335000 1.625000 ;
-      RECT 5.250000 1.795000 5.675000 1.965000 ;
-      RECT 5.250000 1.965000 5.580000 2.025000 ;
-      RECT 5.250000 2.355000 5.580000 2.955000 ;
-      RECT 5.330000 0.355000 5.580000 0.955000 ;
-      RECT 5.330000 0.955000 5.675000 1.125000 ;
-      RECT 5.505000 1.125000 5.675000 1.295000 ;
-      RECT 5.505000 1.295000 6.245000 1.625000 ;
-      RECT 5.505000 1.625000 5.675000 1.795000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  0.580000 1.315000 0.750000 ;
+      RECT 0.115000  0.750000 0.795000 1.130000 ;
+      RECT 0.265000  1.950000 0.795000 2.120000 ;
+      RECT 0.265000  2.120000 0.595000 2.980000 ;
+      RECT 0.625000  0.085000 0.955000 0.410000 ;
+      RECT 0.625000  1.130000 0.795000 1.950000 ;
+      RECT 0.765000  2.290000 1.095000 3.245000 ;
+      RECT 1.135000  0.920000 1.885000 1.170000 ;
+      RECT 1.145000  0.255000 2.645000 0.425000 ;
+      RECT 1.145000  0.425000 1.315000 0.580000 ;
+      RECT 1.265000  2.100000 1.655000 2.440000 ;
+      RECT 1.265000  2.440000 3.045000 2.610000 ;
+      RECT 1.265000  2.610000 1.655000 2.980000 ;
+      RECT 1.485000  0.760000 1.885000 0.920000 ;
+      RECT 1.485000  1.170000 1.885000 1.770000 ;
+      RECT 1.485000  1.770000 1.655000 2.100000 ;
+      RECT 1.825000  1.940000 3.510000 1.970000 ;
+      RECT 1.825000  1.970000 2.225000 2.270000 ;
+      RECT 2.055000  0.595000 2.305000 1.800000 ;
+      RECT 2.055000  1.800000 3.510000 1.940000 ;
+      RECT 2.360000  2.780000 2.705000 3.245000 ;
+      RECT 2.475000  0.425000 2.645000 1.300000 ;
+      RECT 2.475000  1.300000 2.970000 1.630000 ;
+      RECT 2.815000  0.085000 3.145000 1.055000 ;
+      RECT 2.875000  2.610000 3.045000 2.905000 ;
+      RECT 2.875000  2.905000 4.190000 3.075000 ;
+      RECT 3.180000  1.470000 3.510000 1.800000 ;
+      RECT 3.315000  0.255000 4.375000 0.585000 ;
+      RECT 3.315000  0.585000 3.485000 1.470000 ;
+      RECT 3.330000  2.140000 3.850000 2.735000 ;
+      RECT 3.655000  0.805000 4.250000 1.055000 ;
+      RECT 3.680000  1.055000 3.850000 2.140000 ;
+      RECT 4.020000  1.485000 4.350000 1.815000 ;
+      RECT 4.020000  1.815000 4.190000 2.905000 ;
+      RECT 4.080000  1.055000 4.250000 1.145000 ;
+      RECT 4.080000  1.145000 5.160000 1.295000 ;
+      RECT 4.080000  1.295000 5.335000 1.315000 ;
+      RECT 4.360000  2.025000 5.580000 2.355000 ;
+      RECT 4.360000  2.625000 5.080000 3.245000 ;
+      RECT 4.820000  0.085000 5.150000 0.975000 ;
+      RECT 4.990000  1.315000 5.335000 1.625000 ;
+      RECT 5.250000  1.795000 5.675000 1.965000 ;
+      RECT 5.250000  1.965000 5.580000 2.025000 ;
+      RECT 5.250000  2.355000 5.580000 2.955000 ;
+      RECT 5.330000  0.355000 5.580000 0.955000 ;
+      RECT 5.330000  0.955000 5.675000 1.125000 ;
+      RECT 5.505000  1.125000 5.675000 1.295000 ;
+      RECT 5.505000  1.295000 6.245000 1.625000 ;
+      RECT 5.505000  1.625000 5.675000 1.795000 ;
+      RECT 5.845000  0.085000 6.140000 1.125000 ;
+      RECT 5.845000  1.820000 6.060000 3.245000 ;
+      RECT 6.755000  0.085000 7.085000 1.130000 ;
+      RECT 6.835000  1.820000 7.085000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlxtn_2
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef
index cb946f1..60e4d3c 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.magic.lef
@@ -68,32 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.490000 ;
-        RECT 2.815000  0.085000 3.145000 1.050000 ;
-        RECT 4.890000  0.085000 5.140000 1.055000 ;
-        RECT 5.750000  0.085000 6.080000 0.810000 ;
-        RECT 6.785000  0.085000 7.115000 0.810000 ;
-        RECT 7.715000  0.085000 8.045000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -102,79 +76,102 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.635000 2.290000 0.965000 3.245000 ;
-        RECT 2.360000 2.730000 2.820000 3.245000 ;
-        RECT 4.390000 2.590000 5.145000 3.245000 ;
-        RECT 5.815000 2.160000 6.145000 3.245000 ;
-        RECT 6.815000 2.160000 7.145000 3.245000 ;
-        RECT 7.715000 2.320000 8.045000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.555000 0.445000 0.660000 ;
-      RECT 0.115000 0.660000 1.315000 0.830000 ;
-      RECT 0.115000 0.830000 0.795000 1.130000 ;
-      RECT 0.135000 1.950000 0.795000 2.120000 ;
-      RECT 0.135000 2.120000 0.465000 2.980000 ;
-      RECT 0.625000 1.130000 0.795000 1.950000 ;
-      RECT 1.135000 1.000000 1.885000 1.330000 ;
-      RECT 1.135000 2.100000 1.655000 2.390000 ;
-      RECT 1.135000 2.390000 3.160000 2.560000 ;
-      RECT 1.135000 2.560000 1.655000 2.980000 ;
-      RECT 1.145000 0.255000 2.645000 0.425000 ;
-      RECT 1.145000 0.425000 1.315000 0.660000 ;
-      RECT 1.485000 0.760000 1.885000 1.000000 ;
-      RECT 1.485000 1.330000 1.885000 1.770000 ;
-      RECT 1.485000 1.770000 1.655000 2.100000 ;
-      RECT 1.825000 1.940000 2.225000 2.220000 ;
-      RECT 2.055000 0.595000 2.305000 1.720000 ;
-      RECT 2.055000 1.720000 3.540000 1.890000 ;
-      RECT 2.055000 1.890000 2.225000 1.940000 ;
-      RECT 2.475000 0.425000 2.645000 1.220000 ;
-      RECT 2.475000 1.220000 3.000000 1.550000 ;
-      RECT 2.990000 2.560000 3.160000 2.905000 ;
-      RECT 2.990000 2.905000 4.220000 3.075000 ;
-      RECT 3.210000 1.470000 3.540000 1.720000 ;
-      RECT 3.315000 0.255000 4.445000 0.505000 ;
-      RECT 3.315000 0.505000 3.485000 1.470000 ;
-      RECT 3.360000 2.060000 3.880000 2.735000 ;
-      RECT 3.655000 0.725000 4.720000 1.055000 ;
-      RECT 3.710000 1.055000 3.880000 2.060000 ;
-      RECT 4.050000 1.405000 4.380000 1.735000 ;
-      RECT 4.050000 1.735000 4.220000 2.905000 ;
-      RECT 4.390000 1.975000 5.830000 1.990000 ;
-      RECT 4.390000 1.990000 5.645000 2.305000 ;
-      RECT 4.550000 1.055000 4.720000 1.320000 ;
-      RECT 4.550000 1.320000 5.490000 1.650000 ;
-      RECT 5.315000 1.820000 5.830000 1.975000 ;
-      RECT 5.315000 2.305000 5.645000 2.980000 ;
-      RECT 5.320000 0.375000 5.570000 0.980000 ;
-      RECT 5.320000 0.980000 5.830000 1.150000 ;
-      RECT 5.660000 1.150000 5.830000 1.320000 ;
-      RECT 5.660000 1.320000 7.490000 1.650000 ;
-      RECT 5.660000 1.650000 5.830000 1.820000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.555000 0.445000 0.660000 ;
+      RECT 0.115000  0.660000 1.315000 0.830000 ;
+      RECT 0.115000  0.830000 0.795000 1.130000 ;
+      RECT 0.135000  1.950000 0.795000 2.120000 ;
+      RECT 0.135000  2.120000 0.465000 2.980000 ;
+      RECT 0.625000  0.085000 0.955000 0.490000 ;
+      RECT 0.625000  1.130000 0.795000 1.950000 ;
+      RECT 0.635000  2.290000 0.965000 3.245000 ;
+      RECT 1.135000  1.000000 1.885000 1.330000 ;
+      RECT 1.135000  2.100000 1.655000 2.390000 ;
+      RECT 1.135000  2.390000 3.160000 2.560000 ;
+      RECT 1.135000  2.560000 1.655000 2.980000 ;
+      RECT 1.145000  0.255000 2.645000 0.425000 ;
+      RECT 1.145000  0.425000 1.315000 0.660000 ;
+      RECT 1.485000  0.760000 1.885000 1.000000 ;
+      RECT 1.485000  1.330000 1.885000 1.770000 ;
+      RECT 1.485000  1.770000 1.655000 2.100000 ;
+      RECT 1.825000  1.940000 2.225000 2.220000 ;
+      RECT 2.055000  0.595000 2.305000 1.720000 ;
+      RECT 2.055000  1.720000 3.540000 1.890000 ;
+      RECT 2.055000  1.890000 2.225000 1.940000 ;
+      RECT 2.360000  2.730000 2.820000 3.245000 ;
+      RECT 2.475000  0.425000 2.645000 1.220000 ;
+      RECT 2.475000  1.220000 3.000000 1.550000 ;
+      RECT 2.815000  0.085000 3.145000 1.050000 ;
+      RECT 2.990000  2.560000 3.160000 2.905000 ;
+      RECT 2.990000  2.905000 4.220000 3.075000 ;
+      RECT 3.210000  1.470000 3.540000 1.720000 ;
+      RECT 3.315000  0.255000 4.445000 0.505000 ;
+      RECT 3.315000  0.505000 3.485000 1.470000 ;
+      RECT 3.360000  2.060000 3.880000 2.735000 ;
+      RECT 3.655000  0.725000 4.720000 1.055000 ;
+      RECT 3.710000  1.055000 3.880000 2.060000 ;
+      RECT 4.050000  1.405000 4.380000 1.735000 ;
+      RECT 4.050000  1.735000 4.220000 2.905000 ;
+      RECT 4.390000  1.975000 5.830000 1.990000 ;
+      RECT 4.390000  1.990000 5.645000 2.305000 ;
+      RECT 4.390000  2.590000 5.145000 3.245000 ;
+      RECT 4.550000  1.055000 4.720000 1.320000 ;
+      RECT 4.550000  1.320000 5.490000 1.650000 ;
+      RECT 4.890000  0.085000 5.140000 1.055000 ;
+      RECT 5.315000  1.820000 5.830000 1.975000 ;
+      RECT 5.315000  2.305000 5.645000 2.980000 ;
+      RECT 5.320000  0.375000 5.570000 0.980000 ;
+      RECT 5.320000  0.980000 5.830000 1.150000 ;
+      RECT 5.660000  1.150000 5.830000 1.320000 ;
+      RECT 5.660000  1.320000 7.490000 1.650000 ;
+      RECT 5.660000  1.650000 5.830000 1.820000 ;
+      RECT 5.750000  0.085000 6.080000 0.810000 ;
+      RECT 5.815000  2.160000 6.145000 3.245000 ;
+      RECT 6.785000  0.085000 7.115000 0.810000 ;
+      RECT 6.815000  2.160000 7.145000 3.245000 ;
+      RECT 7.715000  0.085000 8.045000 0.810000 ;
+      RECT 7.715000  2.320000 8.045000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlxtn_4
diff --git a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef
index b237ced..db5ae5d 100644
--- a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.magic.lef
@@ -63,29 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.010000 ;
-        RECT 1.675000  0.085000 2.005000 1.185000 ;
-        RECT 4.995000  0.085000 5.325000 0.410000 ;
-        RECT 6.590000  0.085000 7.055000 0.410000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -94,88 +71,108 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.115000 2.100000 0.445000 3.245000 ;
-        RECT 1.660000 2.955000 1.995000 3.245000 ;
-        RECT 4.840000 2.845000 5.170000 3.245000 ;
-        RECT 6.730000 1.950000 7.060000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.420000 0.945000 1.010000 ;
-      RECT 0.645000 2.100000 0.945000 2.980000 ;
-      RECT 0.775000 1.010000 0.945000 1.100000 ;
-      RECT 0.775000 1.100000 1.165000 1.770000 ;
-      RECT 0.775000 1.770000 0.945000 2.100000 ;
-      RECT 1.125000 1.940000 1.455000 2.615000 ;
-      RECT 1.125000 2.615000 2.335000 2.735000 ;
-      RECT 1.125000 2.735000 2.970000 2.785000 ;
-      RECT 1.125000 2.785000 1.455000 2.980000 ;
-      RECT 1.175000 0.405000 1.505000 0.930000 ;
-      RECT 1.335000 0.930000 1.505000 1.355000 ;
-      RECT 1.335000 1.355000 2.345000 1.525000 ;
-      RECT 2.080000 1.940000 2.330000 2.275000 ;
-      RECT 2.080000 2.275000 2.675000 2.395000 ;
-      RECT 2.080000 2.395000 3.310000 2.445000 ;
-      RECT 2.165000 2.785000 2.970000 2.985000 ;
-      RECT 2.175000 0.255000 4.815000 0.425000 ;
-      RECT 2.175000 0.425000 2.505000 0.585000 ;
-      RECT 2.175000 0.755000 3.895000 0.765000 ;
-      RECT 2.175000 0.765000 2.845000 0.925000 ;
-      RECT 2.175000 0.925000 2.345000 1.355000 ;
-      RECT 2.505000 2.445000 3.310000 2.565000 ;
-      RECT 2.515000 1.095000 4.395000 1.105000 ;
-      RECT 2.515000 1.105000 3.355000 1.265000 ;
-      RECT 2.515000 1.265000 2.685000 1.935000 ;
-      RECT 2.515000 1.935000 3.015000 2.055000 ;
-      RECT 2.515000 2.055000 3.420000 2.105000 ;
-      RECT 2.675000 0.595000 3.895000 0.755000 ;
-      RECT 2.845000 2.105000 3.420000 2.225000 ;
-      RECT 2.855000 1.435000 3.355000 1.715000 ;
-      RECT 2.855000 1.715000 3.760000 1.765000 ;
-      RECT 3.015000 0.935000 4.395000 1.095000 ;
-      RECT 3.140000 2.565000 3.310000 2.845000 ;
-      RECT 3.140000 2.845000 4.040000 3.015000 ;
-      RECT 3.185000 1.765000 3.760000 1.885000 ;
-      RECT 3.525000 1.275000 4.100000 1.545000 ;
-      RECT 3.590000 1.885000 3.760000 2.505000 ;
-      RECT 3.590000 2.505000 6.525000 2.675000 ;
-      RECT 3.930000 1.545000 4.100000 2.165000 ;
-      RECT 3.930000 2.165000 5.625000 2.335000 ;
-      RECT 4.065000 0.775000 4.395000 0.935000 ;
-      RECT 4.270000 1.665000 4.815000 1.995000 ;
-      RECT 4.565000 0.425000 4.815000 0.580000 ;
-      RECT 4.565000 0.580000 7.065000 0.750000 ;
-      RECT 4.565000 0.750000 4.815000 1.665000 ;
-      RECT 5.340000 2.675000 6.525000 2.700000 ;
-      RECT 5.375000 0.920000 5.835000 1.170000 ;
-      RECT 5.375000 1.170000 5.625000 2.165000 ;
-      RECT 5.845000 1.350000 6.175000 1.950000 ;
-      RECT 5.845000 1.950000 6.525000 2.505000 ;
-      RECT 6.005000 0.920000 6.410000 1.170000 ;
-      RECT 6.005000 1.170000 6.175000 1.350000 ;
-      RECT 6.895000 0.750000 7.065000 1.320000 ;
-      RECT 6.895000 1.320000 7.255000 1.650000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.010000 ;
+      RECT 0.115000  2.100000 0.445000 3.245000 ;
+      RECT 0.615000  0.420000 0.945000 1.010000 ;
+      RECT 0.645000  2.100000 0.945000 2.980000 ;
+      RECT 0.775000  1.010000 0.945000 1.100000 ;
+      RECT 0.775000  1.100000 1.165000 1.770000 ;
+      RECT 0.775000  1.770000 0.945000 2.100000 ;
+      RECT 1.125000  1.940000 1.455000 2.615000 ;
+      RECT 1.125000  2.615000 2.335000 2.735000 ;
+      RECT 1.125000  2.735000 2.970000 2.785000 ;
+      RECT 1.125000  2.785000 1.455000 2.980000 ;
+      RECT 1.175000  0.405000 1.505000 0.930000 ;
+      RECT 1.335000  0.930000 1.505000 1.355000 ;
+      RECT 1.335000  1.355000 2.345000 1.525000 ;
+      RECT 1.660000  2.955000 1.995000 3.245000 ;
+      RECT 1.675000  0.085000 2.005000 1.185000 ;
+      RECT 2.080000  1.940000 2.330000 2.275000 ;
+      RECT 2.080000  2.275000 2.675000 2.395000 ;
+      RECT 2.080000  2.395000 3.310000 2.445000 ;
+      RECT 2.165000  2.785000 2.970000 2.985000 ;
+      RECT 2.175000  0.255000 4.815000 0.425000 ;
+      RECT 2.175000  0.425000 2.505000 0.585000 ;
+      RECT 2.175000  0.755000 3.895000 0.765000 ;
+      RECT 2.175000  0.765000 2.845000 0.925000 ;
+      RECT 2.175000  0.925000 2.345000 1.355000 ;
+      RECT 2.505000  2.445000 3.310000 2.565000 ;
+      RECT 2.515000  1.095000 4.395000 1.105000 ;
+      RECT 2.515000  1.105000 3.355000 1.265000 ;
+      RECT 2.515000  1.265000 2.685000 1.935000 ;
+      RECT 2.515000  1.935000 3.015000 2.055000 ;
+      RECT 2.515000  2.055000 3.420000 2.105000 ;
+      RECT 2.675000  0.595000 3.895000 0.755000 ;
+      RECT 2.845000  2.105000 3.420000 2.225000 ;
+      RECT 2.855000  1.435000 3.355000 1.715000 ;
+      RECT 2.855000  1.715000 3.760000 1.765000 ;
+      RECT 3.015000  0.935000 4.395000 1.095000 ;
+      RECT 3.140000  2.565000 3.310000 2.845000 ;
+      RECT 3.140000  2.845000 4.040000 3.015000 ;
+      RECT 3.185000  1.765000 3.760000 1.885000 ;
+      RECT 3.525000  1.275000 4.100000 1.545000 ;
+      RECT 3.590000  1.885000 3.760000 2.505000 ;
+      RECT 3.590000  2.505000 6.525000 2.675000 ;
+      RECT 3.930000  1.545000 4.100000 2.165000 ;
+      RECT 3.930000  2.165000 5.625000 2.335000 ;
+      RECT 4.065000  0.775000 4.395000 0.935000 ;
+      RECT 4.270000  1.665000 4.815000 1.995000 ;
+      RECT 4.565000  0.425000 4.815000 0.580000 ;
+      RECT 4.565000  0.580000 7.065000 0.750000 ;
+      RECT 4.565000  0.750000 4.815000 1.665000 ;
+      RECT 4.840000  2.845000 5.170000 3.245000 ;
+      RECT 4.995000  0.085000 5.325000 0.410000 ;
+      RECT 5.340000  2.675000 6.525000 2.700000 ;
+      RECT 5.375000  0.920000 5.835000 1.170000 ;
+      RECT 5.375000  1.170000 5.625000 2.165000 ;
+      RECT 5.845000  1.350000 6.175000 1.950000 ;
+      RECT 5.845000  1.950000 6.525000 2.505000 ;
+      RECT 6.005000  0.920000 6.410000 1.170000 ;
+      RECT 6.005000  1.170000 6.175000 1.350000 ;
+      RECT 6.590000  0.085000 7.055000 0.410000 ;
+      RECT 6.730000  1.950000 7.060000 3.245000 ;
+      RECT 6.895000  0.750000 7.065000 1.320000 ;
+      RECT 6.895000  1.320000 7.255000 1.650000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlxtp_1
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef
index 9ae5510..abf096a 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.magic.lef
@@ -54,19 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 2.825000  0.085000 3.155000 0.870000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -75,41 +62,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 2.825000 2.165000 3.155000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 0.305000 1.720000 0.635000 ;
-      RECT 1.415000 2.395000 1.720000 2.725000 ;
-      RECT 1.475000 0.635000 1.720000 1.380000 ;
-      RECT 1.475000 1.380000 2.740000 1.610000 ;
-      RECT 1.475000 1.610000 1.720000 2.395000 ;
-      RECT 1.985000 0.710000 2.345000 1.040000 ;
-      RECT 1.985000 1.040000 3.155000 1.210000 ;
-      RECT 1.985000 1.825000 3.155000 1.995000 ;
-      RECT 1.985000 1.995000 2.345000 2.190000 ;
-      RECT 2.910000 1.210000 3.155000 1.295000 ;
-      RECT 2.910000 1.295000 3.280000 1.625000 ;
-      RECT 2.910000 1.625000 3.155000 1.825000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  0.305000 1.720000 0.635000 ;
+      RECT 1.415000  2.395000 1.720000 2.725000 ;
+      RECT 1.475000  0.635000 1.720000 1.380000 ;
+      RECT 1.475000  1.380000 2.740000 1.610000 ;
+      RECT 1.475000  1.610000 1.720000 2.395000 ;
+      RECT 1.985000  0.710000 2.345000 1.040000 ;
+      RECT 1.985000  1.040000 3.155000 1.210000 ;
+      RECT 1.985000  1.825000 3.155000 1.995000 ;
+      RECT 1.985000  1.995000 2.345000 2.190000 ;
+      RECT 2.825000  0.085000 3.155000 0.870000 ;
+      RECT 2.825000  2.165000 3.155000 3.245000 ;
+      RECT 2.910000  1.210000 3.155000 1.295000 ;
+      RECT 2.910000  1.295000 3.280000 1.625000 ;
+      RECT 2.910000  1.625000 3.155000 1.825000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlygate4sd1_1
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef
index 21ff2b5..da49a8f 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.magic.lef
@@ -54,19 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 2.825000  0.085000 3.155000 0.870000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -75,41 +62,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 2.825000 2.165000 3.155000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 0.305000 1.720000 0.635000 ;
-      RECT 1.415000 2.395000 1.720000 2.725000 ;
-      RECT 1.475000 0.635000 1.720000 1.380000 ;
-      RECT 1.475000 1.380000 2.740000 1.610000 ;
-      RECT 1.475000 1.610000 1.720000 2.395000 ;
-      RECT 1.985000 0.710000 2.345000 1.040000 ;
-      RECT 1.985000 1.040000 3.155000 1.210000 ;
-      RECT 1.985000 1.825000 3.155000 1.995000 ;
-      RECT 1.985000 1.995000 2.345000 2.190000 ;
-      RECT 2.910000 1.210000 3.155000 1.295000 ;
-      RECT 2.910000 1.295000 3.280000 1.625000 ;
-      RECT 2.910000 1.625000 3.155000 1.825000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  0.305000 1.720000 0.635000 ;
+      RECT 1.415000  2.395000 1.720000 2.725000 ;
+      RECT 1.475000  0.635000 1.720000 1.380000 ;
+      RECT 1.475000  1.380000 2.740000 1.610000 ;
+      RECT 1.475000  1.610000 1.720000 2.395000 ;
+      RECT 1.985000  0.710000 2.345000 1.040000 ;
+      RECT 1.985000  1.040000 3.155000 1.210000 ;
+      RECT 1.985000  1.825000 3.155000 1.995000 ;
+      RECT 1.985000  1.995000 2.345000 2.190000 ;
+      RECT 2.825000  0.085000 3.155000 0.870000 ;
+      RECT 2.825000  2.165000 3.155000 3.245000 ;
+      RECT 2.910000  1.210000 3.155000 1.295000 ;
+      RECT 2.910000  1.295000 3.280000 1.625000 ;
+      RECT 2.910000  1.625000 3.155000 1.825000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlygate4sd2_1
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef
index ba8a432..96be6d3 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.magic.lef
@@ -54,19 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.650000 ;
-        RECT 2.825000  0.085000 3.155000 0.870000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -75,41 +62,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.575000 2.380000 0.905000 3.245000 ;
-        RECT 2.825000 2.165000 3.155000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.305000 1.020000 ;
-      RECT 0.095000 2.030000 1.305000 2.205000 ;
-      RECT 0.095000 2.205000 0.400000 2.725000 ;
-      RECT 0.975000 1.020000 1.305000 2.030000 ;
-      RECT 1.415000 0.305000 1.720000 0.635000 ;
-      RECT 1.415000 2.395000 1.720000 2.725000 ;
-      RECT 1.475000 0.635000 1.720000 1.380000 ;
-      RECT 1.475000 1.380000 2.740000 1.610000 ;
-      RECT 1.475000 1.610000 1.720000 2.395000 ;
-      RECT 1.985000 0.710000 2.345000 1.040000 ;
-      RECT 1.985000 1.040000 3.155000 1.210000 ;
-      RECT 1.985000 1.825000 3.155000 1.995000 ;
-      RECT 1.985000 1.995000 2.345000 2.190000 ;
-      RECT 2.910000 1.210000 3.155000 1.295000 ;
-      RECT 2.910000 1.295000 3.280000 1.625000 ;
-      RECT 2.910000 1.625000 3.155000 1.825000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.305000 1.020000 ;
+      RECT 0.095000  2.030000 1.305000 2.205000 ;
+      RECT 0.095000  2.205000 0.400000 2.725000 ;
+      RECT 0.575000  2.380000 0.905000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.650000 ;
+      RECT 0.975000  1.020000 1.305000 2.030000 ;
+      RECT 1.415000  0.305000 1.720000 0.635000 ;
+      RECT 1.415000  2.395000 1.720000 2.725000 ;
+      RECT 1.475000  0.635000 1.720000 1.380000 ;
+      RECT 1.475000  1.380000 2.740000 1.610000 ;
+      RECT 1.475000  1.610000 1.720000 2.395000 ;
+      RECT 1.985000  0.710000 2.345000 1.040000 ;
+      RECT 1.985000  1.040000 3.155000 1.210000 ;
+      RECT 1.985000  1.825000 3.155000 1.995000 ;
+      RECT 1.985000  1.995000 2.345000 2.190000 ;
+      RECT 2.825000  0.085000 3.155000 0.870000 ;
+      RECT 2.825000  2.165000 3.155000 3.245000 ;
+      RECT 2.910000  1.210000 3.155000 1.295000 ;
+      RECT 2.910000  1.295000 3.280000 1.625000 ;
+      RECT 2.910000  1.625000 3.155000 1.825000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__dlygate4sd3_1
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef
index f3d0d2a..11e7389 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.magic.lef
@@ -45,14 +45,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.065000 1.835000 1.380000 3.075000 ;
-        RECT 1.090000 0.255000 1.380000 1.075000 ;
-        RECT 1.210000 1.075000 1.380000 1.315000 ;
-        RECT 1.210000 1.315000 1.995000 1.605000 ;
-        RECT 1.210000 1.605000 1.380000 1.835000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.950000 1.285000 2.120000 ;
       LAYER met1 ;
         RECT 0.965000 1.920000 1.345000 2.320000 ;
         RECT 0.965000 2.320000 4.210000 2.490000 ;
@@ -62,22 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.590000  0.085000 0.920000 0.805000 ;
-        RECT 2.030000  0.085000 2.360000 0.805000 ;
-        RECT 3.470000  0.085000 3.800000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -86,62 +62,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.590000 2.310000 0.885000 3.245000 ;
-        RECT 2.100000 2.310000 2.395000 3.245000 ;
-        RECT 3.585000 2.310000 3.880000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.700000 0.395000 0.975000 ;
-      RECT 0.100000 0.975000 0.895000 1.145000 ;
-      RECT 0.100000 1.935000 0.895000 2.140000 ;
-      RECT 0.100000 2.140000 0.430000 2.225000 ;
-      RECT 0.725000 1.145000 0.895000 1.275000 ;
-      RECT 0.725000 1.275000 1.040000 1.605000 ;
-      RECT 0.725000 1.605000 0.895000 1.935000 ;
-      RECT 1.550000 0.700000 1.835000 0.975000 ;
-      RECT 1.550000 0.975000 2.335000 1.145000 ;
-      RECT 1.550000 1.895000 2.335000 2.140000 ;
-      RECT 1.550000 2.140000 1.870000 2.225000 ;
-      RECT 2.165000 1.145000 2.335000 1.275000 ;
-      RECT 2.165000 1.275000 2.525000 1.605000 ;
-      RECT 2.165000 1.605000 2.335000 1.895000 ;
-      RECT 2.505000 1.835000 2.865000 2.160000 ;
-      RECT 2.530000 0.255000 2.865000 1.075000 ;
-      RECT 2.565000 2.160000 2.865000 3.075000 ;
-      RECT 2.695000 1.075000 2.865000 1.315000 ;
-      RECT 2.695000 1.315000 3.435000 1.605000 ;
-      RECT 2.695000 1.605000 2.865000 1.835000 ;
-      RECT 3.060000 0.700000 3.275000 0.975000 ;
-      RECT 3.060000 0.975000 3.775000 1.145000 ;
-      RECT 3.070000 1.895000 3.805000 2.140000 ;
-      RECT 3.070000 2.140000 3.400000 2.225000 ;
-      RECT 3.605000 1.145000 3.775000 1.275000 ;
-      RECT 3.605000 1.275000 4.010000 1.605000 ;
-      RECT 3.605000 1.605000 3.805000 1.895000 ;
-      RECT 3.970000 0.255000 4.350000 1.075000 ;
-      RECT 3.975000 1.835000 4.350000 2.160000 ;
-      RECT 4.050000 2.160000 4.350000 3.075000 ;
-      RECT 4.180000 1.075000 4.350000 1.835000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.100000  0.700000 0.395000 0.975000 ;
+      RECT 0.100000  0.975000 0.895000 1.145000 ;
+      RECT 0.100000  1.935000 0.895000 2.140000 ;
+      RECT 0.100000  2.140000 0.430000 2.225000 ;
+      RECT 0.590000  0.085000 0.920000 0.805000 ;
+      RECT 0.590000  2.310000 0.885000 3.245000 ;
+      RECT 0.725000  1.145000 0.895000 1.275000 ;
+      RECT 0.725000  1.275000 1.040000 1.605000 ;
+      RECT 0.725000  1.605000 0.895000 1.935000 ;
+      RECT 1.065000  1.835000 1.380000 3.075000 ;
+      RECT 1.090000  0.255000 1.380000 1.075000 ;
+      RECT 1.210000  1.075000 1.380000 1.315000 ;
+      RECT 1.210000  1.315000 1.995000 1.605000 ;
+      RECT 1.210000  1.605000 1.380000 1.835000 ;
+      RECT 1.550000  0.700000 1.835000 0.975000 ;
+      RECT 1.550000  0.975000 2.335000 1.145000 ;
+      RECT 1.550000  1.895000 2.335000 2.140000 ;
+      RECT 1.550000  2.140000 1.870000 2.225000 ;
+      RECT 2.030000  0.085000 2.360000 0.805000 ;
+      RECT 2.100000  2.310000 2.395000 3.245000 ;
+      RECT 2.165000  1.145000 2.335000 1.275000 ;
+      RECT 2.165000  1.275000 2.525000 1.605000 ;
+      RECT 2.165000  1.605000 2.335000 1.895000 ;
+      RECT 2.505000  1.835000 2.865000 2.160000 ;
+      RECT 2.530000  0.255000 2.865000 1.075000 ;
+      RECT 2.565000  2.160000 2.865000 3.075000 ;
+      RECT 2.695000  1.075000 2.865000 1.315000 ;
+      RECT 2.695000  1.315000 3.435000 1.605000 ;
+      RECT 2.695000  1.605000 2.865000 1.835000 ;
+      RECT 3.060000  0.700000 3.275000 0.975000 ;
+      RECT 3.060000  0.975000 3.775000 1.145000 ;
+      RECT 3.070000  1.895000 3.805000 2.140000 ;
+      RECT 3.070000  2.140000 3.400000 2.225000 ;
+      RECT 3.470000  0.085000 3.800000 0.805000 ;
+      RECT 3.585000  2.310000 3.880000 3.245000 ;
+      RECT 3.605000  1.145000 3.775000 1.275000 ;
+      RECT 3.605000  1.275000 4.010000 1.605000 ;
+      RECT 3.605000  1.605000 3.805000 1.895000 ;
+      RECT 3.970000  0.255000 4.350000 1.075000 ;
+      RECT 3.975000  1.835000 4.350000 2.160000 ;
+      RECT 4.050000  2.160000 4.350000 3.075000 ;
+      RECT 4.180000  1.075000 4.350000 1.835000 ;
     LAYER mcon ;
-      RECT 2.555000 1.950000 2.725000 2.120000 ;
-      RECT 3.995000 1.950000 4.165000 2.120000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  1.950000 1.285000 2.120000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  1.950000 2.725000 2.120000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  1.950000 4.165000 2.120000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
     LAYER met1 ;
       RECT 2.405000 1.920000 2.785000 2.150000 ;
       RECT 3.845000 1.920000 4.225000 2.150000 ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef
index a747c64..b68ea0b 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.magic.lef
@@ -45,15 +45,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 2.505000 1.835000 2.865000 2.160000 ;
-        RECT 2.530000 0.255000 2.865000 1.075000 ;
-        RECT 2.565000 2.160000 2.865000 3.075000 ;
-        RECT 2.695000 1.075000 2.865000 1.315000 ;
-        RECT 2.695000 1.315000 3.435000 1.605000 ;
-        RECT 2.695000 1.605000 2.865000 1.835000 ;
-      LAYER mcon ;
-        RECT 2.555000 1.950000 2.725000 2.120000 ;
       LAYER met1 ;
         RECT 0.965000 2.320000 4.210000 2.490000 ;
         RECT 2.405000 1.920000 2.785000 2.320000 ;
@@ -63,22 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.590000  0.085000 0.920000 0.805000 ;
-        RECT 2.030000  0.085000 2.360000 0.805000 ;
-        RECT 3.470000  0.085000 3.800000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -87,61 +62,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.590000 2.310000 0.885000 3.245000 ;
-        RECT 2.100000 2.310000 2.395000 3.245000 ;
-        RECT 3.585000 2.310000 3.880000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.700000 0.395000 0.975000 ;
-      RECT 0.100000 0.975000 0.895000 1.145000 ;
-      RECT 0.100000 1.935000 0.895000 2.140000 ;
-      RECT 0.100000 2.140000 0.430000 2.225000 ;
-      RECT 0.725000 1.145000 0.895000 1.275000 ;
-      RECT 0.725000 1.275000 1.040000 1.605000 ;
-      RECT 0.725000 1.605000 0.895000 1.935000 ;
-      RECT 1.065000 1.835000 1.380000 3.075000 ;
-      RECT 1.090000 0.255000 1.380000 1.075000 ;
-      RECT 1.210000 1.075000 1.380000 1.315000 ;
-      RECT 1.210000 1.315000 1.995000 1.605000 ;
-      RECT 1.210000 1.605000 1.380000 1.835000 ;
-      RECT 1.550000 0.700000 1.835000 0.975000 ;
-      RECT 1.550000 0.975000 2.335000 1.145000 ;
-      RECT 1.550000 1.895000 2.335000 2.140000 ;
-      RECT 1.550000 2.140000 1.870000 2.225000 ;
-      RECT 2.165000 1.145000 2.335000 1.275000 ;
-      RECT 2.165000 1.275000 2.525000 1.605000 ;
-      RECT 2.165000 1.605000 2.335000 1.895000 ;
-      RECT 3.060000 0.700000 3.275000 0.975000 ;
-      RECT 3.060000 0.975000 3.775000 1.145000 ;
-      RECT 3.070000 1.895000 3.805000 2.140000 ;
-      RECT 3.070000 2.140000 3.400000 2.225000 ;
-      RECT 3.605000 1.145000 3.775000 1.275000 ;
-      RECT 3.605000 1.275000 4.010000 1.605000 ;
-      RECT 3.605000 1.605000 3.805000 1.895000 ;
-      RECT 3.970000 0.255000 4.350000 1.075000 ;
-      RECT 3.975000 1.835000 4.350000 2.160000 ;
-      RECT 4.050000 2.160000 4.350000 3.075000 ;
-      RECT 4.180000 1.075000 4.350000 1.835000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.100000  0.700000 0.395000 0.975000 ;
+      RECT 0.100000  0.975000 0.895000 1.145000 ;
+      RECT 0.100000  1.935000 0.895000 2.140000 ;
+      RECT 0.100000  2.140000 0.430000 2.225000 ;
+      RECT 0.590000  0.085000 0.920000 0.805000 ;
+      RECT 0.590000  2.310000 0.885000 3.245000 ;
+      RECT 0.725000  1.145000 0.895000 1.275000 ;
+      RECT 0.725000  1.275000 1.040000 1.605000 ;
+      RECT 0.725000  1.605000 0.895000 1.935000 ;
+      RECT 1.065000  1.835000 1.380000 3.075000 ;
+      RECT 1.090000  0.255000 1.380000 1.075000 ;
+      RECT 1.210000  1.075000 1.380000 1.315000 ;
+      RECT 1.210000  1.315000 1.995000 1.605000 ;
+      RECT 1.210000  1.605000 1.380000 1.835000 ;
+      RECT 1.550000  0.700000 1.835000 0.975000 ;
+      RECT 1.550000  0.975000 2.335000 1.145000 ;
+      RECT 1.550000  1.895000 2.335000 2.140000 ;
+      RECT 1.550000  2.140000 1.870000 2.225000 ;
+      RECT 2.030000  0.085000 2.360000 0.805000 ;
+      RECT 2.100000  2.310000 2.395000 3.245000 ;
+      RECT 2.165000  1.145000 2.335000 1.275000 ;
+      RECT 2.165000  1.275000 2.525000 1.605000 ;
+      RECT 2.165000  1.605000 2.335000 1.895000 ;
+      RECT 2.505000  1.835000 2.865000 2.160000 ;
+      RECT 2.530000  0.255000 2.865000 1.075000 ;
+      RECT 2.565000  2.160000 2.865000 3.075000 ;
+      RECT 2.695000  1.075000 2.865000 1.315000 ;
+      RECT 2.695000  1.315000 3.435000 1.605000 ;
+      RECT 2.695000  1.605000 2.865000 1.835000 ;
+      RECT 3.060000  0.700000 3.275000 0.975000 ;
+      RECT 3.060000  0.975000 3.775000 1.145000 ;
+      RECT 3.070000  1.895000 3.805000 2.140000 ;
+      RECT 3.070000  2.140000 3.400000 2.225000 ;
+      RECT 3.470000  0.085000 3.800000 0.805000 ;
+      RECT 3.585000  2.310000 3.880000 3.245000 ;
+      RECT 3.605000  1.145000 3.775000 1.275000 ;
+      RECT 3.605000  1.275000 4.010000 1.605000 ;
+      RECT 3.605000  1.605000 3.805000 1.895000 ;
+      RECT 3.970000  0.255000 4.350000 1.075000 ;
+      RECT 3.975000  1.835000 4.350000 2.160000 ;
+      RECT 4.050000  2.160000 4.350000 3.075000 ;
+      RECT 4.180000  1.075000 4.350000 1.835000 ;
     LAYER mcon ;
-      RECT 1.115000 1.950000 1.285000 2.120000 ;
-      RECT 3.995000 1.950000 4.165000 2.120000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  1.950000 1.285000 2.120000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  1.950000 2.725000 2.120000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  1.950000 4.165000 2.120000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
     LAYER met1 ;
       RECT 0.965000 1.920000 1.345000 2.150000 ;
       RECT 3.845000 1.920000 4.225000 2.150000 ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef
index 1506c87..3b401f9 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.magic.lef
@@ -44,13 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.970000 0.255000 4.350000 1.075000 ;
-        RECT 3.975000 1.835000 4.350000 2.160000 ;
-        RECT 4.050000 2.160000 4.350000 3.075000 ;
-        RECT 4.180000 1.075000 4.350000 1.835000 ;
-      LAYER mcon ;
-        RECT 3.995000 1.950000 4.165000 2.120000 ;
       LAYER met1 ;
         RECT 0.965000 2.320000 4.225000 2.490000 ;
         RECT 3.845000 1.920000 4.225000 2.320000 ;
@@ -60,22 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.590000  0.085000 0.920000 0.805000 ;
-        RECT 2.030000  0.085000 2.360000 0.805000 ;
-        RECT 3.470000  0.085000 3.800000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -84,63 +61,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.590000 2.310000 0.885000 3.245000 ;
-        RECT 2.100000 2.310000 2.395000 3.245000 ;
-        RECT 3.585000 2.310000 3.880000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.700000 0.395000 0.975000 ;
-      RECT 0.100000 0.975000 0.895000 1.145000 ;
-      RECT 0.100000 1.935000 0.895000 2.140000 ;
-      RECT 0.100000 2.140000 0.430000 2.225000 ;
-      RECT 0.725000 1.145000 0.895000 1.275000 ;
-      RECT 0.725000 1.275000 1.040000 1.605000 ;
-      RECT 0.725000 1.605000 0.895000 1.935000 ;
-      RECT 1.065000 1.835000 1.380000 3.075000 ;
-      RECT 1.090000 0.255000 1.380000 1.075000 ;
-      RECT 1.210000 1.075000 1.380000 1.315000 ;
-      RECT 1.210000 1.315000 1.995000 1.605000 ;
-      RECT 1.210000 1.605000 1.380000 1.835000 ;
-      RECT 1.550000 0.700000 1.835000 0.975000 ;
-      RECT 1.550000 0.975000 2.335000 1.145000 ;
-      RECT 1.550000 1.895000 2.335000 2.140000 ;
-      RECT 1.550000 2.140000 1.870000 2.225000 ;
-      RECT 2.165000 1.145000 2.335000 1.275000 ;
-      RECT 2.165000 1.275000 2.525000 1.605000 ;
-      RECT 2.165000 1.605000 2.335000 1.895000 ;
-      RECT 2.505000 1.835000 2.865000 2.160000 ;
-      RECT 2.530000 0.255000 2.865000 1.075000 ;
-      RECT 2.565000 2.160000 2.865000 3.075000 ;
-      RECT 2.695000 1.075000 2.865000 1.315000 ;
-      RECT 2.695000 1.315000 3.435000 1.605000 ;
-      RECT 2.695000 1.605000 2.865000 1.835000 ;
-      RECT 3.060000 0.700000 3.275000 0.975000 ;
-      RECT 3.060000 0.975000 3.775000 1.145000 ;
-      RECT 3.070000 1.895000 3.805000 2.140000 ;
-      RECT 3.070000 2.140000 3.400000 2.225000 ;
-      RECT 3.605000 1.145000 3.775000 1.275000 ;
-      RECT 3.605000 1.275000 4.010000 1.605000 ;
-      RECT 3.605000 1.605000 3.805000 1.895000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.100000  0.700000 0.395000 0.975000 ;
+      RECT 0.100000  0.975000 0.895000 1.145000 ;
+      RECT 0.100000  1.935000 0.895000 2.140000 ;
+      RECT 0.100000  2.140000 0.430000 2.225000 ;
+      RECT 0.590000  0.085000 0.920000 0.805000 ;
+      RECT 0.590000  2.310000 0.885000 3.245000 ;
+      RECT 0.725000  1.145000 0.895000 1.275000 ;
+      RECT 0.725000  1.275000 1.040000 1.605000 ;
+      RECT 0.725000  1.605000 0.895000 1.935000 ;
+      RECT 1.065000  1.835000 1.380000 3.075000 ;
+      RECT 1.090000  0.255000 1.380000 1.075000 ;
+      RECT 1.210000  1.075000 1.380000 1.315000 ;
+      RECT 1.210000  1.315000 1.995000 1.605000 ;
+      RECT 1.210000  1.605000 1.380000 1.835000 ;
+      RECT 1.550000  0.700000 1.835000 0.975000 ;
+      RECT 1.550000  0.975000 2.335000 1.145000 ;
+      RECT 1.550000  1.895000 2.335000 2.140000 ;
+      RECT 1.550000  2.140000 1.870000 2.225000 ;
+      RECT 2.030000  0.085000 2.360000 0.805000 ;
+      RECT 2.100000  2.310000 2.395000 3.245000 ;
+      RECT 2.165000  1.145000 2.335000 1.275000 ;
+      RECT 2.165000  1.275000 2.525000 1.605000 ;
+      RECT 2.165000  1.605000 2.335000 1.895000 ;
+      RECT 2.505000  1.835000 2.865000 2.160000 ;
+      RECT 2.530000  0.255000 2.865000 1.075000 ;
+      RECT 2.565000  2.160000 2.865000 3.075000 ;
+      RECT 2.695000  1.075000 2.865000 1.315000 ;
+      RECT 2.695000  1.315000 3.435000 1.605000 ;
+      RECT 2.695000  1.605000 2.865000 1.835000 ;
+      RECT 3.060000  0.700000 3.275000 0.975000 ;
+      RECT 3.060000  0.975000 3.775000 1.145000 ;
+      RECT 3.070000  1.895000 3.805000 2.140000 ;
+      RECT 3.070000  2.140000 3.400000 2.225000 ;
+      RECT 3.470000  0.085000 3.800000 0.805000 ;
+      RECT 3.585000  2.310000 3.880000 3.245000 ;
+      RECT 3.605000  1.145000 3.775000 1.275000 ;
+      RECT 3.605000  1.275000 4.010000 1.605000 ;
+      RECT 3.605000  1.605000 3.805000 1.895000 ;
+      RECT 3.970000  0.255000 4.350000 1.075000 ;
+      RECT 3.975000  1.835000 4.350000 2.160000 ;
+      RECT 4.050000  2.160000 4.350000 3.075000 ;
+      RECT 4.180000  1.075000 4.350000 1.835000 ;
     LAYER mcon ;
-      RECT 1.115000 1.950000 1.285000 2.120000 ;
-      RECT 2.555000 1.950000 2.725000 2.120000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  1.950000 1.285000 2.120000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  1.950000 2.725000 2.120000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  1.950000 4.165000 2.120000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
     LAYER met1 ;
       RECT 0.965000 1.920000 1.345000 2.150000 ;
       RECT 2.405000 1.920000 2.785000 2.150000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef
index 1651165..f1fd7fc 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.magic.lef
@@ -67,19 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.700000  0.085000 0.985000 0.850000 ;
-        RECT 2.390000  0.085000 2.720000 0.640000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -88,38 +75,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.650000 2.760000 0.980000 3.245000 ;
-        RECT 2.365000 2.050000 2.695000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.455000 0.530000 1.150000 ;
-      RECT 0.085000 1.150000 2.200000 1.320000 ;
-      RECT 0.085000 1.320000 0.255000 2.000000 ;
-      RECT 0.085000 2.000000 0.445000 2.880000 ;
-      RECT 1.155000 0.455000 1.450000 0.810000 ;
-      RECT 1.155000 0.810000 2.660000 0.980000 ;
-      RECT 1.185000 2.000000 2.135000 2.170000 ;
-      RECT 1.185000 2.170000 1.695000 2.250000 ;
-      RECT 1.870000 1.320000 2.200000 1.340000 ;
-      RECT 1.965000 1.710000 3.065000 1.880000 ;
-      RECT 1.965000 1.880000 2.135000 2.000000 ;
-      RECT 2.460000 0.980000 2.660000 1.320000 ;
-      RECT 2.460000 1.320000 3.415000 1.650000 ;
-      RECT 2.460000 1.650000 3.065000 1.710000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.085000  0.455000 0.530000 1.150000 ;
+      RECT 0.085000  1.150000 2.200000 1.320000 ;
+      RECT 0.085000  1.320000 0.255000 2.000000 ;
+      RECT 0.085000  2.000000 0.445000 2.880000 ;
+      RECT 0.650000  2.760000 0.980000 3.245000 ;
+      RECT 0.700000  0.085000 0.985000 0.850000 ;
+      RECT 1.155000  0.455000 1.450000 0.810000 ;
+      RECT 1.155000  0.810000 2.660000 0.980000 ;
+      RECT 1.185000  2.000000 2.135000 2.170000 ;
+      RECT 1.185000  2.170000 1.695000 2.250000 ;
+      RECT 1.870000  1.320000 2.200000 1.340000 ;
+      RECT 1.965000  1.710000 3.065000 1.880000 ;
+      RECT 1.965000  1.880000 2.135000 2.000000 ;
+      RECT 2.365000  2.050000 2.695000 3.245000 ;
+      RECT 2.390000  0.085000 2.720000 0.640000 ;
+      RECT 2.460000  0.980000 2.660000 1.320000 ;
+      RECT 2.460000  1.320000 3.415000 1.650000 ;
+      RECT 2.460000  1.650000 3.065000 1.710000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef
index 58a7675..6917d61 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.magic.lef
@@ -65,20 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.545000  0.085000 1.795000 0.790000 ;
-        RECT 3.340000  0.085000 3.670000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -87,46 +73,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.680000 2.920000 2.010000 3.245000 ;
-        RECT 3.225000 2.610000 3.705000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 1.375000 0.425000 ;
-      RECT 0.115000 0.425000 0.365000 1.130000 ;
-      RECT 0.145000 2.140000 0.475000 2.905000 ;
-      RECT 0.145000 2.905000 1.475000 3.075000 ;
-      RECT 0.875000 1.300000 2.135000 1.630000 ;
-      RECT 1.045000 0.425000 1.375000 0.960000 ;
-      RECT 1.045000 0.960000 2.225000 1.130000 ;
-      RECT 1.145000 2.320000 1.475000 2.580000 ;
-      RECT 1.145000 2.580000 2.545000 2.750000 ;
-      RECT 1.145000 2.750000 1.475000 2.905000 ;
-      RECT 1.965000 1.630000 2.135000 2.240000 ;
-      RECT 1.965000 2.240000 4.205000 2.410000 ;
-      RECT 1.975000 0.350000 2.225000 0.960000 ;
-      RECT 2.215000 2.750000 2.545000 2.980000 ;
-      RECT 2.395000 0.325000 3.170000 1.010000 ;
-      RECT 2.395000 1.010000 2.725000 1.820000 ;
-      RECT 2.395000 1.820000 3.105000 2.070000 ;
-      RECT 3.840000 0.350000 4.205000 1.030000 ;
-      RECT 3.875000 1.950000 4.205000 2.240000 ;
-      RECT 3.875000 2.410000 4.205000 2.860000 ;
-      RECT 4.035000 1.030000 4.205000 1.950000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.255000 1.375000 0.425000 ;
+      RECT 0.115000  0.425000 0.365000 1.130000 ;
+      RECT 0.145000  2.140000 0.475000 2.905000 ;
+      RECT 0.145000  2.905000 1.475000 3.075000 ;
+      RECT 0.875000  1.300000 2.135000 1.630000 ;
+      RECT 1.045000  0.425000 1.375000 0.960000 ;
+      RECT 1.045000  0.960000 2.225000 1.130000 ;
+      RECT 1.145000  2.320000 1.475000 2.580000 ;
+      RECT 1.145000  2.580000 2.545000 2.750000 ;
+      RECT 1.145000  2.750000 1.475000 2.905000 ;
+      RECT 1.545000  0.085000 1.795000 0.790000 ;
+      RECT 1.680000  2.920000 2.010000 3.245000 ;
+      RECT 1.965000  1.630000 2.135000 2.240000 ;
+      RECT 1.965000  2.240000 4.205000 2.410000 ;
+      RECT 1.975000  0.350000 2.225000 0.960000 ;
+      RECT 2.215000  2.750000 2.545000 2.980000 ;
+      RECT 2.395000  0.325000 3.170000 1.010000 ;
+      RECT 2.395000  1.010000 2.725000 1.820000 ;
+      RECT 2.395000  1.820000 3.105000 2.070000 ;
+      RECT 3.225000  2.610000 3.705000 3.245000 ;
+      RECT 3.340000  0.085000 3.670000 1.010000 ;
+      RECT 3.840000  0.350000 4.205000 1.030000 ;
+      RECT 3.875000  1.950000 4.205000 2.240000 ;
+      RECT 3.875000  2.410000 4.205000 2.860000 ;
+      RECT 4.035000  1.030000 4.205000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__ebufn_2
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef
index c724f59..608b8f1 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.magic.lef
@@ -67,24 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 1.010000 ;
-        RECT 2.295000  0.085000 2.625000 0.970000 ;
-        RECT 3.155000  0.085000 3.405000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -93,61 +75,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.565000 2.730000 0.920000 3.245000 ;
-        RECT 2.170000 2.740000 2.500000 3.245000 ;
-        RECT 3.070000 2.160000 3.320000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.350000 0.405000 1.130000 ;
-      RECT 0.085000 1.130000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.365000 2.390000 ;
-      RECT 0.085000 2.390000 1.630000 2.560000 ;
-      RECT 0.085000 2.560000 0.365000 2.980000 ;
-      RECT 1.040000 1.720000 1.775000 1.890000 ;
-      RECT 1.040000 1.890000 1.290000 2.220000 ;
-      RECT 1.095000 0.300000 1.775000 1.010000 ;
-      RECT 1.455000 1.010000 1.775000 1.720000 ;
-      RECT 1.460000 2.060000 2.530000 2.230000 ;
-      RECT 1.460000 2.230000 1.630000 2.390000 ;
-      RECT 1.800000 2.400000 2.870000 2.570000 ;
-      RECT 1.800000 2.570000 1.970000 2.820000 ;
-      RECT 1.945000 0.350000 2.115000 1.140000 ;
-      RECT 1.945000 1.140000 3.835000 1.150000 ;
-      RECT 1.945000 1.150000 2.975000 1.310000 ;
-      RECT 2.360000 1.480000 4.830000 1.650000 ;
-      RECT 2.360000 1.650000 2.530000 2.060000 ;
-      RECT 2.700000 1.820000 3.770000 1.990000 ;
-      RECT 2.700000 1.990000 2.870000 2.400000 ;
-      RECT 2.700000 2.570000 2.870000 2.980000 ;
-      RECT 2.805000 0.350000 2.975000 0.980000 ;
-      RECT 2.805000 0.980000 3.835000 1.140000 ;
-      RECT 3.520000 1.990000 3.770000 2.905000 ;
-      RECT 3.520000 2.905000 5.650000 3.075000 ;
-      RECT 3.585000 0.255000 5.655000 0.425000 ;
-      RECT 3.585000 0.425000 3.835000 0.980000 ;
-      RECT 3.820000 1.320000 4.830000 1.480000 ;
-      RECT 4.470000 2.160000 4.700000 2.905000 ;
-      RECT 4.525000 0.425000 4.695000 0.810000 ;
-      RECT 5.400000 1.820000 5.650000 2.905000 ;
-      RECT 5.405000 0.425000 5.655000 1.130000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.085000  0.350000 0.405000 1.130000 ;
+      RECT 0.085000  1.130000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.365000 2.390000 ;
+      RECT 0.085000  2.390000 1.630000 2.560000 ;
+      RECT 0.085000  2.560000 0.365000 2.980000 ;
+      RECT 0.565000  2.730000 0.920000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 1.010000 ;
+      RECT 1.040000  1.720000 1.775000 1.890000 ;
+      RECT 1.040000  1.890000 1.290000 2.220000 ;
+      RECT 1.095000  0.300000 1.775000 1.010000 ;
+      RECT 1.455000  1.010000 1.775000 1.720000 ;
+      RECT 1.460000  2.060000 2.530000 2.230000 ;
+      RECT 1.460000  2.230000 1.630000 2.390000 ;
+      RECT 1.800000  2.400000 2.870000 2.570000 ;
+      RECT 1.800000  2.570000 1.970000 2.820000 ;
+      RECT 1.945000  0.350000 2.115000 1.140000 ;
+      RECT 1.945000  1.140000 3.835000 1.150000 ;
+      RECT 1.945000  1.150000 2.975000 1.310000 ;
+      RECT 2.170000  2.740000 2.500000 3.245000 ;
+      RECT 2.295000  0.085000 2.625000 0.970000 ;
+      RECT 2.360000  1.480000 4.830000 1.650000 ;
+      RECT 2.360000  1.650000 2.530000 2.060000 ;
+      RECT 2.700000  1.820000 3.770000 1.990000 ;
+      RECT 2.700000  1.990000 2.870000 2.400000 ;
+      RECT 2.700000  2.570000 2.870000 2.980000 ;
+      RECT 2.805000  0.350000 2.975000 0.980000 ;
+      RECT 2.805000  0.980000 3.835000 1.140000 ;
+      RECT 3.070000  2.160000 3.320000 3.245000 ;
+      RECT 3.155000  0.085000 3.405000 0.810000 ;
+      RECT 3.520000  1.990000 3.770000 2.905000 ;
+      RECT 3.520000  2.905000 5.650000 3.075000 ;
+      RECT 3.585000  0.255000 5.655000 0.425000 ;
+      RECT 3.585000  0.425000 3.835000 0.980000 ;
+      RECT 3.820000  1.320000 4.830000 1.480000 ;
+      RECT 4.470000  2.160000 4.700000 2.905000 ;
+      RECT 4.525000  0.425000 4.695000 0.810000 ;
+      RECT 5.400000  1.820000 5.650000 2.905000 ;
+      RECT 5.405000  0.425000 5.655000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__ebufn_4
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef
index 310f4c2..9b5f018 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.magic.lef
@@ -71,37 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.560000 0.085000 ;
-        RECT  4.290000  0.085000  4.620000 0.970000 ;
-        RECT  5.230000  0.085000  5.400000 1.130000 ;
-        RECT  6.010000  0.085000  6.260000 1.130000 ;
-        RECT  6.870000  0.085000  7.120000 1.130000 ;
-        RECT  9.330000  0.085000  9.500000 1.010000 ;
-        RECT 10.110000  0.085000 10.445000 0.600000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
@@ -110,82 +79,110 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 10.560000 3.415000 ;
-        RECT  4.370000 2.730000  4.700000 3.245000 ;
-        RECT  5.370000 2.730000  5.700000 3.245000 ;
-        RECT  6.370000 2.730000  6.700000 3.245000 ;
-        RECT  7.405000 2.900000  7.735000 3.245000 ;
-        RECT  9.165000 2.560000  9.495000 3.245000 ;
-        RECT 10.115000 2.060000 10.445000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.560000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.255000  4.110000 0.425000 ;
-      RECT  0.115000 0.425000  0.365000 1.130000 ;
-      RECT  0.120000 1.820000  0.370000 2.905000 ;
-      RECT  0.120000 2.905000  4.200000 3.075000 ;
-      RECT  1.035000 1.320000  3.655000 1.480000 ;
-      RECT  1.035000 1.480000  4.040000 1.650000 ;
-      RECT  1.055000 0.425000  1.225000 0.810000 ;
-      RECT  1.085000 2.160000  1.350000 2.905000 ;
-      RECT  1.930000 0.425000  2.260000 0.810000 ;
-      RECT  2.050000 2.160000  2.220000 2.905000 ;
-      RECT  2.920000 2.160000  3.190000 2.905000 ;
-      RECT  2.930000 0.425000  3.260000 0.810000 ;
-      RECT  3.870000 1.650000  4.040000 2.050000 ;
-      RECT  3.870000 2.050000  7.755000 2.220000 ;
-      RECT  3.870000 2.390000  7.200000 2.560000 ;
-      RECT  3.870000 2.560000  4.200000 2.905000 ;
-      RECT  3.940000 0.425000  4.110000 1.140000 ;
-      RECT  3.940000 1.140000  5.050000 1.300000 ;
-      RECT  3.940000 1.300000  7.550000 1.310000 ;
-      RECT  4.720000 1.310000  7.550000 1.470000 ;
-      RECT  4.800000 0.350000  5.050000 1.140000 ;
-      RECT  4.870000 2.560000  5.200000 2.980000 ;
-      RECT  5.580000 0.350000  5.830000 1.300000 ;
-      RECT  5.870000 2.560000  6.200000 2.980000 ;
-      RECT  6.440000 0.350000  6.690000 1.300000 ;
-      RECT  6.870000 2.560000  8.270000 2.730000 ;
-      RECT  6.870000 2.730000  7.200000 2.980000 ;
-      RECT  7.300000 0.350000  7.550000 1.300000 ;
-      RECT  7.585000 2.220000  9.945000 2.390000 ;
-      RECT  7.720000 0.340000  9.150000 0.670000 ;
-      RECT  7.925000 0.670000  9.150000 1.010000 ;
-      RECT  7.925000 1.010000  8.095000 1.800000 ;
-      RECT  7.925000 1.800000  9.045000 2.050000 ;
-      RECT  7.940000 2.730000  8.270000 2.980000 ;
-      RECT  9.665000 1.720000 10.315000 1.890000 ;
-      RECT  9.665000 1.890000  9.945000 2.220000 ;
-      RECT  9.665000 2.390000  9.945000 2.980000 ;
-      RECT  9.680000 0.340000  9.930000 0.840000 ;
-      RECT  9.680000 0.840000 10.315000 1.010000 ;
-      RECT 10.145000 1.010000 10.315000 1.720000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.115000  0.255000  4.110000 0.425000 ;
+      RECT  0.115000  0.425000  0.365000 1.130000 ;
+      RECT  0.120000  1.820000  0.370000 2.905000 ;
+      RECT  0.120000  2.905000  4.200000 3.075000 ;
+      RECT  1.035000  1.320000  3.655000 1.480000 ;
+      RECT  1.035000  1.480000  4.040000 1.650000 ;
+      RECT  1.055000  0.425000  1.225000 0.810000 ;
+      RECT  1.085000  2.160000  1.350000 2.905000 ;
+      RECT  1.930000  0.425000  2.260000 0.810000 ;
+      RECT  2.050000  2.160000  2.220000 2.905000 ;
+      RECT  2.920000  2.160000  3.190000 2.905000 ;
+      RECT  2.930000  0.425000  3.260000 0.810000 ;
+      RECT  3.870000  1.650000  4.040000 2.050000 ;
+      RECT  3.870000  2.050000  7.755000 2.220000 ;
+      RECT  3.870000  2.390000  7.200000 2.560000 ;
+      RECT  3.870000  2.560000  4.200000 2.905000 ;
+      RECT  3.940000  0.425000  4.110000 1.140000 ;
+      RECT  3.940000  1.140000  5.050000 1.300000 ;
+      RECT  3.940000  1.300000  7.550000 1.310000 ;
+      RECT  4.290000  0.085000  4.620000 0.970000 ;
+      RECT  4.370000  2.730000  4.700000 3.245000 ;
+      RECT  4.720000  1.310000  7.550000 1.470000 ;
+      RECT  4.800000  0.350000  5.050000 1.140000 ;
+      RECT  4.870000  2.560000  5.200000 2.980000 ;
+      RECT  5.230000  0.085000  5.400000 1.130000 ;
+      RECT  5.370000  2.730000  5.700000 3.245000 ;
+      RECT  5.580000  0.350000  5.830000 1.300000 ;
+      RECT  5.870000  2.560000  6.200000 2.980000 ;
+      RECT  6.010000  0.085000  6.260000 1.130000 ;
+      RECT  6.370000  2.730000  6.700000 3.245000 ;
+      RECT  6.440000  0.350000  6.690000 1.300000 ;
+      RECT  6.870000  0.085000  7.120000 1.130000 ;
+      RECT  6.870000  2.560000  8.270000 2.730000 ;
+      RECT  6.870000  2.730000  7.200000 2.980000 ;
+      RECT  7.300000  0.350000  7.550000 1.300000 ;
+      RECT  7.405000  2.900000  7.735000 3.245000 ;
+      RECT  7.585000  2.220000  9.945000 2.390000 ;
+      RECT  7.720000  0.340000  9.150000 0.670000 ;
+      RECT  7.925000  0.670000  9.150000 1.010000 ;
+      RECT  7.925000  1.010000  8.095000 1.800000 ;
+      RECT  7.925000  1.800000  9.045000 2.050000 ;
+      RECT  7.940000  2.730000  8.270000 2.980000 ;
+      RECT  9.165000  2.560000  9.495000 3.245000 ;
+      RECT  9.330000  0.085000  9.500000 1.010000 ;
+      RECT  9.665000  1.720000 10.315000 1.890000 ;
+      RECT  9.665000  1.890000  9.945000 2.220000 ;
+      RECT  9.665000  2.390000  9.945000 2.980000 ;
+      RECT  9.680000  0.340000  9.930000 0.840000 ;
+      RECT  9.680000  0.840000 10.315000 1.010000 ;
+      RECT 10.110000  0.085000 10.445000 0.600000 ;
+      RECT 10.115000  2.060000 10.445000 3.245000 ;
+      RECT 10.145000  1.010000 10.315000 1.720000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
   END
 END sky130_fd_sc_hs__ebufn_8
diff --git a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef
index 525967c..b586125 100644
--- a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.magic.lef
@@ -83,47 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  1.090000  0.085000  1.420000 0.810000 ;
-        RECT  2.170000  0.085000  2.500000 0.810000 ;
-        RECT  3.715000  0.085000  3.885000 1.010000 ;
-        RECT  4.585000  0.085000  4.915000 0.670000 ;
-        RECT  7.220000  0.085000  7.470000 0.795000 ;
-        RECT  8.660000  0.085000  8.910000 0.770000 ;
-        RECT 11.655000  0.085000 11.985000 0.985000 ;
-        RECT 13.605000  0.085000 13.775000 1.150000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
@@ -132,138 +91,175 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.955000 2.630000  1.205000 3.245000 ;
-        RECT  2.395000 2.630000  2.645000 3.245000 ;
-        RECT  3.715000 2.650000  4.045000 3.245000 ;
-        RECT  5.105000 2.650000  5.435000 3.245000 ;
-        RECT  7.695000 2.885000  8.025000 3.245000 ;
-        RECT  9.575000 1.960000  9.905000 3.245000 ;
-        RECT 11.495000 2.325000 12.280000 3.245000 ;
-        RECT 13.540000 1.820000 13.790000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.420000  0.600000 0.750000 ;
-      RECT  0.085000 0.750000  0.255000 2.290000 ;
-      RECT  0.085000 2.290000  1.545000 2.460000 ;
-      RECT  0.085000 2.460000  0.445000 2.980000 ;
-      RECT  1.005000 1.110000  2.000000 1.280000 ;
-      RECT  1.005000 1.280000  1.335000 1.950000 ;
-      RECT  1.005000 1.950000  2.665000 2.120000 ;
-      RECT  1.375000 2.460000  1.545000 2.905000 ;
-      RECT  1.375000 2.905000  2.225000 3.075000 ;
-      RECT  1.650000 0.480000  2.000000 1.110000 ;
-      RECT  1.715000 2.120000  1.885000 2.735000 ;
-      RECT  2.055000 2.290000  3.545000 2.310000 ;
-      RECT  2.055000 2.310000  5.775000 2.460000 ;
-      RECT  2.055000 2.460000  2.225000 2.905000 ;
-      RECT  2.335000 0.980000  2.665000 1.950000 ;
-      RECT  2.875000 0.980000  3.205000 1.990000 ;
-      RECT  3.000000 0.350000  3.545000 0.810000 ;
-      RECT  3.155000 2.460000  5.775000 2.480000 ;
-      RECT  3.155000 2.480000  3.545000 2.960000 ;
-      RECT  3.375000 0.810000  3.545000 2.290000 ;
-      RECT  4.065000 0.350000  4.395000 0.840000 ;
-      RECT  4.065000 0.840000  4.725000 1.010000 ;
-      RECT  4.165000 1.810000  4.965000 2.140000 ;
-      RECT  4.555000 1.010000  4.725000 1.810000 ;
-      RECT  5.095000 0.255000  6.885000 0.425000 ;
-      RECT  5.095000 0.425000  5.345000 1.130000 ;
-      RECT  5.215000 1.300000  5.785000 1.470000 ;
-      RECT  5.215000 1.470000  5.385000 2.310000 ;
-      RECT  5.535000 0.595000  5.785000 1.300000 ;
-      RECT  5.555000 1.810000  6.125000 1.970000 ;
-      RECT  5.555000 1.970000  6.355000 2.140000 ;
-      RECT  5.605000 2.480000  5.775000 2.890000 ;
-      RECT  5.605000 2.890000  6.445000 3.060000 ;
-      RECT  5.955000 0.425000  6.125000 1.810000 ;
-      RECT  5.955000 2.140000  6.355000 2.380000 ;
-      RECT  6.295000 0.595000  6.465000 1.515000 ;
-      RECT  6.295000 1.515000  6.720000 1.685000 ;
-      RECT  6.550000 1.685000  6.720000 1.740000 ;
-      RECT  6.550000 1.740000  8.260000 1.910000 ;
-      RECT  6.550000 1.910000  6.720000 2.550000 ;
-      RECT  6.550000 2.550000  6.980000 2.720000 ;
-      RECT  6.635000 0.425000  6.885000 0.965000 ;
-      RECT  6.635000 0.965000  7.810000 1.135000 ;
-      RECT  6.635000 1.135000  6.885000 1.345000 ;
-      RECT  6.650000 2.720000  6.980000 2.980000 ;
-      RECT  6.890000 2.080000  7.320000 2.380000 ;
-      RECT  7.150000 2.380000  7.320000 2.545000 ;
-      RECT  7.150000 2.545000  8.365000 2.715000 ;
-      RECT  7.205000 1.305000  9.030000 1.475000 ;
-      RECT  7.205000 1.475000  7.535000 1.570000 ;
-      RECT  7.640000 0.255000  8.490000 0.425000 ;
-      RECT  7.640000 0.425000  7.810000 0.965000 ;
-      RECT  7.930000 1.645000  8.260000 1.740000 ;
-      RECT  7.930000 1.910000  8.260000 1.955000 ;
-      RECT  7.980000 0.595000  8.150000 1.305000 ;
-      RECT  8.195000 2.715000  8.365000 2.755000 ;
-      RECT  8.195000 2.755000  9.405000 2.925000 ;
-      RECT  8.230000 2.125000  9.030000 2.375000 ;
-      RECT  8.320000 0.425000  8.490000 0.965000 ;
-      RECT  8.320000 0.965000  9.370000 1.120000 ;
-      RECT  8.320000 1.120000 11.105000 1.135000 ;
-      RECT  8.700000 1.475000  9.030000 2.125000 ;
-      RECT  8.700000 2.375000  9.030000 2.585000 ;
-      RECT  9.200000 1.135000 11.105000 1.290000 ;
-      RECT  9.200000 1.290000 10.085000 1.450000 ;
-      RECT  9.235000 1.620000 10.625000 1.790000 ;
-      RECT  9.235000 1.790000  9.405000 2.755000 ;
-      RECT  9.540000 0.620000 11.445000 0.950000 ;
-      RECT 10.295000 1.460000 10.625000 1.620000 ;
-      RECT 10.445000 1.985000 11.445000 2.155000 ;
-      RECT 10.445000 2.155000 10.775000 2.980000 ;
-      RECT 10.835000 1.290000 11.105000 1.800000 ;
-      RECT 11.275000 0.950000 11.445000 1.155000 ;
-      RECT 11.275000 1.155000 11.985000 1.485000 ;
-      RECT 11.275000 1.485000 11.445000 1.985000 ;
-      RECT 11.615000 1.725000 12.485000 1.805000 ;
-      RECT 11.615000 1.805000 12.700000 2.120000 ;
-      RECT 12.155000 0.255000 13.435000 0.425000 ;
-      RECT 12.155000 0.425000 12.485000 1.725000 ;
-      RECT 12.450000 2.120000 12.700000 2.845000 ;
-      RECT 13.265000 0.425000 13.435000 1.320000 ;
-      RECT 13.265000 1.320000 13.975000 1.650000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.085000  0.420000  0.600000 0.750000 ;
+      RECT  0.085000  0.750000  0.255000 2.290000 ;
+      RECT  0.085000  2.290000  1.545000 2.460000 ;
+      RECT  0.085000  2.460000  0.445000 2.980000 ;
+      RECT  0.955000  2.630000  1.205000 3.245000 ;
+      RECT  1.005000  1.110000  2.000000 1.280000 ;
+      RECT  1.005000  1.280000  1.335000 1.950000 ;
+      RECT  1.005000  1.950000  2.665000 2.120000 ;
+      RECT  1.090000  0.085000  1.420000 0.810000 ;
+      RECT  1.375000  2.460000  1.545000 2.905000 ;
+      RECT  1.375000  2.905000  2.225000 3.075000 ;
+      RECT  1.650000  0.480000  2.000000 1.110000 ;
+      RECT  1.715000  2.120000  1.885000 2.735000 ;
+      RECT  2.055000  2.290000  3.545000 2.310000 ;
+      RECT  2.055000  2.310000  5.775000 2.460000 ;
+      RECT  2.055000  2.460000  2.225000 2.905000 ;
+      RECT  2.170000  0.085000  2.500000 0.810000 ;
+      RECT  2.335000  0.980000  2.665000 1.950000 ;
+      RECT  2.395000  2.630000  2.645000 3.245000 ;
+      RECT  2.875000  0.980000  3.205000 1.990000 ;
+      RECT  3.000000  0.350000  3.545000 0.810000 ;
+      RECT  3.155000  2.460000  5.775000 2.480000 ;
+      RECT  3.155000  2.480000  3.545000 2.960000 ;
+      RECT  3.375000  0.810000  3.545000 2.290000 ;
+      RECT  3.715000  0.085000  3.885000 1.010000 ;
+      RECT  3.715000  2.650000  4.045000 3.245000 ;
+      RECT  4.065000  0.350000  4.395000 0.840000 ;
+      RECT  4.065000  0.840000  4.725000 1.010000 ;
+      RECT  4.165000  1.810000  4.965000 2.140000 ;
+      RECT  4.555000  1.010000  4.725000 1.810000 ;
+      RECT  4.585000  0.085000  4.915000 0.670000 ;
+      RECT  5.095000  0.255000  6.885000 0.425000 ;
+      RECT  5.095000  0.425000  5.345000 1.130000 ;
+      RECT  5.105000  2.650000  5.435000 3.245000 ;
+      RECT  5.215000  1.300000  5.785000 1.470000 ;
+      RECT  5.215000  1.470000  5.385000 2.310000 ;
+      RECT  5.535000  0.595000  5.785000 1.300000 ;
+      RECT  5.555000  1.810000  6.125000 1.970000 ;
+      RECT  5.555000  1.970000  6.355000 2.140000 ;
+      RECT  5.605000  2.480000  5.775000 2.890000 ;
+      RECT  5.605000  2.890000  6.445000 3.060000 ;
+      RECT  5.955000  0.425000  6.125000 1.810000 ;
+      RECT  5.955000  2.140000  6.355000 2.380000 ;
+      RECT  6.295000  0.595000  6.465000 1.515000 ;
+      RECT  6.295000  1.515000  6.720000 1.685000 ;
+      RECT  6.550000  1.685000  6.720000 1.740000 ;
+      RECT  6.550000  1.740000  8.260000 1.910000 ;
+      RECT  6.550000  1.910000  6.720000 2.550000 ;
+      RECT  6.550000  2.550000  6.980000 2.720000 ;
+      RECT  6.635000  0.425000  6.885000 0.965000 ;
+      RECT  6.635000  0.965000  7.810000 1.135000 ;
+      RECT  6.635000  1.135000  6.885000 1.345000 ;
+      RECT  6.650000  2.720000  6.980000 2.980000 ;
+      RECT  6.890000  2.080000  7.320000 2.380000 ;
+      RECT  7.150000  2.380000  7.320000 2.545000 ;
+      RECT  7.150000  2.545000  8.365000 2.715000 ;
+      RECT  7.205000  1.305000  9.030000 1.475000 ;
+      RECT  7.205000  1.475000  7.535000 1.570000 ;
+      RECT  7.220000  0.085000  7.470000 0.795000 ;
+      RECT  7.640000  0.255000  8.490000 0.425000 ;
+      RECT  7.640000  0.425000  7.810000 0.965000 ;
+      RECT  7.695000  2.885000  8.025000 3.245000 ;
+      RECT  7.930000  1.645000  8.260000 1.740000 ;
+      RECT  7.930000  1.910000  8.260000 1.955000 ;
+      RECT  7.980000  0.595000  8.150000 1.305000 ;
+      RECT  8.195000  2.715000  8.365000 2.755000 ;
+      RECT  8.195000  2.755000  9.405000 2.925000 ;
+      RECT  8.230000  2.125000  9.030000 2.375000 ;
+      RECT  8.320000  0.425000  8.490000 0.965000 ;
+      RECT  8.320000  0.965000  9.370000 1.120000 ;
+      RECT  8.320000  1.120000 11.105000 1.135000 ;
+      RECT  8.660000  0.085000  8.910000 0.770000 ;
+      RECT  8.700000  1.475000  9.030000 2.125000 ;
+      RECT  8.700000  2.375000  9.030000 2.585000 ;
+      RECT  9.200000  1.135000 11.105000 1.290000 ;
+      RECT  9.200000  1.290000 10.085000 1.450000 ;
+      RECT  9.235000  1.620000 10.625000 1.790000 ;
+      RECT  9.235000  1.790000  9.405000 2.755000 ;
+      RECT  9.540000  0.620000 11.445000 0.950000 ;
+      RECT  9.575000  1.960000  9.905000 3.245000 ;
+      RECT 10.295000  1.460000 10.625000 1.620000 ;
+      RECT 10.445000  1.985000 11.445000 2.155000 ;
+      RECT 10.445000  2.155000 10.775000 2.980000 ;
+      RECT 10.835000  1.290000 11.105000 1.800000 ;
+      RECT 11.275000  0.950000 11.445000 1.155000 ;
+      RECT 11.275000  1.155000 11.985000 1.485000 ;
+      RECT 11.275000  1.485000 11.445000 1.985000 ;
+      RECT 11.495000  2.325000 12.280000 3.245000 ;
+      RECT 11.615000  1.725000 12.485000 1.805000 ;
+      RECT 11.615000  1.805000 12.700000 2.120000 ;
+      RECT 11.655000  0.085000 11.985000 0.985000 ;
+      RECT 12.155000  0.255000 13.435000 0.425000 ;
+      RECT 12.155000  0.425000 12.485000 1.725000 ;
+      RECT 12.450000  2.120000 12.700000 2.845000 ;
+      RECT 13.265000  0.425000 13.435000 1.320000 ;
+      RECT 13.265000  1.320000 13.975000 1.650000 ;
+      RECT 13.540000  1.820000 13.790000 3.245000 ;
+      RECT 13.605000  0.085000 13.775000 1.150000 ;
     LAYER mcon ;
-      RECT  3.035000 1.580000  3.205000 1.750000 ;
-      RECT 12.155000 1.580000 12.325000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.580000  3.205000 1.750000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  1.580000 12.325000 1.750000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
     LAYER met1 ;
       RECT  2.975000 1.550000  3.265000 1.595000 ;
       RECT  2.975000 1.595000 12.385000 1.735000 ;
diff --git a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef
index fe75dd4..455d24f 100644
--- a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef
+++ b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.magic.lef
@@ -72,44 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  1.020000  0.085000  1.350000 0.600000 ;
-        RECT  2.000000  0.085000  2.330000 0.875000 ;
-        RECT  3.440000  0.085000  3.610000 1.010000 ;
-        RECT  4.335000  0.085000  4.585000 1.130000 ;
-        RECT  7.170000  0.085000  7.420000 0.765000 ;
-        RECT  8.610000  0.085000  8.860000 0.765000 ;
-        RECT 10.350000  0.085000 11.310000 0.665000 ;
-        RECT 12.515000  0.085000 12.845000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
@@ -118,130 +80,164 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.945000 2.520000  1.195000 3.245000 ;
-        RECT  2.385000 2.290000  2.635000 3.245000 ;
-        RECT  3.670000 2.650000  4.000000 3.245000 ;
-        RECT  5.020000 2.650000  5.270000 3.245000 ;
-        RECT  7.410000 2.750000  7.740000 3.245000 ;
-        RECT  8.505000 2.750000  8.835000 3.245000 ;
-        RECT 10.845000 2.525000 11.385000 3.245000 ;
-        RECT 12.605000 1.820000 12.855000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.340000  0.530000 0.810000 ;
-      RECT  0.085000 0.810000  0.255000 2.180000 ;
-      RECT  0.085000 2.180000  1.535000 2.350000 ;
-      RECT  0.085000 2.350000  0.435000 2.980000 ;
-      RECT  0.975000 0.770000  1.820000 0.940000 ;
-      RECT  0.975000 0.940000  1.305000 1.610000 ;
-      RECT  0.975000 1.610000  2.385000 1.780000 ;
-      RECT  0.975000 1.780000  1.305000 2.010000 ;
-      RECT  1.365000 2.350000  1.535000 2.905000 ;
-      RECT  1.365000 2.905000  2.215000 3.075000 ;
-      RECT  1.570000 0.415000  1.820000 0.770000 ;
-      RECT  1.705000 1.780000  1.875000 2.735000 ;
-      RECT  2.045000 1.950000  3.270000 2.120000 ;
-      RECT  2.045000 2.120000  2.215000 2.905000 ;
-      RECT  2.055000 1.385000  2.385000 1.610000 ;
-      RECT  2.555000 1.045000  2.930000 1.780000 ;
-      RECT  2.790000 0.415000  3.270000 0.875000 ;
-      RECT  3.100000 0.875000  3.270000 1.950000 ;
-      RECT  3.100000 2.120000  3.475000 2.310000 ;
-      RECT  3.100000 2.310000  5.610000 2.480000 ;
-      RECT  3.100000 2.480000  3.475000 2.620000 ;
-      RECT  3.790000 0.350000  4.120000 1.010000 ;
-      RECT  3.950000 1.010000  4.120000 1.470000 ;
-      RECT  3.950000 1.470000  4.900000 2.140000 ;
-      RECT  4.765000 0.255000  6.960000 0.425000 ;
-      RECT  4.765000 0.425000  5.095000 1.130000 ;
-      RECT  5.130000 1.480000  5.655000 1.650000 ;
-      RECT  5.130000 1.650000  5.300000 2.310000 ;
-      RECT  5.325000 0.595000  5.655000 1.480000 ;
-      RECT  5.440000 2.480000  5.610000 2.520000 ;
-      RECT  5.440000 2.520000  6.245000 2.690000 ;
-      RECT  5.470000 1.820000  5.995000 1.970000 ;
-      RECT  5.470000 1.970000  6.245000 2.140000 ;
-      RECT  5.825000 0.425000  5.995000 1.820000 ;
-      RECT  5.825000 2.140000  6.245000 2.300000 ;
-      RECT  5.995000 2.690000  6.245000 2.980000 ;
-      RECT  6.165000 0.595000  6.620000 0.765000 ;
-      RECT  6.165000 0.765000  6.335000 1.630000 ;
-      RECT  6.165000 1.630000  8.030000 1.800000 ;
-      RECT  6.415000 1.800000  6.585000 2.520000 ;
-      RECT  6.415000 2.520000  6.775000 2.980000 ;
-      RECT  6.505000 0.935000  7.760000 1.105000 ;
-      RECT  6.505000 1.105000  6.960000 1.310000 ;
-      RECT  6.755000 2.000000  7.115000 2.330000 ;
-      RECT  6.790000 0.425000  6.960000 0.935000 ;
-      RECT  6.945000 2.330000  7.115000 2.410000 ;
-      RECT  6.945000 2.410000  9.800000 2.580000 ;
-      RECT  7.130000 1.275000  8.940000 1.445000 ;
-      RECT  7.130000 1.445000  7.460000 1.460000 ;
-      RECT  7.590000 0.255000  8.440000 0.425000 ;
-      RECT  7.590000 0.425000  7.760000 0.935000 ;
-      RECT  7.700000 1.615000  8.030000 1.630000 ;
-      RECT  7.700000 1.800000  8.030000 1.830000 ;
-      RECT  7.930000 0.595000  8.100000 1.275000 ;
-      RECT  7.945000 2.070000  8.440000 2.240000 ;
-      RECT  8.270000 0.425000  8.440000 0.935000 ;
-      RECT  8.270000 0.935000  9.280000 1.105000 ;
-      RECT  8.270000 1.445000  8.940000 1.605000 ;
-      RECT  8.270000 1.605000  8.440000 2.070000 ;
-      RECT  9.110000 1.105000  9.280000 1.205000 ;
-      RECT  9.110000 1.205000 10.605000 1.375000 ;
-      RECT  9.110000 1.375000  9.460000 1.550000 ;
-      RECT  9.450000 0.350000  9.780000 0.835000 ;
-      RECT  9.450000 0.835000 10.945000 1.005000 ;
-      RECT  9.630000 1.545000 10.065000 1.725000 ;
-      RECT  9.630000 1.725000  9.800000 2.410000 ;
-      RECT  9.970000 1.925000 10.405000 2.095000 ;
-      RECT  9.970000 2.095000 10.220000 3.000000 ;
-      RECT 10.235000 1.755000 10.945000 1.925000 ;
-      RECT 10.275000 1.375000 10.605000 1.585000 ;
-      RECT 10.665000 2.095000 11.885000 2.320000 ;
-      RECT 10.775000 1.005000 11.505000 1.335000 ;
-      RECT 10.775000 1.335000 10.945000 1.755000 ;
-      RECT 11.490000 0.335000 11.845000 0.810000 ;
-      RECT 11.555000 2.320000 11.885000 2.950000 ;
-      RECT 11.645000 1.550000 11.885000 2.095000 ;
-      RECT 11.675000 0.810000 11.845000 1.550000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.085000  0.340000  0.530000 0.810000 ;
+      RECT  0.085000  0.810000  0.255000 2.180000 ;
+      RECT  0.085000  2.180000  1.535000 2.350000 ;
+      RECT  0.085000  2.350000  0.435000 2.980000 ;
+      RECT  0.945000  2.520000  1.195000 3.245000 ;
+      RECT  0.975000  0.770000  1.820000 0.940000 ;
+      RECT  0.975000  0.940000  1.305000 1.610000 ;
+      RECT  0.975000  1.610000  2.385000 1.780000 ;
+      RECT  0.975000  1.780000  1.305000 2.010000 ;
+      RECT  1.020000  0.085000  1.350000 0.600000 ;
+      RECT  1.365000  2.350000  1.535000 2.905000 ;
+      RECT  1.365000  2.905000  2.215000 3.075000 ;
+      RECT  1.570000  0.415000  1.820000 0.770000 ;
+      RECT  1.705000  1.780000  1.875000 2.735000 ;
+      RECT  2.000000  0.085000  2.330000 0.875000 ;
+      RECT  2.045000  1.950000  3.270000 2.120000 ;
+      RECT  2.045000  2.120000  2.215000 2.905000 ;
+      RECT  2.055000  1.385000  2.385000 1.610000 ;
+      RECT  2.385000  2.290000  2.635000 3.245000 ;
+      RECT  2.555000  1.045000  2.930000 1.780000 ;
+      RECT  2.790000  0.415000  3.270000 0.875000 ;
+      RECT  3.100000  0.875000  3.270000 1.950000 ;
+      RECT  3.100000  2.120000  3.475000 2.310000 ;
+      RECT  3.100000  2.310000  5.610000 2.480000 ;
+      RECT  3.100000  2.480000  3.475000 2.620000 ;
+      RECT  3.440000  0.085000  3.610000 1.010000 ;
+      RECT  3.670000  2.650000  4.000000 3.245000 ;
+      RECT  3.790000  0.350000  4.120000 1.010000 ;
+      RECT  3.950000  1.010000  4.120000 1.470000 ;
+      RECT  3.950000  1.470000  4.900000 2.140000 ;
+      RECT  4.335000  0.085000  4.585000 1.130000 ;
+      RECT  4.765000  0.255000  6.960000 0.425000 ;
+      RECT  4.765000  0.425000  5.095000 1.130000 ;
+      RECT  5.020000  2.650000  5.270000 3.245000 ;
+      RECT  5.130000  1.480000  5.655000 1.650000 ;
+      RECT  5.130000  1.650000  5.300000 2.310000 ;
+      RECT  5.325000  0.595000  5.655000 1.480000 ;
+      RECT  5.440000  2.480000  5.610000 2.520000 ;
+      RECT  5.440000  2.520000  6.245000 2.690000 ;
+      RECT  5.470000  1.820000  5.995000 1.970000 ;
+      RECT  5.470000  1.970000  6.245000 2.140000 ;
+      RECT  5.825000  0.425000  5.995000 1.820000 ;
+      RECT  5.825000  2.140000  6.245000 2.300000 ;
+      RECT  5.995000  2.690000  6.245000 2.980000 ;
+      RECT  6.165000  0.595000  6.620000 0.765000 ;
+      RECT  6.165000  0.765000  6.335000 1.630000 ;
+      RECT  6.165000  1.630000  8.030000 1.800000 ;
+      RECT  6.415000  1.800000  6.585000 2.520000 ;
+      RECT  6.415000  2.520000  6.775000 2.980000 ;
+      RECT  6.505000  0.935000  7.760000 1.105000 ;
+      RECT  6.505000  1.105000  6.960000 1.310000 ;
+      RECT  6.755000  2.000000  7.115000 2.330000 ;
+      RECT  6.790000  0.425000  6.960000 0.935000 ;
+      RECT  6.945000  2.330000  7.115000 2.410000 ;
+      RECT  6.945000  2.410000  9.800000 2.580000 ;
+      RECT  7.130000  1.275000  8.940000 1.445000 ;
+      RECT  7.130000  1.445000  7.460000 1.460000 ;
+      RECT  7.170000  0.085000  7.420000 0.765000 ;
+      RECT  7.410000  2.750000  7.740000 3.245000 ;
+      RECT  7.590000  0.255000  8.440000 0.425000 ;
+      RECT  7.590000  0.425000  7.760000 0.935000 ;
+      RECT  7.700000  1.615000  8.030000 1.630000 ;
+      RECT  7.700000  1.800000  8.030000 1.830000 ;
+      RECT  7.930000  0.595000  8.100000 1.275000 ;
+      RECT  7.945000  2.070000  8.440000 2.240000 ;
+      RECT  8.270000  0.425000  8.440000 0.935000 ;
+      RECT  8.270000  0.935000  9.280000 1.105000 ;
+      RECT  8.270000  1.445000  8.940000 1.605000 ;
+      RECT  8.270000  1.605000  8.440000 2.070000 ;
+      RECT  8.505000  2.750000  8.835000 3.245000 ;
+      RECT  8.610000  0.085000  8.860000 0.765000 ;
+      RECT  9.110000  1.105000  9.280000 1.205000 ;
+      RECT  9.110000  1.205000 10.605000 1.375000 ;
+      RECT  9.110000  1.375000  9.460000 1.550000 ;
+      RECT  9.450000  0.350000  9.780000 0.835000 ;
+      RECT  9.450000  0.835000 10.945000 1.005000 ;
+      RECT  9.630000  1.545000 10.065000 1.725000 ;
+      RECT  9.630000  1.725000  9.800000 2.410000 ;
+      RECT  9.970000  1.925000 10.405000 2.095000 ;
+      RECT  9.970000  2.095000 10.220000 3.000000 ;
+      RECT 10.235000  1.755000 10.945000 1.925000 ;
+      RECT 10.275000  1.375000 10.605000 1.585000 ;
+      RECT 10.350000  0.085000 11.310000 0.665000 ;
+      RECT 10.665000  2.095000 11.885000 2.320000 ;
+      RECT 10.775000  1.005000 11.505000 1.335000 ;
+      RECT 10.775000  1.335000 10.945000 1.755000 ;
+      RECT 10.845000  2.525000 11.385000 3.245000 ;
+      RECT 11.490000  0.335000 11.845000 0.810000 ;
+      RECT 11.555000  2.320000 11.885000 2.950000 ;
+      RECT 11.645000  1.550000 11.885000 2.095000 ;
+      RECT 11.675000  0.810000 11.845000 1.550000 ;
+      RECT 12.515000  0.085000 12.845000 1.130000 ;
+      RECT 12.605000  1.820000 12.855000 3.245000 ;
     LAYER mcon ;
-      RECT  2.555000 1.580000  2.725000 1.750000 ;
-      RECT 11.675000 1.580000 11.845000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  1.580000  2.725000 1.750000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  1.580000 11.845000 1.750000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
     LAYER met1 ;
       RECT  2.495000 1.550000  2.785000 1.595000 ;
       RECT  2.495000 1.595000 11.905000 1.735000 ;
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef
index 58e91ed..2a6b08f 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_1.magic.lef
@@ -64,15 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.950000  0.085000 1.280000 1.260000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -81,25 +72,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.925000 1.950000 1.255000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.255000 0.780000 0.560000 ;
-      RECT 0.110000 0.560000 0.770000 1.250000 ;
-      RECT 0.110000 1.250000 0.280000 1.930000 ;
-      RECT 0.110000 1.930000 0.720000 2.100000 ;
-      RECT 0.390000 2.100000 0.720000 2.580000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.110000  0.255000 0.780000 0.560000 ;
+      RECT 0.110000  0.560000 0.770000 1.250000 ;
+      RECT 0.110000  1.250000 0.280000 1.930000 ;
+      RECT 0.110000  1.930000 0.720000 2.100000 ;
+      RECT 0.390000  2.100000 0.720000 2.580000 ;
+      RECT 0.925000  1.950000 1.255000 3.245000 ;
+      RECT 0.950000  0.085000 1.280000 1.260000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef
index 4af26cb..3949065 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_2.magic.lef
@@ -63,18 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.130000  0.085000 0.380000 0.810000 ;
-        RECT 1.565000  0.085000 1.895000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -83,37 +71,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.110000 2.300000 0.360000 3.245000 ;
-        RECT 1.580000 2.160000 1.815000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.560000 0.350000 0.890000 0.810000 ;
-      RECT 0.560000 2.300000 0.890000 2.980000 ;
-      RECT 0.720000 0.810000 0.890000 1.320000 ;
-      RECT 0.720000 1.320000 1.160000 1.650000 ;
-      RECT 0.720000 1.650000 0.890000 2.300000 ;
-      RECT 1.115000 1.820000 2.295000 1.990000 ;
-      RECT 1.115000 1.990000 1.400000 2.980000 ;
-      RECT 1.135000 0.350000 1.385000 0.980000 ;
-      RECT 1.135000 0.980000 2.245000 1.150000 ;
-      RECT 2.015000 1.990000 2.295000 2.905000 ;
-      RECT 2.015000 2.905000 3.245000 3.075000 ;
-      RECT 2.075000 0.350000 3.200000 0.600000 ;
-      RECT 2.075000 0.600000 2.245000 0.980000 ;
-      RECT 2.965000 1.820000 3.245000 2.905000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.110000  2.300000 0.360000 3.245000 ;
+      RECT 0.130000  0.085000 0.380000 0.810000 ;
+      RECT 0.560000  0.350000 0.890000 0.810000 ;
+      RECT 0.560000  2.300000 0.890000 2.980000 ;
+      RECT 0.720000  0.810000 0.890000 1.320000 ;
+      RECT 0.720000  1.320000 1.160000 1.650000 ;
+      RECT 0.720000  1.650000 0.890000 2.300000 ;
+      RECT 1.115000  1.820000 2.295000 1.990000 ;
+      RECT 1.115000  1.990000 1.400000 2.980000 ;
+      RECT 1.135000  0.350000 1.385000 0.980000 ;
+      RECT 1.135000  0.980000 2.245000 1.150000 ;
+      RECT 1.565000  0.085000 1.895000 0.790000 ;
+      RECT 1.580000  2.160000 1.815000 3.245000 ;
+      RECT 2.015000  1.990000 2.295000 2.905000 ;
+      RECT 2.015000  2.905000 3.245000 3.075000 ;
+      RECT 2.075000  0.350000 3.200000 0.600000 ;
+      RECT 2.075000  0.600000 2.245000 0.980000 ;
+      RECT 2.965000  1.820000 3.245000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef
index 3a9e1c5..e6d7423 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_4.magic.lef
@@ -68,23 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 1.130000 ;
-        RECT 1.815000  0.085000 2.145000 0.970000 ;
-        RECT 2.675000  0.085000 3.005000 0.970000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -93,45 +76,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.175000 1.950000 0.425000 3.245000 ;
-        RECT 1.635000 1.820000 1.885000 3.245000 ;
-        RECT 2.535000 1.820000 2.865000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.300000 1.295000 1.130000 ;
-      RECT 0.625000 1.130000 1.295000 1.310000 ;
-      RECT 0.625000 1.310000 0.955000 2.980000 ;
-      RECT 1.185000 1.480000 3.285000 1.650000 ;
-      RECT 1.185000 1.650000 1.435000 2.980000 ;
-      RECT 1.465000 0.350000 1.635000 1.140000 ;
-      RECT 1.465000 1.140000 3.435000 1.310000 ;
-      RECT 2.085000 1.650000 2.335000 2.980000 ;
-      RECT 2.325000 0.350000 2.495000 1.140000 ;
-      RECT 3.035000 1.650000 3.285000 2.905000 ;
-      RECT 3.035000 2.905000 5.165000 3.075000 ;
-      RECT 3.185000 0.255000 5.165000 0.425000 ;
-      RECT 3.185000 0.425000 4.305000 0.600000 ;
-      RECT 3.185000 0.600000 3.435000 1.140000 ;
-      RECT 4.015000 2.060000 4.185000 2.905000 ;
-      RECT 4.835000 0.425000 5.165000 1.010000 ;
-      RECT 4.915000 1.820000 5.165000 2.905000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  0.085000 0.365000 1.130000 ;
+      RECT 0.175000  1.950000 0.425000 3.245000 ;
+      RECT 0.545000  0.300000 1.295000 1.130000 ;
+      RECT 0.625000  1.130000 1.295000 1.310000 ;
+      RECT 0.625000  1.310000 0.955000 2.980000 ;
+      RECT 1.185000  1.480000 3.285000 1.650000 ;
+      RECT 1.185000  1.650000 1.435000 2.980000 ;
+      RECT 1.465000  0.350000 1.635000 1.140000 ;
+      RECT 1.465000  1.140000 3.435000 1.310000 ;
+      RECT 1.635000  1.820000 1.885000 3.245000 ;
+      RECT 1.815000  0.085000 2.145000 0.970000 ;
+      RECT 2.085000  1.650000 2.335000 2.980000 ;
+      RECT 2.325000  0.350000 2.495000 1.140000 ;
+      RECT 2.535000  1.820000 2.865000 3.245000 ;
+      RECT 2.675000  0.085000 3.005000 0.970000 ;
+      RECT 3.035000  1.650000 3.285000 2.905000 ;
+      RECT 3.035000  2.905000 5.165000 3.075000 ;
+      RECT 3.185000  0.255000 5.165000 0.425000 ;
+      RECT 3.185000  0.425000 4.305000 0.600000 ;
+      RECT 3.185000  0.600000 3.435000 1.140000 ;
+      RECT 4.015000  2.060000 4.185000 2.905000 ;
+      RECT 4.835000  0.425000 5.165000 1.010000 ;
+      RECT 4.915000  1.820000 5.165000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef
index f7e8d2c..95e6d92 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_8.magic.lef
@@ -73,33 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.175000  0.085000 0.505000 0.990000 ;
-        RECT 1.875000  0.085000 2.125000 1.130000 ;
-        RECT 2.735000  0.085000 3.065000 1.130000 ;
-        RECT 3.665000  0.085000 3.995000 1.130000 ;
-        RECT 4.595000  0.085000 4.925000 1.040000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -108,67 +81,91 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.115000 1.820000 0.445000 3.245000 ;
-        RECT 1.625000 2.005000 1.955000 3.245000 ;
-        RECT 2.575000 2.005000 2.905000 3.245000 ;
-        RECT 3.525000 2.005000 3.855000 3.245000 ;
-        RECT 4.525000 2.290000 4.855000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 1.130000 1.355000 1.335000 ;
-      RECT 0.615000 1.335000 0.945000 2.980000 ;
-      RECT 0.685000 0.325000 1.355000 1.130000 ;
-      RECT 1.175000 1.665000 4.495000 1.835000 ;
-      RECT 1.175000 1.835000 1.425000 2.980000 ;
-      RECT 1.525000 0.350000 1.695000 1.300000 ;
-      RECT 1.525000 1.300000 5.275000 1.380000 ;
-      RECT 1.525000 1.380000 4.415000 1.470000 ;
-      RECT 2.125000 1.835000 2.375000 2.980000 ;
-      RECT 2.305000 0.350000 2.555000 1.300000 ;
-      RECT 3.075000 1.835000 3.325000 2.980000 ;
-      RECT 3.235000 0.350000 3.485000 1.300000 ;
-      RECT 4.025000 1.835000 4.495000 1.950000 ;
-      RECT 4.025000 1.950000 5.355000 2.120000 ;
-      RECT 4.025000 2.120000 4.355000 2.980000 ;
-      RECT 4.165000 0.350000 4.415000 1.210000 ;
-      RECT 4.165000 1.210000 5.275000 1.300000 ;
-      RECT 5.025000 2.120000 5.355000 2.905000 ;
-      RECT 5.025000 2.905000 9.005000 3.075000 ;
-      RECT 5.105000 0.255000 9.005000 0.425000 ;
-      RECT 5.105000 0.425000 7.145000 0.600000 ;
-      RECT 5.105000 0.600000 5.275000 1.210000 ;
-      RECT 5.925000 2.290000 6.255000 2.905000 ;
-      RECT 6.815000 0.600000 7.145000 0.825000 ;
-      RECT 6.955000 2.290000 7.125000 2.905000 ;
-      RECT 7.675000 0.425000 8.005000 0.825000 ;
-      RECT 7.855000 2.290000 8.025000 2.905000 ;
-      RECT 8.675000 0.425000 9.005000 1.130000 ;
-      RECT 8.755000 1.950000 9.005000 2.905000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.115000  1.820000 0.445000 3.245000 ;
+      RECT 0.175000  0.085000 0.505000 0.990000 ;
+      RECT 0.615000  1.130000 1.355000 1.335000 ;
+      RECT 0.615000  1.335000 0.945000 2.980000 ;
+      RECT 0.685000  0.325000 1.355000 1.130000 ;
+      RECT 1.175000  1.665000 4.495000 1.835000 ;
+      RECT 1.175000  1.835000 1.425000 2.980000 ;
+      RECT 1.525000  0.350000 1.695000 1.300000 ;
+      RECT 1.525000  1.300000 5.275000 1.380000 ;
+      RECT 1.525000  1.380000 4.415000 1.470000 ;
+      RECT 1.625000  2.005000 1.955000 3.245000 ;
+      RECT 1.875000  0.085000 2.125000 1.130000 ;
+      RECT 2.125000  1.835000 2.375000 2.980000 ;
+      RECT 2.305000  0.350000 2.555000 1.300000 ;
+      RECT 2.575000  2.005000 2.905000 3.245000 ;
+      RECT 2.735000  0.085000 3.065000 1.130000 ;
+      RECT 3.075000  1.835000 3.325000 2.980000 ;
+      RECT 3.235000  0.350000 3.485000 1.300000 ;
+      RECT 3.525000  2.005000 3.855000 3.245000 ;
+      RECT 3.665000  0.085000 3.995000 1.130000 ;
+      RECT 4.025000  1.835000 4.495000 1.950000 ;
+      RECT 4.025000  1.950000 5.355000 2.120000 ;
+      RECT 4.025000  2.120000 4.355000 2.980000 ;
+      RECT 4.165000  0.350000 4.415000 1.210000 ;
+      RECT 4.165000  1.210000 5.275000 1.300000 ;
+      RECT 4.525000  2.290000 4.855000 3.245000 ;
+      RECT 4.595000  0.085000 4.925000 1.040000 ;
+      RECT 5.025000  2.120000 5.355000 2.905000 ;
+      RECT 5.025000  2.905000 9.005000 3.075000 ;
+      RECT 5.105000  0.255000 9.005000 0.425000 ;
+      RECT 5.105000  0.425000 7.145000 0.600000 ;
+      RECT 5.105000  0.600000 5.275000 1.210000 ;
+      RECT 5.925000  2.290000 6.255000 2.905000 ;
+      RECT 6.815000  0.600000 7.145000 0.825000 ;
+      RECT 6.955000  2.290000 7.125000 2.905000 ;
+      RECT 7.675000  0.425000 8.005000 0.825000 ;
+      RECT 7.855000  2.290000 8.025000 2.905000 ;
+      RECT 8.675000  0.425000 9.005000 1.130000 ;
+      RECT 8.755000  1.950000 9.005000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvn_8
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef
index 1a5a412..2dc7a52 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_1.magic.lef
@@ -65,15 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.135000  0.085000 1.420000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -82,24 +73,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.085000 2.020000 1.415000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.410000 0.940000 1.060000 ;
-      RECT 0.105000 1.060000 0.275000 2.010000 ;
-      RECT 0.105000 2.010000 0.880000 2.745000 ;
-      RECT 0.105000 2.745000 0.890000 3.075000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.105000  0.410000 0.940000 1.060000 ;
+      RECT 0.105000  1.060000 0.275000 2.010000 ;
+      RECT 0.105000  2.010000 0.880000 2.745000 ;
+      RECT 0.105000  2.745000 0.890000 3.075000 ;
+      RECT 1.085000  2.020000 1.415000 3.245000 ;
+      RECT 1.135000  0.085000 1.420000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef
index 13baf64..c123088 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_2.magic.lef
@@ -62,18 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.450000  0.085000 1.780000 0.970000 ;
-        RECT 2.980000  0.085000 3.245000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -82,35 +70,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.465000 1.820000 1.715000 3.245000 ;
-        RECT 2.915000 2.300000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.820000 0.365000 2.905000 ;
-      RECT 0.115000 2.905000 1.265000 3.075000 ;
-      RECT 0.160000 0.255000 1.270000 0.425000 ;
-      RECT 0.160000 0.425000 0.490000 1.010000 ;
-      RECT 1.095000 1.480000 2.165000 1.650000 ;
-      RECT 1.095000 1.650000 1.265000 2.905000 ;
-      RECT 1.100000 0.425000 1.270000 1.140000 ;
-      RECT 1.100000 1.140000 2.210000 1.310000 ;
-      RECT 1.915000 1.650000 2.165000 2.980000 ;
-      RECT 1.950000 0.350000 2.210000 1.140000 ;
-      RECT 2.415000 0.840000 2.800000 1.140000 ;
-      RECT 2.415000 1.140000 2.745000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  1.820000 0.365000 2.905000 ;
+      RECT 0.115000  2.905000 1.265000 3.075000 ;
+      RECT 0.160000  0.255000 1.270000 0.425000 ;
+      RECT 0.160000  0.425000 0.490000 1.010000 ;
+      RECT 1.095000  1.480000 2.165000 1.650000 ;
+      RECT 1.095000  1.650000 1.265000 2.905000 ;
+      RECT 1.100000  0.425000 1.270000 1.140000 ;
+      RECT 1.100000  1.140000 2.210000 1.310000 ;
+      RECT 1.450000  0.085000 1.780000 0.970000 ;
+      RECT 1.465000  1.820000 1.715000 3.245000 ;
+      RECT 1.915000  1.650000 2.165000 2.980000 ;
+      RECT 1.950000  0.350000 2.210000 1.140000 ;
+      RECT 2.415000  0.840000 2.800000 1.140000 ;
+      RECT 2.415000  1.140000 2.745000 2.980000 ;
+      RECT 2.915000  2.300000 3.245000 3.245000 ;
+      RECT 2.980000  0.085000 3.245000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef
index 7563d57..5bc22d9 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_4.magic.lef
@@ -68,24 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 2.615000  0.085000 2.945000 1.130000 ;
-        RECT 3.615000  0.085000 3.945000 1.130000 ;
-        RECT 5.175000  0.085000 5.505000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -94,48 +76,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 2.565000 1.980000 2.815000 3.245000 ;
-        RECT 3.465000 1.980000 3.725000 3.245000 ;
-        RECT 5.395000 1.820000 5.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 2.445000 0.425000 ;
-      RECT 0.115000 0.425000 0.445000 1.130000 ;
-      RECT 0.115000 1.950000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 2.395000 3.075000 ;
-      RECT 1.115000 0.425000 1.445000 0.800000 ;
-      RECT 1.115000 2.290000 1.365000 2.905000 ;
-      RECT 2.065000 1.640000 4.175000 1.810000 ;
-      RECT 2.065000 1.810000 2.395000 2.905000 ;
-      RECT 2.115000 0.425000 2.445000 1.300000 ;
-      RECT 2.115000 1.300000 4.445000 1.470000 ;
-      RECT 3.015000 1.810000 3.265000 2.980000 ;
-      RECT 3.115000 0.350000 3.445000 1.300000 ;
-      RECT 3.925000 1.810000 4.175000 2.980000 ;
-      RECT 4.115000 0.350000 4.445000 1.300000 ;
-      RECT 4.395000 1.640000 4.785000 1.820000 ;
-      RECT 4.395000 1.820000 5.195000 2.980000 ;
-      RECT 4.395000 2.980000 4.785000 2.990000 ;
-      RECT 4.615000 0.350000 5.005000 1.130000 ;
-      RECT 4.615000 1.130000 4.785000 1.640000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.255000 2.445000 0.425000 ;
+      RECT 0.115000  0.425000 0.445000 1.130000 ;
+      RECT 0.115000  1.950000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 2.395000 3.075000 ;
+      RECT 1.115000  0.425000 1.445000 0.800000 ;
+      RECT 1.115000  2.290000 1.365000 2.905000 ;
+      RECT 2.065000  1.640000 4.175000 1.810000 ;
+      RECT 2.065000  1.810000 2.395000 2.905000 ;
+      RECT 2.115000  0.425000 2.445000 1.300000 ;
+      RECT 2.115000  1.300000 4.445000 1.470000 ;
+      RECT 2.565000  1.980000 2.815000 3.245000 ;
+      RECT 2.615000  0.085000 2.945000 1.130000 ;
+      RECT 3.015000  1.810000 3.265000 2.980000 ;
+      RECT 3.115000  0.350000 3.445000 1.300000 ;
+      RECT 3.465000  1.980000 3.725000 3.245000 ;
+      RECT 3.615000  0.085000 3.945000 1.130000 ;
+      RECT 3.925000  1.810000 4.175000 2.980000 ;
+      RECT 4.115000  0.350000 4.445000 1.300000 ;
+      RECT 4.395000  1.640000 4.785000 1.820000 ;
+      RECT 4.395000  1.820000 5.195000 2.980000 ;
+      RECT 4.395000  2.980000 4.785000 2.990000 ;
+      RECT 4.615000  0.350000 5.005000 1.130000 ;
+      RECT 4.615000  1.130000 4.785000 1.640000 ;
+      RECT 5.175000  0.085000 5.505000 1.010000 ;
+      RECT 5.395000  1.820000 5.645000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef
index 2e4e318..a4744c1 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_8.magic.lef
@@ -73,33 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 4.405000  0.085000 4.735000 1.040000 ;
-        RECT 5.335000  0.085000 5.665000 1.040000 ;
-        RECT 6.195000  0.085000 6.525000 1.040000 ;
-        RECT 7.125000  0.085000 7.455000 1.040000 ;
-        RECT 8.675000  0.085000 8.935000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -108,67 +81,91 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 4.160000 2.400000 4.490000 3.245000 ;
-        RECT 5.140000 1.890000 5.310000 3.245000 ;
-        RECT 5.960000 1.890000 6.210000 3.245000 ;
-        RECT 6.860000 1.890000 7.110000 3.245000 ;
-        RECT 8.765000 1.820000 9.015000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 1.820000 0.375000 2.905000 ;
-      RECT 0.110000 2.905000 3.960000 3.075000 ;
-      RECT 0.115000 0.255000 4.225000 0.425000 ;
-      RECT 0.115000 0.425000 0.445000 1.010000 ;
-      RECT 1.045000 0.425000 1.375000 0.670000 ;
-      RECT 1.070000 2.060000 1.275000 2.905000 ;
-      RECT 1.970000 2.060000 2.190000 2.905000 ;
-      RECT 2.045000 0.425000 2.375000 0.670000 ;
-      RECT 2.875000 2.060000 3.075000 2.905000 ;
-      RECT 3.045000 0.425000 3.375000 0.670000 ;
-      RECT 3.790000 2.060000 4.940000 2.230000 ;
-      RECT 3.790000 2.230000 3.960000 2.905000 ;
-      RECT 4.055000 0.425000 4.225000 1.210000 ;
-      RECT 4.055000 1.210000 7.885000 1.380000 ;
-      RECT 4.690000 1.550000 7.560000 1.720000 ;
-      RECT 4.690000 1.720000 4.940000 2.060000 ;
-      RECT 4.690000 2.230000 4.940000 2.980000 ;
-      RECT 4.905000 0.350000 5.155000 1.210000 ;
-      RECT 5.510000 1.720000 5.760000 2.980000 ;
-      RECT 5.845000 0.350000 6.015000 1.210000 ;
-      RECT 6.410000 1.720000 6.660000 2.980000 ;
-      RECT 6.705000 0.350000 6.955000 1.210000 ;
-      RECT 7.310000 1.720000 7.560000 2.980000 ;
-      RECT 7.635000 0.350000 7.885000 1.210000 ;
-      RECT 7.775000 1.615000 8.225000 1.820000 ;
-      RECT 7.775000 1.820000 8.565000 2.965000 ;
-      RECT 8.055000 0.350000 8.505000 1.010000 ;
-      RECT 8.055000 1.010000 8.225000 1.615000 ;
-      RECT 8.235000 2.965000 8.565000 2.980000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.110000  1.820000 0.375000 2.905000 ;
+      RECT 0.110000  2.905000 3.960000 3.075000 ;
+      RECT 0.115000  0.255000 4.225000 0.425000 ;
+      RECT 0.115000  0.425000 0.445000 1.010000 ;
+      RECT 1.045000  0.425000 1.375000 0.670000 ;
+      RECT 1.070000  2.060000 1.275000 2.905000 ;
+      RECT 1.970000  2.060000 2.190000 2.905000 ;
+      RECT 2.045000  0.425000 2.375000 0.670000 ;
+      RECT 2.875000  2.060000 3.075000 2.905000 ;
+      RECT 3.045000  0.425000 3.375000 0.670000 ;
+      RECT 3.790000  2.060000 4.940000 2.230000 ;
+      RECT 3.790000  2.230000 3.960000 2.905000 ;
+      RECT 4.055000  0.425000 4.225000 1.210000 ;
+      RECT 4.055000  1.210000 7.885000 1.380000 ;
+      RECT 4.160000  2.400000 4.490000 3.245000 ;
+      RECT 4.405000  0.085000 4.735000 1.040000 ;
+      RECT 4.690000  1.550000 7.560000 1.720000 ;
+      RECT 4.690000  1.720000 4.940000 2.060000 ;
+      RECT 4.690000  2.230000 4.940000 2.980000 ;
+      RECT 4.905000  0.350000 5.155000 1.210000 ;
+      RECT 5.140000  1.890000 5.310000 3.245000 ;
+      RECT 5.335000  0.085000 5.665000 1.040000 ;
+      RECT 5.510000  1.720000 5.760000 2.980000 ;
+      RECT 5.845000  0.350000 6.015000 1.210000 ;
+      RECT 5.960000  1.890000 6.210000 3.245000 ;
+      RECT 6.195000  0.085000 6.525000 1.040000 ;
+      RECT 6.410000  1.720000 6.660000 2.980000 ;
+      RECT 6.705000  0.350000 6.955000 1.210000 ;
+      RECT 6.860000  1.890000 7.110000 3.245000 ;
+      RECT 7.125000  0.085000 7.455000 1.040000 ;
+      RECT 7.310000  1.720000 7.560000 2.980000 ;
+      RECT 7.635000  0.350000 7.885000 1.210000 ;
+      RECT 7.775000  1.615000 8.225000 1.820000 ;
+      RECT 7.775000  1.820000 8.565000 2.965000 ;
+      RECT 8.055000  0.350000 8.505000 1.010000 ;
+      RECT 8.055000  1.010000 8.225000 1.615000 ;
+      RECT 8.235000  2.965000 8.565000 2.980000 ;
+      RECT 8.675000  0.085000 8.935000 1.010000 ;
+      RECT 8.765000  1.820000 9.015000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__einvp_8
diff --git a/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef b/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef
index 8169d5f..807b7ea 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_hs__fa_1.magic.lef
@@ -61,16 +61,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.565000 1.260000 2.115000 1.575000 ;
-        RECT 1.565000 1.575000 1.795000 1.780000 ;
-        RECT 3.840000 1.260000 4.195000 1.780000 ;
-        RECT 4.925000 1.275000 5.640000 1.575000 ;
-        RECT 4.925000 1.575000 5.155000 1.780000 ;
-      LAYER mcon ;
-        RECT 1.595000 1.580000 1.765000 1.750000 ;
-        RECT 3.995000 1.580000 4.165000 1.750000 ;
-        RECT 4.955000 1.580000 5.125000 1.750000 ;
       LAYER met1 ;
         RECT 1.535000 1.550000 1.825000 1.595000 ;
         RECT 1.535000 1.595000 5.185000 1.735000 ;
@@ -106,32 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.625000  0.085000 0.980000 0.410000 ;
-        RECT 3.070000  0.085000 3.400000 0.410000 ;
-        RECT 4.080000  0.085000 4.555000 0.710000 ;
-        RECT 6.830000  0.085000 7.080000 0.470000 ;
-        RECT 7.780000  0.085000 8.030000 0.770000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -140,76 +104,107 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.555000 2.050000 0.885000 3.245000 ;
-        RECT 3.080000 2.630000 3.410000 3.245000 ;
-        RECT 4.105000 2.305000 4.435000 3.245000 ;
-        RECT 6.120000 2.500000 6.825000 3.245000 ;
-        RECT 7.755000 1.820000 8.085000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.300000 0.705000 1.630000 ;
-      RECT 0.535000 0.580000 2.270000 0.750000 ;
-      RECT 0.535000 0.750000 0.705000 1.300000 ;
-      RECT 0.535000 1.630000 0.705000 1.710000 ;
-      RECT 0.535000 1.710000 1.225000 1.880000 ;
-      RECT 1.055000 1.880000 1.225000 1.950000 ;
-      RECT 1.055000 1.950000 2.410000 2.120000 ;
-      RECT 1.940000 0.355000 2.270000 0.580000 ;
-      RECT 2.080000 1.745000 2.410000 1.950000 ;
-      RECT 2.080000 2.120000 2.410000 2.755000 ;
-      RECT 2.325000 1.260000 2.750000 1.575000 ;
-      RECT 2.480000 0.420000 2.890000 0.580000 ;
-      RECT 2.480000 0.580000 3.910000 0.750000 ;
-      RECT 2.580000 1.575000 2.750000 1.625000 ;
-      RECT 2.580000 1.625000 3.200000 1.795000 ;
-      RECT 2.610000 1.965000 2.860000 2.290000 ;
-      RECT 2.610000 2.290000 3.930000 2.460000 ;
-      RECT 2.610000 2.460000 2.860000 2.755000 ;
-      RECT 3.030000 1.795000 3.200000 1.950000 ;
-      RECT 3.030000 1.950000 5.495000 2.120000 ;
-      RECT 3.580000 0.420000 3.910000 0.580000 ;
-      RECT 3.600000 2.460000 3.930000 2.755000 ;
-      RECT 5.045000 0.435000 5.375000 0.595000 ;
-      RECT 5.045000 0.595000 6.320000 0.765000 ;
-      RECT 5.070000 2.120000 5.495000 2.755000 ;
-      RECT 5.325000 1.745000 6.550000 1.915000 ;
-      RECT 5.325000 1.915000 5.495000 1.950000 ;
-      RECT 5.555000 0.255000 6.660000 0.425000 ;
-      RECT 5.665000 2.085000 7.320000 2.255000 ;
-      RECT 5.665000 2.255000 5.950000 2.755000 ;
-      RECT 6.150000 0.765000 6.320000 0.980000 ;
-      RECT 6.150000 0.980000 8.040000 1.150000 ;
-      RECT 6.380000 1.150000 6.550000 1.745000 ;
-      RECT 6.490000 0.425000 6.660000 0.640000 ;
-      RECT 6.490000 0.640000 7.590000 0.810000 ;
-      RECT 6.990000 1.950000 7.320000 2.085000 ;
-      RECT 7.000000 2.255000 7.320000 2.830000 ;
-      RECT 7.260000 0.480000 7.590000 0.640000 ;
-      RECT 7.710000 1.150000 8.040000 1.550000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.425000  1.300000 0.705000 1.630000 ;
+      RECT 0.535000  0.580000 2.270000 0.750000 ;
+      RECT 0.535000  0.750000 0.705000 1.300000 ;
+      RECT 0.535000  1.630000 0.705000 1.710000 ;
+      RECT 0.535000  1.710000 1.225000 1.880000 ;
+      RECT 0.555000  2.050000 0.885000 3.245000 ;
+      RECT 0.625000  0.085000 0.980000 0.410000 ;
+      RECT 1.055000  1.880000 1.225000 1.950000 ;
+      RECT 1.055000  1.950000 2.410000 2.120000 ;
+      RECT 1.565000  1.260000 2.115000 1.575000 ;
+      RECT 1.565000  1.575000 1.795000 1.780000 ;
+      RECT 1.940000  0.355000 2.270000 0.580000 ;
+      RECT 2.080000  1.745000 2.410000 1.950000 ;
+      RECT 2.080000  2.120000 2.410000 2.755000 ;
+      RECT 2.325000  1.260000 2.750000 1.575000 ;
+      RECT 2.480000  0.420000 2.890000 0.580000 ;
+      RECT 2.480000  0.580000 3.910000 0.750000 ;
+      RECT 2.580000  1.575000 2.750000 1.625000 ;
+      RECT 2.580000  1.625000 3.200000 1.795000 ;
+      RECT 2.610000  1.965000 2.860000 2.290000 ;
+      RECT 2.610000  2.290000 3.930000 2.460000 ;
+      RECT 2.610000  2.460000 2.860000 2.755000 ;
+      RECT 3.030000  1.795000 3.200000 1.950000 ;
+      RECT 3.030000  1.950000 5.495000 2.120000 ;
+      RECT 3.070000  0.085000 3.400000 0.410000 ;
+      RECT 3.080000  2.630000 3.410000 3.245000 ;
+      RECT 3.580000  0.420000 3.910000 0.580000 ;
+      RECT 3.600000  2.460000 3.930000 2.755000 ;
+      RECT 3.840000  1.260000 4.195000 1.780000 ;
+      RECT 4.080000  0.085000 4.555000 0.710000 ;
+      RECT 4.105000  2.305000 4.435000 3.245000 ;
+      RECT 4.925000  1.275000 5.640000 1.575000 ;
+      RECT 4.925000  1.575000 5.155000 1.780000 ;
+      RECT 5.045000  0.435000 5.375000 0.595000 ;
+      RECT 5.045000  0.595000 6.320000 0.765000 ;
+      RECT 5.070000  2.120000 5.495000 2.755000 ;
+      RECT 5.325000  1.745000 6.550000 1.915000 ;
+      RECT 5.325000  1.915000 5.495000 1.950000 ;
+      RECT 5.555000  0.255000 6.660000 0.425000 ;
+      RECT 5.665000  2.085000 7.320000 2.255000 ;
+      RECT 5.665000  2.255000 5.950000 2.755000 ;
+      RECT 6.120000  2.500000 6.825000 3.245000 ;
+      RECT 6.150000  0.765000 6.320000 0.980000 ;
+      RECT 6.150000  0.980000 8.040000 1.150000 ;
+      RECT 6.380000  1.150000 6.550000 1.745000 ;
+      RECT 6.490000  0.425000 6.660000 0.640000 ;
+      RECT 6.490000  0.640000 7.590000 0.810000 ;
+      RECT 6.830000  0.085000 7.080000 0.470000 ;
+      RECT 6.990000  1.950000 7.320000 2.085000 ;
+      RECT 7.000000  2.255000 7.320000 2.830000 ;
+      RECT 7.260000  0.480000 7.590000 0.640000 ;
+      RECT 7.710000  1.150000 8.040000 1.550000 ;
+      RECT 7.755000  1.820000 8.085000 3.245000 ;
+      RECT 7.780000  0.085000 8.030000 0.770000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  1.580000 1.765000 1.750000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  1.580000 4.165000 1.750000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  1.580000 5.125000 1.750000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__fa_1
diff --git a/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef b/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef
index 1a2dd2f..2aabe89 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_hs__fa_2.magic.lef
@@ -35,18 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.105000 1.300000 0.435000 1.780000 ;
-        RECT 2.525000 1.260000 3.005000 1.575000 ;
-        RECT 2.525000 1.575000 2.755000 1.780000 ;
-        RECT 3.965000 1.260000 4.525000 1.575000 ;
-        RECT 3.965000 1.575000 4.195000 1.765000 ;
-        RECT 6.265000 1.350000 6.595000 1.780000 ;
-      LAYER mcon ;
-        RECT 0.155000 1.580000 0.325000 1.750000 ;
-        RECT 2.555000 1.580000 2.725000 1.750000 ;
-        RECT 3.995000 1.580000 4.165000 1.750000 ;
-        RECT 6.395000 1.580000 6.565000 1.750000 ;
       LAYER met1 ;
         RECT 0.095000 1.550000 0.385000 1.595000 ;
         RECT 0.095000 1.595000 6.625000 1.735000 ;
@@ -115,34 +103,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.615000  0.085000 0.865000 0.735000 ;
-        RECT 2.800000  0.085000 3.310000 0.705000 ;
-        RECT 3.990000  0.085000 4.320000 0.410000 ;
-        RECT 6.470000  0.085000 6.925000 0.405000 ;
-        RECT 7.615000  0.085000 8.065000 0.405000 ;
-        RECT 8.755000  0.085000 9.005000 1.155000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -151,74 +111,109 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.615000 2.660000 1.010000 3.245000 ;
-        RECT 2.825000 2.290000 3.155000 3.245000 ;
-        RECT 3.905000 2.660000 4.290000 3.245000 ;
-        RECT 6.535000 2.660000 6.865000 3.245000 ;
-        RECT 7.530000 2.730000 8.050000 3.245000 ;
-        RECT 8.750000 1.820000 9.000000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.950000 0.425000 2.320000 ;
-      RECT 0.095000 2.320000 1.545000 2.490000 ;
-      RECT 0.095000 2.490000 0.445000 2.910000 ;
-      RECT 0.115000 0.375000 0.445000 0.905000 ;
-      RECT 0.115000 0.905000 1.205000 1.075000 ;
-      RECT 0.115000 1.075000 0.445000 1.130000 ;
-      RECT 1.035000 0.420000 1.810000 0.750000 ;
-      RECT 1.035000 0.750000 1.205000 0.905000 ;
-      RECT 1.215000 2.085000 1.545000 2.320000 ;
-      RECT 1.215000 2.490000 1.545000 2.755000 ;
-      RECT 1.375000 0.920000 6.935000 1.090000 ;
-      RECT 1.375000 1.090000 1.545000 1.745000 ;
-      RECT 1.375000 1.745000 1.885000 1.915000 ;
-      RECT 1.715000 1.915000 1.885000 2.290000 ;
-      RECT 1.715000 2.290000 2.185000 2.620000 ;
-      RECT 1.980000 0.375000 2.310000 0.920000 ;
-      RECT 3.405000 2.320000 4.825000 2.490000 ;
-      RECT 3.405000 2.490000 3.735000 2.755000 ;
-      RECT 3.480000 0.375000 3.810000 0.580000 ;
-      RECT 3.480000 0.580000 4.970000 0.750000 ;
-      RECT 4.495000 2.275000 4.825000 2.320000 ;
-      RECT 4.495000 2.490000 4.825000 2.755000 ;
-      RECT 4.500000 0.420000 4.970000 0.580000 ;
-      RECT 4.765000 1.090000 5.095000 1.575000 ;
-      RECT 5.005000 2.085000 5.335000 2.320000 ;
-      RECT 5.005000 2.320000 8.050000 2.490000 ;
-      RECT 5.005000 2.490000 5.335000 2.755000 ;
-      RECT 5.140000 0.375000 5.470000 0.575000 ;
-      RECT 5.140000 0.575000 8.050000 0.745000 ;
-      RECT 5.140000 0.745000 5.470000 0.750000 ;
-      RECT 6.765000 1.090000 6.935000 1.255000 ;
-      RECT 6.765000 1.255000 7.165000 1.585000 ;
-      RECT 7.880000 0.745000 8.050000 1.320000 ;
-      RECT 7.880000 1.320000 8.235000 1.650000 ;
-      RECT 7.880000 1.650000 8.050000 2.320000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  1.950000 0.425000 2.320000 ;
+      RECT 0.095000  2.320000 1.545000 2.490000 ;
+      RECT 0.095000  2.490000 0.445000 2.910000 ;
+      RECT 0.105000  1.300000 0.435000 1.780000 ;
+      RECT 0.115000  0.375000 0.445000 0.905000 ;
+      RECT 0.115000  0.905000 1.205000 1.075000 ;
+      RECT 0.115000  1.075000 0.445000 1.130000 ;
+      RECT 0.615000  0.085000 0.865000 0.735000 ;
+      RECT 0.615000  2.660000 1.010000 3.245000 ;
+      RECT 1.035000  0.420000 1.810000 0.750000 ;
+      RECT 1.035000  0.750000 1.205000 0.905000 ;
+      RECT 1.215000  2.085000 1.545000 2.320000 ;
+      RECT 1.215000  2.490000 1.545000 2.755000 ;
+      RECT 1.375000  0.920000 6.935000 1.090000 ;
+      RECT 1.375000  1.090000 1.545000 1.745000 ;
+      RECT 1.375000  1.745000 1.885000 1.915000 ;
+      RECT 1.715000  1.915000 1.885000 2.290000 ;
+      RECT 1.715000  2.290000 2.185000 2.620000 ;
+      RECT 1.980000  0.375000 2.310000 0.920000 ;
+      RECT 2.525000  1.260000 3.005000 1.575000 ;
+      RECT 2.525000  1.575000 2.755000 1.780000 ;
+      RECT 2.800000  0.085000 3.310000 0.705000 ;
+      RECT 2.825000  2.290000 3.155000 3.245000 ;
+      RECT 3.405000  2.320000 4.825000 2.490000 ;
+      RECT 3.405000  2.490000 3.735000 2.755000 ;
+      RECT 3.480000  0.375000 3.810000 0.580000 ;
+      RECT 3.480000  0.580000 4.970000 0.750000 ;
+      RECT 3.905000  2.660000 4.290000 3.245000 ;
+      RECT 3.965000  1.260000 4.525000 1.575000 ;
+      RECT 3.965000  1.575000 4.195000 1.765000 ;
+      RECT 3.990000  0.085000 4.320000 0.410000 ;
+      RECT 4.495000  2.275000 4.825000 2.320000 ;
+      RECT 4.495000  2.490000 4.825000 2.755000 ;
+      RECT 4.500000  0.420000 4.970000 0.580000 ;
+      RECT 4.765000  1.090000 5.095000 1.575000 ;
+      RECT 5.005000  2.085000 5.335000 2.320000 ;
+      RECT 5.005000  2.320000 8.050000 2.490000 ;
+      RECT 5.005000  2.490000 5.335000 2.755000 ;
+      RECT 5.140000  0.375000 5.470000 0.575000 ;
+      RECT 5.140000  0.575000 8.050000 0.745000 ;
+      RECT 5.140000  0.745000 5.470000 0.750000 ;
+      RECT 6.265000  1.350000 6.595000 1.780000 ;
+      RECT 6.470000  0.085000 6.925000 0.405000 ;
+      RECT 6.535000  2.660000 6.865000 3.245000 ;
+      RECT 6.765000  1.090000 6.935000 1.255000 ;
+      RECT 6.765000  1.255000 7.165000 1.585000 ;
+      RECT 7.530000  2.730000 8.050000 3.245000 ;
+      RECT 7.615000  0.085000 8.065000 0.405000 ;
+      RECT 7.880000  0.745000 8.050000 1.320000 ;
+      RECT 7.880000  1.320000 8.235000 1.650000 ;
+      RECT 7.880000  1.650000 8.050000 2.320000 ;
+      RECT 8.750000  1.820000 9.000000 3.245000 ;
+      RECT 8.755000  0.085000 9.005000 1.155000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  1.580000 0.325000 1.750000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  1.580000 2.725000 1.750000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  1.580000 4.165000 1.750000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  1.580000 6.565000 1.750000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__fa_2
diff --git a/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef b/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef
index 36cb436..bae68a2 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_hs__fa_4.magic.lef
@@ -64,15 +64,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 2.005000 1.180000 2.275000 1.780000 ;
-        RECT 3.005000 1.180000 3.215000 1.260000 ;
-        RECT 3.005000 1.260000 3.740000 1.575000 ;
-        RECT 5.430000 1.180000 5.745000 1.550000 ;
-      LAYER mcon ;
-        RECT 2.075000 1.210000 2.245000 1.380000 ;
-        RECT 3.035000 1.210000 3.205000 1.380000 ;
-        RECT 5.435000 1.210000 5.605000 1.380000 ;
       LAYER met1 ;
         RECT 2.015000 1.180000 2.305000 1.225000 ;
         RECT 2.015000 1.225000 5.665000 1.365000 ;
@@ -116,40 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.625000  0.085000  1.155000 0.410000 ;
-        RECT  3.175000  0.085000  3.505000 0.670000 ;
-        RECT  4.155000  0.085000  4.485000 0.410000 ;
-        RECT  6.755000  0.085000  7.085000 0.410000 ;
-        RECT  7.775000  0.085000  8.105000 0.410000 ;
-        RECT  8.795000  0.085000  9.125000 0.410000 ;
-        RECT  9.735000  0.085000  9.985000 0.810000 ;
-        RECT 10.595000  0.085000 10.925000 1.170000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -158,90 +115,128 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.645000 2.425000  0.815000 3.245000 ;
-        RECT  3.170000 2.085000  3.500000 3.245000 ;
-        RECT  4.170000 2.425000  4.570000 3.245000 ;
-        RECT  6.795000 2.290000  7.045000 3.245000 ;
-        RECT  7.775000 2.180000  8.025000 3.245000 ;
-        RECT  8.725000 1.820000  8.975000 3.245000 ;
-        RECT  9.675000 2.160000  9.925000 3.245000 ;
-        RECT 10.625000 1.820000 10.875000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.580000 ;
-      RECT 0.115000 0.580000 1.965000 0.670000 ;
-      RECT 0.115000 0.670000 1.495000 0.750000 ;
-      RECT 0.115000 0.750000 0.445000 1.075000 ;
-      RECT 0.115000 1.950000 0.445000 2.085000 ;
-      RECT 0.115000 2.085000 1.155000 2.255000 ;
-      RECT 0.115000 2.255000 0.445000 2.980000 ;
-      RECT 0.985000 2.255000 1.155000 2.630000 ;
-      RECT 0.985000 2.630000 2.005000 2.960000 ;
-      RECT 1.005000 0.920000 5.255000 1.010000 ;
-      RECT 1.005000 1.010000 1.835000 1.090000 ;
-      RECT 1.005000 1.090000 1.175000 1.745000 ;
-      RECT 1.005000 1.745000 1.495000 1.915000 ;
-      RECT 1.325000 0.350000 1.965000 0.580000 ;
-      RECT 1.325000 1.915000 1.495000 2.290000 ;
-      RECT 1.325000 2.290000 2.540000 2.460000 ;
-      RECT 1.665000 0.840000 3.555000 0.920000 ;
-      RECT 2.135000 0.350000 2.465000 0.840000 ;
-      RECT 2.210000 2.460000 2.540000 2.755000 ;
-      RECT 3.385000 1.010000 5.255000 1.090000 ;
-      RECT 3.670000 2.085000 5.070000 2.255000 ;
-      RECT 3.670000 2.255000 4.000000 2.755000 ;
-      RECT 3.725000 0.350000 3.975000 0.580000 ;
-      RECT 3.725000 0.580000 4.915000 0.750000 ;
-      RECT 4.665000 0.350000 4.915000 0.580000 ;
-      RECT 4.740000 2.255000 5.070000 2.755000 ;
-      RECT 4.930000 1.090000 5.255000 1.220000 ;
-      RECT 4.930000 1.220000 5.260000 1.550000 ;
-      RECT 5.085000 0.255000 6.425000 0.425000 ;
-      RECT 5.085000 0.425000 5.255000 0.920000 ;
-      RECT 5.240000 2.060000 7.075000 2.120000 ;
-      RECT 5.240000 2.120000 6.425000 2.230000 ;
-      RECT 5.240000 2.230000 5.570000 2.755000 ;
-      RECT 5.425000 0.595000 5.675000 0.840000 ;
-      RECT 5.425000 0.840000 6.085000 0.920000 ;
-      RECT 5.425000 0.920000 7.075000 1.010000 ;
-      RECT 5.915000 1.010000 7.075000 1.090000 ;
-      RECT 6.255000 0.425000 6.425000 0.580000 ;
-      RECT 6.255000 0.580000 9.135000 0.750000 ;
-      RECT 6.255000 1.950000 7.075000 2.060000 ;
-      RECT 6.905000 1.090000 7.075000 1.340000 ;
-      RECT 6.905000 1.340000 8.105000 1.670000 ;
-      RECT 6.905000 1.670000 7.075000 1.950000 ;
-      RECT 8.965000 0.750000 9.135000 1.320000 ;
-      RECT 8.965000 1.320000 9.955000 1.650000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.115000  0.350000  0.445000 0.580000 ;
+      RECT  0.115000  0.580000  1.965000 0.670000 ;
+      RECT  0.115000  0.670000  1.495000 0.750000 ;
+      RECT  0.115000  0.750000  0.445000 1.075000 ;
+      RECT  0.115000  1.950000  0.445000 2.085000 ;
+      RECT  0.115000  2.085000  1.155000 2.255000 ;
+      RECT  0.115000  2.255000  0.445000 2.980000 ;
+      RECT  0.625000  0.085000  1.155000 0.410000 ;
+      RECT  0.645000  2.425000  0.815000 3.245000 ;
+      RECT  0.985000  2.255000  1.155000 2.630000 ;
+      RECT  0.985000  2.630000  2.005000 2.960000 ;
+      RECT  1.005000  0.920000  5.255000 1.010000 ;
+      RECT  1.005000  1.010000  1.835000 1.090000 ;
+      RECT  1.005000  1.090000  1.175000 1.745000 ;
+      RECT  1.005000  1.745000  1.495000 1.915000 ;
+      RECT  1.325000  0.350000  1.965000 0.580000 ;
+      RECT  1.325000  1.915000  1.495000 2.290000 ;
+      RECT  1.325000  2.290000  2.540000 2.460000 ;
+      RECT  1.665000  0.840000  3.555000 0.920000 ;
+      RECT  2.005000  1.180000  2.275000 1.780000 ;
+      RECT  2.135000  0.350000  2.465000 0.840000 ;
+      RECT  2.210000  2.460000  2.540000 2.755000 ;
+      RECT  3.005000  1.180000  3.215000 1.260000 ;
+      RECT  3.005000  1.260000  3.740000 1.575000 ;
+      RECT  3.170000  2.085000  3.500000 3.245000 ;
+      RECT  3.175000  0.085000  3.505000 0.670000 ;
+      RECT  3.385000  1.010000  5.255000 1.090000 ;
+      RECT  3.670000  2.085000  5.070000 2.255000 ;
+      RECT  3.670000  2.255000  4.000000 2.755000 ;
+      RECT  3.725000  0.350000  3.975000 0.580000 ;
+      RECT  3.725000  0.580000  4.915000 0.750000 ;
+      RECT  4.155000  0.085000  4.485000 0.410000 ;
+      RECT  4.170000  2.425000  4.570000 3.245000 ;
+      RECT  4.665000  0.350000  4.915000 0.580000 ;
+      RECT  4.740000  2.255000  5.070000 2.755000 ;
+      RECT  4.930000  1.090000  5.255000 1.220000 ;
+      RECT  4.930000  1.220000  5.260000 1.550000 ;
+      RECT  5.085000  0.255000  6.425000 0.425000 ;
+      RECT  5.085000  0.425000  5.255000 0.920000 ;
+      RECT  5.240000  2.060000  7.075000 2.120000 ;
+      RECT  5.240000  2.120000  6.425000 2.230000 ;
+      RECT  5.240000  2.230000  5.570000 2.755000 ;
+      RECT  5.425000  0.595000  5.675000 0.840000 ;
+      RECT  5.425000  0.840000  6.085000 0.920000 ;
+      RECT  5.425000  0.920000  7.075000 1.010000 ;
+      RECT  5.430000  1.180000  5.745000 1.550000 ;
+      RECT  5.915000  1.010000  7.075000 1.090000 ;
+      RECT  6.255000  0.425000  6.425000 0.580000 ;
+      RECT  6.255000  0.580000  9.135000 0.750000 ;
+      RECT  6.255000  1.950000  7.075000 2.060000 ;
+      RECT  6.755000  0.085000  7.085000 0.410000 ;
+      RECT  6.795000  2.290000  7.045000 3.245000 ;
+      RECT  6.905000  1.090000  7.075000 1.340000 ;
+      RECT  6.905000  1.340000  8.105000 1.670000 ;
+      RECT  6.905000  1.670000  7.075000 1.950000 ;
+      RECT  7.775000  0.085000  8.105000 0.410000 ;
+      RECT  7.775000  2.180000  8.025000 3.245000 ;
+      RECT  8.725000  1.820000  8.975000 3.245000 ;
+      RECT  8.795000  0.085000  9.125000 0.410000 ;
+      RECT  8.965000  0.750000  9.135000 1.320000 ;
+      RECT  8.965000  1.320000  9.955000 1.650000 ;
+      RECT  9.675000  2.160000  9.925000 3.245000 ;
+      RECT  9.735000  0.085000  9.985000 0.810000 ;
+      RECT 10.595000  0.085000 10.925000 1.170000 ;
+      RECT 10.625000  1.820000 10.875000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  1.210000  2.245000 1.380000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.210000  3.205000 1.380000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.210000  5.605000 1.380000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__fa_4
diff --git a/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef b/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef
index 75eac96..a8853ba 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_hs__fah_1.magic.lef
@@ -85,43 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.620000  0.085000  0.950000 0.560000 ;
-        RECT  2.255000  0.085000  2.425000 0.730000 ;
-        RECT  7.745000  0.085000  8.075000 0.450000 ;
-        RECT 11.915000  0.085000 12.245000 0.620000 ;
-        RECT 12.975000  0.085000 13.305000 0.960000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
@@ -130,156 +93,189 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.645000 2.290000  0.815000 3.245000 ;
-        RECT  2.935000 2.965000  3.290000 3.245000 ;
-        RECT  7.670000 1.765000  8.000000 3.245000 ;
-        RECT 11.950000 2.110000 12.220000 2.330000 ;
-        RECT 11.950000 2.330000 12.290000 3.245000 ;
-        RECT 13.050000 1.970000 13.300000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  1.130000 1.070000  1.675000 1.240000 ;
-      RECT  1.325000 1.950000  1.675000 2.535000 ;
-      RECT  1.325000 2.535000  2.985000 2.625000 ;
-      RECT  1.325000 2.625000  3.630000 2.705000 ;
-      RECT  1.325000 2.705000  1.675000 2.735000 ;
-      RECT  1.505000 1.240000  1.675000 1.950000 ;
-      RECT  1.845000 0.900000  2.765000 1.070000 ;
-      RECT  1.845000 1.070000  2.175000 2.195000 ;
-      RECT  1.845000 2.195000  3.325000 2.285000 ;
-      RECT  1.845000 2.285000  4.535000 2.365000 ;
-      RECT  2.500000 1.240000  3.105000 1.410000 ;
-      RECT  2.500000 1.410000  2.830000 1.635000 ;
-      RECT  2.595000 0.255000  4.285000 0.425000 ;
-      RECT  2.595000 0.425000  2.765000 0.900000 ;
-      RECT  2.815000 2.705000  3.630000 2.795000 ;
-      RECT  2.935000 0.595000  3.945000 0.765000 ;
-      RECT  2.935000 0.765000  3.105000 1.240000 ;
-      RECT  3.005000 1.580000  3.445000 1.855000 ;
-      RECT  3.005000 1.855000  4.000000 2.025000 ;
-      RECT  3.155000 2.365000  4.535000 2.455000 ;
-      RECT  3.275000 0.935000  3.605000 1.185000 ;
-      RECT  3.275000 1.185000  3.445000 1.580000 ;
-      RECT  3.460000 2.795000  3.630000 2.905000 ;
-      RECT  3.460000 2.905000  7.000000 3.075000 ;
-      RECT  3.495000 2.025000  4.000000 2.115000 ;
-      RECT  3.670000 1.435000  4.340000 1.595000 ;
-      RECT  3.670000 1.595000  4.875000 1.685000 ;
-      RECT  3.775000 0.765000  3.945000 1.095000 ;
-      RECT  3.775000 1.095000  5.215000 1.265000 ;
-      RECT  4.115000 0.425000  4.285000 0.755000 ;
-      RECT  4.115000 0.755000  6.215000 0.765000 ;
-      RECT  4.115000 0.765000  5.045000 0.925000 ;
-      RECT  4.170000 1.685000  4.875000 1.765000 ;
-      RECT  4.205000 2.100000  4.535000 2.285000 ;
-      RECT  4.205000 2.455000  4.535000 2.735000 ;
-      RECT  4.455000 0.255000  7.565000 0.425000 ;
-      RECT  4.455000 0.425000  4.705000 0.585000 ;
-      RECT  4.705000 1.765000  4.875000 2.730000 ;
-      RECT  4.705000 2.730000  6.125000 2.905000 ;
-      RECT  4.875000 0.595000  6.215000 0.755000 ;
-      RECT  4.880000 1.265000  5.215000 1.425000 ;
-      RECT  5.045000 1.425000  5.215000 2.320000 ;
-      RECT  5.045000 2.320000  6.660000 2.490000 ;
-      RECT  5.385000 0.935000  5.715000 1.035000 ;
-      RECT  5.385000 1.035000  6.225000 1.205000 ;
-      RECT  5.405000 1.375000  5.885000 1.705000 ;
-      RECT  5.405000 1.705000  5.635000 2.150000 ;
-      RECT  5.885000 0.765000  6.215000 0.865000 ;
-      RECT  6.055000 1.205000  6.225000 1.950000 ;
-      RECT  6.055000 1.950000  7.000000 2.120000 ;
-      RECT  6.330000 2.290000  6.660000 2.320000 ;
-      RECT  6.330000 2.490000  6.660000 2.640000 ;
-      RECT  6.395000 0.670000  6.565000 1.550000 ;
-      RECT  6.395000 1.550000  6.595000 1.780000 ;
-      RECT  6.735000 0.710000  7.065000 1.380000 ;
-      RECT  6.830000 2.120000  7.000000 2.905000 ;
-      RECT  6.845000 1.380000  7.065000 1.550000 ;
-      RECT  6.845000 1.550000  7.075000 1.780000 ;
-      RECT  7.170000 1.950000  7.500000 2.925000 ;
-      RECT  7.235000 0.425000  7.565000 0.620000 ;
-      RECT  7.235000 0.620000 10.315000 0.790000 ;
-      RECT  7.235000 0.790000  7.565000 1.130000 ;
-      RECT  7.330000 1.130000  7.500000 1.950000 ;
-      RECT  8.170000 0.960000  8.635000 1.210000 ;
-      RECT  8.170000 1.210000  8.340000 1.880000 ;
-      RECT  8.170000 1.880000  8.610000 2.905000 ;
-      RECT  8.170000 2.905000 11.740000 3.075000 ;
-      RECT  8.510000 1.380000  8.975000 1.710000 ;
-      RECT  8.780000 1.880000  9.110000 2.565000 ;
-      RECT  8.780000 2.565000 10.815000 2.735000 ;
-      RECT  8.805000 0.790000  8.975000 1.380000 ;
-      RECT  8.895000 0.255000 11.155000 0.425000 ;
-      RECT  8.895000 0.425000  9.385000 0.450000 ;
-      RECT  9.280000 1.805000 10.475000 2.395000 ;
-      RECT  9.645000 0.960000  9.975000 1.805000 ;
-      RECT 10.145000 0.790000 10.315000 1.220000 ;
-      RECT 10.145000 1.220000 10.475000 1.550000 ;
-      RECT 10.485000 0.595000 10.815000 1.050000 ;
-      RECT 10.645000 1.050000 10.815000 2.565000 ;
-      RECT 10.985000 0.425000 11.155000 1.550000 ;
-      RECT 10.985000 1.550000 11.215000 1.780000 ;
-      RECT 10.985000 1.780000 11.155000 2.735000 ;
-      RECT 11.385000 1.130000 11.740000 2.905000 ;
-      RECT 11.405000 0.350000 11.740000 1.130000 ;
-      RECT 11.910000 0.790000 12.805000 0.960000 ;
-      RECT 11.910000 0.960000 12.080000 1.720000 ;
-      RECT 11.910000 1.720000 12.650000 1.940000 ;
-      RECT 12.250000 1.130000 13.830000 1.300000 ;
-      RECT 12.250000 1.300000 12.580000 1.550000 ;
-      RECT 12.390000 1.940000 12.650000 1.970000 ;
-      RECT 12.390000 1.970000 12.850000 2.160000 ;
-      RECT 12.475000 0.350000 12.805000 0.790000 ;
-      RECT 12.520000 2.160000 12.850000 2.980000 ;
-      RECT 13.470000 1.970000 13.830000 2.980000 ;
-      RECT 13.475000 0.350000 13.830000 1.130000 ;
-      RECT 13.660000 1.300000 13.830000 1.970000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.620000  0.085000  0.950000 0.560000 ;
+      RECT  0.645000  2.290000  0.815000 3.245000 ;
+      RECT  1.130000  1.070000  1.675000 1.240000 ;
+      RECT  1.325000  1.950000  1.675000 2.535000 ;
+      RECT  1.325000  2.535000  2.985000 2.625000 ;
+      RECT  1.325000  2.625000  3.630000 2.705000 ;
+      RECT  1.325000  2.705000  1.675000 2.735000 ;
+      RECT  1.505000  1.240000  1.675000 1.950000 ;
+      RECT  1.845000  0.900000  2.765000 1.070000 ;
+      RECT  1.845000  1.070000  2.175000 2.195000 ;
+      RECT  1.845000  2.195000  3.325000 2.285000 ;
+      RECT  1.845000  2.285000  4.535000 2.365000 ;
+      RECT  2.255000  0.085000  2.425000 0.730000 ;
+      RECT  2.500000  1.240000  3.105000 1.410000 ;
+      RECT  2.500000  1.410000  2.830000 1.635000 ;
+      RECT  2.595000  0.255000  4.285000 0.425000 ;
+      RECT  2.595000  0.425000  2.765000 0.900000 ;
+      RECT  2.815000  2.705000  3.630000 2.795000 ;
+      RECT  2.935000  0.595000  3.945000 0.765000 ;
+      RECT  2.935000  0.765000  3.105000 1.240000 ;
+      RECT  2.935000  2.965000  3.290000 3.245000 ;
+      RECT  3.005000  1.580000  3.445000 1.855000 ;
+      RECT  3.005000  1.855000  4.000000 2.025000 ;
+      RECT  3.155000  2.365000  4.535000 2.455000 ;
+      RECT  3.275000  0.935000  3.605000 1.185000 ;
+      RECT  3.275000  1.185000  3.445000 1.580000 ;
+      RECT  3.460000  2.795000  3.630000 2.905000 ;
+      RECT  3.460000  2.905000  7.000000 3.075000 ;
+      RECT  3.495000  2.025000  4.000000 2.115000 ;
+      RECT  3.670000  1.435000  4.340000 1.595000 ;
+      RECT  3.670000  1.595000  4.875000 1.685000 ;
+      RECT  3.775000  0.765000  3.945000 1.095000 ;
+      RECT  3.775000  1.095000  5.215000 1.265000 ;
+      RECT  4.115000  0.425000  4.285000 0.755000 ;
+      RECT  4.115000  0.755000  6.215000 0.765000 ;
+      RECT  4.115000  0.765000  5.045000 0.925000 ;
+      RECT  4.170000  1.685000  4.875000 1.765000 ;
+      RECT  4.205000  2.100000  4.535000 2.285000 ;
+      RECT  4.205000  2.455000  4.535000 2.735000 ;
+      RECT  4.455000  0.255000  7.565000 0.425000 ;
+      RECT  4.455000  0.425000  4.705000 0.585000 ;
+      RECT  4.705000  1.765000  4.875000 2.730000 ;
+      RECT  4.705000  2.730000  6.125000 2.905000 ;
+      RECT  4.875000  0.595000  6.215000 0.755000 ;
+      RECT  4.880000  1.265000  5.215000 1.425000 ;
+      RECT  5.045000  1.425000  5.215000 2.320000 ;
+      RECT  5.045000  2.320000  6.660000 2.490000 ;
+      RECT  5.385000  0.935000  5.715000 1.035000 ;
+      RECT  5.385000  1.035000  6.225000 1.205000 ;
+      RECT  5.405000  1.375000  5.885000 1.705000 ;
+      RECT  5.405000  1.705000  5.635000 2.150000 ;
+      RECT  5.885000  0.765000  6.215000 0.865000 ;
+      RECT  6.055000  1.205000  6.225000 1.950000 ;
+      RECT  6.055000  1.950000  7.000000 2.120000 ;
+      RECT  6.330000  2.290000  6.660000 2.320000 ;
+      RECT  6.330000  2.490000  6.660000 2.640000 ;
+      RECT  6.395000  0.670000  6.565000 1.550000 ;
+      RECT  6.395000  1.550000  6.595000 1.780000 ;
+      RECT  6.735000  0.710000  7.065000 1.380000 ;
+      RECT  6.830000  2.120000  7.000000 2.905000 ;
+      RECT  6.845000  1.380000  7.065000 1.550000 ;
+      RECT  6.845000  1.550000  7.075000 1.780000 ;
+      RECT  7.170000  1.950000  7.500000 2.925000 ;
+      RECT  7.235000  0.425000  7.565000 0.620000 ;
+      RECT  7.235000  0.620000 10.315000 0.790000 ;
+      RECT  7.235000  0.790000  7.565000 1.130000 ;
+      RECT  7.330000  1.130000  7.500000 1.950000 ;
+      RECT  7.670000  1.765000  8.000000 3.245000 ;
+      RECT  7.745000  0.085000  8.075000 0.450000 ;
+      RECT  8.170000  0.960000  8.635000 1.210000 ;
+      RECT  8.170000  1.210000  8.340000 1.880000 ;
+      RECT  8.170000  1.880000  8.610000 2.905000 ;
+      RECT  8.170000  2.905000 11.740000 3.075000 ;
+      RECT  8.510000  1.380000  8.975000 1.710000 ;
+      RECT  8.780000  1.880000  9.110000 2.565000 ;
+      RECT  8.780000  2.565000 10.815000 2.735000 ;
+      RECT  8.805000  0.790000  8.975000 1.380000 ;
+      RECT  8.895000  0.255000 11.155000 0.425000 ;
+      RECT  8.895000  0.425000  9.385000 0.450000 ;
+      RECT  9.280000  1.805000 10.475000 2.395000 ;
+      RECT  9.645000  0.960000  9.975000 1.805000 ;
+      RECT 10.145000  0.790000 10.315000 1.220000 ;
+      RECT 10.145000  1.220000 10.475000 1.550000 ;
+      RECT 10.485000  0.595000 10.815000 1.050000 ;
+      RECT 10.645000  1.050000 10.815000 2.565000 ;
+      RECT 10.985000  0.425000 11.155000 1.550000 ;
+      RECT 10.985000  1.550000 11.215000 1.780000 ;
+      RECT 10.985000  1.780000 11.155000 2.735000 ;
+      RECT 11.385000  1.130000 11.740000 2.905000 ;
+      RECT 11.405000  0.350000 11.740000 1.130000 ;
+      RECT 11.910000  0.790000 12.805000 0.960000 ;
+      RECT 11.910000  0.960000 12.080000 1.720000 ;
+      RECT 11.910000  1.720000 12.650000 1.940000 ;
+      RECT 11.915000  0.085000 12.245000 0.620000 ;
+      RECT 11.950000  2.110000 12.220000 2.330000 ;
+      RECT 11.950000  2.330000 12.290000 3.245000 ;
+      RECT 12.250000  1.130000 13.830000 1.300000 ;
+      RECT 12.250000  1.300000 12.580000 1.550000 ;
+      RECT 12.390000  1.940000 12.650000 1.970000 ;
+      RECT 12.390000  1.970000 12.850000 2.160000 ;
+      RECT 12.475000  0.350000 12.805000 0.790000 ;
+      RECT 12.520000  2.160000 12.850000 2.980000 ;
+      RECT 12.975000  0.085000 13.305000 0.960000 ;
+      RECT 13.050000  1.970000 13.300000 3.245000 ;
+      RECT 13.470000  1.970000 13.830000 2.980000 ;
+      RECT 13.475000  0.350000 13.830000 1.130000 ;
+      RECT 13.660000  1.300000 13.830000 1.970000 ;
     LAYER mcon ;
-      RECT  3.035000 1.580000  3.205000 1.750000 ;
-      RECT  5.435000 1.950000  5.605000 2.120000 ;
-      RECT  6.395000 1.580000  6.565000 1.750000 ;
-      RECT  6.875000 1.580000  7.045000 1.750000 ;
-      RECT  8.840000 1.950000  9.010000 2.120000 ;
-      RECT  9.885000 1.950000 10.055000 2.120000 ;
-      RECT 10.245000 1.950000 10.415000 2.120000 ;
-      RECT 11.015000 1.580000 11.185000 1.750000 ;
-      RECT 12.435000 1.950000 12.605000 2.120000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.580000  3.205000 1.750000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.950000  5.605000 2.120000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  1.580000  6.565000 1.750000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  1.580000  7.045000 1.750000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  8.840000  1.950000  9.010000 2.120000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT  9.885000  1.950000 10.055000 2.120000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.245000  1.950000 10.415000 2.120000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.015000  1.580000 11.185000 1.750000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.435000  1.950000 12.605000 2.120000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
     LAYER met1 ;
       RECT  2.975000 1.550000  3.265000 1.595000 ;
       RECT  2.975000 1.595000  6.625000 1.735000 ;
diff --git a/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef b/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef
index b845e75..7d103e4 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef
+++ b/cells/fah/sky130_fd_sc_hs__fah_2.magic.lef
@@ -92,46 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.170000  0.085000  0.535000 0.790000 ;
-        RECT  1.875000  0.085000  2.125000 0.845000 ;
-        RECT  6.335000  0.085000  6.665000 0.680000 ;
-        RECT 11.105000  0.085000 11.355000 0.505000 ;
-        RECT 12.075000  0.085000 12.405000 0.640000 ;
-        RECT 13.015000  0.085000 13.345000 1.130000 ;
-        RECT 13.955000  0.085000 14.285000 0.630000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
@@ -140,145 +100,181 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.105000 2.160000  0.360000 3.245000 ;
-        RECT  1.540000 1.950000  1.870000 3.245000 ;
-        RECT  6.265000 2.580000  6.595000 3.245000 ;
-        RECT 11.015000 2.940000 11.395000 3.245000 ;
-        RECT 12.140000 2.710000 12.470000 3.245000 ;
-        RECT 13.040000 2.710000 13.370000 3.245000 ;
-        RECT 14.045000 1.820000 14.295000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.125000 1.180000  0.650000 1.470000 ;
-      RECT  0.335000 1.470000  0.650000 1.820000 ;
-      RECT  0.335000 1.820000  0.885000 1.990000 ;
-      RECT  0.480000 0.960000  0.965000 1.130000 ;
-      RECT  0.480000 1.130000  0.650000 1.180000 ;
-      RECT  0.555000 1.990000  0.885000 2.980000 ;
-      RECT  0.705000 0.350000  0.965000 0.960000 ;
-      RECT  0.820000 1.300000  1.395000 1.630000 ;
-      RECT  1.090000 1.630000  1.340000 2.980000 ;
-      RECT  1.225000 0.505000  1.705000 1.120000 ;
-      RECT  1.225000 1.120000  1.395000 1.300000 ;
-      RECT  2.055000 2.015000  2.385000 2.890000 ;
-      RECT  2.055000 2.890000  6.055000 3.060000 ;
-      RECT  2.215000 1.015000  2.555000 1.185000 ;
-      RECT  2.215000 1.185000  2.385000 2.015000 ;
-      RECT  2.305000 0.255000  5.935000 0.425000 ;
-      RECT  2.305000 0.425000  2.555000 1.015000 ;
-      RECT  2.555000 2.390000  3.450000 2.550000 ;
-      RECT  2.555000 2.550000  5.555000 2.720000 ;
-      RECT  3.065000 0.935000  3.395000 1.185000 ;
-      RECT  3.065000 1.185000  3.235000 2.390000 ;
-      RECT  3.620000 2.130000  4.110000 2.380000 ;
-      RECT  3.905000 0.935000  4.235000 1.185000 ;
-      RECT  3.940000 1.185000  4.235000 1.410000 ;
-      RECT  3.940000 1.410000  4.110000 2.130000 ;
-      RECT  4.280000 2.100000  5.215000 2.350000 ;
-      RECT  4.765000 0.935000  5.095000 1.260000 ;
-      RECT  4.765000 1.260000  5.705000 1.355000 ;
-      RECT  4.765000 1.355000  6.545000 1.430000 ;
-      RECT  4.765000 1.430000  4.935000 2.100000 ;
-      RECT  5.105000 1.600000  5.365000 1.760000 ;
-      RECT  5.105000 1.760000  7.045000 1.930000 ;
-      RECT  5.385000 2.100000  6.395000 2.240000 ;
-      RECT  5.385000 2.240000  7.385000 2.270000 ;
-      RECT  5.385000 2.270000  5.555000 2.550000 ;
-      RECT  5.535000 1.430000  6.545000 1.525000 ;
-      RECT  5.605000 0.425000  5.935000 0.750000 ;
-      RECT  5.725000 2.440000  6.055000 2.890000 ;
-      RECT  6.225000 2.270000  7.385000 2.410000 ;
-      RECT  6.375000 0.850000  7.005000 1.020000 ;
-      RECT  6.375000 1.020000  6.545000 1.355000 ;
-      RECT  6.715000 1.190000  7.505000 1.360000 ;
-      RECT  6.715000 1.360000  7.045000 1.760000 ;
-      RECT  6.715000 1.930000  7.045000 2.070000 ;
-      RECT  6.835000 0.255000  7.845000 0.425000 ;
-      RECT  6.835000 0.425000  7.005000 0.850000 ;
-      RECT  7.175000 0.630000  7.505000 1.190000 ;
-      RECT  7.215000 1.630000  7.505000 1.960000 ;
-      RECT  7.215000 1.960000  7.385000 2.240000 ;
-      RECT  7.215000 2.410000  7.385000 2.905000 ;
-      RECT  7.215000 2.905000  9.575000 3.075000 ;
-      RECT  7.555000 2.130000  8.310000 2.735000 ;
-      RECT  7.675000 0.425000  7.845000 1.275000 ;
-      RECT  7.675000 1.275000  7.970000 1.945000 ;
-      RECT  8.015000 0.390000  8.555000 0.640000 ;
-      RECT  8.140000 0.640000  8.555000 1.040000 ;
-      RECT  8.140000 1.040000  8.310000 2.130000 ;
-      RECT  8.480000 1.225000  8.735000 2.905000 ;
-      RECT  8.745000 0.255000 10.935000 0.425000 ;
-      RECT  8.745000 0.425000  9.075000 1.055000 ;
-      RECT  8.905000 1.055000  9.075000 2.130000 ;
-      RECT  8.905000 2.130000  9.235000 2.735000 ;
-      RECT  9.245000 0.595000 10.255000 0.765000 ;
-      RECT  9.245000 0.765000  9.415000 1.630000 ;
-      RECT  9.245000 1.630000  9.575000 1.960000 ;
-      RECT  9.405000 1.960000  9.575000 2.905000 ;
-      RECT  9.585000 0.935000  9.915000 1.185000 ;
-      RECT  9.745000 1.185000  9.915000 2.100000 ;
-      RECT  9.745000 2.100000 10.075000 2.600000 ;
-      RECT  9.745000 2.600000 11.970000 2.770000 ;
-      RECT  9.745000 2.770000 10.075000 2.980000 ;
-      RECT 10.085000 0.765000 10.255000 1.355000 ;
-      RECT 10.085000 1.355000 10.470000 1.685000 ;
-      RECT 10.310000 2.130000 10.810000 2.430000 ;
-      RECT 10.425000 0.595000 10.595000 1.015000 ;
-      RECT 10.425000 1.015000 10.810000 1.185000 ;
-      RECT 10.640000 1.185000 10.810000 2.130000 ;
-      RECT 10.765000 0.425000 10.935000 0.675000 ;
-      RECT 10.765000 0.675000 11.865000 0.845000 ;
-      RECT 10.980000 0.845000 11.865000 1.055000 ;
-      RECT 10.980000 1.055000 11.240000 1.950000 ;
-      RECT 10.980000 1.950000 11.930000 2.200000 ;
-      RECT 11.535000 0.375000 11.865000 0.675000 ;
-      RECT 11.800000 2.370000 13.400000 2.540000 ;
-      RECT 11.800000 2.540000 11.970000 2.600000 ;
-      RECT 12.085000 0.810000 12.415000 1.550000 ;
-      RECT 13.230000 1.300000 13.535000 1.630000 ;
-      RECT 13.230000 1.630000 13.400000 2.370000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.105000  2.160000  0.360000 3.245000 ;
+      RECT  0.125000  1.180000  0.650000 1.470000 ;
+      RECT  0.170000  0.085000  0.535000 0.790000 ;
+      RECT  0.335000  1.470000  0.650000 1.820000 ;
+      RECT  0.335000  1.820000  0.885000 1.990000 ;
+      RECT  0.480000  0.960000  0.965000 1.130000 ;
+      RECT  0.480000  1.130000  0.650000 1.180000 ;
+      RECT  0.555000  1.990000  0.885000 2.980000 ;
+      RECT  0.705000  0.350000  0.965000 0.960000 ;
+      RECT  0.820000  1.300000  1.395000 1.630000 ;
+      RECT  1.090000  1.630000  1.340000 2.980000 ;
+      RECT  1.225000  0.505000  1.705000 1.120000 ;
+      RECT  1.225000  1.120000  1.395000 1.300000 ;
+      RECT  1.540000  1.950000  1.870000 3.245000 ;
+      RECT  1.875000  0.085000  2.125000 0.845000 ;
+      RECT  2.055000  2.015000  2.385000 2.890000 ;
+      RECT  2.055000  2.890000  6.055000 3.060000 ;
+      RECT  2.215000  1.015000  2.555000 1.185000 ;
+      RECT  2.215000  1.185000  2.385000 2.015000 ;
+      RECT  2.305000  0.255000  5.935000 0.425000 ;
+      RECT  2.305000  0.425000  2.555000 1.015000 ;
+      RECT  2.555000  2.390000  3.450000 2.550000 ;
+      RECT  2.555000  2.550000  5.555000 2.720000 ;
+      RECT  3.065000  0.935000  3.395000 1.185000 ;
+      RECT  3.065000  1.185000  3.235000 2.390000 ;
+      RECT  3.620000  2.130000  4.110000 2.380000 ;
+      RECT  3.905000  0.935000  4.235000 1.185000 ;
+      RECT  3.940000  1.185000  4.235000 1.410000 ;
+      RECT  3.940000  1.410000  4.110000 2.130000 ;
+      RECT  4.280000  2.100000  5.215000 2.350000 ;
+      RECT  4.765000  0.935000  5.095000 1.260000 ;
+      RECT  4.765000  1.260000  5.705000 1.355000 ;
+      RECT  4.765000  1.355000  6.545000 1.430000 ;
+      RECT  4.765000  1.430000  4.935000 2.100000 ;
+      RECT  5.105000  1.600000  5.365000 1.760000 ;
+      RECT  5.105000  1.760000  7.045000 1.930000 ;
+      RECT  5.385000  2.100000  6.395000 2.240000 ;
+      RECT  5.385000  2.240000  7.385000 2.270000 ;
+      RECT  5.385000  2.270000  5.555000 2.550000 ;
+      RECT  5.535000  1.430000  6.545000 1.525000 ;
+      RECT  5.605000  0.425000  5.935000 0.750000 ;
+      RECT  5.725000  2.440000  6.055000 2.890000 ;
+      RECT  6.225000  2.270000  7.385000 2.410000 ;
+      RECT  6.265000  2.580000  6.595000 3.245000 ;
+      RECT  6.335000  0.085000  6.665000 0.680000 ;
+      RECT  6.375000  0.850000  7.005000 1.020000 ;
+      RECT  6.375000  1.020000  6.545000 1.355000 ;
+      RECT  6.715000  1.190000  7.505000 1.360000 ;
+      RECT  6.715000  1.360000  7.045000 1.760000 ;
+      RECT  6.715000  1.930000  7.045000 2.070000 ;
+      RECT  6.835000  0.255000  7.845000 0.425000 ;
+      RECT  6.835000  0.425000  7.005000 0.850000 ;
+      RECT  7.175000  0.630000  7.505000 1.190000 ;
+      RECT  7.215000  1.630000  7.505000 1.960000 ;
+      RECT  7.215000  1.960000  7.385000 2.240000 ;
+      RECT  7.215000  2.410000  7.385000 2.905000 ;
+      RECT  7.215000  2.905000  9.575000 3.075000 ;
+      RECT  7.555000  2.130000  8.310000 2.735000 ;
+      RECT  7.675000  0.425000  7.845000 1.275000 ;
+      RECT  7.675000  1.275000  7.970000 1.945000 ;
+      RECT  8.015000  0.390000  8.555000 0.640000 ;
+      RECT  8.140000  0.640000  8.555000 1.040000 ;
+      RECT  8.140000  1.040000  8.310000 2.130000 ;
+      RECT  8.480000  1.225000  8.735000 2.905000 ;
+      RECT  8.745000  0.255000 10.935000 0.425000 ;
+      RECT  8.745000  0.425000  9.075000 1.055000 ;
+      RECT  8.905000  1.055000  9.075000 2.130000 ;
+      RECT  8.905000  2.130000  9.235000 2.735000 ;
+      RECT  9.245000  0.595000 10.255000 0.765000 ;
+      RECT  9.245000  0.765000  9.415000 1.630000 ;
+      RECT  9.245000  1.630000  9.575000 1.960000 ;
+      RECT  9.405000  1.960000  9.575000 2.905000 ;
+      RECT  9.585000  0.935000  9.915000 1.185000 ;
+      RECT  9.745000  1.185000  9.915000 2.100000 ;
+      RECT  9.745000  2.100000 10.075000 2.600000 ;
+      RECT  9.745000  2.600000 11.970000 2.770000 ;
+      RECT  9.745000  2.770000 10.075000 2.980000 ;
+      RECT 10.085000  0.765000 10.255000 1.355000 ;
+      RECT 10.085000  1.355000 10.470000 1.685000 ;
+      RECT 10.310000  2.130000 10.810000 2.430000 ;
+      RECT 10.425000  0.595000 10.595000 1.015000 ;
+      RECT 10.425000  1.015000 10.810000 1.185000 ;
+      RECT 10.640000  1.185000 10.810000 2.130000 ;
+      RECT 10.765000  0.425000 10.935000 0.675000 ;
+      RECT 10.765000  0.675000 11.865000 0.845000 ;
+      RECT 10.980000  0.845000 11.865000 1.055000 ;
+      RECT 10.980000  1.055000 11.240000 1.950000 ;
+      RECT 10.980000  1.950000 11.930000 2.200000 ;
+      RECT 11.015000  2.940000 11.395000 3.245000 ;
+      RECT 11.105000  0.085000 11.355000 0.505000 ;
+      RECT 11.535000  0.375000 11.865000 0.675000 ;
+      RECT 11.800000  2.370000 13.400000 2.540000 ;
+      RECT 11.800000  2.540000 11.970000 2.600000 ;
+      RECT 12.075000  0.085000 12.405000 0.640000 ;
+      RECT 12.085000  0.810000 12.415000 1.550000 ;
+      RECT 12.140000  2.710000 12.470000 3.245000 ;
+      RECT 13.015000  0.085000 13.345000 1.130000 ;
+      RECT 13.040000  2.710000 13.370000 3.245000 ;
+      RECT 13.230000  1.300000 13.535000 1.630000 ;
+      RECT 13.230000  1.630000 13.400000 2.370000 ;
+      RECT 13.955000  0.085000 14.285000 0.630000 ;
+      RECT 14.045000  1.820000 14.295000 3.245000 ;
     LAYER mcon ;
-      RECT  0.155000 1.210000  0.325000 1.380000 ;
-      RECT  3.995000 1.210000  4.165000 1.380000 ;
-      RECT  8.315000 0.840000  8.485000 1.010000 ;
-      RECT 12.155000 0.840000 12.325000 1.010000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  1.210000  0.325000 1.380000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  1.210000  4.165000 1.380000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  0.840000  8.485000 1.010000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  0.840000 12.325000 1.010000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
     LAYER met1 ;
       RECT  0.095000 1.180000  0.385000 1.225000 ;
       RECT  0.095000 1.225000  4.225000 1.365000 ;
diff --git a/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef b/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef
index b3cfe08..1d79155 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef
+++ b/cells/fah/sky130_fd_sc_hs__fah_4.magic.lef
@@ -89,50 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.360000 0.085000 ;
-        RECT  0.545000  0.085000  0.795000 1.000000 ;
-        RECT  1.535000  0.085000  1.795000 0.620000 ;
-        RECT  4.585000  0.085000  4.915000 0.535000 ;
-        RECT 10.065000  0.085000 10.315000 0.500000 ;
-        RECT 10.965000  0.085000 11.295000 0.500000 ;
-        RECT 11.965000  0.085000 12.295000 0.500000 ;
-        RECT 13.035000  0.085000 13.375000 0.500000 ;
-        RECT 13.985000  0.085000 14.315000 0.840000 ;
-        RECT 14.915000  0.085000 15.245000 1.260000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
@@ -141,152 +97,192 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.360000 3.415000 ;
-        RECT  0.565000 1.970000  0.815000 3.245000 ;
-        RECT  1.575000 2.970000  1.915000 3.245000 ;
-        RECT  5.325000 2.290000  5.655000 3.245000 ;
-        RECT  9.115000 2.950000  9.685000 3.245000 ;
-        RECT 10.425000 2.950000 10.755000 3.245000 ;
-        RECT 11.495000 2.950000 12.125000 3.245000 ;
-        RECT 12.920000 1.950000 13.250000 3.245000 ;
-        RECT 13.920000 2.190000 14.250000 3.245000 ;
-        RECT 14.950000 1.820000 15.200000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 15.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.350000  0.365000 1.170000 ;
-      RECT  0.085000 1.170000  1.665000 1.340000 ;
-      RECT  0.085000 1.340000  0.255000 1.970000 ;
-      RECT  0.085000 1.970000  0.365000 2.980000 ;
-      RECT  0.975000 0.350000  1.305000 0.790000 ;
-      RECT  0.975000 0.790000  2.135000 0.960000 ;
-      RECT  0.975000 0.960000  2.005000 1.000000 ;
-      RECT  1.015000 1.970000  1.345000 2.630000 ;
-      RECT  1.015000 2.630000  3.495000 2.800000 ;
-      RECT  1.015000 2.800000  1.345000 2.980000 ;
-      RECT  1.335000 1.340000  1.665000 1.650000 ;
-      RECT  1.835000 1.000000  2.005000 2.630000 ;
-      RECT  1.965000 0.255000  3.415000 0.425000 ;
-      RECT  1.965000 0.425000  2.135000 0.790000 ;
-      RECT  2.175000 1.790000  2.505000 2.290000 ;
-      RECT  2.175000 2.290000  4.505000 2.460000 ;
-      RECT  2.305000 0.625000  2.475000 1.790000 ;
-      RECT  2.655000 0.625000  2.985000 1.210000 ;
-      RECT  2.655000 1.210000  3.545000 1.380000 ;
-      RECT  2.705000 1.550000  3.205000 1.780000 ;
-      RECT  2.705000 1.780000  2.960000 2.120000 ;
-      RECT  3.155000 0.425000  3.415000 1.040000 ;
-      RECT  3.165000 2.800000  3.495000 2.960000 ;
-      RECT  3.375000 1.380000  3.545000 1.935000 ;
-      RECT  3.375000 1.935000  4.030000 2.120000 ;
-      RECT  3.715000 0.630000  3.885000 1.550000 ;
-      RECT  3.715000 1.550000  4.165000 1.765000 ;
-      RECT  4.055000 0.255000  4.385000 0.705000 ;
-      RECT  4.055000 0.705000  5.405000 0.875000 ;
-      RECT  4.065000 1.045000  4.505000 1.310000 ;
-      RECT  4.230000 1.935000  4.505000 2.290000 ;
-      RECT  4.230000 2.460000  4.505000 2.670000 ;
-      RECT  4.335000 1.310000  4.505000 1.935000 ;
-      RECT  5.095000 0.255000  8.195000 0.425000 ;
-      RECT  5.095000 0.425000  5.405000 0.705000 ;
-      RECT  5.095000 0.875000  5.405000 0.920000 ;
-      RECT  5.095000 0.920000  5.265000 1.950000 ;
-      RECT  5.095000 1.950000  6.025000 2.120000 ;
-      RECT  5.435000 1.090000  5.805000 1.375000 ;
-      RECT  5.435000 1.375000  5.635000 1.780000 ;
-      RECT  5.855000 2.120000  6.025000 2.980000 ;
-      RECT  5.875000 0.595000  6.205000 0.875000 ;
-      RECT  5.885000 1.550000  6.145000 1.780000 ;
-      RECT  5.975000 0.875000  6.145000 1.550000 ;
-      RECT  6.195000 1.980000  6.485000 2.150000 ;
-      RECT  6.195000 2.150000  6.365000 2.905000 ;
-      RECT  6.195000 2.905000  8.715000 3.075000 ;
-      RECT  6.315000 1.045000  7.195000 1.215000 ;
-      RECT  6.315000 1.215000  6.485000 1.980000 ;
-      RECT  6.375000 0.595000  8.535000 0.765000 ;
-      RECT  6.375000 0.765000  6.705000 0.845000 ;
-      RECT  6.535000 2.320000  7.535000 2.490000 ;
-      RECT  6.535000 2.490000  6.785000 2.735000 ;
-      RECT  6.655000 1.405000  7.075000 2.150000 ;
-      RECT  6.865000 1.015000  7.195000 1.045000 ;
-      RECT  6.990000 2.725000  7.875000 2.905000 ;
-      RECT  7.365000 0.935000  8.875000 1.105000 ;
-      RECT  7.365000 1.105000  7.685000 1.285000 ;
-      RECT  7.365000 1.285000  7.535000 2.320000 ;
-      RECT  7.705000 1.480000  8.875000 1.650000 ;
-      RECT  7.705000 1.650000  7.875000 2.725000 ;
-      RECT  8.045000 2.095000  8.375000 2.270000 ;
-      RECT  8.045000 2.270000 12.125000 2.440000 ;
-      RECT  8.045000 2.440000  8.375000 2.735000 ;
-      RECT  8.205000 1.320000  8.875000 1.480000 ;
-      RECT  8.365000 0.255000  9.895000 0.425000 ;
-      RECT  8.365000 0.425000  8.535000 0.595000 ;
-      RECT  8.545000 2.610000 12.715000 2.780000 ;
-      RECT  8.545000 2.780000  8.715000 2.905000 ;
-      RECT  8.580000 1.900000  9.215000 2.100000 ;
-      RECT  8.705000 0.595000  9.555000 0.765000 ;
-      RECT  8.705000 0.765000  8.875000 0.935000 ;
-      RECT  9.045000 0.935000  9.215000 1.550000 ;
-      RECT  9.045000 1.550000  9.475000 1.775000 ;
-      RECT  9.045000 1.775000  9.215000 1.900000 ;
-      RECT  9.385000 0.765000  9.555000 1.010000 ;
-      RECT  9.385000 1.010000  9.950000 1.180000 ;
-      RECT  9.725000 0.425000  9.895000 0.670000 ;
-      RECT  9.725000 0.670000 13.385000 0.840000 ;
-      RECT  9.780000 1.180000  9.950000 1.350000 ;
-      RECT  9.780000 1.350000 10.710000 1.680000 ;
-      RECT 11.955000 0.840000 12.125000 2.270000 ;
-      RECT 12.295000 1.010000 12.855000 1.180000 ;
-      RECT 12.295000 1.180000 12.465000 1.950000 ;
-      RECT 12.295000 1.950000 12.715000 2.610000 ;
-      RECT 12.295000 2.780000 12.715000 2.860000 ;
-      RECT 13.215000 0.840000 13.385000 1.350000 ;
-      RECT 13.215000 1.350000 14.325000 1.680000 ;
+      RECT  0.000000 -0.085000 15.360000 0.085000 ;
+      RECT  0.000000  3.245000 15.360000 3.415000 ;
+      RECT  0.085000  0.350000  0.365000 1.170000 ;
+      RECT  0.085000  1.170000  1.665000 1.340000 ;
+      RECT  0.085000  1.340000  0.255000 1.970000 ;
+      RECT  0.085000  1.970000  0.365000 2.980000 ;
+      RECT  0.545000  0.085000  0.795000 1.000000 ;
+      RECT  0.565000  1.970000  0.815000 3.245000 ;
+      RECT  0.975000  0.350000  1.305000 0.790000 ;
+      RECT  0.975000  0.790000  2.135000 0.960000 ;
+      RECT  0.975000  0.960000  2.005000 1.000000 ;
+      RECT  1.015000  1.970000  1.345000 2.630000 ;
+      RECT  1.015000  2.630000  3.495000 2.800000 ;
+      RECT  1.015000  2.800000  1.345000 2.980000 ;
+      RECT  1.335000  1.340000  1.665000 1.650000 ;
+      RECT  1.535000  0.085000  1.795000 0.620000 ;
+      RECT  1.575000  2.970000  1.915000 3.245000 ;
+      RECT  1.835000  1.000000  2.005000 2.630000 ;
+      RECT  1.965000  0.255000  3.415000 0.425000 ;
+      RECT  1.965000  0.425000  2.135000 0.790000 ;
+      RECT  2.175000  1.790000  2.505000 2.290000 ;
+      RECT  2.175000  2.290000  4.505000 2.460000 ;
+      RECT  2.305000  0.625000  2.475000 1.790000 ;
+      RECT  2.655000  0.625000  2.985000 1.210000 ;
+      RECT  2.655000  1.210000  3.545000 1.380000 ;
+      RECT  2.705000  1.550000  3.205000 1.780000 ;
+      RECT  2.705000  1.780000  2.960000 2.120000 ;
+      RECT  3.155000  0.425000  3.415000 1.040000 ;
+      RECT  3.165000  2.800000  3.495000 2.960000 ;
+      RECT  3.375000  1.380000  3.545000 1.935000 ;
+      RECT  3.375000  1.935000  4.030000 2.120000 ;
+      RECT  3.715000  0.630000  3.885000 1.550000 ;
+      RECT  3.715000  1.550000  4.165000 1.765000 ;
+      RECT  4.055000  0.255000  4.385000 0.705000 ;
+      RECT  4.055000  0.705000  5.405000 0.875000 ;
+      RECT  4.065000  1.045000  4.505000 1.310000 ;
+      RECT  4.230000  1.935000  4.505000 2.290000 ;
+      RECT  4.230000  2.460000  4.505000 2.670000 ;
+      RECT  4.335000  1.310000  4.505000 1.935000 ;
+      RECT  4.585000  0.085000  4.915000 0.535000 ;
+      RECT  5.095000  0.255000  8.195000 0.425000 ;
+      RECT  5.095000  0.425000  5.405000 0.705000 ;
+      RECT  5.095000  0.875000  5.405000 0.920000 ;
+      RECT  5.095000  0.920000  5.265000 1.950000 ;
+      RECT  5.095000  1.950000  6.025000 2.120000 ;
+      RECT  5.325000  2.290000  5.655000 3.245000 ;
+      RECT  5.435000  1.090000  5.805000 1.375000 ;
+      RECT  5.435000  1.375000  5.635000 1.780000 ;
+      RECT  5.855000  2.120000  6.025000 2.980000 ;
+      RECT  5.875000  0.595000  6.205000 0.875000 ;
+      RECT  5.885000  1.550000  6.145000 1.780000 ;
+      RECT  5.975000  0.875000  6.145000 1.550000 ;
+      RECT  6.195000  1.980000  6.485000 2.150000 ;
+      RECT  6.195000  2.150000  6.365000 2.905000 ;
+      RECT  6.195000  2.905000  8.715000 3.075000 ;
+      RECT  6.315000  1.045000  7.195000 1.215000 ;
+      RECT  6.315000  1.215000  6.485000 1.980000 ;
+      RECT  6.375000  0.595000  8.535000 0.765000 ;
+      RECT  6.375000  0.765000  6.705000 0.845000 ;
+      RECT  6.535000  2.320000  7.535000 2.490000 ;
+      RECT  6.535000  2.490000  6.785000 2.735000 ;
+      RECT  6.655000  1.405000  7.075000 2.150000 ;
+      RECT  6.865000  1.015000  7.195000 1.045000 ;
+      RECT  6.990000  2.725000  7.875000 2.905000 ;
+      RECT  7.365000  0.935000  8.875000 1.105000 ;
+      RECT  7.365000  1.105000  7.685000 1.285000 ;
+      RECT  7.365000  1.285000  7.535000 2.320000 ;
+      RECT  7.705000  1.480000  8.875000 1.650000 ;
+      RECT  7.705000  1.650000  7.875000 2.725000 ;
+      RECT  8.045000  2.095000  8.375000 2.270000 ;
+      RECT  8.045000  2.270000 12.125000 2.440000 ;
+      RECT  8.045000  2.440000  8.375000 2.735000 ;
+      RECT  8.205000  1.320000  8.875000 1.480000 ;
+      RECT  8.365000  0.255000  9.895000 0.425000 ;
+      RECT  8.365000  0.425000  8.535000 0.595000 ;
+      RECT  8.545000  2.610000 12.715000 2.780000 ;
+      RECT  8.545000  2.780000  8.715000 2.905000 ;
+      RECT  8.580000  1.900000  9.215000 2.100000 ;
+      RECT  8.705000  0.595000  9.555000 0.765000 ;
+      RECT  8.705000  0.765000  8.875000 0.935000 ;
+      RECT  9.045000  0.935000  9.215000 1.550000 ;
+      RECT  9.045000  1.550000  9.475000 1.775000 ;
+      RECT  9.045000  1.775000  9.215000 1.900000 ;
+      RECT  9.115000  2.950000  9.685000 3.245000 ;
+      RECT  9.385000  0.765000  9.555000 1.010000 ;
+      RECT  9.385000  1.010000  9.950000 1.180000 ;
+      RECT  9.725000  0.425000  9.895000 0.670000 ;
+      RECT  9.725000  0.670000 13.385000 0.840000 ;
+      RECT  9.780000  1.180000  9.950000 1.350000 ;
+      RECT  9.780000  1.350000 10.710000 1.680000 ;
+      RECT 10.065000  0.085000 10.315000 0.500000 ;
+      RECT 10.425000  2.950000 10.755000 3.245000 ;
+      RECT 10.965000  0.085000 11.295000 0.500000 ;
+      RECT 11.495000  2.950000 12.125000 3.245000 ;
+      RECT 11.955000  0.840000 12.125000 2.270000 ;
+      RECT 11.965000  0.085000 12.295000 0.500000 ;
+      RECT 12.295000  1.010000 12.855000 1.180000 ;
+      RECT 12.295000  1.180000 12.465000 1.950000 ;
+      RECT 12.295000  1.950000 12.715000 2.610000 ;
+      RECT 12.295000  2.780000 12.715000 2.860000 ;
+      RECT 12.920000  1.950000 13.250000 3.245000 ;
+      RECT 13.035000  0.085000 13.375000 0.500000 ;
+      RECT 13.215000  0.840000 13.385000 1.350000 ;
+      RECT 13.215000  1.350000 14.325000 1.680000 ;
+      RECT 13.920000  2.190000 14.250000 3.245000 ;
+      RECT 13.985000  0.085000 14.315000 0.840000 ;
+      RECT 14.915000  0.085000 15.245000 1.260000 ;
+      RECT 14.950000  1.820000 15.200000 3.245000 ;
     LAYER mcon ;
-      RECT 3.035000 1.580000 3.205000 1.750000 ;
-      RECT 3.515000 1.950000 3.685000 2.120000 ;
-      RECT 3.995000 1.580000 4.165000 1.750000 ;
-      RECT 5.435000 1.580000 5.605000 1.750000 ;
-      RECT 5.915000 1.580000 6.085000 1.750000 ;
-      RECT 6.875000 1.950000 7.045000 2.120000 ;
-      RECT 9.275000 1.580000 9.445000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.580000  3.205000 1.750000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  1.950000  3.685000 2.120000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  1.580000  4.165000 1.750000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.580000  5.605000 1.750000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  1.580000  6.085000 1.750000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  1.950000  7.045000 2.120000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  1.580000  9.445000 1.750000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
     LAYER met1 ;
       RECT 2.975000 1.550000 3.265000 1.595000 ;
       RECT 2.975000 1.595000 5.665000 1.735000 ;
diff --git a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef
index 8a3abbd..70ad052 100644
--- a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.magic.lef
@@ -83,40 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.620000  0.085000  0.950000 0.840000 ;
-        RECT  5.465000  0.085000  5.970000 0.635000 ;
-        RECT  8.705000  0.085000  9.045000 0.985000 ;
-        RECT 11.925000  0.085000 12.345000 0.810000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.960000 0.245000 ;
     END
@@ -125,136 +91,166 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.575000 1.950000  0.825000 3.245000 ;
-        RECT  5.405000 2.730000  5.765000 3.245000 ;
-        RECT  8.885000 1.995000  9.055000 3.245000 ;
-        RECT 12.145000 1.850000 12.395000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.120000 0.350000  0.450000 1.010000 ;
-      RECT  0.120000 1.010000  1.290000 1.180000 ;
-      RECT  0.120000 1.180000  0.375000 2.980000 ;
-      RECT  1.005000 1.180000  1.290000 1.300000 ;
-      RECT  1.005000 1.300000  1.445000 1.630000 ;
-      RECT  1.005000 1.630000  1.175000 2.905000 ;
-      RECT  1.005000 2.905000  3.935000 3.075000 ;
-      RECT  1.120000 0.255000  2.835000 0.425000 ;
-      RECT  1.120000 0.425000  1.290000 1.010000 ;
-      RECT  1.345000 1.820000  1.835000 2.565000 ;
-      RECT  1.345000 2.565000  2.980000 2.735000 ;
-      RECT  1.475000 0.615000  1.835000 1.020000 ;
-      RECT  1.615000 1.020000  1.835000 1.820000 ;
-      RECT  2.045000 1.890000  2.415000 2.070000 ;
-      RECT  2.045000 2.070000  2.485000 2.395000 ;
-      RECT  2.165000 0.615000  2.415000 1.890000 ;
-      RECT  2.585000 0.425000  2.835000 0.750000 ;
-      RECT  2.655000 2.045000  2.980000 2.565000 ;
-      RECT  2.810000 0.920000  3.175000 1.090000 ;
-      RECT  2.810000 1.090000  2.980000 2.045000 ;
-      RECT  3.005000 0.255000  3.945000 0.425000 ;
-      RECT  3.005000 0.425000  3.175000 0.920000 ;
-      RECT  3.185000 1.875000  3.515000 1.880000 ;
-      RECT  3.185000 1.880000  4.275000 2.050000 ;
-      RECT  3.185000 2.050000  3.515000 2.735000 ;
-      RECT  3.345000 0.595000  3.515000 1.875000 ;
-      RECT  3.685000 1.380000  4.285000 1.550000 ;
-      RECT  3.685000 1.550000  3.990000 1.710000 ;
-      RECT  3.685000 2.250000  3.935000 2.905000 ;
-      RECT  3.695000 0.425000  3.945000 1.125000 ;
-      RECT  4.105000 2.050000  4.275000 2.905000 ;
-      RECT  4.105000 2.905000  5.045000 3.075000 ;
-      RECT  4.115000 0.255000  5.295000 0.425000 ;
-      RECT  4.115000 0.425000  4.285000 1.380000 ;
-      RECT  4.445000 1.875000  4.705000 2.735000 ;
-      RECT  4.455000 0.670000  4.705000 1.875000 ;
-      RECT  4.875000 2.390000  6.650000 2.560000 ;
-      RECT  4.875000 2.560000  5.045000 2.905000 ;
-      RECT  4.955000 1.820000  5.800000 1.990000 ;
-      RECT  4.955000 1.990000  5.285000 2.220000 ;
-      RECT  4.965000 0.425000  5.295000 0.840000 ;
-      RECT  4.965000 0.840000  5.800000 1.010000 ;
-      RECT  5.630000 1.010000  5.800000 1.255000 ;
-      RECT  5.630000 1.255000  5.970000 1.585000 ;
-      RECT  5.630000 1.585000  5.800000 1.820000 ;
-      RECT  5.970000 1.820000  6.310000 2.220000 ;
-      RECT  6.140000 0.385000  6.470000 1.065000 ;
-      RECT  6.140000 1.065000  6.310000 1.820000 ;
-      RECT  6.150000 2.560000  6.650000 2.905000 ;
-      RECT  6.150000 2.905000  8.715000 3.075000 ;
-      RECT  6.480000 1.510000  6.730000 1.840000 ;
-      RECT  6.480000 1.840000  6.650000 2.390000 ;
-      RECT  7.240000 1.170000  7.555000 2.150000 ;
-      RECT  7.745000 1.155000  8.035000 1.485000 ;
-      RECT  7.785000 1.485000  7.955000 2.905000 ;
-      RECT  8.125000 1.820000  8.375000 2.735000 ;
-      RECT  8.205000 0.385000  8.535000 1.065000 ;
-      RECT  8.205000 1.065000  8.375000 1.820000 ;
-      RECT  8.545000 1.655000  9.385000 1.825000 ;
-      RECT  8.545000 1.825000  8.715000 2.905000 ;
-      RECT  9.215000 0.255000 10.575000 0.570000 ;
-      RECT  9.215000 0.570000  9.385000 1.655000 ;
-      RECT  9.255000 1.995000  9.725000 2.905000 ;
-      RECT  9.255000 2.905000 11.975000 3.075000 ;
-      RECT  9.555000 0.740000  9.885000 1.340000 ;
-      RECT  9.555000 1.340000  9.725000 1.995000 ;
-      RECT  9.895000 1.900000 10.065000 2.400000 ;
-      RECT  9.895000 2.400000 11.635000 2.570000 ;
-      RECT  9.895000 2.570000 10.065000 2.735000 ;
-      RECT 10.070000 0.740000 10.915000 1.260000 ;
-      RECT 10.265000 1.260000 10.515000 2.230000 ;
-      RECT 10.685000 1.430000 11.015000 2.150000 ;
-      RECT 10.745000 0.320000 11.755000 0.490000 ;
-      RECT 10.745000 0.490000 10.915000 0.740000 ;
-      RECT 10.800000 2.740000 11.155000 2.905000 ;
-      RECT 11.085000 0.660000 11.415000 1.220000 ;
-      RECT 11.085000 1.220000 11.365000 1.250000 ;
-      RECT 11.195000 1.250000 11.365000 1.850000 ;
-      RECT 11.195000 1.850000 11.635000 2.400000 ;
-      RECT 11.385000 2.570000 11.635000 2.735000 ;
-      RECT 11.535000 1.350000 11.975000 1.680000 ;
-      RECT 11.585000 0.490000 11.755000 1.010000 ;
-      RECT 11.585000 1.010000 12.425000 1.180000 ;
-      RECT 11.805000 1.680000 11.975000 2.905000 ;
-      RECT 12.145000 1.180000 12.425000 1.680000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.120000  0.350000  0.450000 1.010000 ;
+      RECT  0.120000  1.010000  1.290000 1.180000 ;
+      RECT  0.120000  1.180000  0.375000 2.980000 ;
+      RECT  0.575000  1.950000  0.825000 3.245000 ;
+      RECT  0.620000  0.085000  0.950000 0.840000 ;
+      RECT  1.005000  1.180000  1.290000 1.300000 ;
+      RECT  1.005000  1.300000  1.445000 1.630000 ;
+      RECT  1.005000  1.630000  1.175000 2.905000 ;
+      RECT  1.005000  2.905000  3.935000 3.075000 ;
+      RECT  1.120000  0.255000  2.835000 0.425000 ;
+      RECT  1.120000  0.425000  1.290000 1.010000 ;
+      RECT  1.345000  1.820000  1.835000 2.565000 ;
+      RECT  1.345000  2.565000  2.980000 2.735000 ;
+      RECT  1.475000  0.615000  1.835000 1.020000 ;
+      RECT  1.615000  1.020000  1.835000 1.820000 ;
+      RECT  2.045000  1.890000  2.415000 2.070000 ;
+      RECT  2.045000  2.070000  2.485000 2.395000 ;
+      RECT  2.165000  0.615000  2.415000 1.890000 ;
+      RECT  2.585000  0.425000  2.835000 0.750000 ;
+      RECT  2.655000  2.045000  2.980000 2.565000 ;
+      RECT  2.810000  0.920000  3.175000 1.090000 ;
+      RECT  2.810000  1.090000  2.980000 2.045000 ;
+      RECT  3.005000  0.255000  3.945000 0.425000 ;
+      RECT  3.005000  0.425000  3.175000 0.920000 ;
+      RECT  3.185000  1.875000  3.515000 1.880000 ;
+      RECT  3.185000  1.880000  4.275000 2.050000 ;
+      RECT  3.185000  2.050000  3.515000 2.735000 ;
+      RECT  3.345000  0.595000  3.515000 1.875000 ;
+      RECT  3.685000  1.380000  4.285000 1.550000 ;
+      RECT  3.685000  1.550000  3.990000 1.710000 ;
+      RECT  3.685000  2.250000  3.935000 2.905000 ;
+      RECT  3.695000  0.425000  3.945000 1.125000 ;
+      RECT  4.105000  2.050000  4.275000 2.905000 ;
+      RECT  4.105000  2.905000  5.045000 3.075000 ;
+      RECT  4.115000  0.255000  5.295000 0.425000 ;
+      RECT  4.115000  0.425000  4.285000 1.380000 ;
+      RECT  4.445000  1.875000  4.705000 2.735000 ;
+      RECT  4.455000  0.670000  4.705000 1.875000 ;
+      RECT  4.875000  2.390000  6.650000 2.560000 ;
+      RECT  4.875000  2.560000  5.045000 2.905000 ;
+      RECT  4.955000  1.820000  5.800000 1.990000 ;
+      RECT  4.955000  1.990000  5.285000 2.220000 ;
+      RECT  4.965000  0.425000  5.295000 0.840000 ;
+      RECT  4.965000  0.840000  5.800000 1.010000 ;
+      RECT  5.405000  2.730000  5.765000 3.245000 ;
+      RECT  5.465000  0.085000  5.970000 0.635000 ;
+      RECT  5.630000  1.010000  5.800000 1.255000 ;
+      RECT  5.630000  1.255000  5.970000 1.585000 ;
+      RECT  5.630000  1.585000  5.800000 1.820000 ;
+      RECT  5.970000  1.820000  6.310000 2.220000 ;
+      RECT  6.140000  0.385000  6.470000 1.065000 ;
+      RECT  6.140000  1.065000  6.310000 1.820000 ;
+      RECT  6.150000  2.560000  6.650000 2.905000 ;
+      RECT  6.150000  2.905000  8.715000 3.075000 ;
+      RECT  6.480000  1.510000  6.730000 1.840000 ;
+      RECT  6.480000  1.840000  6.650000 2.390000 ;
+      RECT  7.240000  1.170000  7.555000 2.150000 ;
+      RECT  7.745000  1.155000  8.035000 1.485000 ;
+      RECT  7.785000  1.485000  7.955000 2.905000 ;
+      RECT  8.125000  1.820000  8.375000 2.735000 ;
+      RECT  8.205000  0.385000  8.535000 1.065000 ;
+      RECT  8.205000  1.065000  8.375000 1.820000 ;
+      RECT  8.545000  1.655000  9.385000 1.825000 ;
+      RECT  8.545000  1.825000  8.715000 2.905000 ;
+      RECT  8.705000  0.085000  9.045000 0.985000 ;
+      RECT  8.885000  1.995000  9.055000 3.245000 ;
+      RECT  9.215000  0.255000 10.575000 0.570000 ;
+      RECT  9.215000  0.570000  9.385000 1.655000 ;
+      RECT  9.255000  1.995000  9.725000 2.905000 ;
+      RECT  9.255000  2.905000 11.975000 3.075000 ;
+      RECT  9.555000  0.740000  9.885000 1.340000 ;
+      RECT  9.555000  1.340000  9.725000 1.995000 ;
+      RECT  9.895000  1.900000 10.065000 2.400000 ;
+      RECT  9.895000  2.400000 11.635000 2.570000 ;
+      RECT  9.895000  2.570000 10.065000 2.735000 ;
+      RECT 10.070000  0.740000 10.915000 1.260000 ;
+      RECT 10.265000  1.260000 10.515000 2.230000 ;
+      RECT 10.685000  1.430000 11.015000 2.150000 ;
+      RECT 10.745000  0.320000 11.755000 0.490000 ;
+      RECT 10.745000  0.490000 10.915000 0.740000 ;
+      RECT 10.800000  2.740000 11.155000 2.905000 ;
+      RECT 11.085000  0.660000 11.415000 1.220000 ;
+      RECT 11.085000  1.220000 11.365000 1.250000 ;
+      RECT 11.195000  1.250000 11.365000 1.850000 ;
+      RECT 11.195000  1.850000 11.635000 2.400000 ;
+      RECT 11.385000  2.570000 11.635000 2.735000 ;
+      RECT 11.535000  1.350000 11.975000 1.680000 ;
+      RECT 11.585000  0.490000 11.755000 1.010000 ;
+      RECT 11.585000  1.010000 12.425000 1.180000 ;
+      RECT 11.805000  1.680000 11.975000 2.905000 ;
+      RECT 11.925000  0.085000 12.345000 0.810000 ;
+      RECT 12.145000  1.180000 12.425000 1.680000 ;
+      RECT 12.145000  1.850000 12.395000 3.245000 ;
     LAYER mcon ;
-      RECT  2.075000 1.950000  2.245000 2.120000 ;
-      RECT  4.475000 1.950000  4.645000 2.120000 ;
-      RECT  7.355000 1.950000  7.525000 2.120000 ;
-      RECT 10.715000 1.950000 10.885000 2.120000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  1.950000  2.245000 2.120000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  1.950000  4.645000 2.120000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  1.950000  7.525000 2.120000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  1.950000 10.885000 2.120000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
     LAYER met1 ;
       RECT  2.015000 1.920000  2.305000 1.965000 ;
       RECT  2.015000 1.965000 10.945000 2.105000 ;
diff --git a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef
index e056767..19d9d6c 100644
--- a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.magic.lef
@@ -85,38 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.520000 0.085000 ;
-        RECT  0.545000  0.085000  0.715000 0.480000 ;
-        RECT  0.545000  0.480000  0.905000 0.810000 ;
-        RECT  4.905000  0.085000  5.155000 0.965000 ;
-        RECT  7.745000  0.085000  7.995000 1.010000 ;
-        RECT 10.495000  0.085000 10.895000 0.410000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.520000 0.245000 ;
     END
@@ -125,126 +93,154 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.520000 3.415000 ;
-        RECT  0.655000 1.950000  0.985000 3.245000 ;
-        RECT  4.545000 1.805000  4.875000 3.245000 ;
-        RECT  7.645000 1.940000  7.815000 3.245000 ;
-        RECT 10.650000 2.100000 10.900000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.520000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.480000  0.365000 0.980000 ;
-      RECT  0.085000 0.980000  1.245000 1.150000 ;
-      RECT  0.085000 1.150000  1.180000 1.180000 ;
-      RECT  0.085000 1.180000  0.255000 1.950000 ;
-      RECT  0.085000 1.950000  0.485000 2.980000 ;
-      RECT  0.975000 1.180000  1.180000 1.680000 ;
-      RECT  1.075000 0.255000  2.615000 0.425000 ;
-      RECT  1.075000 0.425000  1.245000 0.980000 ;
-      RECT  1.190000 1.850000  1.520000 2.905000 ;
-      RECT  1.190000 2.905000  3.810000 3.075000 ;
-      RECT  1.350000 1.320000  1.745000 1.490000 ;
-      RECT  1.350000 1.490000  1.520000 1.850000 ;
-      RECT  1.415000 0.595000  1.745000 1.320000 ;
-      RECT  1.690000 1.660000  2.095000 1.830000 ;
-      RECT  1.690000 1.830000  1.860000 2.565000 ;
-      RECT  1.690000 2.565000  3.260000 2.735000 ;
-      RECT  1.925000 0.595000  2.275000 1.325000 ;
-      RECT  1.925000 1.325000  2.095000 1.660000 ;
-      RECT  2.030000 2.000000  2.200000 2.225000 ;
-      RECT  2.030000 2.225000  3.275000 2.395000 ;
-      RECT  2.400000 1.805000  2.775000 2.055000 ;
-      RECT  2.445000 0.425000  2.615000 0.725000 ;
-      RECT  2.445000 0.725000  2.775000 1.805000 ;
-      RECT  2.785000 0.255000  4.735000 0.425000 ;
-      RECT  2.785000 0.425000  3.115000 0.555000 ;
-      RECT  2.945000 0.725000  3.275000 2.225000 ;
-      RECT  3.460000 0.645000  3.810000 2.905000 ;
-      RECT  4.040000 0.425000  4.735000 1.010000 ;
-      RECT  4.040000 1.010000  4.210000 1.805000 ;
-      RECT  4.040000 1.805000  4.375000 2.965000 ;
-      RECT  5.100000 1.975000  5.430000 2.965000 ;
-      RECT  5.230000 1.135000  5.495000 1.305000 ;
-      RECT  5.230000 1.305000  5.400000 1.975000 ;
-      RECT  5.325000 0.390000  6.150000 0.640000 ;
-      RECT  5.325000 0.640000  5.495000 1.135000 ;
-      RECT  5.570000 1.475000  5.835000 1.805000 ;
-      RECT  5.665000 0.810000  6.115000 1.040000 ;
-      RECT  5.665000 1.040000  5.835000 1.475000 ;
-      RECT  6.345000 1.550000  6.610000 1.880000 ;
-      RECT  6.345000 2.085000  7.475000 2.970000 ;
-      RECT  6.820000 0.810000  7.075000 1.130000 ;
-      RECT  6.820000 1.130000  7.135000 1.800000 ;
-      RECT  7.245000 0.350000  7.575000 0.960000 ;
-      RECT  7.305000 0.960000  7.475000 2.085000 ;
-      RECT  8.015000 1.820000  8.345000 2.320000 ;
-      RECT  8.015000 2.320000 10.030000 2.490000 ;
-      RECT  8.015000 2.490000  8.345000 2.980000 ;
-      RECT  8.175000 0.350000  8.515000 1.130000 ;
-      RECT  8.175000 1.130000  8.345000 1.820000 ;
-      RECT  8.515000 1.300000  8.765000 1.550000 ;
-      RECT  8.515000 1.550000  8.965000 1.780000 ;
-      RECT  8.575000 2.660000  8.905000 2.870000 ;
-      RECT  8.575000 2.870000 10.455000 3.040000 ;
-      RECT  8.775000 0.255000 10.325000 0.425000 ;
-      RECT  8.775000 0.425000  9.105000 1.130000 ;
-      RECT  8.935000 1.130000  9.105000 1.210000 ;
-      RECT  8.935000 1.210000  9.305000 1.380000 ;
-      RECT  9.135000 1.380000  9.305000 1.820000 ;
-      RECT  9.135000 1.820000  9.360000 2.150000 ;
-      RECT  9.275000 0.810000  9.645000 1.040000 ;
-      RECT  9.475000 1.040000  9.645000 1.260000 ;
-      RECT  9.475000 1.260000  9.690000 1.590000 ;
-      RECT  9.560000 1.820000 10.030000 2.320000 ;
-      RECT  9.560000 2.490000 10.030000 2.700000 ;
-      RECT  9.815000 0.595000  9.985000 0.920000 ;
-      RECT  9.815000 0.920000 10.625000 1.090000 ;
-      RECT  9.860000 1.260000 10.285000 1.590000 ;
-      RECT  9.860000 1.590000 10.030000 1.820000 ;
-      RECT 10.155000 0.425000 10.325000 0.580000 ;
-      RECT 10.155000 0.580000 10.980000 0.750000 ;
-      RECT 10.200000 1.760000 10.625000 1.930000 ;
-      RECT 10.200000 1.930000 10.455000 2.870000 ;
-      RECT 10.455000 1.090000 10.625000 1.760000 ;
-      RECT 10.810000 0.750000 10.980000 1.300000 ;
-      RECT 10.810000 1.300000 11.095000 1.630000 ;
+      RECT  0.000000 -0.085000 11.520000 0.085000 ;
+      RECT  0.000000  3.245000 11.520000 3.415000 ;
+      RECT  0.085000  0.480000  0.365000 0.980000 ;
+      RECT  0.085000  0.980000  1.245000 1.150000 ;
+      RECT  0.085000  1.150000  1.180000 1.180000 ;
+      RECT  0.085000  1.180000  0.255000 1.950000 ;
+      RECT  0.085000  1.950000  0.485000 2.980000 ;
+      RECT  0.545000  0.085000  0.715000 0.480000 ;
+      RECT  0.545000  0.480000  0.905000 0.810000 ;
+      RECT  0.655000  1.950000  0.985000 3.245000 ;
+      RECT  0.975000  1.180000  1.180000 1.680000 ;
+      RECT  1.075000  0.255000  2.615000 0.425000 ;
+      RECT  1.075000  0.425000  1.245000 0.980000 ;
+      RECT  1.190000  1.850000  1.520000 2.905000 ;
+      RECT  1.190000  2.905000  3.810000 3.075000 ;
+      RECT  1.350000  1.320000  1.745000 1.490000 ;
+      RECT  1.350000  1.490000  1.520000 1.850000 ;
+      RECT  1.415000  0.595000  1.745000 1.320000 ;
+      RECT  1.690000  1.660000  2.095000 1.830000 ;
+      RECT  1.690000  1.830000  1.860000 2.565000 ;
+      RECT  1.690000  2.565000  3.260000 2.735000 ;
+      RECT  1.925000  0.595000  2.275000 1.325000 ;
+      RECT  1.925000  1.325000  2.095000 1.660000 ;
+      RECT  2.030000  2.000000  2.200000 2.225000 ;
+      RECT  2.030000  2.225000  3.275000 2.395000 ;
+      RECT  2.400000  1.805000  2.775000 2.055000 ;
+      RECT  2.445000  0.425000  2.615000 0.725000 ;
+      RECT  2.445000  0.725000  2.775000 1.805000 ;
+      RECT  2.785000  0.255000  4.735000 0.425000 ;
+      RECT  2.785000  0.425000  3.115000 0.555000 ;
+      RECT  2.945000  0.725000  3.275000 2.225000 ;
+      RECT  3.460000  0.645000  3.810000 2.905000 ;
+      RECT  4.040000  0.425000  4.735000 1.010000 ;
+      RECT  4.040000  1.010000  4.210000 1.805000 ;
+      RECT  4.040000  1.805000  4.375000 2.965000 ;
+      RECT  4.545000  1.805000  4.875000 3.245000 ;
+      RECT  4.905000  0.085000  5.155000 0.965000 ;
+      RECT  5.100000  1.975000  5.430000 2.965000 ;
+      RECT  5.230000  1.135000  5.495000 1.305000 ;
+      RECT  5.230000  1.305000  5.400000 1.975000 ;
+      RECT  5.325000  0.390000  6.150000 0.640000 ;
+      RECT  5.325000  0.640000  5.495000 1.135000 ;
+      RECT  5.570000  1.475000  5.835000 1.805000 ;
+      RECT  5.665000  0.810000  6.115000 1.040000 ;
+      RECT  5.665000  1.040000  5.835000 1.475000 ;
+      RECT  6.345000  1.550000  6.610000 1.880000 ;
+      RECT  6.345000  2.085000  7.475000 2.970000 ;
+      RECT  6.820000  0.810000  7.075000 1.130000 ;
+      RECT  6.820000  1.130000  7.135000 1.800000 ;
+      RECT  7.245000  0.350000  7.575000 0.960000 ;
+      RECT  7.305000  0.960000  7.475000 2.085000 ;
+      RECT  7.645000  1.940000  7.815000 3.245000 ;
+      RECT  7.745000  0.085000  7.995000 1.010000 ;
+      RECT  8.015000  1.820000  8.345000 2.320000 ;
+      RECT  8.015000  2.320000 10.030000 2.490000 ;
+      RECT  8.015000  2.490000  8.345000 2.980000 ;
+      RECT  8.175000  0.350000  8.515000 1.130000 ;
+      RECT  8.175000  1.130000  8.345000 1.820000 ;
+      RECT  8.515000  1.300000  8.765000 1.550000 ;
+      RECT  8.515000  1.550000  8.965000 1.780000 ;
+      RECT  8.575000  2.660000  8.905000 2.870000 ;
+      RECT  8.575000  2.870000 10.455000 3.040000 ;
+      RECT  8.775000  0.255000 10.325000 0.425000 ;
+      RECT  8.775000  0.425000  9.105000 1.130000 ;
+      RECT  8.935000  1.130000  9.105000 1.210000 ;
+      RECT  8.935000  1.210000  9.305000 1.380000 ;
+      RECT  9.135000  1.380000  9.305000 1.820000 ;
+      RECT  9.135000  1.820000  9.360000 2.150000 ;
+      RECT  9.275000  0.810000  9.645000 1.040000 ;
+      RECT  9.475000  1.040000  9.645000 1.260000 ;
+      RECT  9.475000  1.260000  9.690000 1.590000 ;
+      RECT  9.560000  1.820000 10.030000 2.320000 ;
+      RECT  9.560000  2.490000 10.030000 2.700000 ;
+      RECT  9.815000  0.595000  9.985000 0.920000 ;
+      RECT  9.815000  0.920000 10.625000 1.090000 ;
+      RECT  9.860000  1.260000 10.285000 1.590000 ;
+      RECT  9.860000  1.590000 10.030000 1.820000 ;
+      RECT 10.155000  0.425000 10.325000 0.580000 ;
+      RECT 10.155000  0.580000 10.980000 0.750000 ;
+      RECT 10.200000  1.760000 10.625000 1.930000 ;
+      RECT 10.200000  1.930000 10.455000 2.870000 ;
+      RECT 10.455000  1.090000 10.625000 1.760000 ;
+      RECT 10.495000  0.085000 10.895000 0.410000 ;
+      RECT 10.650000  2.100000 10.900000 3.245000 ;
+      RECT 10.810000  0.750000 10.980000 1.300000 ;
+      RECT 10.810000  1.300000 11.095000 1.630000 ;
     LAYER mcon ;
-      RECT 2.075000 0.840000 2.245000 1.010000 ;
-      RECT 3.035000 1.580000 3.205000 1.750000 ;
-      RECT 5.915000 0.840000 6.085000 1.010000 ;
-      RECT 6.395000 1.580000 6.565000 1.750000 ;
-      RECT 6.875000 0.840000 7.045000 1.010000 ;
-      RECT 8.795000 1.580000 8.965000 1.750000 ;
-      RECT 9.275000 0.840000 9.445000 1.010000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  0.840000  2.245000 1.010000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.580000  3.205000 1.750000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  0.840000  6.085000 1.010000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  1.580000  6.565000 1.750000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  0.840000  7.045000 1.010000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  1.580000  8.965000 1.750000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  0.840000  9.445000 1.010000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
     LAYER met1 ;
       RECT 2.015000 0.810000 2.305000 0.855000 ;
       RECT 2.015000 0.855000 9.505000 0.995000 ;
diff --git a/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
index 927205a..a8fc11e 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_1.magic.lef
@@ -34,10 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.480000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
@@ -46,12 +42,16 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.480000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.480000 0.085000 ;
+      RECT 0.000000  3.245000 0.480000 3.415000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+  END
 END sky130_fd_sc_hs__fill_1
diff --git a/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
index 2d38a5a..6ce09ab 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_2.magic.lef
@@ -34,11 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
@@ -47,13 +42,18 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.960000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.960000 0.085000 ;
+      RECT 0.000000  3.245000 0.960000 3.415000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+  END
 END sky130_fd_sc_hs__fill_2
diff --git a/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
index efb3163..752e846 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_4.magic.lef
@@ -34,13 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -49,15 +42,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+  END
 END sky130_fd_sc_hs__fill_4
diff --git a/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
index dcbc2db..a0f2135 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hs__fill_8.magic.lef
@@ -34,17 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -53,19 +42,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+  END
 END sky130_fd_sc_hs__fill_8
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
index d2610a9..14e3796 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.magic.lef
@@ -34,12 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-        RECT 0.135000  0.085000 0.825000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
@@ -48,14 +42,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-        RECT 0.135000 2.750000 0.825000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.960000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.960000 0.085000 ;
+      RECT 0.000000  3.245000 0.960000 3.415000 ;
+      RECT 0.135000  0.085000 0.825000 0.580000 ;
+      RECT 0.135000  2.750000 0.825000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+  END
 END sky130_fd_sc_hs__fill_diode_2
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
index baca3d7..a53c3f0 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.magic.lef
@@ -34,14 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.135000  0.085000 1.785000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -50,16 +42,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.135000 2.750000 1.785000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.135000  0.085000 1.785000 0.580000 ;
+      RECT 0.135000  2.750000 1.785000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+  END
 END sky130_fd_sc_hs__fill_diode_4
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
index f1af360..602c4c1 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.magic.lef
@@ -34,18 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.135000  0.085000 3.705000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -54,20 +42,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.135000 2.750000 3.705000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.135000  0.085000 3.705000 0.580000 ;
+      RECT 0.135000  2.750000 3.705000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+  END
 END sky130_fd_sc_hs__fill_diode_8
diff --git a/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef b/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef
index ec37963..bc6e4e3 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_hs__ha_1.magic.lef
@@ -76,22 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.625000  0.085000 0.875000 0.795000 ;
-        RECT 1.930000  0.085000 2.280000 0.960000 ;
-        RECT 3.810000  0.085000 4.140000 1.180000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -100,45 +84,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.615000 2.650000 1.205000 3.245000 ;
-        RECT 2.485000 2.310000 3.190000 3.245000 ;
-        RECT 3.810000 2.100000 4.140000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.300000 0.855000 1.630000 ;
-      RECT 0.685000 1.130000 1.400000 1.300000 ;
-      RECT 0.685000 1.630000 0.855000 2.310000 ;
-      RECT 0.685000 2.310000 1.740000 2.480000 ;
-      RECT 1.070000 0.910000 1.400000 1.130000 ;
-      RECT 1.195000 1.470000 1.525000 1.970000 ;
-      RECT 1.195000 1.970000 3.640000 2.140000 ;
-      RECT 1.410000 2.480000 1.740000 2.800000 ;
-      RECT 1.580000 0.630000 1.750000 1.130000 ;
-      RECT 1.580000 1.130000 2.790000 1.300000 ;
-      RECT 2.460000 0.840000 2.790000 1.130000 ;
-      RECT 2.460000 1.300000 2.790000 1.355000 ;
-      RECT 3.020000 0.575000 3.350000 1.085000 ;
-      RECT 3.020000 1.085000 3.640000 1.255000 ;
-      RECT 3.360000 2.140000 3.640000 2.980000 ;
-      RECT 3.470000 1.255000 3.640000 1.350000 ;
-      RECT 3.470000 1.350000 4.375000 1.680000 ;
-      RECT 3.470000 1.680000 3.640000 1.970000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.525000  1.300000 0.855000 1.630000 ;
+      RECT 0.615000  2.650000 1.205000 3.245000 ;
+      RECT 0.625000  0.085000 0.875000 0.795000 ;
+      RECT 0.685000  1.130000 1.400000 1.300000 ;
+      RECT 0.685000  1.630000 0.855000 2.310000 ;
+      RECT 0.685000  2.310000 1.740000 2.480000 ;
+      RECT 1.070000  0.910000 1.400000 1.130000 ;
+      RECT 1.195000  1.470000 1.525000 1.970000 ;
+      RECT 1.195000  1.970000 3.640000 2.140000 ;
+      RECT 1.410000  2.480000 1.740000 2.800000 ;
+      RECT 1.580000  0.630000 1.750000 1.130000 ;
+      RECT 1.580000  1.130000 2.790000 1.300000 ;
+      RECT 1.930000  0.085000 2.280000 0.960000 ;
+      RECT 2.460000  0.840000 2.790000 1.130000 ;
+      RECT 2.460000  1.300000 2.790000 1.355000 ;
+      RECT 2.485000  2.310000 3.190000 3.245000 ;
+      RECT 3.020000  0.575000 3.350000 1.085000 ;
+      RECT 3.020000  1.085000 3.640000 1.255000 ;
+      RECT 3.360000  2.140000 3.640000 2.980000 ;
+      RECT 3.470000  1.255000 3.640000 1.350000 ;
+      RECT 3.470000  1.350000 4.375000 1.680000 ;
+      RECT 3.470000  1.680000 3.640000 1.970000 ;
+      RECT 3.810000  0.085000 4.140000 1.180000 ;
+      RECT 3.810000  2.100000 4.140000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__ha_1
diff --git a/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef b/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef
index 706df29..c41a144 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_hs__ha_2.magic.lef
@@ -77,26 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.935000  0.085000 1.265000 0.600000 ;
-        RECT 1.795000  0.085000 2.125000 0.600000 ;
-        RECT 3.545000  0.085000 3.875000 0.710000 ;
-        RECT 4.455000  0.085000 4.705000 0.710000 ;
-        RECT 5.395000  0.085000 5.645000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -105,52 +85,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.115000 2.690000 0.445000 3.245000 ;
-        RECT 1.015000 2.690000 1.400000 3.245000 ;
-        RECT 3.080000 2.680000 3.845000 3.245000 ;
-        RECT 4.415000 2.680000 4.745000 3.245000 ;
-        RECT 5.315000 2.680000 5.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.960000 ;
-      RECT 0.115000 0.960000 0.890000 1.110000 ;
-      RECT 0.115000 1.110000 2.460000 1.130000 ;
-      RECT 0.565000 1.980000 0.895000 2.150000 ;
-      RECT 0.720000 1.130000 2.460000 1.280000 ;
-      RECT 0.720000 1.280000 0.890000 1.980000 ;
-      RECT 1.365000 0.770000 2.465000 0.940000 ;
-      RECT 2.290000 1.280000 3.035000 1.610000 ;
-      RECT 2.290000 1.610000 2.460000 2.340000 ;
-      RECT 2.290000 2.340000 5.555000 2.510000 ;
-      RECT 2.295000 0.255000 3.315000 0.425000 ;
-      RECT 2.295000 0.425000 2.465000 0.770000 ;
-      RECT 2.630000 1.920000 3.490000 2.170000 ;
-      RECT 2.635000 0.595000 2.805000 0.940000 ;
-      RECT 2.635000 0.940000 3.490000 1.110000 ;
-      RECT 2.985000 0.425000 3.315000 0.770000 ;
-      RECT 3.320000 1.110000 3.490000 1.220000 ;
-      RECT 3.320000 1.220000 4.330000 1.550000 ;
-      RECT 3.320000 1.550000 3.490000 1.920000 ;
-      RECT 5.225000 1.300000 5.555000 1.630000 ;
-      RECT 5.385000 1.630000 5.555000 2.340000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 0.960000 ;
+      RECT 0.115000  0.960000 0.890000 1.110000 ;
+      RECT 0.115000  1.110000 2.460000 1.130000 ;
+      RECT 0.115000  2.690000 0.445000 3.245000 ;
+      RECT 0.565000  1.980000 0.895000 2.150000 ;
+      RECT 0.720000  1.130000 2.460000 1.280000 ;
+      RECT 0.720000  1.280000 0.890000 1.980000 ;
+      RECT 0.935000  0.085000 1.265000 0.600000 ;
+      RECT 1.015000  2.690000 1.400000 3.245000 ;
+      RECT 1.365000  0.770000 2.465000 0.940000 ;
+      RECT 1.795000  0.085000 2.125000 0.600000 ;
+      RECT 2.290000  1.280000 3.035000 1.610000 ;
+      RECT 2.290000  1.610000 2.460000 2.340000 ;
+      RECT 2.290000  2.340000 5.555000 2.510000 ;
+      RECT 2.295000  0.255000 3.315000 0.425000 ;
+      RECT 2.295000  0.425000 2.465000 0.770000 ;
+      RECT 2.630000  1.920000 3.490000 2.170000 ;
+      RECT 2.635000  0.595000 2.805000 0.940000 ;
+      RECT 2.635000  0.940000 3.490000 1.110000 ;
+      RECT 2.985000  0.425000 3.315000 0.770000 ;
+      RECT 3.080000  2.680000 3.845000 3.245000 ;
+      RECT 3.320000  1.110000 3.490000 1.220000 ;
+      RECT 3.320000  1.220000 4.330000 1.550000 ;
+      RECT 3.320000  1.550000 3.490000 1.920000 ;
+      RECT 3.545000  0.085000 3.875000 0.710000 ;
+      RECT 4.415000  2.680000 4.745000 3.245000 ;
+      RECT 4.455000  0.085000 4.705000 0.710000 ;
+      RECT 5.225000  1.300000 5.555000 1.630000 ;
+      RECT 5.315000  2.680000 5.645000 3.245000 ;
+      RECT 5.385000  1.630000 5.555000 2.340000 ;
+      RECT 5.395000  0.085000 5.645000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__ha_2
diff --git a/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef b/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef
index 61264cb..030ac47 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_hs__ha_4.magic.lef
@@ -65,17 +65,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 8.075000 1.820000 9.995000 2.150000 ;
-        RECT 8.075000 2.150000 8.305000 2.980000 ;
-        RECT 8.150000 0.350000 8.400000 0.980000 ;
-        RECT 8.150000 0.980000 9.995000 1.150000 ;
-        RECT 9.070000 0.350000 9.400000 0.980000 ;
-        RECT 9.075000 2.150000 9.405000 2.980000 ;
-        RECT 9.825000 1.150000 9.995000 1.820000 ;
-      LAYER mcon ;
-        RECT 8.795000 1.950000 8.965000 2.120000 ;
-        RECT 9.755000 1.950000 9.925000 2.120000 ;
       LAYER met1 ;
         RECT 8.735000 1.920000 9.025000 1.965000 ;
         RECT 8.735000 1.965000 9.985000 2.105000 ;
@@ -88,38 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.545000  0.085000  0.795000 0.945000 ;
-        RECT 1.410000  0.085000  1.660000 0.945000 ;
-        RECT 4.950000  0.085000  5.280000 1.255000 ;
-        RECT 5.920000  0.085000  6.170000 1.130000 ;
-        RECT 6.780000  0.085000  7.110000 0.710000 ;
-        RECT 7.640000  0.085000  7.970000 0.710000 ;
-        RECT 8.570000  0.085000  8.900000 0.810000 ;
-        RECT 9.580000  0.085000  9.885000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -128,81 +85,119 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.555000 2.295000  0.805000 3.245000 ;
-        RECT 2.475000 2.405000  2.805000 3.245000 ;
-        RECT 3.375000 2.505000  3.705000 3.245000 ;
-        RECT 4.430000 2.660000  4.760000 3.245000 ;
-        RECT 5.490000 2.660000  5.945000 3.245000 ;
-        RECT 6.675000 2.660000  7.005000 3.245000 ;
-        RECT 7.575000 2.660000  7.905000 3.245000 ;
-        RECT 8.475000 2.320000  8.805000 3.245000 ;
-        RECT 9.635000 2.320000  9.965000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.955000 1.255000 2.125000 ;
-      RECT 0.105000 2.125000 0.385000 2.965000 ;
-      RECT 0.115000 0.605000 0.365000 1.115000 ;
-      RECT 0.115000 1.115000 2.170000 1.285000 ;
-      RECT 0.980000 0.605000 1.230000 1.115000 ;
-      RECT 1.005000 2.125000 1.255000 2.905000 ;
-      RECT 1.005000 2.905000 2.235000 3.075000 ;
-      RECT 1.455000 1.955000 3.255000 2.125000 ;
-      RECT 1.455000 2.125000 1.735000 2.735000 ;
-      RECT 1.840000 0.265000 3.170000 0.435000 ;
-      RECT 1.840000 0.435000 2.170000 1.115000 ;
-      RECT 1.905000 2.295000 2.235000 2.905000 ;
-      RECT 2.340000 0.605000 2.670000 1.285000 ;
-      RECT 2.500000 1.285000 2.670000 1.905000 ;
-      RECT 2.500000 1.905000 3.255000 1.955000 ;
-      RECT 2.840000 0.435000 3.170000 1.235000 ;
-      RECT 2.925000 2.125000 3.255000 2.165000 ;
-      RECT 2.925000 2.165000 4.070000 2.235000 ;
-      RECT 3.075000 1.405000 4.280000 1.575000 ;
-      RECT 3.075000 1.575000 4.070000 1.735000 ;
-      RECT 3.085000 2.235000 4.070000 2.320000 ;
-      RECT 3.085000 2.320000 7.895000 2.335000 ;
-      RECT 3.520000 0.315000 4.780000 0.485000 ;
-      RECT 3.520000 0.485000 3.780000 1.235000 ;
-      RECT 3.900000 1.735000 4.070000 1.745000 ;
-      RECT 3.900000 1.745000 4.230000 1.820000 ;
-      RECT 3.900000 1.820000 6.050000 1.995000 ;
-      RECT 3.900000 2.335000 7.895000 2.490000 ;
-      RECT 3.950000 0.655000 4.280000 1.405000 ;
-      RECT 4.450000 0.485000 4.780000 1.425000 ;
-      RECT 4.450000 1.425000 5.710000 1.595000 ;
-      RECT 4.955000 1.995000 6.050000 2.150000 ;
-      RECT 5.460000 0.575000 5.710000 1.425000 ;
-      RECT 5.880000 1.320000 6.955000 1.650000 ;
-      RECT 5.880000 1.650000 6.050000 1.820000 ;
-      RECT 7.725000 1.320000 9.645000 1.650000 ;
-      RECT 7.725000 1.650000 7.895000 2.320000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.105000  1.955000  1.255000 2.125000 ;
+      RECT 0.105000  2.125000  0.385000 2.965000 ;
+      RECT 0.115000  0.605000  0.365000 1.115000 ;
+      RECT 0.115000  1.115000  2.170000 1.285000 ;
+      RECT 0.545000  0.085000  0.795000 0.945000 ;
+      RECT 0.555000  2.295000  0.805000 3.245000 ;
+      RECT 0.980000  0.605000  1.230000 1.115000 ;
+      RECT 1.005000  2.125000  1.255000 2.905000 ;
+      RECT 1.005000  2.905000  2.235000 3.075000 ;
+      RECT 1.410000  0.085000  1.660000 0.945000 ;
+      RECT 1.455000  1.955000  3.255000 2.125000 ;
+      RECT 1.455000  2.125000  1.735000 2.735000 ;
+      RECT 1.840000  0.265000  3.170000 0.435000 ;
+      RECT 1.840000  0.435000  2.170000 1.115000 ;
+      RECT 1.905000  2.295000  2.235000 2.905000 ;
+      RECT 2.340000  0.605000  2.670000 1.285000 ;
+      RECT 2.475000  2.405000  2.805000 3.245000 ;
+      RECT 2.500000  1.285000  2.670000 1.905000 ;
+      RECT 2.500000  1.905000  3.255000 1.955000 ;
+      RECT 2.840000  0.435000  3.170000 1.235000 ;
+      RECT 2.925000  2.125000  3.255000 2.165000 ;
+      RECT 2.925000  2.165000  4.070000 2.235000 ;
+      RECT 3.075000  1.405000  4.280000 1.575000 ;
+      RECT 3.075000  1.575000  4.070000 1.735000 ;
+      RECT 3.085000  2.235000  4.070000 2.320000 ;
+      RECT 3.085000  2.320000  7.895000 2.335000 ;
+      RECT 3.375000  2.505000  3.705000 3.245000 ;
+      RECT 3.520000  0.315000  4.780000 0.485000 ;
+      RECT 3.520000  0.485000  3.780000 1.235000 ;
+      RECT 3.900000  1.735000  4.070000 1.745000 ;
+      RECT 3.900000  1.745000  4.230000 1.820000 ;
+      RECT 3.900000  1.820000  6.050000 1.995000 ;
+      RECT 3.900000  2.335000  7.895000 2.490000 ;
+      RECT 3.950000  0.655000  4.280000 1.405000 ;
+      RECT 4.430000  2.660000  4.760000 3.245000 ;
+      RECT 4.450000  0.485000  4.780000 1.425000 ;
+      RECT 4.450000  1.425000  5.710000 1.595000 ;
+      RECT 4.950000  0.085000  5.280000 1.255000 ;
+      RECT 4.955000  1.995000  6.050000 2.150000 ;
+      RECT 5.460000  0.575000  5.710000 1.425000 ;
+      RECT 5.490000  2.660000  5.945000 3.245000 ;
+      RECT 5.880000  1.320000  6.955000 1.650000 ;
+      RECT 5.880000  1.650000  6.050000 1.820000 ;
+      RECT 5.920000  0.085000  6.170000 1.130000 ;
+      RECT 6.675000  2.660000  7.005000 3.245000 ;
+      RECT 6.780000  0.085000  7.110000 0.710000 ;
+      RECT 7.575000  2.660000  7.905000 3.245000 ;
+      RECT 7.640000  0.085000  7.970000 0.710000 ;
+      RECT 7.725000  1.320000  9.645000 1.650000 ;
+      RECT 7.725000  1.650000  7.895000 2.320000 ;
+      RECT 8.075000  1.820000  9.995000 2.150000 ;
+      RECT 8.075000  2.150000  8.305000 2.980000 ;
+      RECT 8.150000  0.350000  8.400000 0.980000 ;
+      RECT 8.150000  0.980000  9.995000 1.150000 ;
+      RECT 8.475000  2.320000  8.805000 3.245000 ;
+      RECT 8.570000  0.085000  8.900000 0.810000 ;
+      RECT 9.070000  0.350000  9.400000 0.980000 ;
+      RECT 9.075000  2.150000  9.405000 2.980000 ;
+      RECT 9.580000  0.085000  9.885000 0.810000 ;
+      RECT 9.635000  2.320000  9.965000 3.245000 ;
+      RECT 9.825000  1.150000  9.995000 1.820000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  1.950000 8.965000 2.120000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  1.950000 9.925000 2.120000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__ha_4
diff --git a/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef
index 5ae627b..7aecbaa 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_1.magic.lef
@@ -52,13 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.485000  0.085000 0.815000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -67,15 +60,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.485000 1.950000 0.815000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.485000  0.085000 0.815000 1.130000 ;
+      RECT 0.485000  1.950000 0.815000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_hs__inv_1
diff --git a/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef
index c477f27..5dc4615 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_16.magic.lef
@@ -35,22 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.070000 1.350000 1.380000 1.770000 ;
-        RECT 2.020000 1.350000 2.310000 1.770000 ;
-        RECT 2.970000 1.350000 3.245000 1.770000 ;
-        RECT 3.885000 1.350000 4.165000 1.770000 ;
-        RECT 4.770000 1.350000 5.085000 1.770000 ;
-        RECT 5.755000 1.350000 6.090000 1.770000 ;
-        RECT 6.770000 1.350000 7.090000 1.770000 ;
-      LAYER mcon ;
-        RECT 1.145000 1.580000 1.315000 1.750000 ;
-        RECT 2.085000 1.580000 2.255000 1.750000 ;
-        RECT 3.025000 1.580000 3.195000 1.750000 ;
-        RECT 3.940000 1.580000 4.110000 1.750000 ;
-        RECT 4.850000 1.580000 5.020000 1.750000 ;
-        RECT 5.845000 1.580000 6.015000 1.750000 ;
-        RECT 6.840000 1.580000 7.010000 1.750000 ;
       LAYER met1 ;
         RECT 1.085000 1.550000 7.070000 1.780000 ;
     END
@@ -60,34 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.565000 1.330000 0.885000 2.995000 ;
-        RECT 0.615000 0.350000 0.945000 1.130000 ;
-        RECT 0.615000 1.130000 0.885000 1.330000 ;
-        RECT 1.515000 1.940000 1.845000 2.980000 ;
-        RECT 1.555000 0.350000 1.845000 1.940000 ;
-        RECT 2.465000 1.940000 2.795000 2.980000 ;
-        RECT 2.485000 0.350000 2.795000 1.940000 ;
-        RECT 3.415000 0.350000 3.710000 2.980000 ;
-        RECT 4.340000 0.350000 4.595000 1.940000 ;
-        RECT 4.340000 1.940000 4.630000 2.980000 ;
-        RECT 5.215000 0.350000 5.525000 1.180000 ;
-        RECT 5.265000 1.180000 5.525000 1.285000 ;
-        RECT 5.265000 1.285000 5.580000 2.980000 ;
-        RECT 6.195000 0.350000 6.525000 1.180000 ;
-        RECT 6.265000 1.180000 6.525000 1.285000 ;
-        RECT 6.265000 1.285000 6.595000 2.980000 ;
-        RECT 7.215000 0.350000 7.545000 1.130000 ;
-        RECT 7.265000 1.130000 7.545000 2.980000 ;
-      LAYER mcon ;
-        RECT 0.645000 1.950000 0.815000 2.120000 ;
-        RECT 1.595000 1.950000 1.765000 2.120000 ;
-        RECT 2.545000 1.950000 2.715000 2.120000 ;
-        RECT 3.495000 1.950000 3.665000 2.120000 ;
-        RECT 4.395000 1.950000 4.565000 2.120000 ;
-        RECT 5.345000 1.950000 5.515000 2.120000 ;
-        RECT 6.345000 1.950000 6.515000 2.120000 ;
-        RECT 7.345000 1.950000 7.515000 2.120000 ;
       LAYER met1 ;
         RECT 0.585000 1.920000 7.575000 2.150000 ;
     END
@@ -96,35 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.185000  0.085000 0.445000 1.130000 ;
-        RECT 1.115000  0.085000 1.375000 1.130000 ;
-        RECT 2.025000  0.085000 2.305000 1.130000 ;
-        RECT 2.975000  0.085000 3.245000 1.130000 ;
-        RECT 3.890000  0.085000 4.150000 1.130000 ;
-        RECT 4.765000  0.085000 5.025000 1.130000 ;
-        RECT 5.705000  0.085000 6.025000 1.130000 ;
-        RECT 6.705000  0.085000 7.045000 1.130000 ;
-        RECT 7.715000  0.085000 8.045000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -133,37 +60,106 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.055000 1.940000 1.345000 3.245000 ;
-        RECT 2.045000 1.940000 2.295000 3.245000 ;
-        RECT 2.995000 1.940000 3.245000 3.245000 ;
-        RECT 3.915000 1.940000 4.150000 3.245000 ;
-        RECT 4.810000 1.940000 5.095000 3.245000 ;
-        RECT 5.765000 1.940000 6.095000 3.245000 ;
-        RECT 6.765000 1.940000 7.095000 3.245000 ;
-        RECT 7.735000 1.820000 8.045000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.185000  0.085000 0.445000 1.130000 ;
+      RECT 0.565000  1.330000 0.885000 2.995000 ;
+      RECT 0.615000  0.350000 0.945000 1.130000 ;
+      RECT 0.615000  1.130000 0.885000 1.330000 ;
+      RECT 1.055000  1.940000 1.345000 3.245000 ;
+      RECT 1.070000  1.350000 1.380000 1.770000 ;
+      RECT 1.115000  0.085000 1.375000 1.130000 ;
+      RECT 1.515000  1.940000 1.845000 2.980000 ;
+      RECT 1.555000  0.350000 1.845000 1.940000 ;
+      RECT 2.020000  1.350000 2.310000 1.770000 ;
+      RECT 2.025000  0.085000 2.305000 1.130000 ;
+      RECT 2.045000  1.940000 2.295000 3.245000 ;
+      RECT 2.465000  1.940000 2.795000 2.980000 ;
+      RECT 2.485000  0.350000 2.795000 1.940000 ;
+      RECT 2.970000  1.350000 3.245000 1.770000 ;
+      RECT 2.975000  0.085000 3.245000 1.130000 ;
+      RECT 2.995000  1.940000 3.245000 3.245000 ;
+      RECT 3.415000  0.350000 3.710000 2.980000 ;
+      RECT 3.885000  1.350000 4.165000 1.770000 ;
+      RECT 3.890000  0.085000 4.150000 1.130000 ;
+      RECT 3.915000  1.940000 4.150000 3.245000 ;
+      RECT 4.340000  0.350000 4.595000 1.940000 ;
+      RECT 4.340000  1.940000 4.630000 2.980000 ;
+      RECT 4.765000  0.085000 5.025000 1.130000 ;
+      RECT 4.770000  1.350000 5.085000 1.770000 ;
+      RECT 4.810000  1.940000 5.095000 3.245000 ;
+      RECT 5.215000  0.350000 5.525000 1.180000 ;
+      RECT 5.265000  1.180000 5.525000 1.285000 ;
+      RECT 5.265000  1.285000 5.580000 2.980000 ;
+      RECT 5.705000  0.085000 6.025000 1.130000 ;
+      RECT 5.755000  1.350000 6.090000 1.770000 ;
+      RECT 5.765000  1.940000 6.095000 3.245000 ;
+      RECT 6.195000  0.350000 6.525000 1.180000 ;
+      RECT 6.265000  1.180000 6.525000 1.285000 ;
+      RECT 6.265000  1.285000 6.595000 2.980000 ;
+      RECT 6.705000  0.085000 7.045000 1.130000 ;
+      RECT 6.765000  1.940000 7.095000 3.245000 ;
+      RECT 6.770000  1.350000 7.090000 1.770000 ;
+      RECT 7.215000  0.350000 7.545000 1.130000 ;
+      RECT 7.265000  1.130000 7.545000 2.980000 ;
+      RECT 7.715000  0.085000 8.045000 1.130000 ;
+      RECT 7.735000  1.820000 8.045000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.645000  1.950000 0.815000 2.120000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.145000  1.580000 1.315000 1.750000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  1.950000 1.765000 2.120000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.085000  1.580000 2.255000 1.750000 ;
+      RECT 2.545000  1.950000 2.715000 2.120000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.025000  1.580000 3.195000 1.750000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.495000  1.950000 3.665000 2.120000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.940000  1.580000 4.110000 1.750000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.395000  1.950000 4.565000 2.120000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.850000  1.580000 5.020000 1.750000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.345000  1.950000 5.515000 2.120000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.845000  1.580000 6.015000 1.750000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.345000  1.950000 6.515000 2.120000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.840000  1.580000 7.010000 1.750000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.345000  1.950000 7.515000 2.120000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+  END
 END sky130_fd_sc_hs__inv_16
diff --git a/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef
index 3a08520..5c9e7a9 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_2.magic.lef
@@ -53,14 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.130000  0.085000 0.380000 1.130000 ;
-        RECT 1.070000  0.085000 1.320000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -69,16 +61,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.105000 1.950000 0.435000 3.245000 ;
-        RECT 1.085000 1.820000 1.335000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.105000  1.950000 0.435000 3.245000 ;
+      RECT 0.130000  0.085000 0.380000 1.130000 ;
+      RECT 1.070000  0.085000 1.320000 1.130000 ;
+      RECT 1.085000  1.820000 1.335000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_hs__inv_2
diff --git a/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef
index 7247ef5..17f2bed 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_4.magic.lef
@@ -58,17 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.045000  0.085000 1.375000 0.840000 ;
-        RECT 1.955000  0.085000 2.285000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -77,19 +66,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.150000 1.950000 0.400000 3.245000 ;
-        RECT 1.130000 2.290000 1.300000 3.245000 ;
-        RECT 2.030000 2.290000 2.280000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.150000  1.950000 0.400000 3.245000 ;
+      RECT 1.045000  0.085000 1.375000 0.840000 ;
+      RECT 1.130000  2.290000 1.300000 3.245000 ;
+      RECT 1.955000  0.085000 2.285000 0.840000 ;
+      RECT 2.030000  2.290000 2.280000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+  END
 END sky130_fd_sc_hs__inv_4
diff --git a/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef
index 3fe7133..7bae4af 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hs__inv_8.magic.lef
@@ -65,23 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.130000  0.085000 0.380000 1.130000 ;
-        RECT 0.990000  0.085000 1.320000 0.840000 ;
-        RECT 1.850000  0.085000 2.180000 0.840000 ;
-        RECT 2.850000  0.085000 3.180000 0.970000 ;
-        RECT 3.780000  0.085000 4.110000 0.970000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -90,25 +73,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.015000 2.290000 1.345000 3.245000 ;
-        RECT 2.045000 2.290000 2.295000 3.245000 ;
-        RECT 2.865000 1.820000 3.195000 3.245000 ;
-        RECT 3.865000 1.820000 4.195000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.130000  0.085000 0.380000 1.130000 ;
+      RECT 0.990000  0.085000 1.320000 0.840000 ;
+      RECT 1.015000  2.290000 1.345000 3.245000 ;
+      RECT 1.850000  0.085000 2.180000 0.840000 ;
+      RECT 2.045000  2.290000 2.295000 3.245000 ;
+      RECT 2.850000  0.085000 3.180000 0.970000 ;
+      RECT 2.865000  1.820000 3.195000 3.245000 ;
+      RECT 3.780000  0.085000 4.110000 0.970000 ;
+      RECT 3.865000  1.820000 4.195000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+  END
 END sky130_fd_sc_hs__inv_8
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef
index 3470d62..81a6596 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_1.magic.lef
@@ -74,20 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.615000  0.085000 0.990000 0.910000 ;
-        RECT 2.305000  0.085000 2.475000 0.740000 ;
-        RECT 2.305000  0.740000 2.850000 0.910000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -96,34 +82,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.660000 1.950000 0.990000 3.245000 ;
-        RECT 2.435000 2.290000 2.840000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.350000 0.785000 1.680000 ;
-      RECT 0.615000 1.090000 3.700000 1.260000 ;
-      RECT 0.615000 1.260000 0.785000 1.350000 ;
-      RECT 1.480000 0.580000 1.810000 1.090000 ;
-      RECT 1.565000 1.950000 3.725000 2.120000 ;
-      RECT 1.565000 2.120000 1.895000 2.940000 ;
-      RECT 1.895000 1.260000 2.065000 1.950000 ;
-      RECT 3.370000 0.840000 3.700000 1.090000 ;
-      RECT 3.395000 1.930000 3.725000 1.950000 ;
-      RECT 3.395000 2.120000 3.725000 2.940000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.425000  1.350000 0.785000 1.680000 ;
+      RECT 0.615000  0.085000 0.990000 0.910000 ;
+      RECT 0.615000  1.090000 3.700000 1.260000 ;
+      RECT 0.615000  1.260000 0.785000 1.350000 ;
+      RECT 0.660000  1.950000 0.990000 3.245000 ;
+      RECT 1.480000  0.580000 1.810000 1.090000 ;
+      RECT 1.565000  1.950000 3.725000 2.120000 ;
+      RECT 1.565000  2.120000 1.895000 2.940000 ;
+      RECT 1.895000  1.260000 2.065000 1.950000 ;
+      RECT 2.305000  0.085000 2.475000 0.740000 ;
+      RECT 2.305000  0.740000 2.850000 0.910000 ;
+      RECT 2.435000  2.290000 2.840000 3.245000 ;
+      RECT 3.370000  0.840000 3.700000 1.090000 ;
+      RECT 3.395000  1.930000 3.725000 1.950000 ;
+      RECT 3.395000  2.120000 3.725000 2.940000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__maj3_1
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef
index 4d92824..c447d38 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_2.magic.lef
@@ -74,22 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.135000  0.085000 0.385000 1.130000 ;
-        RECT 1.075000  0.085000 1.795000 1.010000 ;
-        RECT 3.340000  0.085000 3.840000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -98,39 +82,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.135000 1.820000 0.385000 3.245000 ;
-        RECT 1.085000 2.120000 1.780000 3.245000 ;
-        RECT 3.485000 2.290000 3.815000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.895000 1.320000 1.255000 1.650000 ;
-      RECT 1.085000 1.650000 1.255000 1.780000 ;
-      RECT 1.085000 1.780000 2.135000 1.950000 ;
-      RECT 1.965000 0.350000 2.760000 0.905000 ;
-      RECT 1.965000 0.905000 4.660000 1.075000 ;
-      RECT 1.965000 1.075000 2.135000 1.780000 ;
-      RECT 1.965000 1.950000 4.685000 2.120000 ;
-      RECT 1.965000 2.120000 2.785000 2.755000 ;
-      RECT 4.330000 0.350000 4.660000 0.905000 ;
-      RECT 4.330000 1.075000 4.660000 1.130000 ;
-      RECT 4.355000 1.820000 4.685000 1.950000 ;
-      RECT 4.355000 2.120000 4.685000 2.860000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.135000  0.085000 0.385000 1.130000 ;
+      RECT 0.135000  1.820000 0.385000 3.245000 ;
+      RECT 0.895000  1.320000 1.255000 1.650000 ;
+      RECT 1.075000  0.085000 1.795000 1.010000 ;
+      RECT 1.085000  1.650000 1.255000 1.780000 ;
+      RECT 1.085000  1.780000 2.135000 1.950000 ;
+      RECT 1.085000  2.120000 1.780000 3.245000 ;
+      RECT 1.965000  0.350000 2.760000 0.905000 ;
+      RECT 1.965000  0.905000 4.660000 1.075000 ;
+      RECT 1.965000  1.075000 2.135000 1.780000 ;
+      RECT 1.965000  1.950000 4.685000 2.120000 ;
+      RECT 1.965000  2.120000 2.785000 2.755000 ;
+      RECT 3.340000  0.085000 3.840000 0.680000 ;
+      RECT 3.485000  2.290000 3.815000 3.245000 ;
+      RECT 4.330000  0.350000 4.660000 0.905000 ;
+      RECT 4.330000  1.075000 4.660000 1.130000 ;
+      RECT 4.355000  1.820000 4.685000 1.950000 ;
+      RECT 4.355000  2.120000 4.685000 2.860000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__maj3_2
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef
index 4911e19..e2e8ad3 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_4.magic.lef
@@ -85,32 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.285000 ;
-        RECT 2.145000  0.085000 2.315000 0.960000 ;
-        RECT 4.005000  0.085000 4.335000 0.620000 ;
-        RECT 5.955000  0.085000 6.205000 1.175000 ;
-        RECT 6.855000  0.085000 7.185000 0.835000 ;
-        RECT 7.715000  0.085000 8.045000 0.835000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -119,73 +93,96 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.130000 1.940000 0.380000 3.245000 ;
-        RECT 2.060000 2.555000 2.320000 3.245000 ;
-        RECT 3.990000 2.555000 4.320000 3.245000 ;
-        RECT 5.940000 1.940000 6.190000 3.245000 ;
-        RECT 6.895000 2.185000 7.145000 3.245000 ;
-        RECT 7.715000 1.820000 8.045000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.580000 2.215000 0.910000 2.905000 ;
-      RECT 0.580000 2.905000 1.860000 3.075000 ;
-      RECT 0.625000 0.265000 1.965000 0.435000 ;
-      RECT 0.625000 0.435000 0.955000 0.620000 ;
-      RECT 0.795000 0.790000 1.465000 0.960000 ;
-      RECT 0.795000 0.960000 0.965000 1.875000 ;
-      RECT 0.795000 1.875000 1.410000 2.045000 ;
-      RECT 1.095000 2.045000 1.410000 2.215000 ;
-      RECT 1.095000 2.215000 5.290000 2.385000 ;
-      RECT 1.095000 2.385000 1.350000 2.735000 ;
-      RECT 1.135000 0.605000 1.465000 0.790000 ;
-      RECT 1.530000 2.555000 1.860000 2.905000 ;
-      RECT 1.635000 0.435000 1.965000 0.960000 ;
-      RECT 2.490000 2.555000 2.820000 2.905000 ;
-      RECT 2.490000 2.905000 3.820000 3.075000 ;
-      RECT 2.495000 0.265000 3.825000 0.435000 ;
-      RECT 2.495000 0.435000 2.885000 0.935000 ;
-      RECT 2.990000 2.385000 3.320000 2.735000 ;
-      RECT 3.065000 0.605000 3.315000 0.790000 ;
-      RECT 3.065000 0.790000 5.265000 0.960000 ;
-      RECT 3.490000 2.555000 3.820000 2.905000 ;
-      RECT 3.495000 0.435000 3.825000 0.620000 ;
-      RECT 4.505000 0.255000 5.775000 0.425000 ;
-      RECT 4.505000 0.425000 4.835000 0.620000 ;
-      RECT 4.510000 2.555000 5.740000 2.725000 ;
-      RECT 4.510000 2.725000 4.840000 2.980000 ;
-      RECT 4.960000 1.970000 5.560000 2.140000 ;
-      RECT 4.960000 2.140000 5.290000 2.215000 ;
-      RECT 5.095000 0.595000 5.265000 0.790000 ;
-      RECT 5.095000 0.960000 5.265000 1.130000 ;
-      RECT 5.095000 1.130000 5.560000 1.300000 ;
-      RECT 5.390000 1.300000 5.560000 1.345000 ;
-      RECT 5.390000 1.345000 7.150000 1.675000 ;
-      RECT 5.390000 1.675000 5.560000 1.970000 ;
-      RECT 5.410000 2.725000 5.740000 2.980000 ;
-      RECT 5.445000 0.425000 5.775000 0.960000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.285000 ;
+      RECT 0.130000  1.940000 0.380000 3.245000 ;
+      RECT 0.580000  2.215000 0.910000 2.905000 ;
+      RECT 0.580000  2.905000 1.860000 3.075000 ;
+      RECT 0.625000  0.265000 1.965000 0.435000 ;
+      RECT 0.625000  0.435000 0.955000 0.620000 ;
+      RECT 0.795000  0.790000 1.465000 0.960000 ;
+      RECT 0.795000  0.960000 0.965000 1.875000 ;
+      RECT 0.795000  1.875000 1.410000 2.045000 ;
+      RECT 1.095000  2.045000 1.410000 2.215000 ;
+      RECT 1.095000  2.215000 5.290000 2.385000 ;
+      RECT 1.095000  2.385000 1.350000 2.735000 ;
+      RECT 1.135000  0.605000 1.465000 0.790000 ;
+      RECT 1.530000  2.555000 1.860000 2.905000 ;
+      RECT 1.635000  0.435000 1.965000 0.960000 ;
+      RECT 2.060000  2.555000 2.320000 3.245000 ;
+      RECT 2.145000  0.085000 2.315000 0.960000 ;
+      RECT 2.490000  2.555000 2.820000 2.905000 ;
+      RECT 2.490000  2.905000 3.820000 3.075000 ;
+      RECT 2.495000  0.265000 3.825000 0.435000 ;
+      RECT 2.495000  0.435000 2.885000 0.935000 ;
+      RECT 2.990000  2.385000 3.320000 2.735000 ;
+      RECT 3.065000  0.605000 3.315000 0.790000 ;
+      RECT 3.065000  0.790000 5.265000 0.960000 ;
+      RECT 3.490000  2.555000 3.820000 2.905000 ;
+      RECT 3.495000  0.435000 3.825000 0.620000 ;
+      RECT 3.990000  2.555000 4.320000 3.245000 ;
+      RECT 4.005000  0.085000 4.335000 0.620000 ;
+      RECT 4.505000  0.255000 5.775000 0.425000 ;
+      RECT 4.505000  0.425000 4.835000 0.620000 ;
+      RECT 4.510000  2.555000 5.740000 2.725000 ;
+      RECT 4.510000  2.725000 4.840000 2.980000 ;
+      RECT 4.960000  1.970000 5.560000 2.140000 ;
+      RECT 4.960000  2.140000 5.290000 2.215000 ;
+      RECT 5.095000  0.595000 5.265000 0.790000 ;
+      RECT 5.095000  0.960000 5.265000 1.130000 ;
+      RECT 5.095000  1.130000 5.560000 1.300000 ;
+      RECT 5.390000  1.300000 5.560000 1.345000 ;
+      RECT 5.390000  1.345000 7.150000 1.675000 ;
+      RECT 5.390000  1.675000 5.560000 1.970000 ;
+      RECT 5.410000  2.725000 5.740000 2.980000 ;
+      RECT 5.445000  0.425000 5.775000 0.960000 ;
+      RECT 5.940000  1.940000 6.190000 3.245000 ;
+      RECT 5.955000  0.085000 6.205000 1.175000 ;
+      RECT 6.855000  0.085000 7.185000 0.835000 ;
+      RECT 6.895000  2.185000 7.145000 3.245000 ;
+      RECT 7.715000  0.085000 8.045000 0.835000 ;
+      RECT 7.715000  1.820000 8.045000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__maj3_4
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef
index 3201bd5..700feef 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_1.magic.lef
@@ -75,21 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.625000  0.085000 1.005000 0.680000 ;
-        RECT 0.625000  0.680000 0.835000 1.130000 ;
-        RECT 3.295000  0.085000 3.625000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -98,44 +83,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.650000 2.400000 0.980000 3.245000 ;
-        RECT 3.295000 1.820000 3.625000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.540000 0.445000 1.130000 ;
-      RECT 0.115000 1.130000 0.285000 1.950000 ;
-      RECT 0.115000 1.950000 0.445000 2.060000 ;
-      RECT 0.115000 2.060000 1.320000 2.230000 ;
-      RECT 0.115000 2.230000 0.445000 2.700000 ;
-      RECT 1.005000 0.850000 1.345000 1.020000 ;
-      RECT 1.005000 1.020000 1.175000 1.720000 ;
-      RECT 1.005000 1.720000 2.395000 1.890000 ;
-      RECT 1.150000 2.230000 1.320000 2.905000 ;
-      RECT 1.150000 2.905000 3.125000 3.075000 ;
-      RECT 1.175000 0.390000 3.125000 0.640000 ;
-      RECT 1.175000 0.640000 1.345000 0.850000 ;
-      RECT 2.065000 1.890000 2.395000 2.735000 ;
-      RECT 2.955000 0.640000 3.125000 0.980000 ;
-      RECT 2.955000 0.980000 3.695000 1.150000 ;
-      RECT 2.955000 1.320000 3.355000 1.650000 ;
-      RECT 2.955000 1.650000 3.125000 2.905000 ;
-      RECT 3.525000 1.150000 3.695000 1.300000 ;
-      RECT 3.525000 1.300000 3.895000 1.630000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.540000 0.445000 1.130000 ;
+      RECT 0.115000  1.130000 0.285000 1.950000 ;
+      RECT 0.115000  1.950000 0.445000 2.060000 ;
+      RECT 0.115000  2.060000 1.320000 2.230000 ;
+      RECT 0.115000  2.230000 0.445000 2.700000 ;
+      RECT 0.625000  0.085000 1.005000 0.680000 ;
+      RECT 0.625000  0.680000 0.835000 1.130000 ;
+      RECT 0.650000  2.400000 0.980000 3.245000 ;
+      RECT 1.005000  0.850000 1.345000 1.020000 ;
+      RECT 1.005000  1.020000 1.175000 1.720000 ;
+      RECT 1.005000  1.720000 2.395000 1.890000 ;
+      RECT 1.150000  2.230000 1.320000 2.905000 ;
+      RECT 1.150000  2.905000 3.125000 3.075000 ;
+      RECT 1.175000  0.390000 3.125000 0.640000 ;
+      RECT 1.175000  0.640000 1.345000 0.850000 ;
+      RECT 2.065000  1.890000 2.395000 2.735000 ;
+      RECT 2.955000  0.640000 3.125000 0.980000 ;
+      RECT 2.955000  0.980000 3.695000 1.150000 ;
+      RECT 2.955000  1.320000 3.355000 1.650000 ;
+      RECT 2.955000  1.650000 3.125000 2.905000 ;
+      RECT 3.295000  0.085000 3.625000 0.810000 ;
+      RECT 3.295000  1.820000 3.625000 3.245000 ;
+      RECT 3.525000  1.150000 3.695000 1.300000 ;
+      RECT 3.525000  1.300000 3.895000 1.630000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef
index 335861d..6fbe7a1 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_2.magic.lef
@@ -73,25 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 1.715000  0.790000 3.170000 0.960000 ;
-        RECT 1.715000  0.960000 2.045000 1.130000 ;
-        RECT 3.000000  0.085000 3.170000 0.790000 ;
-        RECT 3.840000  0.085000 4.230000 0.600000 ;
-        RECT 4.835000  0.085000 5.165000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -100,51 +81,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 2.075000 2.650000 2.405000 3.245000 ;
-        RECT 3.870000 2.650000 4.210000 3.245000 ;
-        RECT 4.780000 2.650000 5.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.825000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 1.905000 3.075000 ;
-      RECT 0.170000 0.290000 2.750000 0.460000 ;
-      RECT 0.170000 0.460000 0.500000 1.010000 ;
-      RECT 0.620000 1.820000 1.535000 1.970000 ;
-      RECT 0.620000 1.970000 3.165000 2.140000 ;
-      RECT 0.620000 2.140000 0.840000 2.725000 ;
-      RECT 0.670000 0.680000 1.535000 1.010000 ;
-      RECT 1.015000 2.310000 2.825000 2.480000 ;
-      RECT 1.015000 2.480000 1.345000 2.735000 ;
-      RECT 1.365000 1.010000 1.535000 1.820000 ;
-      RECT 1.575000 2.650000 1.905000 2.905000 ;
-      RECT 2.420000 0.460000 2.750000 0.620000 ;
-      RECT 2.555000 1.470000 2.885000 1.630000 ;
-      RECT 2.555000 1.630000 3.795000 1.800000 ;
-      RECT 2.575000 2.480000 2.825000 2.980000 ;
-      RECT 2.995000 2.140000 3.165000 2.310000 ;
-      RECT 2.995000 2.310000 5.165000 2.480000 ;
-      RECT 3.335000 1.800000 3.795000 2.140000 ;
-      RECT 3.340000 0.350000 3.670000 0.770000 ;
-      RECT 3.340000 0.770000 3.795000 0.940000 ;
-      RECT 3.625000 0.940000 3.795000 1.630000 ;
-      RECT 4.835000 1.300000 5.165000 2.310000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  1.825000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 1.905000 3.075000 ;
+      RECT 0.170000  0.290000 2.750000 0.460000 ;
+      RECT 0.170000  0.460000 0.500000 1.010000 ;
+      RECT 0.620000  1.820000 1.535000 1.970000 ;
+      RECT 0.620000  1.970000 3.165000 2.140000 ;
+      RECT 0.620000  2.140000 0.840000 2.725000 ;
+      RECT 0.670000  0.680000 1.535000 1.010000 ;
+      RECT 1.015000  2.310000 2.825000 2.480000 ;
+      RECT 1.015000  2.480000 1.345000 2.735000 ;
+      RECT 1.365000  1.010000 1.535000 1.820000 ;
+      RECT 1.575000  2.650000 1.905000 2.905000 ;
+      RECT 1.715000  0.790000 3.170000 0.960000 ;
+      RECT 1.715000  0.960000 2.045000 1.130000 ;
+      RECT 2.075000  2.650000 2.405000 3.245000 ;
+      RECT 2.420000  0.460000 2.750000 0.620000 ;
+      RECT 2.555000  1.470000 2.885000 1.630000 ;
+      RECT 2.555000  1.630000 3.795000 1.800000 ;
+      RECT 2.575000  2.480000 2.825000 2.980000 ;
+      RECT 2.995000  2.140000 3.165000 2.310000 ;
+      RECT 2.995000  2.310000 5.165000 2.480000 ;
+      RECT 3.000000  0.085000 3.170000 0.790000 ;
+      RECT 3.335000  1.800000 3.795000 2.140000 ;
+      RECT 3.340000  0.350000 3.670000 0.770000 ;
+      RECT 3.340000  0.770000 3.795000 0.940000 ;
+      RECT 3.625000  0.940000 3.795000 1.630000 ;
+      RECT 3.840000  0.085000 4.230000 0.600000 ;
+      RECT 3.870000  2.650000 4.210000 3.245000 ;
+      RECT 4.780000  2.650000 5.165000 3.245000 ;
+      RECT 4.835000  0.085000 5.165000 1.130000 ;
+      RECT 4.835000  1.300000 5.165000 2.310000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef
index 178308f..023e336 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_4.magic.lef
@@ -80,32 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.770000  0.085000 1.100000 1.150000 ;
-        RECT 1.810000  0.085000 2.140000 1.070000 ;
-        RECT 2.925000  0.085000 3.255000 1.255000 ;
-        RECT 4.020000  0.085000 4.490000 0.905000 ;
-        RECT 5.170000  0.085000 5.575000 0.585000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -114,77 +88,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.650000 2.730000 0.995000 3.245000 ;
-        RECT 1.820000 2.835000 2.150000 3.245000 ;
-        RECT 3.060000 2.835000 3.390000 3.245000 ;
-        RECT 4.130000 2.775000 4.460000 3.245000 ;
-        RECT 5.200000 2.775000 5.450000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.470000 0.600000 1.150000 ;
-      RECT 0.085000 1.150000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.445000 2.390000 ;
-      RECT 0.085000 2.390000 1.335000 2.495000 ;
-      RECT 0.085000 2.495000 3.505000 2.560000 ;
-      RECT 0.085000 2.560000 0.445000 2.860000 ;
-      RECT 1.165000 2.560000 3.505000 2.665000 ;
-      RECT 3.335000 1.935000 4.085000 2.105000 ;
-      RECT 3.335000 2.105000 3.505000 2.495000 ;
-      RECT 3.520000 0.575000 3.850000 1.095000 ;
-      RECT 3.520000 1.095000 5.325000 1.110000 ;
-      RECT 3.520000 1.110000 8.020000 1.265000 ;
-      RECT 3.675000 2.275000 3.925000 2.435000 ;
-      RECT 3.675000 2.435000 5.790000 2.605000 ;
-      RECT 3.675000 2.605000 3.925000 2.975000 ;
-      RECT 3.915000 1.435000 4.985000 1.765000 ;
-      RECT 3.915000 1.765000 4.085000 1.935000 ;
-      RECT 4.660000 0.575000 4.990000 0.755000 ;
-      RECT 4.660000 0.755000 5.665000 0.770000 ;
-      RECT 4.660000 0.770000 7.090000 0.925000 ;
-      RECT 4.665000 1.935000 5.140000 2.095000 ;
-      RECT 4.665000 2.095000 6.130000 2.265000 ;
-      RECT 5.155000 1.265000 8.020000 1.280000 ;
-      RECT 5.385000 1.450000 6.470000 1.780000 ;
-      RECT 5.495000 0.925000 7.090000 0.940000 ;
-      RECT 5.620000 2.605000 5.790000 2.710000 ;
-      RECT 5.620000 2.710000 7.115000 2.980000 ;
-      RECT 5.835000 0.255000 8.525000 0.425000 ;
-      RECT 5.835000 0.425000 6.590000 0.600000 ;
-      RECT 5.960000 2.265000 6.130000 2.370000 ;
-      RECT 5.960000 2.370000 8.025000 2.540000 ;
-      RECT 6.300000 1.780000 6.470000 1.950000 ;
-      RECT 6.300000 1.950000 8.525000 2.200000 ;
-      RECT 6.760000 0.595000 7.090000 0.770000 ;
-      RECT 7.260000 0.425000 7.590000 0.940000 ;
-      RECT 7.695000 2.540000 8.025000 2.980000 ;
-      RECT 7.770000 0.595000 8.020000 1.110000 ;
-      RECT 8.190000 0.425000 8.525000 1.030000 ;
-      RECT 8.195000 2.200000 8.525000 2.980000 ;
-      RECT 8.355000 1.030000 8.525000 1.950000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.085000  0.470000 0.600000 1.150000 ;
+      RECT 0.085000  1.150000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.445000 2.390000 ;
+      RECT 0.085000  2.390000 1.335000 2.495000 ;
+      RECT 0.085000  2.495000 3.505000 2.560000 ;
+      RECT 0.085000  2.560000 0.445000 2.860000 ;
+      RECT 0.650000  2.730000 0.995000 3.245000 ;
+      RECT 0.770000  0.085000 1.100000 1.150000 ;
+      RECT 1.165000  2.560000 3.505000 2.665000 ;
+      RECT 1.810000  0.085000 2.140000 1.070000 ;
+      RECT 1.820000  2.835000 2.150000 3.245000 ;
+      RECT 2.925000  0.085000 3.255000 1.255000 ;
+      RECT 3.060000  2.835000 3.390000 3.245000 ;
+      RECT 3.335000  1.935000 4.085000 2.105000 ;
+      RECT 3.335000  2.105000 3.505000 2.495000 ;
+      RECT 3.520000  0.575000 3.850000 1.095000 ;
+      RECT 3.520000  1.095000 5.325000 1.110000 ;
+      RECT 3.520000  1.110000 8.020000 1.265000 ;
+      RECT 3.675000  2.275000 3.925000 2.435000 ;
+      RECT 3.675000  2.435000 5.790000 2.605000 ;
+      RECT 3.675000  2.605000 3.925000 2.975000 ;
+      RECT 3.915000  1.435000 4.985000 1.765000 ;
+      RECT 3.915000  1.765000 4.085000 1.935000 ;
+      RECT 4.020000  0.085000 4.490000 0.905000 ;
+      RECT 4.130000  2.775000 4.460000 3.245000 ;
+      RECT 4.660000  0.575000 4.990000 0.755000 ;
+      RECT 4.660000  0.755000 5.665000 0.770000 ;
+      RECT 4.660000  0.770000 7.090000 0.925000 ;
+      RECT 4.665000  1.935000 5.140000 2.095000 ;
+      RECT 4.665000  2.095000 6.130000 2.265000 ;
+      RECT 5.155000  1.265000 8.020000 1.280000 ;
+      RECT 5.170000  0.085000 5.575000 0.585000 ;
+      RECT 5.200000  2.775000 5.450000 3.245000 ;
+      RECT 5.385000  1.450000 6.470000 1.780000 ;
+      RECT 5.495000  0.925000 7.090000 0.940000 ;
+      RECT 5.620000  2.605000 5.790000 2.710000 ;
+      RECT 5.620000  2.710000 7.115000 2.980000 ;
+      RECT 5.835000  0.255000 8.525000 0.425000 ;
+      RECT 5.835000  0.425000 6.590000 0.600000 ;
+      RECT 5.960000  2.265000 6.130000 2.370000 ;
+      RECT 5.960000  2.370000 8.025000 2.540000 ;
+      RECT 6.300000  1.780000 6.470000 1.950000 ;
+      RECT 6.300000  1.950000 8.525000 2.200000 ;
+      RECT 6.760000  0.595000 7.090000 0.770000 ;
+      RECT 7.260000  0.425000 7.590000 0.940000 ;
+      RECT 7.695000  2.540000 8.025000 2.980000 ;
+      RECT 7.770000  0.595000 8.020000 1.110000 ;
+      RECT 8.190000  0.425000 8.525000 1.030000 ;
+      RECT 8.195000  2.200000 8.525000 2.980000 ;
+      RECT 8.355000  1.030000 8.525000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__mux2_4
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef
index f24bdf1..30d440a 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.magic.lef
@@ -71,19 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 0.905000 ;
-        RECT 1.605000  0.085000 1.935000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -92,42 +79,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.105000 2.100000 0.355000 3.245000 ;
-        RECT 1.530000 2.290000 1.860000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.405000 0.890000 0.905000 ;
-      RECT 0.555000 2.100000 0.890000 2.980000 ;
-      RECT 0.720000 0.905000 0.890000 1.350000 ;
-      RECT 0.720000 1.350000 2.130000 1.520000 ;
-      RECT 0.720000 1.520000 0.890000 2.100000 ;
-      RECT 1.080000 1.820000 1.330000 1.950000 ;
-      RECT 1.080000 1.950000 2.835000 2.120000 ;
-      RECT 1.080000 2.120000 1.330000 2.980000 ;
-      RECT 1.105000 0.350000 1.435000 1.010000 ;
-      RECT 1.105000 1.010000 2.275000 1.180000 ;
-      RECT 1.800000 1.520000 2.130000 1.680000 ;
-      RECT 2.060000 2.290000 2.310000 2.905000 ;
-      RECT 2.060000 2.905000 3.735000 3.075000 ;
-      RECT 2.105000 0.350000 3.680000 0.520000 ;
-      RECT 2.105000 0.520000 2.275000 1.010000 ;
-      RECT 2.505000 2.120000 2.835000 2.735000 ;
-      RECT 3.395000 0.520000 3.680000 1.010000 ;
-      RECT 3.405000 1.820000 3.735000 2.905000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.105000  2.100000 0.355000 3.245000 ;
+      RECT 0.115000  0.085000 0.365000 0.905000 ;
+      RECT 0.545000  0.405000 0.890000 0.905000 ;
+      RECT 0.555000  2.100000 0.890000 2.980000 ;
+      RECT 0.720000  0.905000 0.890000 1.350000 ;
+      RECT 0.720000  1.350000 2.130000 1.520000 ;
+      RECT 0.720000  1.520000 0.890000 2.100000 ;
+      RECT 1.080000  1.820000 1.330000 1.950000 ;
+      RECT 1.080000  1.950000 2.835000 2.120000 ;
+      RECT 1.080000  2.120000 1.330000 2.980000 ;
+      RECT 1.105000  0.350000 1.435000 1.010000 ;
+      RECT 1.105000  1.010000 2.275000 1.180000 ;
+      RECT 1.530000  2.290000 1.860000 3.245000 ;
+      RECT 1.605000  0.085000 1.935000 0.840000 ;
+      RECT 1.800000  1.520000 2.130000 1.680000 ;
+      RECT 2.060000  2.290000 2.310000 2.905000 ;
+      RECT 2.060000  2.905000 3.735000 3.075000 ;
+      RECT 2.105000  0.350000 3.680000 0.520000 ;
+      RECT 2.105000  0.520000 2.275000 1.010000 ;
+      RECT 2.505000  2.120000 2.835000 2.735000 ;
+      RECT 3.395000  0.520000 3.680000 1.010000 ;
+      RECT 3.405000  1.820000 3.735000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef
index 04977e0..333264d 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.magic.lef
@@ -78,25 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 3.140000  0.085000 3.470000 0.490000 ;
-        RECT 4.210000  0.085000 4.555000 0.490000 ;
-        RECT 5.285000  0.085000 5.615000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -105,55 +86,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 3.075000 2.965000 3.470000 3.245000 ;
-        RECT 4.210000 2.850000 4.555000 3.245000 ;
-        RECT 5.260000 2.180000 5.590000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 2.285000 4.005000 2.340000 ;
-      RECT 0.615000 2.340000 3.185000 2.455000 ;
-      RECT 0.615000 2.455000 0.945000 2.980000 ;
-      RECT 0.640000 0.595000 2.410000 0.750000 ;
-      RECT 0.640000 0.750000 5.115000 0.765000 ;
-      RECT 0.640000 0.765000 0.970000 1.010000 ;
-      RECT 1.685000 2.625000 5.090000 2.680000 ;
-      RECT 1.685000 2.680000 3.525000 2.795000 ;
-      RECT 1.685000 2.795000 2.395000 2.955000 ;
-      RECT 1.740000 0.935000 2.070000 1.090000 ;
-      RECT 1.740000 1.090000 4.030000 1.260000 ;
-      RECT 2.240000 0.765000 5.115000 0.830000 ;
-      RECT 2.240000 0.830000 3.250000 0.920000 ;
-      RECT 3.015000 2.010000 4.005000 2.285000 ;
-      RECT 3.080000 0.660000 5.115000 0.750000 ;
-      RECT 3.355000 2.510000 5.090000 2.625000 ;
-      RECT 3.650000 1.000000 4.030000 1.090000 ;
-      RECT 4.735000 0.500000 5.115000 0.660000 ;
-      RECT 4.760000 2.180000 5.090000 2.510000 ;
-      RECT 4.760000 2.680000 5.090000 2.980000 ;
-      RECT 4.910000 1.010000 6.150000 1.180000 ;
-      RECT 4.910000 1.180000 5.240000 1.670000 ;
-      RECT 5.795000 0.570000 6.150000 1.010000 ;
-      RECT 5.795000 2.180000 6.150000 2.860000 ;
-      RECT 5.980000 1.180000 6.150000 2.180000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.615000  2.285000 4.005000 2.340000 ;
+      RECT 0.615000  2.340000 3.185000 2.455000 ;
+      RECT 0.615000  2.455000 0.945000 2.980000 ;
+      RECT 0.640000  0.595000 2.410000 0.750000 ;
+      RECT 0.640000  0.750000 5.115000 0.765000 ;
+      RECT 0.640000  0.765000 0.970000 1.010000 ;
+      RECT 1.685000  2.625000 5.090000 2.680000 ;
+      RECT 1.685000  2.680000 3.525000 2.795000 ;
+      RECT 1.685000  2.795000 2.395000 2.955000 ;
+      RECT 1.740000  0.935000 2.070000 1.090000 ;
+      RECT 1.740000  1.090000 4.030000 1.260000 ;
+      RECT 2.240000  0.765000 5.115000 0.830000 ;
+      RECT 2.240000  0.830000 3.250000 0.920000 ;
+      RECT 3.015000  2.010000 4.005000 2.285000 ;
+      RECT 3.075000  2.965000 3.470000 3.245000 ;
+      RECT 3.080000  0.660000 5.115000 0.750000 ;
+      RECT 3.140000  0.085000 3.470000 0.490000 ;
+      RECT 3.355000  2.510000 5.090000 2.625000 ;
+      RECT 3.650000  1.000000 4.030000 1.090000 ;
+      RECT 4.210000  0.085000 4.555000 0.490000 ;
+      RECT 4.210000  2.850000 4.555000 3.245000 ;
+      RECT 4.735000  0.500000 5.115000 0.660000 ;
+      RECT 4.760000  2.180000 5.090000 2.510000 ;
+      RECT 4.760000  2.680000 5.090000 2.980000 ;
+      RECT 4.910000  1.010000 6.150000 1.180000 ;
+      RECT 4.910000  1.180000 5.240000 1.670000 ;
+      RECT 5.260000  2.180000 5.590000 3.245000 ;
+      RECT 5.285000  0.085000 5.615000 0.840000 ;
+      RECT 5.795000  0.570000 6.150000 1.010000 ;
+      RECT 5.795000  2.180000 6.150000 2.860000 ;
+      RECT 5.980000  1.180000 6.150000 2.180000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__mux2i_2
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef
index 37b3c6f..f4bdd7c 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.magic.lef
@@ -85,35 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 4.935000  0.085000  5.185000 0.490000 ;
-        RECT 5.875000  0.085000  6.205000 0.410000 ;
-        RECT 6.895000  0.085000  7.225000 0.410000 ;
-        RECT 7.905000  0.085000  8.325000 0.640000 ;
-        RECT 8.995000  0.085000  9.325000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -122,73 +93,99 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 4.475000 1.840000  6.080000 2.050000 ;
-        RECT 4.475000 2.050000  9.010000 2.220000 ;
-        RECT 6.730000 2.730000  7.060000 3.245000 ;
-        RECT 7.730000 2.730000  8.060000 3.245000 ;
-        RECT 8.760000 2.220000  9.010000 3.245000 ;
-        RECT 9.635000 2.050000  9.965000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.255000 4.765000 0.425000 ;
-      RECT 0.545000 0.425000 0.875000 0.840000 ;
-      RECT 0.565000 2.290000 0.895000 2.905000 ;
-      RECT 0.565000 2.905000 6.560000 3.075000 ;
-      RECT 1.405000 0.425000 1.735000 0.840000 ;
-      RECT 1.465000 2.290000 1.715000 2.905000 ;
-      RECT 2.415000 2.290000 2.745000 2.565000 ;
-      RECT 2.415000 2.565000 5.130000 2.735000 ;
-      RECT 2.420000 0.595000 4.425000 0.765000 ;
-      RECT 3.415000 2.290000 3.745000 2.565000 ;
-      RECT 4.255000 0.765000 4.425000 1.000000 ;
-      RECT 4.255000 1.000000 6.715000 1.170000 ;
-      RECT 4.595000 0.425000 4.765000 0.660000 ;
-      RECT 4.595000 0.660000 7.735000 0.750000 ;
-      RECT 4.595000 0.750000 5.525000 0.830000 ;
-      RECT 4.960000 2.390000 8.560000 2.560000 ;
-      RECT 4.960000 2.560000 5.130000 2.565000 ;
-      RECT 5.150000 1.340000 6.840000 1.670000 ;
-      RECT 5.300000 2.730000 6.560000 2.905000 ;
-      RECT 5.355000 0.580000 7.735000 0.660000 ;
-      RECT 6.385000 0.920000 6.715000 1.000000 ;
-      RECT 6.670000 1.670000 6.840000 1.710000 ;
-      RECT 6.670000 1.710000 9.825000 1.880000 ;
-      RECT 7.230000 2.560000 7.560000 2.980000 ;
-      RECT 7.405000 0.390000 7.735000 0.580000 ;
-      RECT 7.405000 0.750000 7.735000 0.840000 ;
-      RECT 7.405000 0.840000 8.825000 1.010000 ;
-      RECT 8.230000 2.560000 8.560000 2.980000 ;
-      RECT 8.495000 0.390000 8.825000 0.840000 ;
-      RECT 9.185000 1.880000 9.455000 2.700000 ;
-      RECT 9.495000 0.390000 9.825000 1.010000 ;
-      RECT 9.655000 1.010000 9.825000 1.710000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.545000  0.255000  4.765000 0.425000 ;
+      RECT 0.545000  0.425000  0.875000 0.840000 ;
+      RECT 0.565000  2.290000  0.895000 2.905000 ;
+      RECT 0.565000  2.905000  6.560000 3.075000 ;
+      RECT 1.405000  0.425000  1.735000 0.840000 ;
+      RECT 1.465000  2.290000  1.715000 2.905000 ;
+      RECT 2.415000  2.290000  2.745000 2.565000 ;
+      RECT 2.415000  2.565000  5.130000 2.735000 ;
+      RECT 2.420000  0.595000  4.425000 0.765000 ;
+      RECT 3.415000  2.290000  3.745000 2.565000 ;
+      RECT 4.255000  0.765000  4.425000 1.000000 ;
+      RECT 4.255000  1.000000  6.715000 1.170000 ;
+      RECT 4.475000  1.840000  6.080000 2.050000 ;
+      RECT 4.475000  2.050000  9.010000 2.220000 ;
+      RECT 4.595000  0.425000  4.765000 0.660000 ;
+      RECT 4.595000  0.660000  7.735000 0.750000 ;
+      RECT 4.595000  0.750000  5.525000 0.830000 ;
+      RECT 4.935000  0.085000  5.185000 0.490000 ;
+      RECT 4.960000  2.390000  8.560000 2.560000 ;
+      RECT 4.960000  2.560000  5.130000 2.565000 ;
+      RECT 5.150000  1.340000  6.840000 1.670000 ;
+      RECT 5.300000  2.730000  6.560000 2.905000 ;
+      RECT 5.355000  0.580000  7.735000 0.660000 ;
+      RECT 5.875000  0.085000  6.205000 0.410000 ;
+      RECT 6.385000  0.920000  6.715000 1.000000 ;
+      RECT 6.670000  1.670000  6.840000 1.710000 ;
+      RECT 6.670000  1.710000  9.825000 1.880000 ;
+      RECT 6.730000  2.730000  7.060000 3.245000 ;
+      RECT 6.895000  0.085000  7.225000 0.410000 ;
+      RECT 7.230000  2.560000  7.560000 2.980000 ;
+      RECT 7.405000  0.390000  7.735000 0.580000 ;
+      RECT 7.405000  0.750000  7.735000 0.840000 ;
+      RECT 7.405000  0.840000  8.825000 1.010000 ;
+      RECT 7.730000  2.730000  8.060000 3.245000 ;
+      RECT 7.905000  0.085000  8.325000 0.640000 ;
+      RECT 8.230000  2.560000  8.560000 2.980000 ;
+      RECT 8.495000  0.390000  8.825000 0.840000 ;
+      RECT 8.760000  2.220000  9.010000 3.245000 ;
+      RECT 8.995000  0.085000  9.325000 1.010000 ;
+      RECT 9.185000  1.880000  9.455000 2.700000 ;
+      RECT 9.495000  0.390000  9.825000 1.010000 ;
+      RECT 9.635000  2.050000  9.965000 3.245000 ;
+      RECT 9.655000  1.010000  9.825000 1.710000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__mux2i_4
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef
index bdde7de..0301dd4 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_1.magic.lef
@@ -99,33 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.700000  0.085000 1.090000 0.680000 ;
-        RECT 3.125000  0.085000 3.715000 0.680000 ;
-        RECT 5.260000  0.085000 5.590000 0.935000 ;
-        RECT 8.580000  0.085000 8.910000 1.180000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -134,93 +107,117 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.725000 1.950000 1.055000 3.245000 ;
-        RECT 3.265000 2.675000 3.595000 3.245000 ;
-        RECT 5.730000 2.675000 6.060000 3.245000 ;
-        RECT 8.690000 2.290000 9.020000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.350000 0.445000 0.860000 ;
-      RECT 0.110000 0.860000 1.700000 1.030000 ;
-      RECT 0.110000 1.030000 0.280000 1.950000 ;
-      RECT 0.110000 1.950000 0.555000 2.880000 ;
-      RECT 1.530000 0.255000 2.630000 0.425000 ;
-      RECT 1.530000 0.425000 1.700000 0.860000 ;
-      RECT 1.530000 1.030000 1.700000 1.200000 ;
-      RECT 1.530000 1.200000 1.860000 1.530000 ;
-      RECT 1.875000 0.595000 2.200000 1.030000 ;
-      RECT 2.030000 1.030000 2.200000 1.685000 ;
-      RECT 2.030000 1.685000 2.550000 2.335000 ;
-      RECT 2.030000 2.335000 4.020000 2.505000 ;
-      RECT 2.030000 2.505000 2.550000 2.725000 ;
-      RECT 2.460000 0.425000 2.630000 0.875000 ;
-      RECT 2.460000 0.875000 4.750000 1.045000 ;
-      RECT 2.460000 1.045000 2.790000 1.450000 ;
-      RECT 3.795000 2.505000 4.020000 2.905000 ;
-      RECT 3.795000 2.905000 5.550000 3.075000 ;
-      RECT 4.080000 1.045000 4.410000 1.450000 ;
-      RECT 4.210000 0.375000 5.090000 0.705000 ;
-      RECT 4.305000 1.995000 5.680000 2.165000 ;
-      RECT 4.305000 2.165000 5.165000 2.735000 ;
-      RECT 4.580000 1.045000 4.750000 1.445000 ;
-      RECT 4.580000 1.445000 5.340000 1.775000 ;
-      RECT 4.920000 0.705000 5.090000 1.105000 ;
-      RECT 4.920000 1.105000 6.235000 1.275000 ;
-      RECT 5.350000 2.335000 6.620000 2.505000 ;
-      RECT 5.350000 2.505000 5.550000 2.905000 ;
-      RECT 5.510000 1.275000 5.680000 1.995000 ;
-      RECT 5.985000 0.265000 7.695000 0.435000 ;
-      RECT 5.985000 0.435000 6.485000 0.445000 ;
-      RECT 5.985000 0.445000 6.235000 1.105000 ;
-      RECT 6.290000 1.950000 6.620000 2.335000 ;
-      RECT 6.290000 2.505000 6.620000 2.980000 ;
-      RECT 6.405000 0.615000 7.355000 0.785000 ;
-      RECT 6.405000 0.785000 6.575000 1.950000 ;
-      RECT 6.745000 0.955000 6.925000 1.115000 ;
-      RECT 6.745000 1.115000 7.120000 1.285000 ;
-      RECT 6.790000 1.285000 7.120000 2.905000 ;
-      RECT 6.790000 2.905000 8.520000 3.075000 ;
-      RECT 7.105000 0.605000 7.355000 0.615000 ;
-      RECT 7.105000 0.785000 7.355000 0.935000 ;
-      RECT 7.290000 1.105000 7.695000 1.275000 ;
-      RECT 7.290000 1.275000 7.460000 1.945000 ;
-      RECT 7.290000 1.945000 7.620000 2.735000 ;
-      RECT 7.525000 0.435000 7.695000 1.105000 ;
-      RECT 7.630000 1.445000 8.035000 1.775000 ;
-      RECT 7.850000 1.775000 8.035000 1.950000 ;
-      RECT 7.850000 1.950000 8.180000 2.735000 ;
-      RECT 7.865000 0.500000 8.410000 1.180000 ;
-      RECT 7.865000 1.180000 8.035000 1.445000 ;
-      RECT 8.350000 1.950000 8.915000 2.120000 ;
-      RECT 8.350000 2.120000 8.520000 2.905000 ;
-      RECT 8.745000 1.350000 9.075000 1.680000 ;
-      RECT 8.745000 1.680000 8.915000 1.950000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.110000  0.350000 0.445000 0.860000 ;
+      RECT 0.110000  0.860000 1.700000 1.030000 ;
+      RECT 0.110000  1.030000 0.280000 1.950000 ;
+      RECT 0.110000  1.950000 0.555000 2.880000 ;
+      RECT 0.700000  0.085000 1.090000 0.680000 ;
+      RECT 0.725000  1.950000 1.055000 3.245000 ;
+      RECT 1.530000  0.255000 2.630000 0.425000 ;
+      RECT 1.530000  0.425000 1.700000 0.860000 ;
+      RECT 1.530000  1.030000 1.700000 1.200000 ;
+      RECT 1.530000  1.200000 1.860000 1.530000 ;
+      RECT 1.875000  0.595000 2.200000 1.030000 ;
+      RECT 2.030000  1.030000 2.200000 1.685000 ;
+      RECT 2.030000  1.685000 2.550000 2.335000 ;
+      RECT 2.030000  2.335000 4.020000 2.505000 ;
+      RECT 2.030000  2.505000 2.550000 2.725000 ;
+      RECT 2.460000  0.425000 2.630000 0.875000 ;
+      RECT 2.460000  0.875000 4.750000 1.045000 ;
+      RECT 2.460000  1.045000 2.790000 1.450000 ;
+      RECT 3.125000  0.085000 3.715000 0.680000 ;
+      RECT 3.265000  2.675000 3.595000 3.245000 ;
+      RECT 3.795000  2.505000 4.020000 2.905000 ;
+      RECT 3.795000  2.905000 5.550000 3.075000 ;
+      RECT 4.080000  1.045000 4.410000 1.450000 ;
+      RECT 4.210000  0.375000 5.090000 0.705000 ;
+      RECT 4.305000  1.995000 5.680000 2.165000 ;
+      RECT 4.305000  2.165000 5.165000 2.735000 ;
+      RECT 4.580000  1.045000 4.750000 1.445000 ;
+      RECT 4.580000  1.445000 5.340000 1.775000 ;
+      RECT 4.920000  0.705000 5.090000 1.105000 ;
+      RECT 4.920000  1.105000 6.235000 1.275000 ;
+      RECT 5.260000  0.085000 5.590000 0.935000 ;
+      RECT 5.350000  2.335000 6.620000 2.505000 ;
+      RECT 5.350000  2.505000 5.550000 2.905000 ;
+      RECT 5.510000  1.275000 5.680000 1.995000 ;
+      RECT 5.730000  2.675000 6.060000 3.245000 ;
+      RECT 5.985000  0.265000 7.695000 0.435000 ;
+      RECT 5.985000  0.435000 6.485000 0.445000 ;
+      RECT 5.985000  0.445000 6.235000 1.105000 ;
+      RECT 6.290000  1.950000 6.620000 2.335000 ;
+      RECT 6.290000  2.505000 6.620000 2.980000 ;
+      RECT 6.405000  0.615000 7.355000 0.785000 ;
+      RECT 6.405000  0.785000 6.575000 1.950000 ;
+      RECT 6.745000  0.955000 6.925000 1.115000 ;
+      RECT 6.745000  1.115000 7.120000 1.285000 ;
+      RECT 6.790000  1.285000 7.120000 2.905000 ;
+      RECT 6.790000  2.905000 8.520000 3.075000 ;
+      RECT 7.105000  0.605000 7.355000 0.615000 ;
+      RECT 7.105000  0.785000 7.355000 0.935000 ;
+      RECT 7.290000  1.105000 7.695000 1.275000 ;
+      RECT 7.290000  1.275000 7.460000 1.945000 ;
+      RECT 7.290000  1.945000 7.620000 2.735000 ;
+      RECT 7.525000  0.435000 7.695000 1.105000 ;
+      RECT 7.630000  1.445000 8.035000 1.775000 ;
+      RECT 7.850000  1.775000 8.035000 1.950000 ;
+      RECT 7.850000  1.950000 8.180000 2.735000 ;
+      RECT 7.865000  0.500000 8.410000 1.180000 ;
+      RECT 7.865000  1.180000 8.035000 1.445000 ;
+      RECT 8.350000  1.950000 8.915000 2.120000 ;
+      RECT 8.350000  2.120000 8.520000 2.905000 ;
+      RECT 8.580000  0.085000 8.910000 1.180000 ;
+      RECT 8.690000  2.290000 9.020000 3.245000 ;
+      RECT 8.745000  1.350000 9.075000 1.680000 ;
+      RECT 8.745000  1.680000 8.915000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
   END
 END sky130_fd_sc_hs__mux4_1
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef
index 70ee5b3..0ba7d60 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_2.magic.lef
@@ -109,36 +109,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.560000 0.085000 ;
-        RECT  0.820000  0.085000  1.150000 0.940000 ;
-        RECT  3.445000  0.085000  3.925000 0.940000 ;
-        RECT  6.140000  0.085000  6.470000 0.600000 ;
-        RECT  9.300000  0.085000  9.470000 1.180000 ;
-        RECT 10.160000  0.085000 10.410000 1.260000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
@@ -147,85 +117,111 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 10.560000 3.415000 ;
-        RECT  0.755000 1.950000  1.085000 3.245000 ;
-        RECT  3.615000 2.290000  3.945000 3.245000 ;
-        RECT  6.165000 2.710000  6.495000 3.245000 ;
-        RECT  9.300000 1.850000  9.470000 3.245000 ;
-        RECT 10.200000 1.820000 10.450000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.560000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.500000 0.465000 1.010000 ;
-      RECT 0.095000 1.010000 0.265000 1.920000 ;
-      RECT 0.095000 1.920000 0.585000 2.150000 ;
-      RECT 0.255000 2.150000 0.585000 2.980000 ;
-      RECT 1.850000 0.760000 2.665000 1.090000 ;
-      RECT 2.045000 1.450000 2.325000 2.150000 ;
-      RECT 2.495000 1.090000 2.665000 1.950000 ;
-      RECT 2.495000 1.950000 4.285000 2.120000 ;
-      RECT 2.495000 2.120000 3.445000 2.980000 ;
-      RECT 4.115000 2.120000 4.285000 2.320000 ;
-      RECT 4.115000 2.320000 5.605000 2.490000 ;
-      RECT 4.530000 0.350000 5.105000 0.770000 ;
-      RECT 4.530000 0.770000 8.015000 0.940000 ;
-      RECT 4.925000 1.460000 5.265000 2.150000 ;
-      RECT 5.055000 2.660000 5.945000 2.910000 ;
-      RECT 5.435000 1.960000 7.080000 2.200000 ;
-      RECT 5.435000 2.200000 5.605000 2.320000 ;
-      RECT 5.775000 2.370000 7.980000 2.540000 ;
-      RECT 5.775000 2.540000 5.945000 2.660000 ;
-      RECT 6.560000 1.110000 7.955000 1.280000 ;
-      RECT 6.560000 1.280000 6.730000 1.950000 ;
-      RECT 6.560000 1.950000 7.080000 1.960000 ;
-      RECT 6.690000 0.350000 6.940000 0.770000 ;
-      RECT 7.120000 0.255000 9.130000 0.425000 ;
-      RECT 7.120000 0.425000 7.450000 0.600000 ;
-      RECT 7.200000 2.710000 7.530000 2.905000 ;
-      RECT 7.200000 2.905000 9.130000 3.075000 ;
-      RECT 7.650000 1.950000 7.980000 2.370000 ;
-      RECT 7.725000 1.450000 8.450000 1.780000 ;
-      RECT 7.810000 2.540000 7.980000 2.565000 ;
-      RECT 7.810000 2.565000 8.790000 2.735000 ;
-      RECT 7.845000 0.595000 8.790000 0.765000 ;
-      RECT 7.845000 0.765000 8.015000 0.770000 ;
-      RECT 8.185000 0.935000 8.450000 1.450000 ;
-      RECT 8.200000 1.780000 8.450000 2.395000 ;
-      RECT 8.620000 0.765000 8.790000 2.565000 ;
-      RECT 8.960000 0.425000 9.130000 1.350000 ;
-      RECT 8.960000 1.350000 9.385000 1.680000 ;
-      RECT 8.960000 1.680000 9.130000 2.905000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.095000  0.500000  0.465000 1.010000 ;
+      RECT  0.095000  1.010000  0.265000 1.920000 ;
+      RECT  0.095000  1.920000  0.585000 2.150000 ;
+      RECT  0.255000  2.150000  0.585000 2.980000 ;
+      RECT  0.755000  1.950000  1.085000 3.245000 ;
+      RECT  0.820000  0.085000  1.150000 0.940000 ;
+      RECT  1.850000  0.760000  2.665000 1.090000 ;
+      RECT  2.045000  1.450000  2.325000 2.150000 ;
+      RECT  2.495000  1.090000  2.665000 1.950000 ;
+      RECT  2.495000  1.950000  4.285000 2.120000 ;
+      RECT  2.495000  2.120000  3.445000 2.980000 ;
+      RECT  3.445000  0.085000  3.925000 0.940000 ;
+      RECT  3.615000  2.290000  3.945000 3.245000 ;
+      RECT  4.115000  2.120000  4.285000 2.320000 ;
+      RECT  4.115000  2.320000  5.605000 2.490000 ;
+      RECT  4.530000  0.350000  5.105000 0.770000 ;
+      RECT  4.530000  0.770000  8.015000 0.940000 ;
+      RECT  4.925000  1.460000  5.265000 2.150000 ;
+      RECT  5.055000  2.660000  5.945000 2.910000 ;
+      RECT  5.435000  1.960000  7.080000 2.200000 ;
+      RECT  5.435000  2.200000  5.605000 2.320000 ;
+      RECT  5.775000  2.370000  7.980000 2.540000 ;
+      RECT  5.775000  2.540000  5.945000 2.660000 ;
+      RECT  6.140000  0.085000  6.470000 0.600000 ;
+      RECT  6.165000  2.710000  6.495000 3.245000 ;
+      RECT  6.560000  1.110000  7.955000 1.280000 ;
+      RECT  6.560000  1.280000  6.730000 1.950000 ;
+      RECT  6.560000  1.950000  7.080000 1.960000 ;
+      RECT  6.690000  0.350000  6.940000 0.770000 ;
+      RECT  7.120000  0.255000  9.130000 0.425000 ;
+      RECT  7.120000  0.425000  7.450000 0.600000 ;
+      RECT  7.200000  2.710000  7.530000 2.905000 ;
+      RECT  7.200000  2.905000  9.130000 3.075000 ;
+      RECT  7.650000  1.950000  7.980000 2.370000 ;
+      RECT  7.725000  1.450000  8.450000 1.780000 ;
+      RECT  7.810000  2.540000  7.980000 2.565000 ;
+      RECT  7.810000  2.565000  8.790000 2.735000 ;
+      RECT  7.845000  0.595000  8.790000 0.765000 ;
+      RECT  7.845000  0.765000  8.015000 0.770000 ;
+      RECT  8.185000  0.935000  8.450000 1.450000 ;
+      RECT  8.200000  1.780000  8.450000 2.395000 ;
+      RECT  8.620000  0.765000  8.790000 2.565000 ;
+      RECT  8.960000  0.425000  9.130000 1.350000 ;
+      RECT  8.960000  1.350000  9.385000 1.680000 ;
+      RECT  8.960000  1.680000  9.130000 2.905000 ;
+      RECT  9.300000  0.085000  9.470000 1.180000 ;
+      RECT  9.300000  1.850000  9.470000 3.245000 ;
+      RECT 10.160000  0.085000 10.410000 1.260000 ;
+      RECT 10.200000  1.820000 10.450000 3.245000 ;
     LAYER mcon ;
-      RECT 0.155000 1.950000 0.325000 2.120000 ;
-      RECT 2.075000 1.950000 2.245000 2.120000 ;
-      RECT 4.955000 1.950000 5.125000 2.120000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  1.950000  0.325000 2.120000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  1.950000  2.245000 2.120000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  1.950000  5.125000 2.120000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
     LAYER met1 ;
       RECT 0.095000 1.920000 0.385000 1.965000 ;
       RECT 0.095000 1.965000 5.185000 2.105000 ;
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef
index c7069ec..4dd015c 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_4.magic.lef
@@ -106,55 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.800000 0.085000 ;
-        RECT  0.115000  0.085000  0.365000 1.030000 ;
-        RECT  0.115000  1.030000  1.370000 1.280000 ;
-        RECT  1.045000  0.640000  1.370000 1.030000 ;
-        RECT  1.980000  0.085000  2.310000 0.450000 ;
-        RECT  5.375000  0.085000  5.705000 1.130000 ;
-        RECT  8.495000  0.085000  8.825000 0.410000 ;
-        RECT  9.435000  0.085000  9.685000 0.750000 ;
-        RECT 10.295000  0.085000 10.545000 1.030000 ;
-        RECT 14.715000  0.085000 14.885000 1.130000 ;
-        RECT 15.495000  0.085000 15.745000 0.790000 ;
-        RECT 16.355000  0.085000 16.685000 0.790000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
-        RECT 16.475000 -0.085000 16.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
@@ -163,159 +114,204 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 16.800000 3.415000 ;
-        RECT  0.115000 1.950000  0.365000 3.245000 ;
-        RECT  1.095000 2.310000  1.345000 3.245000 ;
-        RECT  2.045000 2.650000  2.295000 3.245000 ;
-        RECT  5.400000 1.820000  5.730000 3.245000 ;
-        RECT  8.320000 2.965000  8.650000 3.245000 ;
-        RECT  9.390000 2.965000  9.730000 3.245000 ;
-        RECT 10.465000 2.285000 10.635000 3.245000 ;
-        RECT 14.375000 1.820000 14.705000 3.245000 ;
-        RECT 15.405000 2.140000 15.655000 3.245000 ;
-        RECT 16.325000 2.140000 16.655000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
-        RECT 16.475000 3.245000 16.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 16.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.545000 0.275000  1.810000 0.470000 ;
-      RECT  0.545000 0.470000  0.875000 0.860000 ;
-      RECT  0.565000 1.950000  0.895000 1.970000 ;
-      RECT  0.565000 1.970000  2.695000 2.140000 ;
-      RECT  0.565000 2.140000  0.895000 2.980000 ;
-      RECT  1.515000 2.310000  3.300000 2.480000 ;
-      RECT  1.515000 2.480000  1.845000 2.980000 ;
-      RECT  1.550000 0.960000  1.800000 1.130000 ;
-      RECT  1.550000 1.130000  2.695000 1.260000 ;
-      RECT  1.550000 1.260000  4.205000 1.300000 ;
-      RECT  1.575000 0.470000  1.810000 0.620000 ;
-      RECT  1.575000 0.620000  2.140000 0.790000 ;
-      RECT  1.970000 0.790000  3.380000 0.960000 ;
-      RECT  2.525000 1.300000  4.205000 1.430000 ;
-      RECT  2.525000 1.600000  4.190000 1.770000 ;
-      RECT  2.525000 1.770000  2.695000 1.970000 ;
-      RECT  2.525000 2.650000  2.860000 2.905000 ;
-      RECT  2.525000 2.905000  4.720000 3.075000 ;
-      RECT  2.540000 0.255000  4.715000 0.425000 ;
-      RECT  2.540000 0.425000  2.870000 0.620000 ;
-      RECT  2.990000 1.940000  3.300000 2.310000 ;
-      RECT  3.045000 2.480000  3.300000 2.735000 ;
-      RECT  3.050000 0.595000  3.380000 0.790000 ;
-      RECT  3.050000 0.960000  3.380000 1.090000 ;
-      RECT  3.490000 1.940000  3.820000 2.905000 ;
-      RECT  3.605000 0.425000  3.775000 1.090000 ;
-      RECT  3.955000 0.595000  4.205000 1.260000 ;
-      RECT  4.020000 1.770000  4.190000 2.735000 ;
-      RECT  4.375000 0.425000  4.715000 1.180000 ;
-      RECT  4.375000 1.180000  4.545000 1.920000 ;
-      RECT  4.375000 1.920000  4.720000 2.905000 ;
-      RECT  4.715000 1.350000  5.200000 1.365000 ;
-      RECT  4.715000 1.365000  6.705000 1.535000 ;
-      RECT  4.715000 1.535000  5.200000 1.680000 ;
-      RECT  4.945000 0.350000  5.200000 1.350000 ;
-      RECT  4.950000 1.680000  5.200000 2.980000 ;
-      RECT  5.935000 0.585000  6.185000 1.025000 ;
-      RECT  5.935000 1.025000  7.125000 1.195000 ;
-      RECT  5.960000 1.865000  7.125000 1.945000 ;
-      RECT  5.960000 1.945000 10.975000 2.035000 ;
-      RECT  5.960000 2.035000  6.210000 2.905000 ;
-      RECT  6.035000 1.535000  6.705000 1.695000 ;
-      RECT  6.365000 0.255000  8.325000 0.425000 ;
-      RECT  6.365000 0.425000  6.695000 0.855000 ;
-      RECT  6.410000 2.205000  6.740000 2.905000 ;
-      RECT  6.410000 2.905000  8.150000 3.075000 ;
-      RECT  6.875000 0.595000  7.985000 0.765000 ;
-      RECT  6.875000 0.765000  7.125000 1.025000 ;
-      RECT  6.875000 1.195000  7.125000 1.265000 ;
-      RECT  6.940000 1.265000  7.125000 1.865000 ;
-      RECT  6.940000 2.035000 10.975000 2.115000 ;
-      RECT  6.940000 2.115000  7.125000 2.735000 ;
-      RECT  7.305000 0.935000  7.555000 1.095000 ;
-      RECT  7.305000 1.095000  8.325000 1.265000 ;
-      RECT  7.310000 2.285000  9.185000 2.455000 ;
-      RECT  7.310000 2.455000  7.640000 2.735000 ;
-      RECT  7.735000 0.765000  7.985000 0.925000 ;
-      RECT  7.980000 2.625000 10.265000 2.795000 ;
-      RECT  7.980000 2.795000  8.150000 2.905000 ;
-      RECT  8.155000 0.425000  8.325000 0.580000 ;
-      RECT  8.155000 0.580000  9.255000 0.750000 ;
-      RECT  8.155000 0.920000 10.115000 1.090000 ;
-      RECT  8.155000 1.090000  8.325000 1.095000 ;
-      RECT  9.005000 0.350000  9.255000 0.580000 ;
-      RECT  9.865000 0.350000 10.115000 0.920000 ;
-      RECT  9.935000 2.285000 10.265000 2.625000 ;
-      RECT  9.935000 2.795000 10.265000 2.980000 ;
-      RECT 10.715000 0.255000 11.815000 0.425000 ;
-      RECT 10.715000 0.425000 10.885000 1.945000 ;
-      RECT 10.805000 2.115000 10.975000 2.905000 ;
-      RECT 10.805000 2.905000 12.975000 3.075000 ;
-      RECT 11.055000 0.595000 12.675000 0.620000 ;
-      RECT 11.055000 0.620000 12.155000 0.765000 ;
-      RECT 11.055000 0.765000 11.475000 1.030000 ;
-      RECT 11.145000 1.030000 11.475000 2.565000 ;
-      RECT 11.145000 2.565000 12.475000 2.735000 ;
-      RECT 11.645000 0.935000 13.175000 0.960000 ;
-      RECT 11.645000 0.960000 12.495000 1.105000 ;
-      RECT 11.645000 1.105000 11.975000 2.395000 ;
-      RECT 11.985000 0.255000 14.545000 0.425000 ;
-      RECT 11.985000 0.425000 12.675000 0.595000 ;
-      RECT 12.145000 1.950000 12.475000 2.060000 ;
-      RECT 12.145000 2.060000 13.475000 2.230000 ;
-      RECT 12.145000 2.230000 12.475000 2.565000 ;
-      RECT 12.325000 0.790000 13.175000 0.935000 ;
-      RECT 12.645000 2.400000 12.975000 2.905000 ;
-      RECT 12.860000 0.595000 13.175000 0.790000 ;
-      RECT 13.005000 1.470000 13.330000 1.720000 ;
-      RECT 13.005000 1.720000 14.205000 1.890000 ;
-      RECT 13.145000 2.230000 13.475000 2.980000 ;
-      RECT 13.345000 0.425000 13.675000 0.960000 ;
-      RECT 13.875000 1.890000 14.205000 2.980000 ;
-      RECT 13.905000 0.595000 14.205000 0.960000 ;
-      RECT 14.035000 0.960000 14.205000 1.720000 ;
-      RECT 14.375000 0.425000 14.545000 1.300000 ;
-      RECT 14.375000 1.300000 16.210000 1.630000 ;
+      RECT  0.000000 -0.085000 16.800000 0.085000 ;
+      RECT  0.000000  3.245000 16.800000 3.415000 ;
+      RECT  0.115000  0.085000  0.365000 1.030000 ;
+      RECT  0.115000  1.030000  1.370000 1.280000 ;
+      RECT  0.115000  1.950000  0.365000 3.245000 ;
+      RECT  0.545000  0.275000  1.810000 0.470000 ;
+      RECT  0.545000  0.470000  0.875000 0.860000 ;
+      RECT  0.565000  1.950000  0.895000 1.970000 ;
+      RECT  0.565000  1.970000  2.695000 2.140000 ;
+      RECT  0.565000  2.140000  0.895000 2.980000 ;
+      RECT  1.045000  0.640000  1.370000 1.030000 ;
+      RECT  1.095000  2.310000  1.345000 3.245000 ;
+      RECT  1.515000  2.310000  3.300000 2.480000 ;
+      RECT  1.515000  2.480000  1.845000 2.980000 ;
+      RECT  1.550000  0.960000  1.800000 1.130000 ;
+      RECT  1.550000  1.130000  2.695000 1.260000 ;
+      RECT  1.550000  1.260000  4.205000 1.300000 ;
+      RECT  1.575000  0.470000  1.810000 0.620000 ;
+      RECT  1.575000  0.620000  2.140000 0.790000 ;
+      RECT  1.970000  0.790000  3.380000 0.960000 ;
+      RECT  1.980000  0.085000  2.310000 0.450000 ;
+      RECT  2.045000  2.650000  2.295000 3.245000 ;
+      RECT  2.525000  1.300000  4.205000 1.430000 ;
+      RECT  2.525000  1.600000  4.190000 1.770000 ;
+      RECT  2.525000  1.770000  2.695000 1.970000 ;
+      RECT  2.525000  2.650000  2.860000 2.905000 ;
+      RECT  2.525000  2.905000  4.720000 3.075000 ;
+      RECT  2.540000  0.255000  4.715000 0.425000 ;
+      RECT  2.540000  0.425000  2.870000 0.620000 ;
+      RECT  2.990000  1.940000  3.300000 2.310000 ;
+      RECT  3.045000  2.480000  3.300000 2.735000 ;
+      RECT  3.050000  0.595000  3.380000 0.790000 ;
+      RECT  3.050000  0.960000  3.380000 1.090000 ;
+      RECT  3.490000  1.940000  3.820000 2.905000 ;
+      RECT  3.605000  0.425000  3.775000 1.090000 ;
+      RECT  3.955000  0.595000  4.205000 1.260000 ;
+      RECT  4.020000  1.770000  4.190000 2.735000 ;
+      RECT  4.375000  0.425000  4.715000 1.180000 ;
+      RECT  4.375000  1.180000  4.545000 1.920000 ;
+      RECT  4.375000  1.920000  4.720000 2.905000 ;
+      RECT  4.715000  1.350000  5.200000 1.365000 ;
+      RECT  4.715000  1.365000  6.705000 1.535000 ;
+      RECT  4.715000  1.535000  5.200000 1.680000 ;
+      RECT  4.945000  0.350000  5.200000 1.350000 ;
+      RECT  4.950000  1.680000  5.200000 2.980000 ;
+      RECT  5.375000  0.085000  5.705000 1.130000 ;
+      RECT  5.400000  1.820000  5.730000 3.245000 ;
+      RECT  5.935000  0.585000  6.185000 1.025000 ;
+      RECT  5.935000  1.025000  7.125000 1.195000 ;
+      RECT  5.960000  1.865000  7.125000 1.945000 ;
+      RECT  5.960000  1.945000 10.975000 2.035000 ;
+      RECT  5.960000  2.035000  6.210000 2.905000 ;
+      RECT  6.035000  1.535000  6.705000 1.695000 ;
+      RECT  6.365000  0.255000  8.325000 0.425000 ;
+      RECT  6.365000  0.425000  6.695000 0.855000 ;
+      RECT  6.410000  2.205000  6.740000 2.905000 ;
+      RECT  6.410000  2.905000  8.150000 3.075000 ;
+      RECT  6.875000  0.595000  7.985000 0.765000 ;
+      RECT  6.875000  0.765000  7.125000 1.025000 ;
+      RECT  6.875000  1.195000  7.125000 1.265000 ;
+      RECT  6.940000  1.265000  7.125000 1.865000 ;
+      RECT  6.940000  2.035000 10.975000 2.115000 ;
+      RECT  6.940000  2.115000  7.125000 2.735000 ;
+      RECT  7.305000  0.935000  7.555000 1.095000 ;
+      RECT  7.305000  1.095000  8.325000 1.265000 ;
+      RECT  7.310000  2.285000  9.185000 2.455000 ;
+      RECT  7.310000  2.455000  7.640000 2.735000 ;
+      RECT  7.735000  0.765000  7.985000 0.925000 ;
+      RECT  7.980000  2.625000 10.265000 2.795000 ;
+      RECT  7.980000  2.795000  8.150000 2.905000 ;
+      RECT  8.155000  0.425000  8.325000 0.580000 ;
+      RECT  8.155000  0.580000  9.255000 0.750000 ;
+      RECT  8.155000  0.920000 10.115000 1.090000 ;
+      RECT  8.155000  1.090000  8.325000 1.095000 ;
+      RECT  8.320000  2.965000  8.650000 3.245000 ;
+      RECT  8.495000  0.085000  8.825000 0.410000 ;
+      RECT  9.005000  0.350000  9.255000 0.580000 ;
+      RECT  9.390000  2.965000  9.730000 3.245000 ;
+      RECT  9.435000  0.085000  9.685000 0.750000 ;
+      RECT  9.865000  0.350000 10.115000 0.920000 ;
+      RECT  9.935000  2.285000 10.265000 2.625000 ;
+      RECT  9.935000  2.795000 10.265000 2.980000 ;
+      RECT 10.295000  0.085000 10.545000 1.030000 ;
+      RECT 10.465000  2.285000 10.635000 3.245000 ;
+      RECT 10.715000  0.255000 11.815000 0.425000 ;
+      RECT 10.715000  0.425000 10.885000 1.945000 ;
+      RECT 10.805000  2.115000 10.975000 2.905000 ;
+      RECT 10.805000  2.905000 12.975000 3.075000 ;
+      RECT 11.055000  0.595000 12.675000 0.620000 ;
+      RECT 11.055000  0.620000 12.155000 0.765000 ;
+      RECT 11.055000  0.765000 11.475000 1.030000 ;
+      RECT 11.145000  1.030000 11.475000 2.565000 ;
+      RECT 11.145000  2.565000 12.475000 2.735000 ;
+      RECT 11.645000  0.935000 13.175000 0.960000 ;
+      RECT 11.645000  0.960000 12.495000 1.105000 ;
+      RECT 11.645000  1.105000 11.975000 2.395000 ;
+      RECT 11.985000  0.255000 14.545000 0.425000 ;
+      RECT 11.985000  0.425000 12.675000 0.595000 ;
+      RECT 12.145000  1.950000 12.475000 2.060000 ;
+      RECT 12.145000  2.060000 13.475000 2.230000 ;
+      RECT 12.145000  2.230000 12.475000 2.565000 ;
+      RECT 12.325000  0.790000 13.175000 0.935000 ;
+      RECT 12.645000  2.400000 12.975000 2.905000 ;
+      RECT 12.860000  0.595000 13.175000 0.790000 ;
+      RECT 13.005000  1.470000 13.330000 1.720000 ;
+      RECT 13.005000  1.720000 14.205000 1.890000 ;
+      RECT 13.145000  2.230000 13.475000 2.980000 ;
+      RECT 13.345000  0.425000 13.675000 0.960000 ;
+      RECT 13.875000  1.890000 14.205000 2.980000 ;
+      RECT 13.905000  0.595000 14.205000 0.960000 ;
+      RECT 14.035000  0.960000 14.205000 1.720000 ;
+      RECT 14.375000  0.425000 14.545000 1.300000 ;
+      RECT 14.375000  1.300000 16.210000 1.630000 ;
+      RECT 14.375000  1.820000 14.705000 3.245000 ;
+      RECT 14.715000  0.085000 14.885000 1.130000 ;
+      RECT 15.405000  2.140000 15.655000 3.245000 ;
+      RECT 15.495000  0.085000 15.745000 0.790000 ;
+      RECT 16.325000  2.140000 16.655000 3.245000 ;
+      RECT 16.355000  0.085000 16.685000 0.790000 ;
     LAYER mcon ;
-      RECT  4.475000 1.950000  4.645000 2.120000 ;
-      RECT 11.675000 1.950000 11.845000 2.120000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  1.950000  4.645000 2.120000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  1.950000 11.845000 2.120000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
     LAYER met1 ;
       RECT  4.415000 1.920000  4.705000 1.965000 ;
       RECT  4.415000 1.965000 11.905000 2.105000 ;
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef
index ff77b7d..80e10f4 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_1.magic.lef
@@ -64,13 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.130000  0.085000 0.460000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -79,16 +72,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.105000 1.820000 0.435000 3.245000 ;
-        RECT 1.005000 1.820000 1.335000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.105000  1.820000 0.435000 3.245000 ;
+      RECT 0.130000  0.085000 0.460000 1.010000 ;
+      RECT 1.005000  1.820000 1.335000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_hs__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef
index e3e2742..bf801f7 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_2.magic.lef
@@ -66,15 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -83,27 +74,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.120000 1.820000 0.370000 3.245000 ;
-        RECT 1.020000 2.290000 1.350000 3.245000 ;
-        RECT 1.930000 2.290000 2.260000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 1.275000 1.180000 ;
-      RECT 1.105000 0.255000 2.285000 0.425000 ;
-      RECT 1.105000 0.425000 1.275000 1.010000 ;
-      RECT 1.955000 0.425000 2.285000 0.840000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.010000 ;
+      RECT 0.115000  1.010000 1.275000 1.180000 ;
+      RECT 0.120000  1.820000 0.370000 3.245000 ;
+      RECT 0.545000  0.085000 0.875000 0.840000 ;
+      RECT 1.020000  2.290000 1.350000 3.245000 ;
+      RECT 1.105000  0.255000 2.285000 0.425000 ;
+      RECT 1.105000  0.425000 1.275000 1.010000 ;
+      RECT 1.930000  2.290000 2.260000 3.245000 ;
+      RECT 1.955000  0.425000 2.285000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef
index 7929c52..7b79d6f 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_4.magic.lef
@@ -68,20 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.805000 ;
-        RECT 1.405000  0.085000 1.735000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -90,33 +76,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.115000 1.850000 0.445000 3.245000 ;
-        RECT 1.830000 2.290000 2.160000 3.245000 ;
-        RECT 3.875000 2.290000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 2.165000 1.180000 ;
-      RECT 1.055000 0.350000 1.225000 1.010000 ;
-      RECT 1.915000 0.255000 4.205000 0.425000 ;
-      RECT 1.915000 0.425000 2.165000 1.010000 ;
-      RECT 2.835000 0.425000 3.165000 0.805000 ;
-      RECT 3.875000 0.425000 4.205000 0.805000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.010000 ;
+      RECT 0.115000  1.010000 2.165000 1.180000 ;
+      RECT 0.115000  1.850000 0.445000 3.245000 ;
+      RECT 0.545000  0.085000 0.875000 0.805000 ;
+      RECT 1.055000  0.350000 1.225000 1.010000 ;
+      RECT 1.405000  0.085000 1.735000 0.805000 ;
+      RECT 1.830000  2.290000 2.160000 3.245000 ;
+      RECT 1.915000  0.255000 4.205000 0.425000 ;
+      RECT 1.915000  0.425000 2.165000 1.010000 ;
+      RECT 2.835000  0.425000 3.165000 0.805000 ;
+      RECT 3.875000  0.425000 4.205000 0.805000 ;
+      RECT 3.875000  2.290000 4.205000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef
index abb810b..5c8042b 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_8.magic.lef
@@ -71,30 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.535000  0.085000 0.865000 0.995000 ;
-        RECT 1.395000  0.085000 1.725000 0.840000 ;
-        RECT 2.325000  0.085000 2.905000 0.840000 ;
-        RECT 3.475000  0.085000 3.805000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -103,46 +79,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.660000 1.950000 1.970000 3.245000 ;
-        RECT 2.640000 2.290000 4.210000 3.245000 ;
-        RECT 4.880000 1.820000 5.210000 3.245000 ;
-        RECT 5.440000 1.820000 5.770000 3.245000 ;
-        RECT 6.440000 2.290000 7.150000 3.245000 ;
-        RECT 7.720000 2.290000 8.050000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.350000 0.355000 1.165000 ;
-      RECT 0.105000 1.165000 4.155000 1.180000 ;
-      RECT 0.105000 1.180000 1.860000 1.355000 ;
-      RECT 1.035000 0.350000 1.225000 1.010000 ;
-      RECT 1.035000 1.010000 4.155000 1.165000 ;
-      RECT 1.895000 0.350000 2.155000 1.010000 ;
-      RECT 3.075000 0.350000 3.305000 1.010000 ;
-      RECT 3.985000 0.350000 8.045000 0.600000 ;
-      RECT 3.985000 0.600000 4.155000 1.010000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.105000  0.350000 0.355000 1.165000 ;
+      RECT 0.105000  1.165000 4.155000 1.180000 ;
+      RECT 0.105000  1.180000 1.860000 1.355000 ;
+      RECT 0.535000  0.085000 0.865000 0.995000 ;
+      RECT 0.660000  1.950000 1.970000 3.245000 ;
+      RECT 1.035000  0.350000 1.225000 1.010000 ;
+      RECT 1.035000  1.010000 4.155000 1.165000 ;
+      RECT 1.395000  0.085000 1.725000 0.840000 ;
+      RECT 1.895000  0.350000 2.155000 1.010000 ;
+      RECT 2.325000  0.085000 2.905000 0.840000 ;
+      RECT 2.640000  2.290000 4.210000 3.245000 ;
+      RECT 3.075000  0.350000 3.305000 1.010000 ;
+      RECT 3.475000  0.085000 3.805000 0.840000 ;
+      RECT 3.985000  0.350000 8.045000 0.600000 ;
+      RECT 3.985000  0.600000 4.155000 1.010000 ;
+      RECT 4.880000  1.820000 5.210000 3.245000 ;
+      RECT 5.440000  1.820000 5.770000 3.245000 ;
+      RECT 6.440000  2.290000 7.150000 3.245000 ;
+      RECT 7.720000  2.290000 8.050000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand2_8
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef
index d389a92..b16691c 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.magic.lef
@@ -64,15 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.550000  0.085000 1.220000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -81,28 +72,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.650000 2.290000 0.915000 3.245000 ;
-        RECT 1.735000 2.650000 2.070000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.540000 0.380000 0.960000 ;
-      RECT 0.115000 0.960000 1.685000 1.130000 ;
-      RECT 0.115000 1.950000 1.685000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.700000 ;
-      RECT 1.515000 1.130000 1.685000 1.300000 ;
-      RECT 1.515000 1.300000 1.915000 1.630000 ;
-      RECT 1.515000 1.630000 1.685000 1.950000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.115000  0.540000 0.380000 0.960000 ;
+      RECT 0.115000  0.960000 1.685000 1.130000 ;
+      RECT 0.115000  1.950000 1.685000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.700000 ;
+      RECT 0.550000  0.085000 1.220000 0.790000 ;
+      RECT 0.650000  2.290000 0.915000 3.245000 ;
+      RECT 1.515000  1.130000 1.685000 1.300000 ;
+      RECT 1.515000  1.300000 1.915000 1.630000 ;
+      RECT 1.515000  1.630000 1.685000 1.950000 ;
+      RECT 1.735000  2.650000 2.070000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef
index 415f3a5..b055c21 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.magic.lef
@@ -65,18 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 0.875000 0.840000 ;
-        RECT 2.560000  0.085000 2.730000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -85,38 +73,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.725000 2.290000 1.095000 3.245000 ;
-        RECT 2.015000 2.710000 2.345000 3.245000 ;
-        RECT 2.915000 2.710000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 0.975000 1.140000 ;
-      RECT 0.115000 1.140000 1.135000 1.180000 ;
-      RECT 0.115000 1.950000 0.975000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.860000 ;
-      RECT 0.805000 1.180000 1.135000 1.470000 ;
-      RECT 0.805000 1.470000 0.975000 1.950000 ;
-      RECT 1.190000 0.255000 2.380000 0.425000 ;
-      RECT 1.190000 0.425000 1.520000 0.970000 ;
-      RECT 1.305000 0.970000 1.475000 2.370000 ;
-      RECT 1.305000 2.370000 3.245000 2.540000 ;
-      RECT 2.050000 0.425000 2.380000 1.050000 ;
-      RECT 2.915000 0.350000 3.245000 1.130000 ;
-      RECT 3.075000 1.130000 3.245000 2.370000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 0.975000 1.140000 ;
+      RECT 0.115000  1.140000 1.135000 1.180000 ;
+      RECT 0.115000  1.950000 0.975000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.860000 ;
+      RECT 0.615000  0.085000 0.875000 0.840000 ;
+      RECT 0.725000  2.290000 1.095000 3.245000 ;
+      RECT 0.805000  1.180000 1.135000 1.470000 ;
+      RECT 0.805000  1.470000 0.975000 1.950000 ;
+      RECT 1.190000  0.255000 2.380000 0.425000 ;
+      RECT 1.190000  0.425000 1.520000 0.970000 ;
+      RECT 1.305000  0.970000 1.475000 2.370000 ;
+      RECT 1.305000  2.370000 3.245000 2.540000 ;
+      RECT 2.015000  2.710000 2.345000 3.245000 ;
+      RECT 2.050000  0.425000 2.380000 1.050000 ;
+      RECT 2.560000  0.085000 2.730000 1.130000 ;
+      RECT 2.915000  0.350000 3.245000 1.130000 ;
+      RECT 2.915000  2.710000 3.245000 3.245000 ;
+      RECT 3.075000  1.130000 3.245000 2.370000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef
index d3daa5d..544fe94 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.magic.lef
@@ -69,24 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.790000 ;
-        RECT 3.550000  0.085000 3.880000 0.580000 ;
-        RECT 4.480000  0.085000 5.145000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -95,45 +77,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.435000 1.950000 1.060000 3.245000 ;
-        RECT 1.765000 1.850000 2.095000 3.245000 ;
-        RECT 3.045000 2.320000 4.645000 3.245000 ;
-        RECT 5.315000 1.950000 5.600000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.350000 0.385000 0.960000 ;
-      RECT 0.135000 0.960000 1.455000 1.130000 ;
-      RECT 1.195000 0.255000 3.380000 0.425000 ;
-      RECT 1.195000 0.425000 1.455000 0.790000 ;
-      RECT 1.230000 1.950000 1.560000 2.700000 ;
-      RECT 1.285000 1.130000 1.455000 1.430000 ;
-      RECT 1.285000 1.430000 3.075000 1.680000 ;
-      RECT 1.285000 1.680000 1.455000 1.950000 ;
-      RECT 2.055000 0.425000 2.385000 0.920000 ;
-      RECT 3.050000 0.425000 3.380000 0.750000 ;
-      RECT 3.050000 0.750000 4.310000 0.920000 ;
-      RECT 3.980000 0.920000 4.310000 0.960000 ;
-      RECT 3.980000 0.960000 5.645000 1.130000 ;
-      RECT 4.050000 0.330000 4.310000 0.750000 ;
-      RECT 5.315000 0.350000 5.645000 0.960000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.135000  0.350000 0.385000 0.960000 ;
+      RECT 0.135000  0.960000 1.455000 1.130000 ;
+      RECT 0.435000  1.950000 1.060000 3.245000 ;
+      RECT 0.565000  0.085000 0.895000 0.790000 ;
+      RECT 1.195000  0.255000 3.380000 0.425000 ;
+      RECT 1.195000  0.425000 1.455000 0.790000 ;
+      RECT 1.230000  1.950000 1.560000 2.700000 ;
+      RECT 1.285000  1.130000 1.455000 1.430000 ;
+      RECT 1.285000  1.430000 3.075000 1.680000 ;
+      RECT 1.285000  1.680000 1.455000 1.950000 ;
+      RECT 1.765000  1.850000 2.095000 3.245000 ;
+      RECT 2.055000  0.425000 2.385000 0.920000 ;
+      RECT 3.045000  2.320000 4.645000 3.245000 ;
+      RECT 3.050000  0.425000 3.380000 0.750000 ;
+      RECT 3.050000  0.750000 4.310000 0.920000 ;
+      RECT 3.550000  0.085000 3.880000 0.580000 ;
+      RECT 3.980000  0.920000 4.310000 0.960000 ;
+      RECT 3.980000  0.960000 5.645000 1.130000 ;
+      RECT 4.050000  0.330000 4.310000 0.750000 ;
+      RECT 4.480000  0.085000 5.145000 0.790000 ;
+      RECT 5.315000  0.350000 5.645000 0.960000 ;
+      RECT 5.315000  1.950000 5.600000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand2b_4
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef
index 72a7a8e..ab9902b 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_1.magic.lef
@@ -75,15 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.320000  0.085000 0.650000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -92,18 +83,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.185000 1.820000 0.435000 3.245000 ;
-        RECT 1.215000 2.060000 1.545000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.185000  1.820000 0.435000 3.245000 ;
+      RECT 0.320000  0.085000 0.650000 1.010000 ;
+      RECT 1.215000  2.060000 1.545000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+  END
 END sky130_fd_sc_hs__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef
index 3e6a5de..5f73df2 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_2.magic.lef
@@ -82,17 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.530000  0.085000 0.860000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -101,34 +90,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.065000 2.630000 1.315000 3.245000 ;
-        RECT 2.015000 2.630000 2.345000 3.245000 ;
-        RECT 2.995000 1.820000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.350000 0.350000 0.750000 ;
-      RECT 0.100000 0.750000 3.260000 0.765000 ;
-      RECT 0.100000 0.765000 1.370000 0.920000 ;
-      RECT 0.100000 0.920000 0.430000 1.010000 ;
-      RECT 1.040000 0.330000 1.210000 0.595000 ;
-      RECT 1.040000 0.595000 3.260000 0.750000 ;
-      RECT 1.455000 0.255000 2.765000 0.425000 ;
-      RECT 2.930000 0.765000 3.260000 1.150000 ;
-      RECT 2.945000 0.405000 3.260000 0.595000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.100000  0.350000 0.350000 0.750000 ;
+      RECT 0.100000  0.750000 3.260000 0.765000 ;
+      RECT 0.100000  0.765000 1.370000 0.920000 ;
+      RECT 0.100000  0.920000 0.430000 1.010000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.530000  0.085000 0.860000 0.580000 ;
+      RECT 1.040000  0.330000 1.210000 0.595000 ;
+      RECT 1.040000  0.595000 3.260000 0.750000 ;
+      RECT 1.065000  2.630000 1.315000 3.245000 ;
+      RECT 1.455000  0.255000 2.765000 0.425000 ;
+      RECT 2.015000  2.630000 2.345000 3.245000 ;
+      RECT 2.930000  0.765000 3.260000 1.150000 ;
+      RECT 2.945000  0.405000 3.260000 0.595000 ;
+      RECT 2.995000  1.820000 3.245000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef
index b4210ea..ec8e439 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_4.magic.lef
@@ -81,25 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 4.085000  0.085000 4.415000 0.750000 ;
-        RECT 4.945000  0.085000 5.275000 0.750000 ;
-        RECT 5.805000  0.085000 6.135000 1.170000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -108,42 +89,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.115000 2.290000 0.445000 3.245000 ;
-        RECT 1.535000 2.290000 1.865000 3.245000 ;
-        RECT 2.535000 2.290000 3.790000 3.245000 ;
-        RECT 4.460000 1.950000 5.765000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.255000 3.875000 0.425000 ;
-      RECT 0.105000 0.425000 0.355000 0.840000 ;
-      RECT 1.045000 0.425000 1.215000 0.840000 ;
-      RECT 1.905000 0.425000 2.075000 1.170000 ;
-      RECT 2.255000 0.595000 2.585000 0.920000 ;
-      RECT 2.255000 0.920000 5.625000 1.170000 ;
-      RECT 2.755000 0.425000 2.945000 0.750000 ;
-      RECT 3.115000 0.595000 3.445000 0.920000 ;
-      RECT 3.615000 0.425000 3.875000 0.750000 ;
-      RECT 4.585000 0.390000 4.775000 0.920000 ;
-      RECT 5.455000 0.390000 5.625000 0.920000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.105000  0.255000 3.875000 0.425000 ;
+      RECT 0.105000  0.425000 0.355000 0.840000 ;
+      RECT 0.115000  2.290000 0.445000 3.245000 ;
+      RECT 1.045000  0.425000 1.215000 0.840000 ;
+      RECT 1.535000  2.290000 1.865000 3.245000 ;
+      RECT 1.905000  0.425000 2.075000 1.170000 ;
+      RECT 2.255000  0.595000 2.585000 0.920000 ;
+      RECT 2.255000  0.920000 5.625000 1.170000 ;
+      RECT 2.535000  2.290000 3.790000 3.245000 ;
+      RECT 2.755000  0.425000 2.945000 0.750000 ;
+      RECT 3.115000  0.595000 3.445000 0.920000 ;
+      RECT 3.615000  0.425000 3.875000 0.750000 ;
+      RECT 4.085000  0.085000 4.415000 0.750000 ;
+      RECT 4.460000  1.950000 5.765000 3.245000 ;
+      RECT 4.585000  0.390000 4.775000 0.920000 ;
+      RECT 4.945000  0.085000 5.275000 0.750000 ;
+      RECT 5.455000  0.390000 5.625000 0.920000 ;
+      RECT 5.805000  0.085000 6.135000 1.170000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand3_4
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef
index 14c20c1..35b6e84 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.magic.lef
@@ -76,16 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.545000  0.085000 1.220000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -94,28 +84,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.805000 1.950000 1.135000 3.245000 ;
-        RECT 1.805000 2.290000 2.135000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.560000 0.375000 0.980000 ;
-      RECT 0.105000 0.980000 2.255000 1.150000 ;
-      RECT 0.105000 1.150000 0.275000 1.950000 ;
-      RECT 0.105000 1.950000 0.600000 2.700000 ;
-      RECT 2.085000 1.150000 2.255000 1.320000 ;
-      RECT 2.085000 1.320000 2.455000 1.650000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.105000  0.560000 0.375000 0.980000 ;
+      RECT 0.105000  0.980000 2.255000 1.150000 ;
+      RECT 0.105000  1.150000 0.275000 1.950000 ;
+      RECT 0.105000  1.950000 0.600000 2.700000 ;
+      RECT 0.545000  0.085000 1.220000 0.810000 ;
+      RECT 0.805000  1.950000 1.135000 3.245000 ;
+      RECT 1.805000  2.290000 2.135000 3.245000 ;
+      RECT 2.085000  1.150000 2.255000 1.320000 ;
+      RECT 2.085000  1.320000 2.455000 1.650000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef
index e371709..a75150a 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.magic.lef
@@ -75,20 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.530000  0.085000 0.820000 0.910000 ;
-        RECT 1.435000  0.085000 1.765000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -97,41 +83,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.830000 2.290000 1.075000 3.245000 ;
-        RECT 1.805000 2.290000 2.135000 3.245000 ;
-        RECT 2.790000 2.290000 3.120000 3.245000 ;
-        RECT 3.875000 1.950000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.450000 0.350000 1.090000 ;
-      RECT 0.100000 1.090000 2.195000 1.260000 ;
-      RECT 0.305000 1.950000 0.890000 2.120000 ;
-      RECT 0.305000 2.120000 0.635000 2.980000 ;
-      RECT 0.720000 1.260000 0.890000 1.950000 ;
-      RECT 1.005000 0.330000 1.255000 0.750000 ;
-      RECT 1.005000 0.750000 3.790000 0.840000 ;
-      RECT 1.005000 0.840000 2.105000 0.920000 ;
-      RECT 1.935000 0.670000 3.790000 0.750000 ;
-      RECT 1.975000 0.330000 4.220000 0.500000 ;
-      RECT 2.025000 1.260000 2.195000 1.350000 ;
-      RECT 2.025000 1.350000 2.355000 1.680000 ;
-      RECT 2.970000 0.840000 3.790000 1.180000 ;
-      RECT 3.960000 0.500000 4.220000 1.180000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.100000  0.450000 0.350000 1.090000 ;
+      RECT 0.100000  1.090000 2.195000 1.260000 ;
+      RECT 0.305000  1.950000 0.890000 2.120000 ;
+      RECT 0.305000  2.120000 0.635000 2.980000 ;
+      RECT 0.530000  0.085000 0.820000 0.910000 ;
+      RECT 0.720000  1.260000 0.890000 1.950000 ;
+      RECT 0.830000  2.290000 1.075000 3.245000 ;
+      RECT 1.005000  0.330000 1.255000 0.750000 ;
+      RECT 1.005000  0.750000 3.790000 0.840000 ;
+      RECT 1.005000  0.840000 2.105000 0.920000 ;
+      RECT 1.435000  0.085000 1.765000 0.580000 ;
+      RECT 1.805000  2.290000 2.135000 3.245000 ;
+      RECT 1.935000  0.670000 3.790000 0.750000 ;
+      RECT 1.975000  0.330000 4.220000 0.500000 ;
+      RECT 2.025000  1.260000 2.195000 1.350000 ;
+      RECT 2.025000  1.350000 2.355000 1.680000 ;
+      RECT 2.790000  2.290000 3.120000 3.245000 ;
+      RECT 2.970000  0.840000 3.790000 1.180000 ;
+      RECT 3.875000  1.950000 4.205000 3.245000 ;
+      RECT 3.960000  0.500000 4.220000 1.180000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef
index 65d9cc9..866c2d7 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.magic.lef
@@ -74,28 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.935000  0.085000 1.280000 0.410000 ;
-        RECT 1.970000  0.085000 2.460000 0.500000 ;
-        RECT 3.140000  0.085000 3.470000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -104,58 +82,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.115000 2.290000 0.445000 3.245000 ;
-        RECT 1.490000 2.650000 2.565000 3.245000 ;
-        RECT 3.135000 2.650000 3.630000 3.245000 ;
-        RECT 4.580000 2.650000 5.400000 3.245000 ;
-        RECT 5.970000 2.650000 7.565000 3.245000 ;
-        RECT 6.400000 2.160000 7.565000 2.650000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.580000 1.790000 0.670000 ;
-      RECT 0.085000 0.670000 2.970000 0.750000 ;
-      RECT 0.085000 0.750000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.785000 2.120000 ;
-      RECT 0.425000 0.920000 0.755000 1.010000 ;
-      RECT 0.425000 1.010000 3.770000 1.180000 ;
-      RECT 0.615000 2.120000 0.785000 2.310000 ;
-      RECT 0.615000 2.310000 6.230000 2.480000 ;
-      RECT 0.955000 1.950000 1.435000 2.140000 ;
-      RECT 1.265000 1.180000 1.435000 1.950000 ;
-      RECT 1.460000 0.390000 1.790000 0.580000 ;
-      RECT 1.460000 0.750000 2.970000 0.840000 ;
-      RECT 2.640000 0.390000 2.970000 0.670000 ;
-      RECT 3.600000 1.180000 3.770000 1.300000 ;
-      RECT 3.600000 1.300000 4.610000 1.630000 ;
-      RECT 3.700000 0.350000 7.565000 0.600000 ;
-      RECT 3.700000 0.600000 4.030000 0.630000 ;
-      RECT 5.515000 0.600000 7.565000 0.670000 ;
-      RECT 5.945000 0.840000 7.415000 1.010000 ;
-      RECT 6.060000 1.820000 7.415000 1.990000 ;
-      RECT 6.060000 1.990000 6.230000 2.310000 ;
-      RECT 7.245000 1.010000 7.415000 1.820000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.085000  0.580000 1.790000 0.670000 ;
+      RECT 0.085000  0.670000 2.970000 0.750000 ;
+      RECT 0.085000  0.750000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.785000 2.120000 ;
+      RECT 0.115000  2.290000 0.445000 3.245000 ;
+      RECT 0.425000  0.920000 0.755000 1.010000 ;
+      RECT 0.425000  1.010000 3.770000 1.180000 ;
+      RECT 0.615000  2.120000 0.785000 2.310000 ;
+      RECT 0.615000  2.310000 6.230000 2.480000 ;
+      RECT 0.935000  0.085000 1.280000 0.410000 ;
+      RECT 0.955000  1.950000 1.435000 2.140000 ;
+      RECT 1.265000  1.180000 1.435000 1.950000 ;
+      RECT 1.460000  0.390000 1.790000 0.580000 ;
+      RECT 1.460000  0.750000 2.970000 0.840000 ;
+      RECT 1.490000  2.650000 2.565000 3.245000 ;
+      RECT 1.970000  0.085000 2.460000 0.500000 ;
+      RECT 2.640000  0.390000 2.970000 0.670000 ;
+      RECT 3.135000  2.650000 3.630000 3.245000 ;
+      RECT 3.140000  0.085000 3.470000 0.840000 ;
+      RECT 3.600000  1.180000 3.770000 1.300000 ;
+      RECT 3.600000  1.300000 4.610000 1.630000 ;
+      RECT 3.700000  0.350000 7.565000 0.600000 ;
+      RECT 3.700000  0.600000 4.030000 0.630000 ;
+      RECT 4.580000  2.650000 5.400000 3.245000 ;
+      RECT 5.515000  0.600000 7.565000 0.670000 ;
+      RECT 5.945000  0.840000 7.415000 1.010000 ;
+      RECT 5.970000  2.650000 7.565000 3.245000 ;
+      RECT 6.060000  1.820000 7.415000 1.990000 ;
+      RECT 6.060000  1.990000 6.230000 2.310000 ;
+      RECT 6.400000  2.160000 7.565000 2.650000 ;
+      RECT 7.245000  1.010000 7.415000 1.820000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand3b_4
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef
index 1078fee..bdd47b6 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_1.magic.lef
@@ -86,16 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.110000  0.085000 0.785000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -104,20 +94,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.375000 2.060000 0.705000 3.245000 ;
-        RECT 1.400000 2.320000 1.730000 3.245000 ;
-        RECT 2.435000 1.820000 2.765000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.110000  0.085000 0.785000 0.600000 ;
+      RECT 0.375000  2.060000 0.705000 3.245000 ;
+      RECT 1.400000  2.320000 1.730000 3.245000 ;
+      RECT 2.435000  1.820000 2.765000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+  END
 END sky130_fd_sc_hs__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef
index af4ae97..f44104b 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_2.magic.lef
@@ -87,20 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -109,41 +95,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.115000 1.950000 0.450000 3.245000 ;
-        RECT 1.070000 2.290000 1.400000 3.245000 ;
-        RECT 2.080000 2.290000 2.650000 3.245000 ;
-        RECT 3.330000 2.290000 3.660000 3.245000 ;
-        RECT 4.295000 2.320000 4.625000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 1.315000 1.180000 ;
-      RECT 1.145000 0.255000 2.325000 0.425000 ;
-      RECT 1.145000 0.425000 1.315000 1.010000 ;
-      RECT 1.495000 0.595000 1.825000 1.010000 ;
-      RECT 1.495000 1.010000 3.315000 1.180000 ;
-      RECT 1.995000 0.425000 2.325000 0.840000 ;
-      RECT 2.555000 0.255000 4.675000 0.425000 ;
-      RECT 2.555000 0.425000 2.815000 0.840000 ;
-      RECT 2.985000 0.645000 3.315000 1.010000 ;
-      RECT 3.485000 0.425000 3.675000 1.130000 ;
-      RECT 4.345000 0.425000 4.675000 0.840000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 1.315000 1.180000 ;
+      RECT 0.115000  1.950000 0.450000 3.245000 ;
+      RECT 0.615000  0.085000 0.945000 0.840000 ;
+      RECT 1.070000  2.290000 1.400000 3.245000 ;
+      RECT 1.145000  0.255000 2.325000 0.425000 ;
+      RECT 1.145000  0.425000 1.315000 1.010000 ;
+      RECT 1.495000  0.595000 1.825000 1.010000 ;
+      RECT 1.495000  1.010000 3.315000 1.180000 ;
+      RECT 1.995000  0.425000 2.325000 0.840000 ;
+      RECT 2.080000  2.290000 2.650000 3.245000 ;
+      RECT 2.555000  0.255000 4.675000 0.425000 ;
+      RECT 2.555000  0.425000 2.815000 0.840000 ;
+      RECT 2.985000  0.645000 3.315000 1.010000 ;
+      RECT 3.330000  2.290000 3.660000 3.245000 ;
+      RECT 3.485000  0.425000 3.675000 1.130000 ;
+      RECT 4.295000  2.320000 4.625000 3.245000 ;
+      RECT 4.345000  0.425000 4.675000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef
index 9f59694..0782f9b 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_4.magic.lef
@@ -87,29 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.840000 ;
-        RECT 1.615000  0.085000 1.945000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -118,52 +95,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.115000 1.950000 1.650000 3.245000 ;
-        RECT 2.320000 2.290000 2.650000 3.245000 ;
-        RECT 3.600000 2.290000 4.500000 3.245000 ;
-        RECT 5.450000 2.290000 7.140000 3.245000 ;
-        RECT 8.190000 2.290000 8.520000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 2.575000 1.180000 ;
-      RECT 1.115000 0.350000 1.445000 1.010000 ;
-      RECT 2.245000 0.350000 4.365000 0.680000 ;
-      RECT 2.245000 0.680000 2.575000 1.010000 ;
-      RECT 2.745000 0.850000 3.935000 0.880000 ;
-      RECT 2.745000 0.880000 6.215000 1.130000 ;
-      RECT 4.595000 0.350000 8.525000 0.520000 ;
-      RECT 4.595000 0.520000 4.925000 0.710000 ;
-      RECT 5.095000 0.800000 5.285000 0.880000 ;
-      RECT 5.455000 0.520000 5.785000 0.710000 ;
-      RECT 5.955000 0.800000 6.145000 0.880000 ;
-      RECT 6.315000 0.520000 6.645000 0.710000 ;
-      RECT 7.175000 0.520000 7.505000 0.710000 ;
-      RECT 8.195000 0.520000 8.525000 0.710000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 2.575000 1.180000 ;
+      RECT 0.115000  1.950000 1.650000 3.245000 ;
+      RECT 0.615000  0.085000 0.945000 0.840000 ;
+      RECT 1.115000  0.350000 1.445000 1.010000 ;
+      RECT 1.615000  0.085000 1.945000 0.840000 ;
+      RECT 2.245000  0.350000 4.365000 0.680000 ;
+      RECT 2.245000  0.680000 2.575000 1.010000 ;
+      RECT 2.320000  2.290000 2.650000 3.245000 ;
+      RECT 2.745000  0.850000 3.935000 0.880000 ;
+      RECT 2.745000  0.880000 6.215000 1.130000 ;
+      RECT 3.600000  2.290000 4.500000 3.245000 ;
+      RECT 4.595000  0.350000 8.525000 0.520000 ;
+      RECT 4.595000  0.520000 4.925000 0.710000 ;
+      RECT 5.095000  0.800000 5.285000 0.880000 ;
+      RECT 5.450000  2.290000 7.140000 3.245000 ;
+      RECT 5.455000  0.520000 5.785000 0.710000 ;
+      RECT 5.955000  0.800000 6.145000 0.880000 ;
+      RECT 6.315000  0.520000 6.645000 0.710000 ;
+      RECT 7.175000  0.520000 7.505000 0.710000 ;
+      RECT 8.190000  2.290000 8.520000 3.245000 ;
+      RECT 8.195000  0.520000 8.525000 0.710000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4_4
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef
index 0526178..6c9ddc6 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.magic.lef
@@ -85,17 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.855000  0.085000 1.185000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -104,30 +93,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.785000 1.820000 1.115000 3.245000 ;
-        RECT 1.785000 2.320000 2.115000 3.245000 ;
-        RECT 2.805000 2.060000 3.135000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.680000 0.650000 0.840000 ;
-      RECT 0.105000 0.840000 2.735000 1.010000 ;
-      RECT 0.105000 1.010000 0.275000 1.820000 ;
-      RECT 0.105000 1.820000 0.580000 2.700000 ;
-      RECT 2.565000 1.010000 2.735000 1.220000 ;
-      RECT 2.565000 1.220000 2.935000 1.550000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.105000  0.680000 0.650000 0.840000 ;
+      RECT 0.105000  0.840000 2.735000 1.010000 ;
+      RECT 0.105000  1.010000 0.275000 1.820000 ;
+      RECT 0.105000  1.820000 0.580000 2.700000 ;
+      RECT 0.785000  1.820000 1.115000 3.245000 ;
+      RECT 0.855000  0.085000 1.185000 0.670000 ;
+      RECT 1.785000  2.320000 2.115000 3.245000 ;
+      RECT 2.565000  1.010000 2.735000 1.220000 ;
+      RECT 2.565000  1.220000 2.935000 1.550000 ;
+      RECT 2.805000  2.060000 3.135000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef
index 65b8500..f9aa316 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.magic.lef
@@ -88,23 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.670000 ;
-        RECT 4.865000  0.085000 5.195000 0.760000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -113,48 +96,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 1.040000 2.020000 1.370000 3.245000 ;
-        RECT 1.995000 2.290000 2.590000 3.245000 ;
-        RECT 3.260000 2.290000 3.590000 3.245000 ;
-        RECT 4.320000 2.290000 4.650000 3.245000 ;
-        RECT 5.360000 1.950000 5.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.840000 ;
-      RECT 0.115000 0.840000 1.325000 1.010000 ;
-      RECT 0.505000 1.680000 1.325000 1.850000 ;
-      RECT 0.505000 1.850000 0.835000 2.860000 ;
-      RECT 1.105000 0.350000 2.325000 0.630000 ;
-      RECT 1.155000 1.010000 1.325000 1.350000 ;
-      RECT 1.155000 1.350000 1.720000 1.680000 ;
-      RECT 2.075000 0.630000 2.325000 0.670000 ;
-      RECT 2.075000 0.670000 3.345000 0.840000 ;
-      RECT 2.505000 0.255000 4.335000 0.425000 ;
-      RECT 2.505000 0.425000 2.835000 0.500000 ;
-      RECT 3.015000 0.595000 3.345000 0.670000 ;
-      RECT 3.575000 0.595000 3.825000 0.930000 ;
-      RECT 3.575000 0.930000 5.645000 1.180000 ;
-      RECT 4.005000 0.425000 4.335000 0.760000 ;
-      RECT 4.505000 0.400000 4.695000 0.930000 ;
-      RECT 5.395000 0.400000 5.645000 0.930000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.840000 ;
+      RECT 0.115000  0.840000 1.325000 1.010000 ;
+      RECT 0.505000  1.680000 1.325000 1.850000 ;
+      RECT 0.505000  1.850000 0.835000 2.860000 ;
+      RECT 0.545000  0.085000 0.875000 0.670000 ;
+      RECT 1.040000  2.020000 1.370000 3.245000 ;
+      RECT 1.105000  0.350000 2.325000 0.630000 ;
+      RECT 1.155000  1.010000 1.325000 1.350000 ;
+      RECT 1.155000  1.350000 1.720000 1.680000 ;
+      RECT 1.995000  2.290000 2.590000 3.245000 ;
+      RECT 2.075000  0.630000 2.325000 0.670000 ;
+      RECT 2.075000  0.670000 3.345000 0.840000 ;
+      RECT 2.505000  0.255000 4.335000 0.425000 ;
+      RECT 2.505000  0.425000 2.835000 0.500000 ;
+      RECT 3.015000  0.595000 3.345000 0.670000 ;
+      RECT 3.260000  2.290000 3.590000 3.245000 ;
+      RECT 3.575000  0.595000 3.825000 0.930000 ;
+      RECT 3.575000  0.930000 5.645000 1.180000 ;
+      RECT 4.005000  0.425000 4.335000 0.760000 ;
+      RECT 4.320000  2.290000 4.650000 3.245000 ;
+      RECT 4.505000  0.400000 4.695000 0.930000 ;
+      RECT 4.865000  0.085000 5.195000 0.760000 ;
+      RECT 5.360000  1.950000 5.645000 3.245000 ;
+      RECT 5.395000  0.400000 5.645000 0.930000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef
index c7d7eca..ff93c11 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.magic.lef
@@ -90,31 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.600000 ;
-        RECT 7.270000  0.085000 7.600000 0.780000 ;
-        RECT 8.130000  0.085000 8.505000 0.780000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -123,62 +98,84 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.505000 1.950000 0.835000 3.245000 ;
-        RECT 1.540000 1.850000 1.870000 3.245000 ;
-        RECT 2.850000 2.290000 4.190000 3.245000 ;
-        RECT 4.760000 2.290000 5.885000 3.245000 ;
-        RECT 6.835000 2.290000 8.035000 3.245000 ;
-        RECT 8.675000 1.950000 8.955000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.770000 0.445000 0.960000 ;
-      RECT 0.115000 0.960000 1.335000 1.130000 ;
-      RECT 1.005000 1.130000 1.335000 1.430000 ;
-      RECT 1.005000 1.430000 2.850000 1.680000 ;
-      RECT 1.005000 1.680000 1.335000 2.700000 ;
-      RECT 1.105000 0.255000 3.075000 0.425000 ;
-      RECT 1.105000 0.425000 1.435000 0.710000 ;
-      RECT 1.965000 0.425000 2.215000 0.710000 ;
-      RECT 2.905000 0.425000 3.075000 0.750000 ;
-      RECT 2.905000 0.750000 4.875000 0.920000 ;
-      RECT 3.255000 0.330000 6.725000 0.580000 ;
-      RECT 5.105000 0.770000 5.435000 0.960000 ;
-      RECT 5.105000 0.960000 6.215000 1.010000 ;
-      RECT 5.105000 1.010000 9.005000 1.130000 ;
-      RECT 5.535000 0.580000 6.725000 0.600000 ;
-      RECT 5.605000 0.600000 5.795000 0.710000 ;
-      RECT 5.965000 0.770000 6.215000 0.960000 ;
-      RECT 5.965000 1.130000 7.170000 1.180000 ;
-      RECT 6.395000 0.600000 6.725000 0.840000 ;
-      RECT 6.920000 0.350000 7.100000 0.960000 ;
-      RECT 6.920000 0.960000 9.005000 1.010000 ;
-      RECT 7.770000 0.350000 7.960000 0.960000 ;
-      RECT 8.675000 0.350000 9.005000 0.960000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.115000  0.770000 0.445000 0.960000 ;
+      RECT 0.115000  0.960000 1.335000 1.130000 ;
+      RECT 0.505000  1.950000 0.835000 3.245000 ;
+      RECT 0.545000  0.085000 0.875000 0.600000 ;
+      RECT 1.005000  1.130000 1.335000 1.430000 ;
+      RECT 1.005000  1.430000 2.850000 1.680000 ;
+      RECT 1.005000  1.680000 1.335000 2.700000 ;
+      RECT 1.105000  0.255000 3.075000 0.425000 ;
+      RECT 1.105000  0.425000 1.435000 0.710000 ;
+      RECT 1.540000  1.850000 1.870000 3.245000 ;
+      RECT 1.965000  0.425000 2.215000 0.710000 ;
+      RECT 2.850000  2.290000 4.190000 3.245000 ;
+      RECT 2.905000  0.425000 3.075000 0.750000 ;
+      RECT 2.905000  0.750000 4.875000 0.920000 ;
+      RECT 3.255000  0.330000 6.725000 0.580000 ;
+      RECT 4.760000  2.290000 5.885000 3.245000 ;
+      RECT 5.105000  0.770000 5.435000 0.960000 ;
+      RECT 5.105000  0.960000 6.215000 1.010000 ;
+      RECT 5.105000  1.010000 9.005000 1.130000 ;
+      RECT 5.535000  0.580000 6.725000 0.600000 ;
+      RECT 5.605000  0.600000 5.795000 0.710000 ;
+      RECT 5.965000  0.770000 6.215000 0.960000 ;
+      RECT 5.965000  1.130000 7.170000 1.180000 ;
+      RECT 6.395000  0.600000 6.725000 0.840000 ;
+      RECT 6.835000  2.290000 8.035000 3.245000 ;
+      RECT 6.920000  0.350000 7.100000 0.960000 ;
+      RECT 6.920000  0.960000 9.005000 1.010000 ;
+      RECT 7.270000  0.085000 7.600000 0.780000 ;
+      RECT 7.770000  0.350000 7.960000 0.960000 ;
+      RECT 8.130000  0.085000 8.505000 0.780000 ;
+      RECT 8.675000  0.350000 9.005000 0.960000 ;
+      RECT 8.675000  1.950000 8.955000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4b_4
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef
index 4d85eef..9a94d06 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.magic.lef
@@ -89,20 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.650000  0.085000 0.980000 0.960000 ;
-        RECT 3.825000  0.085000 4.155000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -111,38 +97,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.615000 1.970000 0.945000 3.245000 ;
-        RECT 2.175000 2.650000 2.595000 3.245000 ;
-        RECT 3.265000 2.290000 3.595000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.840000 0.470000 1.130000 ;
-      RECT 0.115000 1.130000 2.015000 1.300000 ;
-      RECT 0.115000 1.300000 0.285000 1.970000 ;
-      RECT 0.115000 1.970000 0.445000 2.850000 ;
-      RECT 1.115000 1.970000 2.355000 2.140000 ;
-      RECT 1.115000 2.140000 1.445000 2.850000 ;
-      RECT 1.150000 0.630000 1.490000 0.790000 ;
-      RECT 1.150000 0.790000 2.355000 0.960000 ;
-      RECT 1.685000 1.300000 2.015000 1.550000 ;
-      RECT 2.185000 0.960000 2.355000 1.220000 ;
-      RECT 2.185000 1.220000 2.745000 1.550000 ;
-      RECT 2.185000 1.550000 2.355000 1.970000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.840000 0.470000 1.130000 ;
+      RECT 0.115000  1.130000 2.015000 1.300000 ;
+      RECT 0.115000  1.300000 0.285000 1.970000 ;
+      RECT 0.115000  1.970000 0.445000 2.850000 ;
+      RECT 0.615000  1.970000 0.945000 3.245000 ;
+      RECT 0.650000  0.085000 0.980000 0.960000 ;
+      RECT 1.115000  1.970000 2.355000 2.140000 ;
+      RECT 1.115000  2.140000 1.445000 2.850000 ;
+      RECT 1.150000  0.630000 1.490000 0.790000 ;
+      RECT 1.150000  0.790000 2.355000 0.960000 ;
+      RECT 1.685000  1.300000 2.015000 1.550000 ;
+      RECT 2.175000  2.650000 2.595000 3.245000 ;
+      RECT 2.185000  0.960000 2.355000 1.220000 ;
+      RECT 2.185000  1.220000 2.745000 1.550000 ;
+      RECT 2.185000  1.550000 2.355000 1.970000 ;
+      RECT 3.265000  2.290000 3.595000 3.245000 ;
+      RECT 3.825000  0.085000 4.155000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef
index c69e723..6c82553 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.magic.lef
@@ -92,25 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.630000  0.085000 0.960000 1.010000 ;
-        RECT 5.840000  0.085000 6.170000 0.815000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -119,58 +100,74 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.650000 2.580000 0.980000 3.245000 ;
-        RECT 1.845000 2.580000 2.175000 3.245000 ;
-        RECT 2.845000 2.190000 3.175000 3.245000 ;
-        RECT 3.845000 2.290000 4.605000 3.245000 ;
-        RECT 5.275000 2.290000 5.605000 3.245000 ;
-        RECT 6.275000 1.950000 6.605000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.350000 0.460000 1.030000 ;
-      RECT 0.095000 1.030000 0.265000 1.950000 ;
-      RECT 0.095000 1.950000 0.445000 2.240000 ;
-      RECT 0.095000 2.240000 2.175000 2.410000 ;
-      RECT 0.095000 2.410000 0.445000 2.860000 ;
-      RECT 1.130000 0.350000 1.675000 1.010000 ;
-      RECT 1.185000 1.820000 1.675000 2.070000 ;
-      RECT 1.505000 1.010000 2.515000 1.180000 ;
-      RECT 1.505000 1.180000 1.675000 1.820000 ;
-      RECT 1.845000 0.330000 3.195000 0.500000 ;
-      RECT 1.845000 0.500000 2.175000 0.840000 ;
-      RECT 1.845000 1.350000 2.175000 2.240000 ;
-      RECT 2.345000 1.180000 2.515000 1.430000 ;
-      RECT 2.345000 1.430000 3.795000 1.600000 ;
-      RECT 3.025000 0.500000 3.195000 0.750000 ;
-      RECT 3.025000 0.750000 4.180000 0.920000 ;
-      RECT 3.125000 1.600000 3.795000 1.680000 ;
-      RECT 3.365000 0.255000 5.240000 0.425000 ;
-      RECT 3.365000 0.425000 3.695000 0.580000 ;
-      RECT 4.410000 0.620000 4.740000 1.010000 ;
-      RECT 4.410000 1.010000 6.600000 1.180000 ;
-      RECT 4.910000 0.425000 5.240000 0.815000 ;
-      RECT 5.420000 0.350000 5.670000 1.010000 ;
-      RECT 6.350000 0.350000 6.600000 1.010000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.095000  0.350000 0.460000 1.030000 ;
+      RECT 0.095000  1.030000 0.265000 1.950000 ;
+      RECT 0.095000  1.950000 0.445000 2.240000 ;
+      RECT 0.095000  2.240000 2.175000 2.410000 ;
+      RECT 0.095000  2.410000 0.445000 2.860000 ;
+      RECT 0.630000  0.085000 0.960000 1.010000 ;
+      RECT 0.650000  2.580000 0.980000 3.245000 ;
+      RECT 1.130000  0.350000 1.675000 1.010000 ;
+      RECT 1.185000  1.820000 1.675000 2.070000 ;
+      RECT 1.505000  1.010000 2.515000 1.180000 ;
+      RECT 1.505000  1.180000 1.675000 1.820000 ;
+      RECT 1.845000  0.330000 3.195000 0.500000 ;
+      RECT 1.845000  0.500000 2.175000 0.840000 ;
+      RECT 1.845000  1.350000 2.175000 2.240000 ;
+      RECT 1.845000  2.580000 2.175000 3.245000 ;
+      RECT 2.345000  1.180000 2.515000 1.430000 ;
+      RECT 2.345000  1.430000 3.795000 1.600000 ;
+      RECT 2.845000  2.190000 3.175000 3.245000 ;
+      RECT 3.025000  0.500000 3.195000 0.750000 ;
+      RECT 3.025000  0.750000 4.180000 0.920000 ;
+      RECT 3.125000  1.600000 3.795000 1.680000 ;
+      RECT 3.365000  0.255000 5.240000 0.425000 ;
+      RECT 3.365000  0.425000 3.695000 0.580000 ;
+      RECT 3.845000  2.290000 4.605000 3.245000 ;
+      RECT 4.410000  0.620000 4.740000 1.010000 ;
+      RECT 4.410000  1.010000 6.600000 1.180000 ;
+      RECT 4.910000  0.425000 5.240000 0.815000 ;
+      RECT 5.275000  2.290000 5.605000 3.245000 ;
+      RECT 5.420000  0.350000 5.670000 1.010000 ;
+      RECT 5.840000  0.085000 6.170000 0.815000 ;
+      RECT 6.275000  1.950000 6.605000 3.245000 ;
+      RECT 6.350000  0.350000 6.600000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4bb_2
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef
index aefa831..38c6356 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.magic.lef
@@ -101,33 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.625000  0.085000  0.955000 0.490000 ;
-        RECT 8.275000  0.085000  8.605000 0.790000 ;
-        RECT 9.135000  0.085000  9.465000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -136,81 +109,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.115000 2.290000  0.445000 3.245000 ;
-        RECT 1.015000 2.390000  1.345000 3.245000 ;
-        RECT 2.005000 2.390000  2.335000 3.245000 ;
-        RECT 3.135000 2.400000  3.465000 3.245000 ;
-        RECT 4.035000 2.400000  4.365000 3.245000 ;
-        RECT 4.985000 2.190000  5.315000 3.245000 ;
-        RECT 5.885000 2.160000  6.135000 3.245000 ;
-        RECT 6.835000 2.290000  7.165000 3.245000 ;
-        RECT 7.865000 2.290000  8.115000 3.245000 ;
-        RECT 8.815000 2.290000  8.985000 3.245000 ;
-        RECT 9.715000 1.950000  9.965000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.550000 0.445000 0.660000 ;
-      RECT 0.100000 0.660000 1.760000 0.830000 ;
-      RECT 0.100000 0.830000 0.445000 1.280000 ;
-      RECT 0.100000 1.280000 0.270000 1.950000 ;
-      RECT 0.100000 1.950000 0.815000 2.120000 ;
-      RECT 0.645000 2.120000 0.815000 2.980000 ;
-      RECT 1.125000 1.000000 1.420000 1.330000 ;
-      RECT 1.125000 1.330000 1.295000 2.050000 ;
-      RECT 1.125000 2.050000 2.135000 2.220000 ;
-      RECT 1.515000 2.220000 1.795000 2.980000 ;
-      RECT 1.590000 0.830000 1.760000 1.210000 ;
-      RECT 1.590000 1.210000 3.165000 1.380000 ;
-      RECT 1.930000 0.255000 3.935000 0.425000 ;
-      RECT 1.930000 0.425000 2.100000 1.040000 ;
-      RECT 1.965000 1.720000 4.315000 1.890000 ;
-      RECT 1.965000 1.890000 2.135000 2.050000 ;
-      RECT 2.155000 1.380000 3.165000 1.550000 ;
-      RECT 2.820000 0.425000 3.150000 0.700000 ;
-      RECT 3.685000 0.425000 3.935000 0.750000 ;
-      RECT 3.685000 0.750000 5.895000 0.920000 ;
-      RECT 4.115000 0.255000 7.745000 0.425000 ;
-      RECT 4.115000 0.425000 5.385000 0.580000 ;
-      RECT 4.145000 1.430000 5.345000 1.680000 ;
-      RECT 4.145000 1.680000 4.315000 1.720000 ;
-      RECT 5.565000 0.595000 5.895000 0.750000 ;
-      RECT 6.125000 0.595000 6.375000 0.980000 ;
-      RECT 6.125000 0.980000 9.965000 1.130000 ;
-      RECT 6.125000 1.130000 8.095000 1.150000 ;
-      RECT 6.555000 0.425000 6.885000 0.810000 ;
-      RECT 7.065000 0.595000 7.235000 0.980000 ;
-      RECT 7.415000 0.425000 7.745000 0.810000 ;
-      RECT 7.925000 0.350000 8.095000 0.960000 ;
-      RECT 7.925000 0.960000 9.965000 0.980000 ;
-      RECT 8.785000 0.350000 8.955000 0.960000 ;
-      RECT 9.635000 0.350000 9.965000 0.960000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.100000  0.550000  0.445000 0.660000 ;
+      RECT 0.100000  0.660000  1.760000 0.830000 ;
+      RECT 0.100000  0.830000  0.445000 1.280000 ;
+      RECT 0.100000  1.280000  0.270000 1.950000 ;
+      RECT 0.100000  1.950000  0.815000 2.120000 ;
+      RECT 0.115000  2.290000  0.445000 3.245000 ;
+      RECT 0.625000  0.085000  0.955000 0.490000 ;
+      RECT 0.645000  2.120000  0.815000 2.980000 ;
+      RECT 1.015000  2.390000  1.345000 3.245000 ;
+      RECT 1.125000  1.000000  1.420000 1.330000 ;
+      RECT 1.125000  1.330000  1.295000 2.050000 ;
+      RECT 1.125000  2.050000  2.135000 2.220000 ;
+      RECT 1.515000  2.220000  1.795000 2.980000 ;
+      RECT 1.590000  0.830000  1.760000 1.210000 ;
+      RECT 1.590000  1.210000  3.165000 1.380000 ;
+      RECT 1.930000  0.255000  3.935000 0.425000 ;
+      RECT 1.930000  0.425000  2.100000 1.040000 ;
+      RECT 1.965000  1.720000  4.315000 1.890000 ;
+      RECT 1.965000  1.890000  2.135000 2.050000 ;
+      RECT 2.005000  2.390000  2.335000 3.245000 ;
+      RECT 2.155000  1.380000  3.165000 1.550000 ;
+      RECT 2.820000  0.425000  3.150000 0.700000 ;
+      RECT 3.135000  2.400000  3.465000 3.245000 ;
+      RECT 3.685000  0.425000  3.935000 0.750000 ;
+      RECT 3.685000  0.750000  5.895000 0.920000 ;
+      RECT 4.035000  2.400000  4.365000 3.245000 ;
+      RECT 4.115000  0.255000  7.745000 0.425000 ;
+      RECT 4.115000  0.425000  5.385000 0.580000 ;
+      RECT 4.145000  1.430000  5.345000 1.680000 ;
+      RECT 4.145000  1.680000  4.315000 1.720000 ;
+      RECT 4.985000  2.190000  5.315000 3.245000 ;
+      RECT 5.565000  0.595000  5.895000 0.750000 ;
+      RECT 5.885000  2.160000  6.135000 3.245000 ;
+      RECT 6.125000  0.595000  6.375000 0.980000 ;
+      RECT 6.125000  0.980000  9.965000 1.130000 ;
+      RECT 6.125000  1.130000  8.095000 1.150000 ;
+      RECT 6.555000  0.425000  6.885000 0.810000 ;
+      RECT 6.835000  2.290000  7.165000 3.245000 ;
+      RECT 7.065000  0.595000  7.235000 0.980000 ;
+      RECT 7.415000  0.425000  7.745000 0.810000 ;
+      RECT 7.865000  2.290000  8.115000 3.245000 ;
+      RECT 7.925000  0.350000  8.095000 0.960000 ;
+      RECT 7.925000  0.960000  9.965000 0.980000 ;
+      RECT 8.275000  0.085000  8.605000 0.790000 ;
+      RECT 8.785000  0.350000  8.955000 0.960000 ;
+      RECT 8.815000  2.290000  8.985000 3.245000 ;
+      RECT 9.135000  0.085000  9.465000 0.790000 ;
+      RECT 9.635000  0.350000  9.965000 0.960000 ;
+      RECT 9.715000  1.950000  9.965000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__nand4bb_4
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef
index 29b8db7..3d5c554 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_1.magic.lef
@@ -64,14 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.135000  0.085000 0.385000 1.130000 ;
-        RECT 0.995000  0.085000 1.325000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -80,15 +72,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.115000 1.950000 0.445000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.115000  1.950000 0.445000 3.245000 ;
+      RECT 0.135000  0.085000 0.385000 1.130000 ;
+      RECT 0.995000  0.085000 1.325000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_hs__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef
index c9ccd21..c46468f 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_2.magic.lef
@@ -64,16 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.010000 ;
-        RECT 1.115000  0.085000 1.445000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -82,25 +72,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.505000 2.115000 1.755000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 1.820000 0.405000 2.905000 ;
-      RECT 0.155000 2.905000 1.305000 3.075000 ;
-      RECT 1.135000 1.775000 2.285000 1.945000 ;
-      RECT 1.135000 1.945000 1.305000 2.905000 ;
-      RECT 1.955000 1.945000 2.285000 2.980000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.010000 ;
+      RECT 0.155000  1.820000 0.405000 2.905000 ;
+      RECT 0.155000  2.905000 1.305000 3.075000 ;
+      RECT 1.115000  0.085000 1.445000 1.130000 ;
+      RECT 1.135000  1.775000 2.285000 1.945000 ;
+      RECT 1.135000  1.945000 1.305000 2.905000 ;
+      RECT 1.505000  2.115000 1.755000 3.245000 ;
+      RECT 1.955000  1.945000 2.285000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef
index 0ba95a7..13d885c 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_4.magic.lef
@@ -70,21 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.115000  0.085000 0.470000 1.010000 ;
-        RECT 1.860000  0.085000 2.190000 0.670000 ;
-        RECT 2.860000  0.085000 4.205000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -93,32 +78,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.645000 2.060000 0.815000 3.245000 ;
-        RECT 1.545000 2.060000 1.715000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.720000 2.195000 1.890000 ;
-      RECT 0.115000 1.890000 0.445000 2.980000 ;
-      RECT 1.015000 1.890000 1.345000 2.980000 ;
-      RECT 1.915000 1.890000 2.195000 2.905000 ;
-      RECT 1.915000 2.905000 4.145000 3.075000 ;
-      RECT 2.865000 2.060000 3.195000 2.905000 ;
-      RECT 3.865000 1.820000 4.145000 2.905000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.085000 0.470000 1.010000 ;
+      RECT 0.115000  1.720000 2.195000 1.890000 ;
+      RECT 0.115000  1.890000 0.445000 2.980000 ;
+      RECT 0.645000  2.060000 0.815000 3.245000 ;
+      RECT 1.015000  1.890000 1.345000 2.980000 ;
+      RECT 1.545000  2.060000 1.715000 3.245000 ;
+      RECT 1.860000  0.085000 2.190000 0.670000 ;
+      RECT 1.915000  1.890000 2.195000 2.905000 ;
+      RECT 1.915000  2.905000 4.145000 3.075000 ;
+      RECT 2.860000  0.085000 4.205000 1.010000 ;
+      RECT 2.865000  2.060000 3.195000 2.905000 ;
+      RECT 3.865000  1.820000 4.145000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef
index ef2d07e..73a722d 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_8.magic.lef
@@ -74,31 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.650000  0.085000 1.690000 1.130000 ;
-        RECT 2.360000  0.085000 3.090000 0.840000 ;
-        RECT 3.760000  0.085000 4.090000 0.840000 ;
-        RECT 5.445000  0.085000 5.775000 0.970000 ;
-        RECT 6.445000  0.085000 6.775000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -107,47 +82,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.615000 2.120000 0.945000 3.245000 ;
-        RECT 1.515000 2.290000 1.845000 3.245000 ;
-        RECT 2.465000 2.290000 2.795000 3.245000 ;
-        RECT 3.415000 2.290000 3.745000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.780000 1.315000 1.950000 ;
-      RECT 0.115000 1.950000 0.445000 2.980000 ;
-      RECT 1.145000 1.950000 4.245000 2.120000 ;
-      RECT 1.145000 2.120000 1.315000 2.980000 ;
-      RECT 2.045000 2.120000 2.295000 2.980000 ;
-      RECT 2.995000 2.120000 3.245000 2.980000 ;
-      RECT 3.915000 2.120000 4.245000 2.905000 ;
-      RECT 3.915000 2.905000 8.045000 3.075000 ;
-      RECT 4.925000 1.950000 5.185000 2.905000 ;
-      RECT 5.875000 1.820000 6.080000 2.905000 ;
-      RECT 6.775000 1.820000 7.035000 2.905000 ;
-      RECT 7.715000 1.820000 8.045000 2.905000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  1.780000 1.315000 1.950000 ;
+      RECT 0.115000  1.950000 0.445000 2.980000 ;
+      RECT 0.615000  2.120000 0.945000 3.245000 ;
+      RECT 0.650000  0.085000 1.690000 1.130000 ;
+      RECT 1.145000  1.950000 4.245000 2.120000 ;
+      RECT 1.145000  2.120000 1.315000 2.980000 ;
+      RECT 1.515000  2.290000 1.845000 3.245000 ;
+      RECT 2.045000  2.120000 2.295000 2.980000 ;
+      RECT 2.360000  0.085000 3.090000 0.840000 ;
+      RECT 2.465000  2.290000 2.795000 3.245000 ;
+      RECT 2.995000  2.120000 3.245000 2.980000 ;
+      RECT 3.415000  2.290000 3.745000 3.245000 ;
+      RECT 3.760000  0.085000 4.090000 0.840000 ;
+      RECT 3.915000  2.120000 4.245000 2.905000 ;
+      RECT 3.915000  2.905000 8.045000 3.075000 ;
+      RECT 4.925000  1.950000 5.185000 2.905000 ;
+      RECT 5.445000  0.085000 5.775000 0.970000 ;
+      RECT 5.875000  1.820000 6.080000 2.905000 ;
+      RECT 6.445000  0.085000 6.775000 1.130000 ;
+      RECT 6.775000  1.820000 7.035000 2.905000 ;
+      RECT 7.715000  1.820000 8.045000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor2_8
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef
index 6b818ae..185934d 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.magic.lef
@@ -64,16 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.950000  0.085000 1.280000 1.010000 ;
-        RECT 1.955000  0.085000 2.230000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -82,26 +72,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.925000 2.060000 1.255000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.255000 0.680000 0.780000 1.010000 ;
-      RECT 0.315000 1.720000 1.705000 1.890000 ;
-      RECT 0.315000 1.890000 0.645000 2.700000 ;
-      RECT 0.610000 1.010000 0.780000 1.720000 ;
-      RECT 1.535000 1.320000 1.975000 1.650000 ;
-      RECT 1.535000 1.650000 1.705000 1.720000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.255000  0.680000 0.780000 1.010000 ;
+      RECT 0.315000  1.720000 1.705000 1.890000 ;
+      RECT 0.315000  1.890000 0.645000 2.700000 ;
+      RECT 0.610000  1.010000 0.780000 1.720000 ;
+      RECT 0.925000  2.060000 1.255000 3.245000 ;
+      RECT 0.950000  0.085000 1.280000 1.010000 ;
+      RECT 1.535000  1.320000 1.975000 1.650000 ;
+      RECT 1.535000  1.650000 1.705000 1.720000 ;
+      RECT 1.955000  0.085000 2.230000 0.810000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef
index af9b131..b88af7e 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.magic.lef
@@ -66,19 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.985000  0.085000 1.315000 0.960000 ;
-        RECT 1.985000  0.085000 2.315000 0.790000 ;
-        RECT 2.915000  0.085000 3.245000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -87,33 +74,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.560000 1.970000 0.890000 3.245000 ;
-        RECT 2.550000 2.290000 2.800000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.450000 0.780000 1.130000 ;
-      RECT 0.110000 1.130000 1.475000 1.300000 ;
-      RECT 0.110000 1.300000 0.360000 2.980000 ;
-      RECT 1.120000 1.820000 1.450000 2.905000 ;
-      RECT 1.120000 2.905000 2.350000 3.075000 ;
-      RECT 1.145000 1.300000 1.475000 1.550000 ;
-      RECT 2.020000 1.950000 3.250000 2.120000 ;
-      RECT 2.020000 2.120000 2.350000 2.905000 ;
-      RECT 3.000000 1.820000 3.250000 1.950000 ;
-      RECT 3.000000 2.120000 3.250000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.110000  0.450000 0.780000 1.130000 ;
+      RECT 0.110000  1.130000 1.475000 1.300000 ;
+      RECT 0.110000  1.300000 0.360000 2.980000 ;
+      RECT 0.560000  1.970000 0.890000 3.245000 ;
+      RECT 0.985000  0.085000 1.315000 0.960000 ;
+      RECT 1.120000  1.820000 1.450000 2.905000 ;
+      RECT 1.120000  2.905000 2.350000 3.075000 ;
+      RECT 1.145000  1.300000 1.475000 1.550000 ;
+      RECT 1.985000  0.085000 2.315000 0.790000 ;
+      RECT 2.020000  1.950000 3.250000 2.120000 ;
+      RECT 2.020000  2.120000 2.350000 2.905000 ;
+      RECT 2.550000  2.290000 2.800000 3.245000 ;
+      RECT 2.915000  0.085000 3.245000 0.840000 ;
+      RECT 3.000000  1.820000 3.250000 1.950000 ;
+      RECT 3.000000  2.120000 3.250000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef
index 5e36ad6..c9d98b1 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.magic.lef
@@ -76,23 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 1.550000  0.085000 1.880000 0.500000 ;
-        RECT 2.570000  0.085000 3.380000 0.500000 ;
-        RECT 3.990000  0.085000 4.240000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -101,42 +84,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.115000 1.850000 0.365000 3.245000 ;
-        RECT 1.095000 2.260000 1.265000 3.245000 ;
-        RECT 3.815000 2.060000 4.145000 3.245000 ;
-        RECT 4.880000 1.995000 5.130000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 1.920000 1.715000 2.090000 ;
-      RECT 0.565000 2.090000 0.895000 2.980000 ;
-      RECT 1.465000 2.090000 1.715000 2.905000 ;
-      RECT 1.465000 2.905000 3.645000 3.075000 ;
-      RECT 2.225000 1.350000 3.225000 1.680000 ;
-      RECT 2.365000 2.400000 2.695000 2.905000 ;
-      RECT 3.055000 1.680000 3.225000 1.720000 ;
-      RECT 3.055000 1.720000 4.580000 1.890000 ;
-      RECT 3.315000 2.060000 3.645000 2.905000 ;
-      RECT 4.350000 1.890000 4.580000 1.995000 ;
-      RECT 4.350000 1.995000 4.680000 2.875000 ;
-      RECT 4.410000 0.345000 5.165000 1.010000 ;
-      RECT 4.410000 1.010000 4.580000 1.720000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  1.850000 0.365000 3.245000 ;
+      RECT 0.565000  1.920000 1.715000 2.090000 ;
+      RECT 0.565000  2.090000 0.895000 2.980000 ;
+      RECT 1.095000  2.260000 1.265000 3.245000 ;
+      RECT 1.465000  2.090000 1.715000 2.905000 ;
+      RECT 1.465000  2.905000 3.645000 3.075000 ;
+      RECT 1.550000  0.085000 1.880000 0.500000 ;
+      RECT 2.225000  1.350000 3.225000 1.680000 ;
+      RECT 2.365000  2.400000 2.695000 2.905000 ;
+      RECT 2.570000  0.085000 3.380000 0.500000 ;
+      RECT 3.055000  1.680000 3.225000 1.720000 ;
+      RECT 3.055000  1.720000 4.580000 1.890000 ;
+      RECT 3.315000  2.060000 3.645000 2.905000 ;
+      RECT 3.815000  2.060000 4.145000 3.245000 ;
+      RECT 3.990000  0.085000 4.240000 0.840000 ;
+      RECT 4.350000  1.890000 4.580000 1.995000 ;
+      RECT 4.350000  1.995000 4.680000 2.875000 ;
+      RECT 4.410000  0.345000 5.165000 1.010000 ;
+      RECT 4.410000  1.010000 4.580000 1.720000 ;
+      RECT 4.880000  1.995000 5.130000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor2b_4
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef
index 5ceb0a6..935193f 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_1.magic.lef
@@ -75,16 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.710000 ;
-        RECT 0.115000  0.710000 0.360000 1.010000 ;
-        RECT 0.975000  0.085000 1.305000 0.710000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -93,17 +83,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.105000 1.950000 0.355000 2.325000 ;
-        RECT 0.105000 2.325000 0.435000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.105000  1.950000 0.355000 2.325000 ;
+      RECT 0.105000  2.325000 0.435000 3.245000 ;
+      RECT 0.115000  0.085000 0.445000 0.710000 ;
+      RECT 0.115000  0.710000 0.360000 1.010000 ;
+      RECT 0.975000  0.085000 1.305000 0.710000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+  END
 END sky130_fd_sc_hs__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef
index e11c222..ee9d894 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_2.magic.lef
@@ -78,18 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 1.480000 0.650000 ;
-        RECT 2.150000  0.085000 2.480000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -98,30 +86,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 2.015000 2.400000 2.345000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 2.060000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 1.315000 3.075000 ;
-      RECT 1.145000 1.720000 3.245000 1.890000 ;
-      RECT 1.145000 1.890000 1.315000 2.905000 ;
-      RECT 1.515000 2.060000 2.795000 2.230000 ;
-      RECT 1.515000 2.230000 1.845000 2.990000 ;
-      RECT 2.515000 2.230000 2.795000 2.990000 ;
-      RECT 2.965000 1.890000 3.245000 2.980000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  2.060000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 1.315000 3.075000 ;
+      RECT 0.615000  0.085000 1.480000 0.650000 ;
+      RECT 1.145000  1.720000 3.245000 1.890000 ;
+      RECT 1.145000  1.890000 1.315000 2.905000 ;
+      RECT 1.515000  2.060000 2.795000 2.230000 ;
+      RECT 1.515000  2.230000 1.845000 2.990000 ;
+      RECT 2.015000  2.400000 2.345000 3.245000 ;
+      RECT 2.150000  0.085000 2.480000 1.130000 ;
+      RECT 2.515000  2.230000 2.795000 2.990000 ;
+      RECT 2.965000  1.890000 3.245000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef
index ec0f917..68479dc 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_4.magic.lef
@@ -86,27 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 1.130000 ;
-        RECT 1.045000  0.085000 1.375000 0.840000 ;
-        RECT 2.045000  0.085000 2.375000 0.670000 ;
-        RECT 3.055000  0.085000 3.365000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -115,44 +94,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.560000 2.680000 0.890000 3.245000 ;
-        RECT 5.835000 2.700000 6.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 1.820000 0.360000 2.340000 ;
-      RECT 0.110000 2.340000 1.340000 2.510000 ;
-      RECT 0.110000 2.510000 0.360000 2.980000 ;
-      RECT 1.090000 2.510000 6.615000 2.530000 ;
-      RECT 1.090000 2.530000 4.735000 2.680000 ;
-      RECT 1.090000 2.680000 1.340000 2.980000 ;
-      RECT 1.540000 2.850000 4.285000 2.905000 ;
-      RECT 1.540000 2.905000 5.265000 3.075000 ;
-      RECT 4.485000 2.360000 6.615000 2.510000 ;
-      RECT 4.485000 2.680000 4.735000 2.735000 ;
-      RECT 4.935000 2.700000 5.265000 2.905000 ;
-      RECT 5.465000 2.530000 5.635000 3.000000 ;
-      RECT 6.365000 1.820000 6.615000 2.360000 ;
-      RECT 6.365000 2.530000 6.615000 2.980000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.110000  1.820000 0.360000 2.340000 ;
+      RECT 0.110000  2.340000 1.340000 2.510000 ;
+      RECT 0.110000  2.510000 0.360000 2.980000 ;
+      RECT 0.115000  0.085000 0.365000 1.130000 ;
+      RECT 0.560000  2.680000 0.890000 3.245000 ;
+      RECT 1.045000  0.085000 1.375000 0.840000 ;
+      RECT 1.090000  2.510000 6.615000 2.530000 ;
+      RECT 1.090000  2.530000 4.735000 2.680000 ;
+      RECT 1.090000  2.680000 1.340000 2.980000 ;
+      RECT 1.540000  2.850000 4.285000 2.905000 ;
+      RECT 1.540000  2.905000 5.265000 3.075000 ;
+      RECT 2.045000  0.085000 2.375000 0.670000 ;
+      RECT 3.055000  0.085000 3.365000 0.670000 ;
+      RECT 4.485000  2.360000 6.615000 2.510000 ;
+      RECT 4.485000  2.680000 4.735000 2.735000 ;
+      RECT 4.935000  2.700000 5.265000 2.905000 ;
+      RECT 5.465000  2.530000 5.635000 3.000000 ;
+      RECT 5.835000  2.700000 6.165000 3.245000 ;
+      RECT 6.365000  1.820000 6.615000 2.360000 ;
+      RECT 6.365000  2.530000 6.615000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor3_4
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef
index c75d3cf..9e9b4c3 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.magic.lef
@@ -74,17 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.830000  0.085000 1.160000 1.010000 ;
-        RECT 1.830000  0.085000 2.160000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -93,28 +82,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.835000 2.290000 1.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.680000 0.650000 1.010000 ;
-      RECT 0.105000 1.010000 0.275000 1.820000 ;
-      RECT 0.105000 1.820000 0.595000 1.950000 ;
-      RECT 0.105000 1.950000 2.295000 2.120000 ;
-      RECT 0.105000 2.120000 0.595000 2.700000 ;
-      RECT 2.125000 1.350000 2.455000 1.680000 ;
-      RECT 2.125000 1.680000 2.295000 1.950000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.105000  0.680000 0.650000 1.010000 ;
+      RECT 0.105000  1.010000 0.275000 1.820000 ;
+      RECT 0.105000  1.820000 0.595000 1.950000 ;
+      RECT 0.105000  1.950000 2.295000 2.120000 ;
+      RECT 0.105000  2.120000 0.595000 2.700000 ;
+      RECT 0.830000  0.085000 1.160000 1.010000 ;
+      RECT 0.835000  2.290000 1.165000 3.245000 ;
+      RECT 1.830000  0.085000 2.160000 0.840000 ;
+      RECT 2.125000  1.350000 2.455000 1.680000 ;
+      RECT 2.125000  1.680000 2.295000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef
index 71080ef..2f7e102 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.magic.lef
@@ -76,23 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.620000  0.085000 0.950000 0.940000 ;
-        RECT 1.565000  0.085000 2.335000 0.600000 ;
-        RECT 2.865000  0.085000 3.755000 0.770000 ;
-        RECT 4.355000  0.085000 4.685000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -101,39 +84,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.560000 1.950000 0.890000 3.245000 ;
-        RECT 3.460000 2.290000 3.790000 3.245000 ;
-        RECT 4.425000 1.950000 4.690000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.350000 0.450000 1.110000 ;
-      RECT 0.085000 1.110000 1.335000 1.280000 ;
-      RECT 0.085000 1.280000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.360000 2.980000 ;
-      RECT 1.005000 1.280000 1.335000 1.550000 ;
-      RECT 1.110000 1.820000 1.440000 2.905000 ;
-      RECT 1.110000 2.905000 3.240000 3.075000 ;
-      RECT 2.010000 1.820000 2.290000 2.905000 ;
-      RECT 2.460000 1.950000 4.240000 2.120000 ;
-      RECT 2.460000 2.120000 2.790000 2.735000 ;
-      RECT 2.970000 2.290000 3.240000 2.905000 ;
-      RECT 3.990000 2.120000 4.240000 2.980000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.085000  0.350000 0.450000 1.110000 ;
+      RECT 0.085000  1.110000 1.335000 1.280000 ;
+      RECT 0.085000  1.280000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.360000 2.980000 ;
+      RECT 0.560000  1.950000 0.890000 3.245000 ;
+      RECT 0.620000  0.085000 0.950000 0.940000 ;
+      RECT 1.005000  1.280000 1.335000 1.550000 ;
+      RECT 1.110000  1.820000 1.440000 2.905000 ;
+      RECT 1.110000  2.905000 3.240000 3.075000 ;
+      RECT 1.565000  0.085000 2.335000 0.600000 ;
+      RECT 2.010000  1.820000 2.290000 2.905000 ;
+      RECT 2.460000  1.950000 4.240000 2.120000 ;
+      RECT 2.460000  2.120000 2.790000 2.735000 ;
+      RECT 2.865000  0.085000 3.755000 0.770000 ;
+      RECT 2.970000  2.290000 3.240000 2.905000 ;
+      RECT 3.460000  2.290000 3.790000 3.245000 ;
+      RECT 3.990000  2.120000 4.240000 2.980000 ;
+      RECT 4.355000  0.085000 4.685000 1.130000 ;
+      RECT 4.425000  1.950000 4.690000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef
index f96a453..942951c 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.magic.lef
@@ -83,32 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.115000  0.085000 1.445000 0.840000 ;
-        RECT 2.115000  0.085000 2.445000 0.810000 ;
-        RECT 2.975000  0.085000 3.305000 0.810000 ;
-        RECT 3.975000  0.085000 4.305000 0.710000 ;
-        RECT 4.975000  0.085000 5.435000 0.680000 ;
-        RECT 6.105000  0.085000 6.435000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -117,56 +91,79 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 4.400000 2.580000 4.730000 3.245000 ;
-        RECT 5.300000 2.400000 5.630000 3.245000 ;
-        RECT 6.250000 2.060000 6.580000 3.245000 ;
-        RECT 7.235000 2.060000 7.565000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 2.370000 3.075000 ;
-      RECT 0.615000 1.950000 1.870000 2.120000 ;
-      RECT 0.615000 2.120000 0.945000 2.735000 ;
-      RECT 1.145000 2.290000 1.315000 2.905000 ;
-      RECT 1.525000 2.120000 1.870000 2.240000 ;
-      RECT 1.525000 2.240000 5.100000 2.410000 ;
-      RECT 1.525000 2.410000 1.855000 2.735000 ;
-      RECT 2.040000 2.580000 4.170000 2.750000 ;
-      RECT 2.040000 2.750000 2.370000 2.905000 ;
-      RECT 2.580000 1.320000 4.195000 1.650000 ;
-      RECT 2.940000 2.750000 3.270000 2.910000 ;
-      RECT 3.840000 2.750000 4.170000 2.910000 ;
-      RECT 3.890000 1.650000 4.195000 1.720000 ;
-      RECT 3.890000 1.720000 7.565000 1.890000 ;
-      RECT 4.795000 2.060000 6.080000 2.230000 ;
-      RECT 4.795000 2.230000 5.100000 2.240000 ;
-      RECT 4.930000 2.410000 5.100000 2.990000 ;
-      RECT 5.810000 2.230000 6.080000 2.990000 ;
-      RECT 6.605000 0.350000 7.565000 1.010000 ;
-      RECT 6.785000 1.890000 7.055000 2.700000 ;
-      RECT 7.395000 1.010000 7.565000 1.720000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.115000  1.950000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 2.370000 3.075000 ;
+      RECT 0.615000  1.950000 1.870000 2.120000 ;
+      RECT 0.615000  2.120000 0.945000 2.735000 ;
+      RECT 1.115000  0.085000 1.445000 0.840000 ;
+      RECT 1.145000  2.290000 1.315000 2.905000 ;
+      RECT 1.525000  2.120000 1.870000 2.240000 ;
+      RECT 1.525000  2.240000 5.100000 2.410000 ;
+      RECT 1.525000  2.410000 1.855000 2.735000 ;
+      RECT 2.040000  2.580000 4.170000 2.750000 ;
+      RECT 2.040000  2.750000 2.370000 2.905000 ;
+      RECT 2.115000  0.085000 2.445000 0.810000 ;
+      RECT 2.580000  1.320000 4.195000 1.650000 ;
+      RECT 2.940000  2.750000 3.270000 2.910000 ;
+      RECT 2.975000  0.085000 3.305000 0.810000 ;
+      RECT 3.840000  2.750000 4.170000 2.910000 ;
+      RECT 3.890000  1.650000 4.195000 1.720000 ;
+      RECT 3.890000  1.720000 7.565000 1.890000 ;
+      RECT 3.975000  0.085000 4.305000 0.710000 ;
+      RECT 4.400000  2.580000 4.730000 3.245000 ;
+      RECT 4.795000  2.060000 6.080000 2.230000 ;
+      RECT 4.795000  2.230000 5.100000 2.240000 ;
+      RECT 4.930000  2.410000 5.100000 2.990000 ;
+      RECT 4.975000  0.085000 5.435000 0.680000 ;
+      RECT 5.300000  2.400000 5.630000 3.245000 ;
+      RECT 5.810000  2.230000 6.080000 2.990000 ;
+      RECT 6.105000  0.085000 6.435000 1.010000 ;
+      RECT 6.250000  2.060000 6.580000 3.245000 ;
+      RECT 6.605000  0.350000 7.565000 1.010000 ;
+      RECT 6.785000  1.890000 7.055000 2.700000 ;
+      RECT 7.235000  2.060000 7.565000 3.245000 ;
+      RECT 7.395000  1.010000 7.565000 1.720000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor3b_4
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef
index 6f3ca77..c490b7a 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_1.magic.lef
@@ -83,18 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.210000  0.085000 0.610000 1.010000 ;
-        RECT 1.210000  0.085000 1.540000 0.840000 ;
-        RECT 2.310000  0.085000 2.640000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -103,18 +91,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.255000 1.820000 0.585000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.210000  0.085000 0.610000 1.010000 ;
+      RECT 0.255000  1.820000 0.585000 3.245000 ;
+      RECT 1.210000  0.085000 1.540000 0.840000 ;
+      RECT 2.310000  0.085000 2.640000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+  END
 END sky130_fd_sc_hs__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef
index 7ebf460..f4531f0 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_2.magic.lef
@@ -92,21 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.605000  0.085000 1.380000 0.600000 ;
-        RECT 2.050000  0.085000 2.380000 0.810000 ;
-        RECT 3.050000  0.085000 3.380000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -115,36 +100,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 2.975000 2.730000 3.305000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 2.010000 0.445000 2.320000 ;
-      RECT 0.115000 2.320000 2.285000 2.490000 ;
-      RECT 0.115000 2.490000 0.365000 3.000000 ;
-      RECT 0.565000 2.660000 1.835000 2.980000 ;
-      RECT 2.035000 1.820000 2.285000 2.050000 ;
-      RECT 2.035000 2.050000 4.205000 2.220000 ;
-      RECT 2.035000 2.220000 2.285000 2.320000 ;
-      RECT 2.035000 2.490000 2.285000 2.980000 ;
-      RECT 2.475000 2.390000 3.755000 2.560000 ;
-      RECT 2.475000 2.560000 2.805000 3.000000 ;
-      RECT 3.505000 2.560000 3.755000 3.000000 ;
-      RECT 3.940000 2.220000 4.205000 2.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  2.010000 0.445000 2.320000 ;
+      RECT 0.115000  2.320000 2.285000 2.490000 ;
+      RECT 0.115000  2.490000 0.365000 3.000000 ;
+      RECT 0.565000  2.660000 1.835000 2.980000 ;
+      RECT 0.605000  0.085000 1.380000 0.600000 ;
+      RECT 2.035000  1.820000 2.285000 2.050000 ;
+      RECT 2.035000  2.050000 4.205000 2.220000 ;
+      RECT 2.035000  2.220000 2.285000 2.320000 ;
+      RECT 2.035000  2.490000 2.285000 2.980000 ;
+      RECT 2.050000  0.085000 2.380000 0.810000 ;
+      RECT 2.475000  2.390000 3.755000 2.560000 ;
+      RECT 2.475000  2.560000 2.805000 3.000000 ;
+      RECT 2.975000  2.730000 3.305000 3.245000 ;
+      RECT 3.050000  0.085000 3.380000 1.010000 ;
+      RECT 3.505000  2.560000 3.755000 3.000000 ;
+      RECT 3.940000  2.220000 4.205000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef
index 47d9531..b0552f7 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_4.magic.lef
@@ -90,32 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.840000 ;
-        RECT 1.910000  0.085000 2.240000 0.840000 ;
-        RECT 3.760000  0.085000 4.090000 0.840000 ;
-        RECT 4.760000  0.085000 7.070000 0.790000 ;
-        RECT 8.030000  0.085000 8.360000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -124,54 +98,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 6.695000 2.290000 7.025000 3.245000 ;
-        RECT 7.695000 2.290000 8.025000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 2.290000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 2.265000 3.075000 ;
-      RECT 1.145000 2.290000 1.395000 2.905000 ;
-      RECT 2.095000 1.820000 2.265000 1.950000 ;
-      RECT 2.095000 1.950000 4.145000 2.120000 ;
-      RECT 2.095000 2.120000 2.265000 2.905000 ;
-      RECT 2.465000 2.290000 2.795000 2.905000 ;
-      RECT 2.465000 2.905000 6.075000 3.075000 ;
-      RECT 2.970000 2.120000 3.190000 2.735000 ;
-      RECT 3.365000 2.290000 3.695000 2.905000 ;
-      RECT 3.895000 2.120000 4.145000 2.735000 ;
-      RECT 4.375000 1.950000 8.525000 2.120000 ;
-      RECT 4.375000 2.120000 4.625000 2.735000 ;
-      RECT 4.825000 2.300000 5.155000 2.905000 ;
-      RECT 5.340000 2.120000 5.560000 2.735000 ;
-      RECT 5.745000 2.300000 6.075000 2.905000 ;
-      RECT 6.255000 2.120000 6.525000 2.980000 ;
-      RECT 7.195000 2.120000 7.525000 2.980000 ;
-      RECT 8.195000 1.820000 8.525000 1.950000 ;
-      RECT 8.195000 2.120000 8.525000 2.980000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.840000 ;
+      RECT 0.115000  2.290000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 2.265000 3.075000 ;
+      RECT 1.145000  2.290000 1.395000 2.905000 ;
+      RECT 1.910000  0.085000 2.240000 0.840000 ;
+      RECT 2.095000  1.820000 2.265000 1.950000 ;
+      RECT 2.095000  1.950000 4.145000 2.120000 ;
+      RECT 2.095000  2.120000 2.265000 2.905000 ;
+      RECT 2.465000  2.290000 2.795000 2.905000 ;
+      RECT 2.465000  2.905000 6.075000 3.075000 ;
+      RECT 2.970000  2.120000 3.190000 2.735000 ;
+      RECT 3.365000  2.290000 3.695000 2.905000 ;
+      RECT 3.760000  0.085000 4.090000 0.840000 ;
+      RECT 3.895000  2.120000 4.145000 2.735000 ;
+      RECT 4.375000  1.950000 8.525000 2.120000 ;
+      RECT 4.375000  2.120000 4.625000 2.735000 ;
+      RECT 4.760000  0.085000 7.070000 0.790000 ;
+      RECT 4.825000  2.300000 5.155000 2.905000 ;
+      RECT 5.340000  2.120000 5.560000 2.735000 ;
+      RECT 5.745000  2.300000 6.075000 2.905000 ;
+      RECT 6.255000  2.120000 6.525000 2.980000 ;
+      RECT 6.695000  2.290000 7.025000 3.245000 ;
+      RECT 7.195000  2.120000 7.525000 2.980000 ;
+      RECT 7.695000  2.290000 8.025000 3.245000 ;
+      RECT 8.030000  0.085000 8.360000 1.010000 ;
+      RECT 8.195000  1.820000 8.525000 1.950000 ;
+      RECT 8.195000  2.120000 8.525000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4_4
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef
index 35c6655..6fdff75 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.magic.lef
@@ -83,19 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.790000  0.085000 1.120000 0.940000 ;
-        RECT 1.790000  0.085000 2.120000 0.840000 ;
-        RECT 2.800000  0.085000 3.130000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -104,29 +91,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.835000 2.290000 1.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.350000 0.620000 0.940000 ;
-      RECT 0.105000 0.940000 0.275000 1.820000 ;
-      RECT 0.105000 1.820000 0.595000 1.950000 ;
-      RECT 0.105000 1.950000 2.735000 2.120000 ;
-      RECT 0.105000 2.120000 0.595000 2.700000 ;
-      RECT 2.565000 1.350000 2.935000 1.680000 ;
-      RECT 2.565000 1.680000 2.735000 1.950000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.105000  0.350000 0.620000 0.940000 ;
+      RECT 0.105000  0.940000 0.275000 1.820000 ;
+      RECT 0.105000  1.820000 0.595000 1.950000 ;
+      RECT 0.105000  1.950000 2.735000 2.120000 ;
+      RECT 0.105000  2.120000 0.595000 2.700000 ;
+      RECT 0.790000  0.085000 1.120000 0.940000 ;
+      RECT 0.835000  2.290000 1.165000 3.245000 ;
+      RECT 1.790000  0.085000 2.120000 0.840000 ;
+      RECT 2.565000  1.350000 2.935000 1.680000 ;
+      RECT 2.565000  1.680000 2.735000 1.950000 ;
+      RECT 2.800000  0.085000 3.130000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef
index b696864..53b6e57 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.magic.lef
@@ -89,26 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.750000  0.085000 1.080000 0.960000 ;
-        RECT 1.750000  0.085000 2.270000 0.600000 ;
-        RECT 2.940000  0.085000 3.270000 0.840000 ;
-        RECT 3.940000  0.085000 4.645000 0.790000 ;
-        RECT 5.315000  0.085000 5.645000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -117,44 +97,61 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.565000 1.970000 0.895000 3.245000 ;
-        RECT 4.835000 2.290000 5.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.580000 1.130000 ;
-      RECT 0.115000 1.130000 1.775000 1.300000 ;
-      RECT 0.115000 1.300000 0.365000 2.980000 ;
-      RECT 1.105000 1.300000 1.775000 1.550000 ;
-      RECT 1.125000 1.820000 1.455000 2.905000 ;
-      RECT 1.125000 2.905000 2.275000 3.075000 ;
-      RECT 2.025000 2.290000 3.255000 2.460000 ;
-      RECT 2.025000 2.460000 2.275000 2.905000 ;
-      RECT 2.475000 2.630000 2.805000 2.905000 ;
-      RECT 2.475000 2.905000 4.265000 3.075000 ;
-      RECT 3.005000 2.460000 3.255000 2.735000 ;
-      RECT 3.485000 1.950000 5.625000 2.120000 ;
-      RECT 3.485000 2.120000 3.735000 2.735000 ;
-      RECT 3.935000 2.290000 4.265000 2.905000 ;
-      RECT 4.465000 2.120000 4.635000 2.980000 ;
-      RECT 5.375000 2.120000 5.625000 2.980000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.350000 0.580000 1.130000 ;
+      RECT 0.115000  1.130000 1.775000 1.300000 ;
+      RECT 0.115000  1.300000 0.365000 2.980000 ;
+      RECT 0.565000  1.970000 0.895000 3.245000 ;
+      RECT 0.750000  0.085000 1.080000 0.960000 ;
+      RECT 1.105000  1.300000 1.775000 1.550000 ;
+      RECT 1.125000  1.820000 1.455000 2.905000 ;
+      RECT 1.125000  2.905000 2.275000 3.075000 ;
+      RECT 1.750000  0.085000 2.270000 0.600000 ;
+      RECT 2.025000  2.290000 3.255000 2.460000 ;
+      RECT 2.025000  2.460000 2.275000 2.905000 ;
+      RECT 2.475000  2.630000 2.805000 2.905000 ;
+      RECT 2.475000  2.905000 4.265000 3.075000 ;
+      RECT 2.940000  0.085000 3.270000 0.840000 ;
+      RECT 3.005000  2.460000 3.255000 2.735000 ;
+      RECT 3.485000  1.950000 5.625000 2.120000 ;
+      RECT 3.485000  2.120000 3.735000 2.735000 ;
+      RECT 3.935000  2.290000 4.265000 2.905000 ;
+      RECT 3.940000  0.085000 4.645000 0.790000 ;
+      RECT 4.465000  2.120000 4.635000 2.980000 ;
+      RECT 4.835000  2.290000 5.165000 3.245000 ;
+      RECT 5.315000  0.085000 5.645000 1.130000 ;
+      RECT 5.375000  2.120000 5.625000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef
index d0a1b2a..d8cb77d 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.magic.lef
@@ -97,39 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 1.060000  0.085000  1.390000 1.130000 ;
-        RECT 2.000000  0.085000  2.330000 0.790000 ;
-        RECT 3.000000  0.085000  3.330000 1.130000 ;
-        RECT 3.930000  0.085000  4.735000 0.840000 ;
-        RECT 5.405000  0.085000  6.080000 0.840000 ;
-        RECT 6.750000  0.085000  7.080000 0.805000 ;
-        RECT 7.750000  0.085000  8.105000 0.805000 ;
-        RECT 8.705000  0.085000  9.035000 0.805000 ;
-        RECT 9.635000  0.085000  9.965000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -138,65 +105,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.115000 2.100000  0.365000 3.245000 ;
-        RECT 1.075000 2.100000  1.345000 3.245000 ;
-        RECT 8.285000 2.290000  8.535000 3.245000 ;
-        RECT 9.265000 2.290000  9.515000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.275000 0.420000 0.890000 0.750000 ;
-      RECT 0.565000 2.100000 0.895000 2.980000 ;
-      RECT 0.720000 0.750000 0.890000 1.320000 ;
-      RECT 0.720000 1.320000 2.330000 1.650000 ;
-      RECT 0.720000 1.650000 0.890000 2.100000 ;
-      RECT 1.575000 1.820000 1.825000 2.905000 ;
-      RECT 1.575000 2.905000 3.755000 3.075000 ;
-      RECT 2.525000 2.160000 2.805000 2.905000 ;
-      RECT 3.475000 2.320000 5.705000 2.460000 ;
-      RECT 3.475000 2.460000 4.755000 2.490000 ;
-      RECT 3.475000 2.490000 3.755000 2.905000 ;
-      RECT 3.925000 2.660000 4.255000 2.905000 ;
-      RECT 3.925000 2.905000 7.715000 3.075000 ;
-      RECT 4.425000 2.290000 5.705000 2.320000 ;
-      RECT 4.425000 2.490000 4.755000 2.720000 ;
-      RECT 4.925000 2.630000 5.255000 2.905000 ;
-      RECT 5.440000 2.460000 5.705000 2.540000 ;
-      RECT 5.935000 1.950000 9.965000 2.120000 ;
-      RECT 5.935000 2.120000 6.265000 2.735000 ;
-      RECT 6.435000 2.290000 6.765000 2.905000 ;
-      RECT 6.935000 2.120000 7.265000 2.735000 ;
-      RECT 7.465000 2.290000 7.715000 2.905000 ;
-      RECT 7.885000 2.120000 8.115000 2.980000 ;
-      RECT 8.735000 2.120000 9.065000 2.980000 ;
-      RECT 9.715000 1.820000 9.965000 1.950000 ;
-      RECT 9.715000 2.120000 9.965000 2.980000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  2.100000  0.365000 3.245000 ;
+      RECT 0.275000  0.420000  0.890000 0.750000 ;
+      RECT 0.565000  2.100000  0.895000 2.980000 ;
+      RECT 0.720000  0.750000  0.890000 1.320000 ;
+      RECT 0.720000  1.320000  2.330000 1.650000 ;
+      RECT 0.720000  1.650000  0.890000 2.100000 ;
+      RECT 1.060000  0.085000  1.390000 1.130000 ;
+      RECT 1.075000  2.100000  1.345000 3.245000 ;
+      RECT 1.575000  1.820000  1.825000 2.905000 ;
+      RECT 1.575000  2.905000  3.755000 3.075000 ;
+      RECT 2.000000  0.085000  2.330000 0.790000 ;
+      RECT 2.525000  2.160000  2.805000 2.905000 ;
+      RECT 3.000000  0.085000  3.330000 1.130000 ;
+      RECT 3.475000  2.320000  5.705000 2.460000 ;
+      RECT 3.475000  2.460000  4.755000 2.490000 ;
+      RECT 3.475000  2.490000  3.755000 2.905000 ;
+      RECT 3.925000  2.660000  4.255000 2.905000 ;
+      RECT 3.925000  2.905000  7.715000 3.075000 ;
+      RECT 3.930000  0.085000  4.735000 0.840000 ;
+      RECT 4.425000  2.290000  5.705000 2.320000 ;
+      RECT 4.425000  2.490000  4.755000 2.720000 ;
+      RECT 4.925000  2.630000  5.255000 2.905000 ;
+      RECT 5.405000  0.085000  6.080000 0.840000 ;
+      RECT 5.440000  2.460000  5.705000 2.540000 ;
+      RECT 5.935000  1.950000  9.965000 2.120000 ;
+      RECT 5.935000  2.120000  6.265000 2.735000 ;
+      RECT 6.435000  2.290000  6.765000 2.905000 ;
+      RECT 6.750000  0.085000  7.080000 0.805000 ;
+      RECT 6.935000  2.120000  7.265000 2.735000 ;
+      RECT 7.465000  2.290000  7.715000 2.905000 ;
+      RECT 7.750000  0.085000  8.105000 0.805000 ;
+      RECT 7.885000  2.120000  8.115000 2.980000 ;
+      RECT 8.285000  2.290000  8.535000 3.245000 ;
+      RECT 8.705000  0.085000  9.035000 0.805000 ;
+      RECT 8.735000  2.120000  9.065000 2.980000 ;
+      RECT 9.265000  2.290000  9.515000 3.245000 ;
+      RECT 9.635000  0.085000  9.965000 1.130000 ;
+      RECT 9.715000  1.820000  9.965000 1.950000 ;
+      RECT 9.715000  2.120000  9.965000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4b_4
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef
index b80857a..a5555dd 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.magic.lef
@@ -84,22 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.945000  0.085000 1.275000 1.130000 ;
-        RECT 1.945000  0.085000 2.690000 0.680000 ;
-        RECT 3.405000  0.085000 4.175000 0.920000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -108,39 +92,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.650000 2.900000 1.345000 3.245000 ;
-        RECT 3.965000 2.100000 4.185000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.680000 0.775000 1.010000 ;
-      RECT 0.115000 1.820000 0.775000 2.560000 ;
-      RECT 0.115000 2.560000 3.795000 2.730000 ;
-      RECT 0.605000 1.010000 0.775000 1.820000 ;
-      RECT 2.485000 1.350000 2.815000 1.720000 ;
-      RECT 2.485000 1.720000 3.795000 1.890000 ;
-      RECT 3.070000 1.220000 4.685000 1.260000 ;
-      RECT 3.070000 1.260000 3.740000 1.550000 ;
-      RECT 3.570000 1.090000 4.685000 1.220000 ;
-      RECT 3.625000 1.890000 3.795000 2.560000 ;
-      RECT 4.355000 0.540000 4.685000 1.090000 ;
-      RECT 4.355000 2.100000 4.685000 2.980000 ;
-      RECT 4.515000 1.260000 4.685000 2.100000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.680000 0.775000 1.010000 ;
+      RECT 0.115000  1.820000 0.775000 2.560000 ;
+      RECT 0.115000  2.560000 3.795000 2.730000 ;
+      RECT 0.605000  1.010000 0.775000 1.820000 ;
+      RECT 0.650000  2.900000 1.345000 3.245000 ;
+      RECT 0.945000  0.085000 1.275000 1.130000 ;
+      RECT 1.945000  0.085000 2.690000 0.680000 ;
+      RECT 2.485000  1.350000 2.815000 1.720000 ;
+      RECT 2.485000  1.720000 3.795000 1.890000 ;
+      RECT 3.070000  1.220000 4.685000 1.260000 ;
+      RECT 3.070000  1.260000 3.740000 1.550000 ;
+      RECT 3.405000  0.085000 4.175000 0.920000 ;
+      RECT 3.570000  1.090000 4.685000 1.220000 ;
+      RECT 3.625000  1.890000 3.795000 2.560000 ;
+      RECT 3.965000  2.100000 4.185000 3.245000 ;
+      RECT 4.355000  0.540000 4.685000 1.090000 ;
+      RECT 4.355000  2.100000 4.685000 2.980000 ;
+      RECT 4.515000  1.260000 4.685000 2.100000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef
index 124d301..826c83b 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.magic.lef
@@ -91,30 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.990000  0.085000 1.515000 0.540000 ;
-        RECT 2.195000  0.085000 2.710000 0.540000 ;
-        RECT 3.400000  0.085000 3.775000 0.500000 ;
-        RECT 4.455000  0.085000 4.785000 0.840000 ;
-        RECT 5.385000  0.085000 6.155000 0.840000 ;
-        RECT 6.755000  0.085000 7.085000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -123,60 +99,81 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.615000 1.970000 1.715000 3.245000 ;
-        RECT 6.385000 2.290000 6.555000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.130000 0.815000 1.300000 ;
-      RECT 0.115000 1.300000 0.285000 1.970000 ;
-      RECT 0.115000 1.970000 0.445000 2.980000 ;
-      RECT 0.485000 0.360000 0.815000 0.710000 ;
-      RECT 0.485000 0.710000 2.665000 0.880000 ;
-      RECT 0.485000 0.880000 0.815000 1.130000 ;
-      RECT 1.620000 1.050000 2.325000 1.300000 ;
-      RECT 1.885000 1.970000 2.325000 2.140000 ;
-      RECT 1.885000 2.140000 2.215000 2.980000 ;
-      RECT 2.155000 1.300000 2.325000 1.350000 ;
-      RECT 2.155000 1.350000 3.165000 1.680000 ;
-      RECT 2.155000 1.680000 2.325000 1.970000 ;
-      RECT 2.495000 0.880000 2.665000 1.010000 ;
-      RECT 2.495000 1.010000 3.785000 1.180000 ;
-      RECT 2.495000 1.850000 2.775000 2.905000 ;
-      RECT 2.495000 2.905000 3.725000 3.075000 ;
-      RECT 3.395000 2.190000 4.675000 2.360000 ;
-      RECT 3.395000 2.360000 3.725000 2.905000 ;
-      RECT 3.615000 1.180000 3.785000 1.350000 ;
-      RECT 3.615000 1.350000 3.945000 1.680000 ;
-      RECT 3.895000 2.530000 4.175000 2.905000 ;
-      RECT 3.895000 2.905000 5.685000 3.075000 ;
-      RECT 4.345000 2.360000 4.675000 2.735000 ;
-      RECT 4.905000 1.820000 5.155000 1.950000 ;
-      RECT 4.905000 1.950000 7.085000 2.120000 ;
-      RECT 4.905000 2.120000 5.155000 2.735000 ;
-      RECT 5.355000 2.290000 5.685000 2.905000 ;
-      RECT 5.855000 2.120000 6.185000 2.980000 ;
-      RECT 6.755000 2.120000 7.085000 2.980000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  1.130000 0.815000 1.300000 ;
+      RECT 0.115000  1.300000 0.285000 1.970000 ;
+      RECT 0.115000  1.970000 0.445000 2.980000 ;
+      RECT 0.485000  0.360000 0.815000 0.710000 ;
+      RECT 0.485000  0.710000 2.665000 0.880000 ;
+      RECT 0.485000  0.880000 0.815000 1.130000 ;
+      RECT 0.615000  1.970000 1.715000 3.245000 ;
+      RECT 0.990000  0.085000 1.515000 0.540000 ;
+      RECT 1.620000  1.050000 2.325000 1.300000 ;
+      RECT 1.885000  1.970000 2.325000 2.140000 ;
+      RECT 1.885000  2.140000 2.215000 2.980000 ;
+      RECT 2.155000  1.300000 2.325000 1.350000 ;
+      RECT 2.155000  1.350000 3.165000 1.680000 ;
+      RECT 2.155000  1.680000 2.325000 1.970000 ;
+      RECT 2.195000  0.085000 2.710000 0.540000 ;
+      RECT 2.495000  0.880000 2.665000 1.010000 ;
+      RECT 2.495000  1.010000 3.785000 1.180000 ;
+      RECT 2.495000  1.850000 2.775000 2.905000 ;
+      RECT 2.495000  2.905000 3.725000 3.075000 ;
+      RECT 3.395000  2.190000 4.675000 2.360000 ;
+      RECT 3.395000  2.360000 3.725000 2.905000 ;
+      RECT 3.400000  0.085000 3.775000 0.500000 ;
+      RECT 3.615000  1.180000 3.785000 1.350000 ;
+      RECT 3.615000  1.350000 3.945000 1.680000 ;
+      RECT 3.895000  2.530000 4.175000 2.905000 ;
+      RECT 3.895000  2.905000 5.685000 3.075000 ;
+      RECT 4.345000  2.360000 4.675000 2.735000 ;
+      RECT 4.455000  0.085000 4.785000 0.840000 ;
+      RECT 4.905000  1.820000 5.155000 1.950000 ;
+      RECT 4.905000  1.950000 7.085000 2.120000 ;
+      RECT 4.905000  2.120000 5.155000 2.735000 ;
+      RECT 5.355000  2.290000 5.685000 2.905000 ;
+      RECT 5.385000  0.085000 6.155000 0.840000 ;
+      RECT 5.855000  2.120000 6.185000 2.980000 ;
+      RECT 6.385000  2.290000 6.555000 3.245000 ;
+      RECT 6.755000  0.085000 7.085000 1.130000 ;
+      RECT 6.755000  2.120000 7.085000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef
index 0c53568..616104b 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.magic.lef
@@ -100,42 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.115000  0.085000  0.445000 1.130000 ;
-        RECT  1.115000  0.085000  1.445000 0.670000 ;
-        RECT  2.115000  0.085000  2.445000 0.670000 ;
-        RECT  3.085000  0.085000  3.415000 0.745000 ;
-        RECT  4.015000  0.085000  4.345000 0.745000 ;
-        RECT  5.015000  0.085000  5.345000 0.745000 ;
-        RECT  5.945000  0.085000  6.275000 1.130000 ;
-        RECT  6.945000  0.085000  7.535000 0.680000 ;
-        RECT  8.205000  0.085000  8.750000 0.680000 ;
-        RECT 10.095000  0.085000 10.495000 0.940000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -144,82 +108,115 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  1.115000 2.730000  1.445000 3.245000 ;
-        RECT  2.065000 2.730000  2.435000 3.245000 ;
-        RECT  8.790000 2.370000  9.120000 3.245000 ;
-        RECT  9.775000 2.100000  9.945000 3.245000 ;
-        RECT 10.595000 2.290000 10.925000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 1.820000  0.445000 2.050000 ;
-      RECT  0.115000 2.050000  3.390000 2.220000 ;
-      RECT  0.115000 2.220000  0.445000 2.980000 ;
-      RECT  0.615000 2.390000  2.885000 2.560000 ;
-      RECT  0.615000 2.560000  0.945000 2.980000 ;
-      RECT  1.645000 2.560000  1.895000 2.980000 ;
-      RECT  2.635000 2.560000  2.885000 2.905000 ;
-      RECT  2.635000 2.905000  3.890000 3.075000 ;
-      RECT  3.060000 1.755000  4.260000 1.925000 ;
-      RECT  3.060000 1.925000  3.390000 2.050000 ;
-      RECT  3.060000 2.220000  3.390000 2.735000 ;
-      RECT  3.560000 2.095000  3.890000 2.905000 ;
-      RECT  4.090000 1.925000  4.260000 2.905000 ;
-      RECT  4.090000 2.905000  8.490000 3.075000 ;
-      RECT  4.345000 1.255000  5.355000 1.585000 ;
-      RECT  4.470000 1.755000  4.800000 2.565000 ;
-      RECT  4.470000 2.565000  8.035000 2.735000 ;
-      RECT  5.185000 1.585000  5.355000 2.225000 ;
-      RECT  5.185000 2.225000  7.570000 2.395000 ;
-      RECT  6.785000 1.225000  8.375000 1.555000 ;
-      RECT  7.400000 1.725000  8.875000 1.895000 ;
-      RECT  7.400000 1.895000  7.570000 2.225000 ;
-      RECT  7.760000 2.065000  8.035000 2.565000 ;
-      RECT  8.205000 0.850000  9.090000 1.020000 ;
-      RECT  8.205000 1.020000  8.375000 1.225000 ;
-      RECT  8.205000 2.065000  8.490000 2.905000 ;
-      RECT  8.545000 1.190000  9.585000 1.360000 ;
-      RECT  8.545000 1.360000  8.875000 1.725000 ;
-      RECT  8.705000 1.895000  8.875000 2.030000 ;
-      RECT  8.705000 2.030000  9.575000 2.200000 ;
-      RECT  8.920000 0.255000  9.925000 0.425000 ;
-      RECT  8.920000 0.425000  9.090000 0.850000 ;
-      RECT  9.260000 0.670000  9.585000 1.190000 ;
-      RECT  9.300000 2.200000  9.575000 2.980000 ;
-      RECT  9.755000 0.425000  9.925000 1.110000 ;
-      RECT  9.755000 1.110000 10.925000 1.280000 ;
-      RECT 10.145000 1.950000 10.925000 2.120000 ;
-      RECT 10.145000 2.120000 10.395000 2.980000 ;
-      RECT 10.665000 0.350000 10.925000 1.110000 ;
-      RECT 10.755000 1.280000 10.925000 1.950000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.115000  0.085000  0.445000 1.130000 ;
+      RECT  0.115000  1.820000  0.445000 2.050000 ;
+      RECT  0.115000  2.050000  3.390000 2.220000 ;
+      RECT  0.115000  2.220000  0.445000 2.980000 ;
+      RECT  0.615000  2.390000  2.885000 2.560000 ;
+      RECT  0.615000  2.560000  0.945000 2.980000 ;
+      RECT  1.115000  0.085000  1.445000 0.670000 ;
+      RECT  1.115000  2.730000  1.445000 3.245000 ;
+      RECT  1.645000  2.560000  1.895000 2.980000 ;
+      RECT  2.065000  2.730000  2.435000 3.245000 ;
+      RECT  2.115000  0.085000  2.445000 0.670000 ;
+      RECT  2.635000  2.560000  2.885000 2.905000 ;
+      RECT  2.635000  2.905000  3.890000 3.075000 ;
+      RECT  3.060000  1.755000  4.260000 1.925000 ;
+      RECT  3.060000  1.925000  3.390000 2.050000 ;
+      RECT  3.060000  2.220000  3.390000 2.735000 ;
+      RECT  3.085000  0.085000  3.415000 0.745000 ;
+      RECT  3.560000  2.095000  3.890000 2.905000 ;
+      RECT  4.015000  0.085000  4.345000 0.745000 ;
+      RECT  4.090000  1.925000  4.260000 2.905000 ;
+      RECT  4.090000  2.905000  8.490000 3.075000 ;
+      RECT  4.345000  1.255000  5.355000 1.585000 ;
+      RECT  4.470000  1.755000  4.800000 2.565000 ;
+      RECT  4.470000  2.565000  8.035000 2.735000 ;
+      RECT  5.015000  0.085000  5.345000 0.745000 ;
+      RECT  5.185000  1.585000  5.355000 2.225000 ;
+      RECT  5.185000  2.225000  7.570000 2.395000 ;
+      RECT  5.945000  0.085000  6.275000 1.130000 ;
+      RECT  6.785000  1.225000  8.375000 1.555000 ;
+      RECT  6.945000  0.085000  7.535000 0.680000 ;
+      RECT  7.400000  1.725000  8.875000 1.895000 ;
+      RECT  7.400000  1.895000  7.570000 2.225000 ;
+      RECT  7.760000  2.065000  8.035000 2.565000 ;
+      RECT  8.205000  0.085000  8.750000 0.680000 ;
+      RECT  8.205000  0.850000  9.090000 1.020000 ;
+      RECT  8.205000  1.020000  8.375000 1.225000 ;
+      RECT  8.205000  2.065000  8.490000 2.905000 ;
+      RECT  8.545000  1.190000  9.585000 1.360000 ;
+      RECT  8.545000  1.360000  8.875000 1.725000 ;
+      RECT  8.705000  1.895000  8.875000 2.030000 ;
+      RECT  8.705000  2.030000  9.575000 2.200000 ;
+      RECT  8.790000  2.370000  9.120000 3.245000 ;
+      RECT  8.920000  0.255000  9.925000 0.425000 ;
+      RECT  8.920000  0.425000  9.090000 0.850000 ;
+      RECT  9.260000  0.670000  9.585000 1.190000 ;
+      RECT  9.300000  2.200000  9.575000 2.980000 ;
+      RECT  9.755000  0.425000  9.925000 1.110000 ;
+      RECT  9.755000  1.110000 10.925000 1.280000 ;
+      RECT  9.775000  2.100000  9.945000 3.245000 ;
+      RECT 10.095000  0.085000 10.495000 0.940000 ;
+      RECT 10.145000  1.950000 10.925000 2.120000 ;
+      RECT 10.145000  2.120000 10.395000 2.980000 ;
+      RECT 10.595000  2.290000 10.925000 3.245000 ;
+      RECT 10.665000  0.350000 10.925000 1.110000 ;
+      RECT 10.755000  1.280000 10.925000 1.950000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__nor4bb_4
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef
index 62ab740..6c4215f 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.535000  0.085000 0.865000 1.040000 ;
-        RECT 2.880000  0.085000 3.210000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -111,37 +98,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.615000 2.410000 0.945000 3.245000 ;
-        RECT 1.740000 2.455000 2.290000 3.245000 ;
-        RECT 3.405000 1.950000 3.735000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.435000 1.210000 1.330000 1.380000 ;
-      RECT 0.435000 1.380000 0.785000 1.550000 ;
-      RECT 0.615000 1.550000 0.785000 2.070000 ;
-      RECT 0.615000 2.070000 2.865000 2.240000 ;
-      RECT 1.080000 0.350000 1.330000 1.210000 ;
-      RECT 1.195000 2.240000 2.865000 2.245000 ;
-      RECT 1.195000 2.245000 1.525000 2.925000 ;
-      RECT 2.380000 0.350000 2.710000 0.960000 ;
-      RECT 2.380000 0.960000 3.710000 1.130000 ;
-      RECT 2.535000 2.045000 2.865000 2.070000 ;
-      RECT 2.535000 2.245000 2.865000 2.925000 ;
-      RECT 3.380000 0.350000 3.710000 0.960000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.435000  1.210000 1.330000 1.380000 ;
+      RECT 0.435000  1.380000 0.785000 1.550000 ;
+      RECT 0.535000  0.085000 0.865000 1.040000 ;
+      RECT 0.615000  1.550000 0.785000 2.070000 ;
+      RECT 0.615000  2.070000 2.865000 2.240000 ;
+      RECT 0.615000  2.410000 0.945000 3.245000 ;
+      RECT 1.080000  0.350000 1.330000 1.210000 ;
+      RECT 1.195000  2.240000 2.865000 2.245000 ;
+      RECT 1.195000  2.245000 1.525000 2.925000 ;
+      RECT 1.740000  2.455000 2.290000 3.245000 ;
+      RECT 2.380000  0.350000 2.710000 0.960000 ;
+      RECT 2.380000  0.960000 3.710000 1.130000 ;
+      RECT 2.535000  2.045000 2.865000 2.070000 ;
+      RECT 2.535000  2.245000 2.865000 2.925000 ;
+      RECT 2.880000  0.085000 3.210000 0.790000 ;
+      RECT 3.380000  0.350000 3.710000 0.960000 ;
+      RECT 3.405000  1.950000 3.735000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2111a_1
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef
index e48f293..31cbcf9 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.magic.lef
@@ -90,22 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.750000  0.085000 1.220000 0.670000 ;
-        RECT 3.410000  0.085000 3.740000 0.825000 ;
-        RECT 4.420000  0.085000 4.685000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -114,40 +98,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.295000 1.820000 0.625000 3.245000 ;
-        RECT 1.785000 2.290000 2.115000 3.245000 ;
-        RECT 2.875000 2.290000 3.685000 3.245000 ;
-        RECT 4.355000 1.820000 4.685000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.250000 0.350000 0.580000 0.840000 ;
-      RECT 0.250000 0.840000 1.720000 1.010000 ;
-      RECT 1.285000 1.820000 1.615000 1.950000 ;
-      RECT 1.285000 1.950000 3.685000 2.120000 ;
-      RECT 1.285000 2.120000 1.615000 2.860000 ;
-      RECT 1.390000 0.350000 1.720000 0.840000 ;
-      RECT 2.375000 2.120000 2.705000 2.880000 ;
-      RECT 2.850000 0.350000 3.180000 1.010000 ;
-      RECT 2.850000 1.010000 3.685000 1.180000 ;
-      RECT 3.515000 1.180000 3.685000 1.300000 ;
-      RECT 3.515000 1.300000 3.845000 1.630000 ;
-      RECT 3.515000 1.630000 3.685000 1.950000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.250000  0.350000 0.580000 0.840000 ;
+      RECT 0.250000  0.840000 1.720000 1.010000 ;
+      RECT 0.295000  1.820000 0.625000 3.245000 ;
+      RECT 0.750000  0.085000 1.220000 0.670000 ;
+      RECT 1.285000  1.820000 1.615000 1.950000 ;
+      RECT 1.285000  1.950000 3.685000 2.120000 ;
+      RECT 1.285000  2.120000 1.615000 2.860000 ;
+      RECT 1.390000  0.350000 1.720000 0.840000 ;
+      RECT 1.785000  2.290000 2.115000 3.245000 ;
+      RECT 2.375000  2.120000 2.705000 2.880000 ;
+      RECT 2.850000  0.350000 3.180000 1.010000 ;
+      RECT 2.850000  1.010000 3.685000 1.180000 ;
+      RECT 2.875000  2.290000 3.685000 3.245000 ;
+      RECT 3.410000  0.085000 3.740000 0.825000 ;
+      RECT 3.515000  1.180000 3.685000 1.300000 ;
+      RECT 3.515000  1.300000 3.845000 1.630000 ;
+      RECT 3.515000  1.630000 3.685000 1.950000 ;
+      RECT 4.355000  1.820000 4.685000 3.245000 ;
+      RECT 4.420000  0.085000 4.685000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2111a_2
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef
index f7e8176..a683c3f 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.magic.lef
@@ -96,31 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 3.735000  0.085000 4.065000 0.940000 ;
-        RECT 4.825000  0.085000 5.155000 0.940000 ;
-        RECT 5.685000  0.085000 6.015000 1.130000 ;
-        RECT 6.685000  0.085000 7.015000 0.815000 ;
-        RECT 7.685000  0.085000 8.015000 0.815000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -129,68 +104,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.615000 2.315000 0.945000 3.245000 ;
-        RECT 1.615000 2.315000 1.945000 3.245000 ;
-        RECT 2.685000 2.315000 3.015000 3.245000 ;
-        RECT 4.780000 2.630000 5.110000 3.245000 ;
-        RECT 5.815000 2.290000 6.145000 3.245000 ;
-        RECT 6.765000 2.350000 7.095000 3.245000 ;
-        RECT 7.715000 1.820000 8.045000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 2.250000 0.425000 ;
-      RECT 0.115000 0.425000 1.230000 0.600000 ;
-      RECT 0.115000 0.600000 0.380000 1.115000 ;
-      RECT 0.115000 1.950000 6.145000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.820000 ;
-      RECT 0.550000 0.770000 0.890000 1.130000 ;
-      RECT 0.720000 1.130000 0.890000 1.950000 ;
-      RECT 1.060000 0.600000 1.230000 1.130000 ;
-      RECT 1.115000 2.120000 1.445000 2.820000 ;
-      RECT 1.410000 0.595000 1.740000 0.710000 ;
-      RECT 1.410000 0.710000 3.125000 0.880000 ;
-      RECT 1.410000 0.880000 1.740000 1.130000 ;
-      RECT 1.920000 0.425000 2.250000 0.540000 ;
-      RECT 2.150000 1.940000 2.480000 1.950000 ;
-      RECT 2.150000 2.120000 2.480000 2.820000 ;
-      RECT 2.365000 1.050000 3.555000 1.110000 ;
-      RECT 2.365000 1.110000 5.505000 1.280000 ;
-      RECT 2.365000 1.280000 2.775000 1.300000 ;
-      RECT 2.875000 0.520000 3.125000 0.710000 ;
-      RECT 3.220000 2.120000 3.550000 2.905000 ;
-      RECT 3.220000 2.905000 4.550000 3.075000 ;
-      RECT 3.305000 0.520000 3.555000 1.050000 ;
-      RECT 3.720000 2.290000 5.610000 2.460000 ;
-      RECT 3.720000 2.460000 4.050000 2.735000 ;
-      RECT 4.220000 2.630000 4.550000 2.905000 ;
-      RECT 4.235000 0.520000 4.565000 1.110000 ;
-      RECT 5.280000 2.460000 5.610000 2.980000 ;
-      RECT 5.335000 0.350000 5.505000 1.110000 ;
-      RECT 5.975000 1.350000 7.125000 1.680000 ;
-      RECT 5.975000 1.680000 6.145000 1.950000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.255000 2.250000 0.425000 ;
+      RECT 0.115000  0.425000 1.230000 0.600000 ;
+      RECT 0.115000  0.600000 0.380000 1.115000 ;
+      RECT 0.115000  1.950000 6.145000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.820000 ;
+      RECT 0.550000  0.770000 0.890000 1.130000 ;
+      RECT 0.615000  2.315000 0.945000 3.245000 ;
+      RECT 0.720000  1.130000 0.890000 1.950000 ;
+      RECT 1.060000  0.600000 1.230000 1.130000 ;
+      RECT 1.115000  2.120000 1.445000 2.820000 ;
+      RECT 1.410000  0.595000 1.740000 0.710000 ;
+      RECT 1.410000  0.710000 3.125000 0.880000 ;
+      RECT 1.410000  0.880000 1.740000 1.130000 ;
+      RECT 1.615000  2.315000 1.945000 3.245000 ;
+      RECT 1.920000  0.425000 2.250000 0.540000 ;
+      RECT 2.150000  1.940000 2.480000 1.950000 ;
+      RECT 2.150000  2.120000 2.480000 2.820000 ;
+      RECT 2.365000  1.050000 3.555000 1.110000 ;
+      RECT 2.365000  1.110000 5.505000 1.280000 ;
+      RECT 2.365000  1.280000 2.775000 1.300000 ;
+      RECT 2.685000  2.315000 3.015000 3.245000 ;
+      RECT 2.875000  0.520000 3.125000 0.710000 ;
+      RECT 3.220000  2.120000 3.550000 2.905000 ;
+      RECT 3.220000  2.905000 4.550000 3.075000 ;
+      RECT 3.305000  0.520000 3.555000 1.050000 ;
+      RECT 3.720000  2.290000 5.610000 2.460000 ;
+      RECT 3.720000  2.460000 4.050000 2.735000 ;
+      RECT 3.735000  0.085000 4.065000 0.940000 ;
+      RECT 4.220000  2.630000 4.550000 2.905000 ;
+      RECT 4.235000  0.520000 4.565000 1.110000 ;
+      RECT 4.780000  2.630000 5.110000 3.245000 ;
+      RECT 4.825000  0.085000 5.155000 0.940000 ;
+      RECT 5.280000  2.460000 5.610000 2.980000 ;
+      RECT 5.335000  0.350000 5.505000 1.110000 ;
+      RECT 5.685000  0.085000 6.015000 1.130000 ;
+      RECT 5.815000  2.290000 6.145000 3.245000 ;
+      RECT 5.975000  1.350000 7.125000 1.680000 ;
+      RECT 5.975000  1.680000 6.145000 1.950000 ;
+      RECT 6.685000  0.085000 7.015000 0.815000 ;
+      RECT 6.765000  2.350000 7.095000 3.245000 ;
+      RECT 7.685000  0.085000 8.015000 0.815000 ;
+      RECT 7.715000  1.820000 8.045000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2111a_4
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef
index ff41489..2e00a7d 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.magic.lef
@@ -92,17 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.325000  0.085000 2.745000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -111,27 +100,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.380000 2.060000 0.710000 3.245000 ;
-        RECT 1.485000 2.060000 1.815000 3.245000 ;
-        RECT 2.890000 1.820000 3.220000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.825000 0.350000 2.155000 0.840000 ;
-      RECT 1.825000 0.840000 3.245000 1.010000 ;
-      RECT 2.915000 0.350000 3.245000 0.840000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.380000  2.060000 0.710000 3.245000 ;
+      RECT 1.485000  2.060000 1.815000 3.245000 ;
+      RECT 1.825000  0.350000 2.155000 0.840000 ;
+      RECT 1.825000  0.840000 3.245000 1.010000 ;
+      RECT 2.325000  0.085000 2.745000 0.600000 ;
+      RECT 2.890000  1.820000 3.220000 3.245000 ;
+      RECT 2.915000  0.350000 3.245000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2111ai_1
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef
index d1b59b9..dc85d14 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.magic.lef
@@ -98,23 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 3.890000  0.085000 4.220000 0.840000 ;
-        RECT 4.840000  0.085000 5.170000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -123,51 +106,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.155000 1.820000 0.405000 3.245000 ;
-        RECT 1.105000 2.140000 1.355000 3.245000 ;
-        RECT 2.085000 2.290000 2.255000 3.245000 ;
-        RECT 2.985000 2.290000 3.235000 3.245000 ;
-        RECT 4.815000 2.290000 5.145000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.180000 0.255000 1.290000 0.425000 ;
-      RECT 0.180000 0.425000 0.510000 1.010000 ;
-      RECT 1.120000 0.425000 1.290000 0.840000 ;
-      RECT 1.120000 0.840000 2.300000 1.010000 ;
-      RECT 1.120000 1.010000 1.290000 1.130000 ;
-      RECT 1.470000 0.255000 3.360000 0.425000 ;
-      RECT 1.470000 0.425000 1.800000 0.670000 ;
-      RECT 1.970000 0.595000 2.300000 0.840000 ;
-      RECT 1.970000 1.010000 2.300000 1.130000 ;
-      RECT 2.530000 0.595000 2.860000 1.010000 ;
-      RECT 2.530000 1.010000 5.600000 1.180000 ;
-      RECT 3.030000 0.425000 3.360000 0.840000 ;
-      RECT 3.465000 2.290000 3.715000 2.905000 ;
-      RECT 3.465000 2.905000 4.615000 3.075000 ;
-      RECT 3.540000 0.350000 3.710000 1.010000 ;
-      RECT 4.420000 0.350000 4.670000 1.010000 ;
-      RECT 4.445000 1.950000 5.645000 2.120000 ;
-      RECT 4.445000 2.120000 4.615000 2.905000 ;
-      RECT 5.315000 2.120000 5.645000 2.980000 ;
-      RECT 5.350000 0.350000 5.600000 1.010000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.155000  1.820000 0.405000 3.245000 ;
+      RECT 0.180000  0.255000 1.290000 0.425000 ;
+      RECT 0.180000  0.425000 0.510000 1.010000 ;
+      RECT 1.105000  2.140000 1.355000 3.245000 ;
+      RECT 1.120000  0.425000 1.290000 0.840000 ;
+      RECT 1.120000  0.840000 2.300000 1.010000 ;
+      RECT 1.120000  1.010000 1.290000 1.130000 ;
+      RECT 1.470000  0.255000 3.360000 0.425000 ;
+      RECT 1.470000  0.425000 1.800000 0.670000 ;
+      RECT 1.970000  0.595000 2.300000 0.840000 ;
+      RECT 1.970000  1.010000 2.300000 1.130000 ;
+      RECT 2.085000  2.290000 2.255000 3.245000 ;
+      RECT 2.530000  0.595000 2.860000 1.010000 ;
+      RECT 2.530000  1.010000 5.600000 1.180000 ;
+      RECT 2.985000  2.290000 3.235000 3.245000 ;
+      RECT 3.030000  0.425000 3.360000 0.840000 ;
+      RECT 3.465000  2.290000 3.715000 2.905000 ;
+      RECT 3.465000  2.905000 4.615000 3.075000 ;
+      RECT 3.540000  0.350000 3.710000 1.010000 ;
+      RECT 3.890000  0.085000 4.220000 0.840000 ;
+      RECT 4.420000  0.350000 4.670000 1.010000 ;
+      RECT 4.445000  1.950000 5.645000 2.120000 ;
+      RECT 4.445000  2.120000 4.615000 2.905000 ;
+      RECT 4.815000  2.290000 5.145000 3.245000 ;
+      RECT 4.840000  0.085000 5.170000 0.840000 ;
+      RECT 5.315000  2.120000 5.645000 2.980000 ;
+      RECT 5.350000  0.350000 5.600000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2111ai_2
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef
index 98381f2..8c5faa0 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.magic.lef
@@ -102,34 +102,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 6.475000  0.085000  6.805000 0.820000 ;
-        RECT 7.335000  0.085000  7.665000 0.820000 ;
-        RECT 8.265000  0.085000  8.595000 0.820000 ;
-        RECT 9.205000  0.085000  9.535000 0.820000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -138,62 +110,87 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 1.370000 2.290000  1.700000 3.245000 ;
-        RECT 2.370000 2.140000  3.020000 3.245000 ;
-        RECT 3.690000 2.290000  4.020000 3.245000 ;
-        RECT 6.335000 2.630000  6.585000 3.245000 ;
-        RECT 7.315000 2.630000  7.485000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 2.155000 0.600000 ;
-      RECT 0.115000 0.600000 0.445000 1.130000 ;
-      RECT 1.985000 0.600000 2.155000 0.815000 ;
-      RECT 1.985000 0.815000 3.955000 1.130000 ;
-      RECT 2.335000 0.350000 5.805000 0.645000 ;
-      RECT 4.185000 0.815000 4.515000 0.850000 ;
-      RECT 4.185000 0.850000 6.305000 1.010000 ;
-      RECT 4.185000 1.010000 9.965000 1.130000 ;
-      RECT 4.750000 2.290000 8.015000 2.460000 ;
-      RECT 4.750000 2.460000 6.165000 2.980000 ;
-      RECT 5.045000 1.130000 9.965000 1.180000 ;
-      RECT 5.475000 0.645000 5.805000 0.680000 ;
-      RECT 5.975000 0.350000 6.305000 0.850000 ;
-      RECT 6.785000 2.460000 7.115000 2.980000 ;
-      RECT 6.985000 0.350000 7.155000 1.010000 ;
-      RECT 7.685000 2.460000 8.015000 2.905000 ;
-      RECT 7.685000 2.905000 9.965000 3.075000 ;
-      RECT 7.845000 0.350000 8.095000 1.010000 ;
-      RECT 8.685000 2.290000 9.015000 2.905000 ;
-      RECT 8.775000 0.350000 9.025000 1.010000 ;
-      RECT 9.715000 0.350000 9.965000 1.010000 ;
-      RECT 9.715000 1.820000 9.965000 2.905000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  0.350000  2.155000 0.600000 ;
+      RECT 0.115000  0.600000  0.445000 1.130000 ;
+      RECT 1.370000  2.290000  1.700000 3.245000 ;
+      RECT 1.985000  0.600000  2.155000 0.815000 ;
+      RECT 1.985000  0.815000  3.955000 1.130000 ;
+      RECT 2.335000  0.350000  5.805000 0.645000 ;
+      RECT 2.370000  2.140000  3.020000 3.245000 ;
+      RECT 3.690000  2.290000  4.020000 3.245000 ;
+      RECT 4.185000  0.815000  4.515000 0.850000 ;
+      RECT 4.185000  0.850000  6.305000 1.010000 ;
+      RECT 4.185000  1.010000  9.965000 1.130000 ;
+      RECT 4.750000  2.290000  8.015000 2.460000 ;
+      RECT 4.750000  2.460000  6.165000 2.980000 ;
+      RECT 5.045000  1.130000  9.965000 1.180000 ;
+      RECT 5.475000  0.645000  5.805000 0.680000 ;
+      RECT 5.975000  0.350000  6.305000 0.850000 ;
+      RECT 6.335000  2.630000  6.585000 3.245000 ;
+      RECT 6.475000  0.085000  6.805000 0.820000 ;
+      RECT 6.785000  2.460000  7.115000 2.980000 ;
+      RECT 6.985000  0.350000  7.155000 1.010000 ;
+      RECT 7.315000  2.630000  7.485000 3.245000 ;
+      RECT 7.335000  0.085000  7.665000 0.820000 ;
+      RECT 7.685000  2.460000  8.015000 2.905000 ;
+      RECT 7.685000  2.905000  9.965000 3.075000 ;
+      RECT 7.845000  0.350000  8.095000 1.010000 ;
+      RECT 8.265000  0.085000  8.595000 0.820000 ;
+      RECT 8.685000  2.290000  9.015000 2.905000 ;
+      RECT 8.775000  0.350000  9.025000 1.010000 ;
+      RECT 9.205000  0.085000  9.535000 0.820000 ;
+      RECT 9.715000  0.350000  9.965000 1.010000 ;
+      RECT 9.715000  1.820000  9.965000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2111ai_4
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef
index d0c2ba1..0d3f398 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_1.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 1.130000 ;
-        RECT 1.765000  0.085000 2.155000 0.925000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -103,39 +89,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.615000 2.310000 1.855000 3.245000 ;
-        RECT 2.895000 2.310000 3.705000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.320000 1.095000 1.650000 ;
-      RECT 0.925000 1.650000 1.095000 1.970000 ;
-      RECT 0.925000 1.970000 4.205000 2.140000 ;
-      RECT 1.265000 0.660000 1.595000 1.130000 ;
-      RECT 1.265000 1.130000 2.495000 1.300000 ;
-      RECT 2.325000 0.810000 3.185000 0.980000 ;
-      RECT 2.325000 0.980000 2.495000 1.130000 ;
-      RECT 2.395000 1.940000 2.835000 1.970000 ;
-      RECT 2.395000 2.140000 2.725000 2.980000 ;
-      RECT 2.665000 1.150000 4.135000 1.320000 ;
-      RECT 2.665000 1.320000 2.835000 1.940000 ;
-      RECT 3.760000 0.835000 4.135000 1.150000 ;
-      RECT 3.875000 2.140000 4.205000 2.980000 ;
-      RECT 3.885000 0.660000 4.135000 0.835000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.425000  1.320000 1.095000 1.650000 ;
+      RECT 0.615000  0.085000 0.945000 1.130000 ;
+      RECT 0.615000  2.310000 1.855000 3.245000 ;
+      RECT 0.925000  1.650000 1.095000 1.970000 ;
+      RECT 0.925000  1.970000 4.205000 2.140000 ;
+      RECT 1.265000  0.660000 1.595000 1.130000 ;
+      RECT 1.265000  1.130000 2.495000 1.300000 ;
+      RECT 1.765000  0.085000 2.155000 0.925000 ;
+      RECT 2.325000  0.810000 3.185000 0.980000 ;
+      RECT 2.325000  0.980000 2.495000 1.130000 ;
+      RECT 2.395000  1.940000 2.835000 1.970000 ;
+      RECT 2.395000  2.140000 2.725000 2.980000 ;
+      RECT 2.665000  1.150000 4.135000 1.320000 ;
+      RECT 2.665000  1.320000 2.835000 1.940000 ;
+      RECT 2.895000  2.310000 3.705000 3.245000 ;
+      RECT 3.760000  0.835000 4.135000 1.150000 ;
+      RECT 3.875000  2.140000 4.205000 2.980000 ;
+      RECT 3.885000  0.660000 4.135000 0.835000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef
index 284a2de..9dd9bf8 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_2.magic.lef
@@ -82,20 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.525000  0.085000 1.775000 0.500000 ;
-        RECT 2.550000  0.085000 2.800000 0.840000 ;
-        RECT 3.410000  0.085000 3.740000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -104,37 +90,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.605000 2.290000 0.935000 3.245000 ;
-        RECT 2.025000 2.290000 2.725000 3.245000 ;
-        RECT 3.395000 1.820000 3.725000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.820000 0.435000 1.950000 ;
-      RECT 0.105000 1.950000 2.675000 2.120000 ;
-      RECT 0.105000 2.120000 0.435000 2.860000 ;
-      RECT 0.130000 0.350000 0.775000 1.010000 ;
-      RECT 0.605000 1.010000 2.675000 1.180000 ;
-      RECT 1.025000 0.350000 1.355000 0.670000 ;
-      RECT 1.025000 0.670000 2.350000 0.840000 ;
-      RECT 1.105000 2.120000 1.435000 2.860000 ;
-      RECT 2.020000 0.350000 2.350000 0.670000 ;
-      RECT 2.505000 1.180000 2.675000 1.300000 ;
-      RECT 2.505000 1.300000 2.835000 1.630000 ;
-      RECT 2.505000 1.630000 2.675000 1.950000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.105000  1.820000 0.435000 1.950000 ;
+      RECT 0.105000  1.950000 2.675000 2.120000 ;
+      RECT 0.105000  2.120000 0.435000 2.860000 ;
+      RECT 0.130000  0.350000 0.775000 1.010000 ;
+      RECT 0.605000  1.010000 2.675000 1.180000 ;
+      RECT 0.605000  2.290000 0.935000 3.245000 ;
+      RECT 1.025000  0.350000 1.355000 0.670000 ;
+      RECT 1.025000  0.670000 2.350000 0.840000 ;
+      RECT 1.105000  2.120000 1.435000 2.860000 ;
+      RECT 1.525000  0.085000 1.775000 0.500000 ;
+      RECT 2.020000  0.350000 2.350000 0.670000 ;
+      RECT 2.025000  2.290000 2.725000 3.245000 ;
+      RECT 2.505000  1.180000 2.675000 1.300000 ;
+      RECT 2.505000  1.300000 2.835000 1.630000 ;
+      RECT 2.505000  1.630000 2.675000 1.950000 ;
+      RECT 2.550000  0.085000 2.800000 0.840000 ;
+      RECT 3.395000  1.820000 3.725000 3.245000 ;
+      RECT 3.410000  0.085000 3.740000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef
index 3c43809..4666ea7 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_4.magic.lef
@@ -85,28 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.150000  0.085000 0.400000 0.790000 ;
-        RECT 1.010000  0.085000 1.340000 0.790000 ;
-        RECT 1.940000  0.085000 2.270000 1.130000 ;
-        RECT 4.830000  0.085000 5.175000 0.935000 ;
-        RECT 5.775000  0.085000 6.105000 0.940000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -115,56 +93,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.115000 2.140000 0.445000 3.245000 ;
-        RECT 1.115000 2.140000 1.445000 3.245000 ;
-        RECT 2.115000 2.290000 2.445000 3.245000 ;
-        RECT 3.275000 2.290000 3.605000 3.245000 ;
-        RECT 4.325000 2.290000 4.655000 3.245000 ;
-        RECT 6.275000 1.950000 6.605000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 1.300000 2.285000 1.630000 ;
-      RECT 2.115000 1.630000 2.285000 1.950000 ;
-      RECT 2.115000 1.950000 5.655000 2.120000 ;
-      RECT 2.530000 0.255000 4.650000 0.425000 ;
-      RECT 2.530000 0.425000 2.780000 1.265000 ;
-      RECT 2.775000 2.120000 3.105000 2.815000 ;
-      RECT 3.040000 0.595000 4.220000 0.765000 ;
-      RECT 3.040000 0.765000 3.210000 1.285000 ;
-      RECT 3.390000 0.935000 3.720000 1.110000 ;
-      RECT 3.390000 1.110000 4.120000 1.280000 ;
-      RECT 3.790000 2.120000 4.120000 2.815000 ;
-      RECT 3.890000 0.765000 4.220000 0.940000 ;
-      RECT 3.950000 1.280000 4.120000 1.950000 ;
-      RECT 4.400000 0.425000 4.650000 1.110000 ;
-      RECT 4.400000 1.110000 6.605000 1.280000 ;
-      RECT 4.400000 1.280000 4.650000 1.285000 ;
-      RECT 4.825000 2.290000 5.155000 2.905000 ;
-      RECT 4.825000 2.905000 6.105000 3.075000 ;
-      RECT 5.325000 2.120000 5.655000 2.735000 ;
-      RECT 5.345000 0.605000 5.595000 1.110000 ;
-      RECT 5.855000 1.950000 6.105000 2.905000 ;
-      RECT 6.275000 0.605000 6.605000 1.110000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  2.140000 0.445000 3.245000 ;
+      RECT 0.150000  0.085000 0.400000 0.790000 ;
+      RECT 0.615000  1.300000 2.285000 1.630000 ;
+      RECT 1.010000  0.085000 1.340000 0.790000 ;
+      RECT 1.115000  2.140000 1.445000 3.245000 ;
+      RECT 1.940000  0.085000 2.270000 1.130000 ;
+      RECT 2.115000  1.630000 2.285000 1.950000 ;
+      RECT 2.115000  1.950000 5.655000 2.120000 ;
+      RECT 2.115000  2.290000 2.445000 3.245000 ;
+      RECT 2.530000  0.255000 4.650000 0.425000 ;
+      RECT 2.530000  0.425000 2.780000 1.265000 ;
+      RECT 2.775000  2.120000 3.105000 2.815000 ;
+      RECT 3.040000  0.595000 4.220000 0.765000 ;
+      RECT 3.040000  0.765000 3.210000 1.285000 ;
+      RECT 3.275000  2.290000 3.605000 3.245000 ;
+      RECT 3.390000  0.935000 3.720000 1.110000 ;
+      RECT 3.390000  1.110000 4.120000 1.280000 ;
+      RECT 3.790000  2.120000 4.120000 2.815000 ;
+      RECT 3.890000  0.765000 4.220000 0.940000 ;
+      RECT 3.950000  1.280000 4.120000 1.950000 ;
+      RECT 4.325000  2.290000 4.655000 3.245000 ;
+      RECT 4.400000  0.425000 4.650000 1.110000 ;
+      RECT 4.400000  1.110000 6.605000 1.280000 ;
+      RECT 4.400000  1.280000 4.650000 1.285000 ;
+      RECT 4.825000  2.290000 5.155000 2.905000 ;
+      RECT 4.825000  2.905000 6.105000 3.075000 ;
+      RECT 4.830000  0.085000 5.175000 0.935000 ;
+      RECT 5.325000  2.120000 5.655000 2.735000 ;
+      RECT 5.345000  0.605000 5.595000 1.110000 ;
+      RECT 5.775000  0.085000 6.105000 0.940000 ;
+      RECT 5.855000  1.950000 6.105000 2.905000 ;
+      RECT 6.275000  0.605000 6.605000 1.110000 ;
+      RECT 6.275000  1.950000 6.605000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__o211a_4
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef
index 076ec3c..5ed92fb 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.magic.lef
@@ -86,16 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.635000  0.085000 0.965000 0.780000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -104,25 +94,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.115000 1.950000 0.365000 3.245000 ;
-        RECT 1.705000 2.140000 2.035000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.350000 0.465000 0.960000 ;
-      RECT 0.135000 0.960000 1.395000 1.130000 ;
-      RECT 1.145000 0.350000 1.395000 0.960000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.115000  1.950000 0.365000 3.245000 ;
+      RECT 0.135000  0.350000 0.465000 0.960000 ;
+      RECT 0.135000  0.960000 1.395000 1.130000 ;
+      RECT 0.635000  0.085000 0.965000 0.780000 ;
+      RECT 1.145000  0.350000 1.395000 0.960000 ;
+      RECT 1.705000  2.140000 2.035000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef
index 452f56b..2ff395a 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.magic.lef
@@ -86,22 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 2.560000  0.085000 2.890000 0.795000 ;
-        RECT 3.420000  0.085000 3.750000 0.795000 ;
-        RECT 4.330000  0.085000 4.685000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -110,42 +94,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.145000 1.950000 0.395000 3.245000 ;
-        RECT 1.125000 2.290000 1.295000 3.245000 ;
-        RECT 2.025000 2.290000 2.275000 3.245000 ;
-        RECT 3.855000 2.160000 4.185000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.130000 0.255000 2.330000 0.425000 ;
-      RECT 0.130000 0.425000 0.380000 1.180000 ;
-      RECT 1.060000 0.425000 2.330000 0.730000 ;
-      RECT 1.060000 0.730000 1.390000 1.180000 ;
-      RECT 1.560000 0.900000 1.890000 0.980000 ;
-      RECT 1.560000 0.980000 4.160000 1.150000 ;
-      RECT 1.560000 1.150000 1.890000 1.180000 ;
-      RECT 2.505000 2.290000 2.755000 2.905000 ;
-      RECT 2.505000 2.905000 3.655000 3.075000 ;
-      RECT 3.070000 0.350000 3.240000 0.980000 ;
-      RECT 3.485000 1.820000 4.685000 1.990000 ;
-      RECT 3.485000 1.990000 3.655000 2.905000 ;
-      RECT 3.935000 0.350000 4.160000 0.980000 ;
-      RECT 4.355000 1.990000 4.685000 2.980000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.130000  0.255000 2.330000 0.425000 ;
+      RECT 0.130000  0.425000 0.380000 1.180000 ;
+      RECT 0.145000  1.950000 0.395000 3.245000 ;
+      RECT 1.060000  0.425000 2.330000 0.730000 ;
+      RECT 1.060000  0.730000 1.390000 1.180000 ;
+      RECT 1.125000  2.290000 1.295000 3.245000 ;
+      RECT 1.560000  0.900000 1.890000 0.980000 ;
+      RECT 1.560000  0.980000 4.160000 1.150000 ;
+      RECT 1.560000  1.150000 1.890000 1.180000 ;
+      RECT 2.025000  2.290000 2.275000 3.245000 ;
+      RECT 2.505000  2.290000 2.755000 2.905000 ;
+      RECT 2.505000  2.905000 3.655000 3.075000 ;
+      RECT 2.560000  0.085000 2.890000 0.795000 ;
+      RECT 3.070000  0.350000 3.240000 0.980000 ;
+      RECT 3.420000  0.085000 3.750000 0.795000 ;
+      RECT 3.485000  1.820000 4.685000 1.990000 ;
+      RECT 3.485000  1.990000 3.655000 2.905000 ;
+      RECT 3.855000  2.160000 4.185000 3.245000 ;
+      RECT 3.935000  0.350000 4.160000 0.980000 ;
+      RECT 4.330000  0.085000 4.685000 1.010000 ;
+      RECT 4.355000  1.990000 4.685000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef
index 65c687c..a45ebd6 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.magic.lef
@@ -89,30 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.840000 ;
-        RECT 1.545000  0.085000 1.875000 0.840000 ;
-        RECT 2.405000  0.085000 2.735000 0.840000 ;
-        RECT 3.265000  0.085000 3.595000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -121,57 +97,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.660000 2.290000 0.830000 3.245000 ;
-        RECT 1.560000 2.290000 1.730000 3.245000 ;
-        RECT 4.440000 2.290000 4.770000 3.245000 ;
-        RECT 5.440000 2.290000 5.770000 3.245000 ;
-        RECT 6.440000 2.290000 7.290000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 5.765000 1.180000 ;
-      RECT 0.130000 1.950000 2.260000 2.120000 ;
-      RECT 0.130000 2.120000 0.460000 2.980000 ;
-      RECT 1.030000 2.120000 1.360000 2.980000 ;
-      RECT 1.125000 0.350000 1.375000 1.010000 ;
-      RECT 1.930000 2.120000 2.260000 2.905000 ;
-      RECT 1.930000 2.905000 4.210000 3.075000 ;
-      RECT 2.055000 0.350000 2.225000 1.010000 ;
-      RECT 2.915000 0.350000 3.085000 1.010000 ;
-      RECT 2.960000 2.290000 3.210000 2.905000 ;
-      RECT 3.795000 0.350000 3.965000 0.820000 ;
-      RECT 3.795000 0.820000 4.905000 1.010000 ;
-      RECT 3.880000 2.290000 4.210000 2.905000 ;
-      RECT 4.145000 0.255000 8.045000 0.425000 ;
-      RECT 4.145000 0.425000 5.255000 0.650000 ;
-      RECT 5.085000 0.650000 5.255000 0.840000 ;
-      RECT 5.435000 0.595000 5.765000 1.010000 ;
-      RECT 5.995000 0.425000 6.325000 1.180000 ;
-      RECT 6.855000 0.425000 7.185000 0.840000 ;
-      RECT 7.715000 0.425000 8.045000 1.180000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 5.765000 1.180000 ;
+      RECT 0.130000  1.950000 2.260000 2.120000 ;
+      RECT 0.130000  2.120000 0.460000 2.980000 ;
+      RECT 0.615000  0.085000 0.945000 0.840000 ;
+      RECT 0.660000  2.290000 0.830000 3.245000 ;
+      RECT 1.030000  2.120000 1.360000 2.980000 ;
+      RECT 1.125000  0.350000 1.375000 1.010000 ;
+      RECT 1.545000  0.085000 1.875000 0.840000 ;
+      RECT 1.560000  2.290000 1.730000 3.245000 ;
+      RECT 1.930000  2.120000 2.260000 2.905000 ;
+      RECT 1.930000  2.905000 4.210000 3.075000 ;
+      RECT 2.055000  0.350000 2.225000 1.010000 ;
+      RECT 2.405000  0.085000 2.735000 0.840000 ;
+      RECT 2.915000  0.350000 3.085000 1.010000 ;
+      RECT 2.960000  2.290000 3.210000 2.905000 ;
+      RECT 3.265000  0.085000 3.595000 0.840000 ;
+      RECT 3.795000  0.350000 3.965000 0.820000 ;
+      RECT 3.795000  0.820000 4.905000 1.010000 ;
+      RECT 3.880000  2.290000 4.210000 2.905000 ;
+      RECT 4.145000  0.255000 8.045000 0.425000 ;
+      RECT 4.145000  0.425000 5.255000 0.650000 ;
+      RECT 4.440000  2.290000 4.770000 3.245000 ;
+      RECT 5.085000  0.650000 5.255000 0.840000 ;
+      RECT 5.435000  0.595000 5.765000 1.010000 ;
+      RECT 5.440000  2.290000 5.770000 3.245000 ;
+      RECT 5.995000  0.425000 6.325000 1.180000 ;
+      RECT 6.440000  2.290000 7.290000 3.245000 ;
+      RECT 6.855000  0.425000 7.185000 0.840000 ;
+      RECT 7.715000  0.425000 8.045000 1.180000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__o211ai_4
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef
index 14df406..f1fa5a2 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_1.magic.lef
@@ -71,17 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.935000 ;
-        RECT 2.005000  0.085000 2.335000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -90,31 +79,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.615000 2.290000 1.180000 3.245000 ;
-        RECT 2.435000 1.950000 2.765000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 1.105000 1.395000 1.275000 ;
-      RECT 0.535000 1.275000 0.865000 1.550000 ;
-      RECT 0.695000 1.550000 0.865000 1.950000 ;
-      RECT 0.695000 1.950000 1.690000 2.120000 ;
-      RECT 1.145000 0.350000 1.395000 1.105000 ;
-      RECT 1.360000 2.120000 1.690000 2.795000 ;
-      RECT 1.575000 0.350000 1.825000 0.960000 ;
-      RECT 1.575000 0.960000 2.765000 1.130000 ;
-      RECT 2.515000 0.350000 2.765000 0.960000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.535000  1.105000 1.395000 1.275000 ;
+      RECT 0.535000  1.275000 0.865000 1.550000 ;
+      RECT 0.545000  0.085000 0.875000 0.935000 ;
+      RECT 0.615000  2.290000 1.180000 3.245000 ;
+      RECT 0.695000  1.550000 0.865000 1.950000 ;
+      RECT 0.695000  1.950000 1.690000 2.120000 ;
+      RECT 1.145000  0.350000 1.395000 1.105000 ;
+      RECT 1.360000  2.120000 1.690000 2.795000 ;
+      RECT 1.575000  0.350000 1.825000 0.960000 ;
+      RECT 1.575000  0.960000 2.765000 1.130000 ;
+      RECT 2.005000  0.085000 2.335000 0.790000 ;
+      RECT 2.435000  1.950000 2.765000 3.245000 ;
+      RECT 2.515000  0.350000 2.765000 0.960000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef
index 44bdc2b..0861bad 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_2.magic.lef
@@ -72,20 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.750000  0.085000 1.235000 0.600000 ;
-        RECT 2.465000  0.085000 2.795000 1.050000 ;
-        RECT 3.475000  0.085000 3.725000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -94,34 +80,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.335000 1.820000 0.665000 3.245000 ;
-        RECT 1.965000 2.060000 2.295000 3.245000 ;
-        RECT 2.965000 2.060000 3.295000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.250000 0.340000 0.580000 0.840000 ;
-      RECT 0.250000 0.840000 1.735000 1.010000 ;
-      RECT 1.325000 1.720000 2.295000 1.890000 ;
-      RECT 1.325000 1.890000 1.655000 2.860000 ;
-      RECT 1.405000 0.340000 1.735000 0.840000 ;
-      RECT 1.905000 0.340000 2.295000 1.010000 ;
-      RECT 2.125000 1.010000 2.295000 1.220000 ;
-      RECT 2.125000 1.220000 2.645000 1.550000 ;
-      RECT 2.125000 1.550000 2.295000 1.720000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.250000  0.340000 0.580000 0.840000 ;
+      RECT 0.250000  0.840000 1.735000 1.010000 ;
+      RECT 0.335000  1.820000 0.665000 3.245000 ;
+      RECT 0.750000  0.085000 1.235000 0.600000 ;
+      RECT 1.325000  1.720000 2.295000 1.890000 ;
+      RECT 1.325000  1.890000 1.655000 2.860000 ;
+      RECT 1.405000  0.340000 1.735000 0.840000 ;
+      RECT 1.905000  0.340000 2.295000 1.010000 ;
+      RECT 1.965000  2.060000 2.295000 3.245000 ;
+      RECT 2.125000  1.010000 2.295000 1.220000 ;
+      RECT 2.125000  1.220000 2.645000 1.550000 ;
+      RECT 2.125000  1.550000 2.295000 1.720000 ;
+      RECT 2.465000  0.085000 2.795000 1.050000 ;
+      RECT 2.965000  2.060000 3.295000 3.245000 ;
+      RECT 3.475000  0.085000 3.725000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef
index 66761d4..8c1284a 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_4.magic.lef
@@ -78,26 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.615000  0.085000 0.950000 0.935000 ;
-        RECT 1.560000  0.085000 1.890000 0.935000 ;
-        RECT 3.560000  0.085000 3.810000 1.005000 ;
-        RECT 4.420000  0.085000 4.785000 0.665000 ;
-        RECT 5.315000  0.085000 5.645000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -106,48 +86,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.115000 1.915000 0.445000 3.245000 ;
-        RECT 2.065000 2.290000 2.395000 3.245000 ;
-        RECT 3.135000 2.300000 3.615000 3.245000 ;
-        RECT 4.315000 2.060000 4.645000 3.245000 ;
-        RECT 5.315000 1.950000 5.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.605000 0.445000 1.105000 ;
-      RECT 0.115000 1.105000 2.390000 1.275000 ;
-      RECT 0.115000 1.275000 0.445000 1.285000 ;
-      RECT 0.615000 1.950000 0.865000 2.905000 ;
-      RECT 0.615000 2.905000 1.895000 3.075000 ;
-      RECT 1.065000 1.950000 3.575000 2.120000 ;
-      RECT 1.065000 2.120000 1.395000 2.735000 ;
-      RECT 1.130000 0.605000 1.380000 1.105000 ;
-      RECT 1.565000 2.290000 1.895000 2.905000 ;
-      RECT 2.060000 0.265000 3.330000 0.435000 ;
-      RECT 2.060000 0.435000 2.390000 1.105000 ;
-      RECT 2.565000 2.120000 2.895000 2.795000 ;
-      RECT 2.570000 0.605000 2.820000 1.175000 ;
-      RECT 2.570000 1.175000 4.795000 1.345000 ;
-      RECT 3.000000 0.435000 3.330000 1.005000 ;
-      RECT 3.405000 1.345000 4.795000 1.550000 ;
-      RECT 3.405000 1.550000 3.575000 1.950000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.605000 0.445000 1.105000 ;
+      RECT 0.115000  1.105000 2.390000 1.275000 ;
+      RECT 0.115000  1.275000 0.445000 1.285000 ;
+      RECT 0.115000  1.915000 0.445000 3.245000 ;
+      RECT 0.615000  0.085000 0.950000 0.935000 ;
+      RECT 0.615000  1.950000 0.865000 2.905000 ;
+      RECT 0.615000  2.905000 1.895000 3.075000 ;
+      RECT 1.065000  1.950000 3.575000 2.120000 ;
+      RECT 1.065000  2.120000 1.395000 2.735000 ;
+      RECT 1.130000  0.605000 1.380000 1.105000 ;
+      RECT 1.560000  0.085000 1.890000 0.935000 ;
+      RECT 1.565000  2.290000 1.895000 2.905000 ;
+      RECT 2.060000  0.265000 3.330000 0.435000 ;
+      RECT 2.060000  0.435000 2.390000 1.105000 ;
+      RECT 2.065000  2.290000 2.395000 3.245000 ;
+      RECT 2.565000  2.120000 2.895000 2.795000 ;
+      RECT 2.570000  0.605000 2.820000 1.175000 ;
+      RECT 2.570000  1.175000 4.795000 1.345000 ;
+      RECT 3.000000  0.435000 3.330000 1.005000 ;
+      RECT 3.135000  2.300000 3.615000 3.245000 ;
+      RECT 3.405000  1.345000 4.795000 1.550000 ;
+      RECT 3.405000  1.550000 3.575000 1.950000 ;
+      RECT 3.560000  0.085000 3.810000 1.005000 ;
+      RECT 4.315000  2.060000 4.645000 3.245000 ;
+      RECT 4.420000  0.085000 4.785000 0.665000 ;
+      RECT 5.315000  0.085000 5.645000 1.130000 ;
+      RECT 5.315000  1.950000 5.645000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21a_4
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef
index adaeb39..3c16344 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.magic.lef
@@ -73,15 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.605000  0.085000 1.295000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -90,25 +81,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.305000 1.820000 0.555000 3.245000 ;
-        RECT 1.870000 1.950000 2.200000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.420000 0.670000 ;
-      RECT 0.115000 0.670000 1.785000 0.840000 ;
-      RECT 0.115000 0.840000 0.445000 1.010000 ;
-      RECT 1.480000 0.350000 1.785000 0.670000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.115000  0.350000 0.420000 0.670000 ;
+      RECT 0.115000  0.670000 1.785000 0.840000 ;
+      RECT 0.115000  0.840000 0.445000 1.010000 ;
+      RECT 0.305000  1.820000 0.555000 3.245000 ;
+      RECT 0.605000  0.085000 1.295000 0.500000 ;
+      RECT 1.480000  0.350000 1.785000 0.670000 ;
+      RECT 1.870000  1.950000 2.200000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef
index f6e7435..7bd45b5 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.magic.lef
@@ -77,18 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.830000 ;
-        RECT 1.545000  0.085000 1.875000 0.830000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -97,33 +85,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 2.290000 0.365000 3.245000 ;
-        RECT 2.095000 2.630000 2.345000 3.245000 ;
-        RECT 2.995000 1.820000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 2.305000 1.180000 ;
-      RECT 0.565000 2.290000 0.895000 2.905000 ;
-      RECT 0.565000 2.905000 1.895000 3.075000 ;
-      RECT 1.125000 0.350000 1.375000 1.010000 ;
-      RECT 1.565000 2.630000 1.895000 2.905000 ;
-      RECT 2.055000 0.350000 3.245000 0.520000 ;
-      RECT 2.055000 0.520000 2.305000 1.010000 ;
-      RECT 2.915000 0.520000 3.245000 1.010000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 2.305000 1.180000 ;
+      RECT 0.115000  2.290000 0.365000 3.245000 ;
+      RECT 0.565000  2.290000 0.895000 2.905000 ;
+      RECT 0.565000  2.905000 1.895000 3.075000 ;
+      RECT 0.615000  0.085000 0.945000 0.830000 ;
+      RECT 1.125000  0.350000 1.375000 1.010000 ;
+      RECT 1.545000  0.085000 1.875000 0.830000 ;
+      RECT 1.565000  2.630000 1.895000 2.905000 ;
+      RECT 2.055000  0.350000 3.245000 0.520000 ;
+      RECT 2.055000  0.520000 2.305000 1.010000 ;
+      RECT 2.095000  2.630000 2.345000 3.245000 ;
+      RECT 2.915000  0.520000 3.245000 1.010000 ;
+      RECT 2.995000  1.820000 3.245000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef
index a824da6..5f54196 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.magic.lef
@@ -79,25 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.810000 ;
-        RECT 1.405000  0.085000 1.735000 0.670000 ;
-        RECT 4.025000  0.085000 4.355000 0.840000 ;
-        RECT 4.885000  0.085000 5.215000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -106,52 +87,68 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.095000 2.290000 1.265000 3.245000 ;
-        RECT 1.995000 2.630000 2.245000 3.245000 ;
-        RECT 2.900000 2.630000 3.230000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.980000 ;
-      RECT 0.115000 0.980000 2.100000 1.010000 ;
-      RECT 0.115000 1.010000 1.225000 1.150000 ;
-      RECT 0.565000 1.820000 0.895000 1.950000 ;
-      RECT 0.565000 1.950000 1.795000 2.120000 ;
-      RECT 0.565000 2.120000 0.895000 2.980000 ;
-      RECT 1.055000 0.350000 1.225000 0.840000 ;
-      RECT 1.055000 0.840000 2.100000 0.980000 ;
-      RECT 1.465000 2.120000 1.795000 2.290000 ;
-      RECT 1.465000 2.290000 3.790000 2.460000 ;
-      RECT 1.465000 2.460000 1.795000 2.980000 ;
-      RECT 1.930000 0.255000 3.845000 0.425000 ;
-      RECT 1.930000 0.425000 2.100000 0.840000 ;
-      RECT 2.710000 0.425000 3.040000 0.670000 ;
-      RECT 3.460000 2.460000 3.790000 2.905000 ;
-      RECT 3.460000 2.905000 5.640000 3.075000 ;
-      RECT 3.675000 0.425000 3.845000 1.010000 ;
-      RECT 3.675000 1.010000 5.645000 1.180000 ;
-      RECT 4.490000 2.290000 4.660000 2.905000 ;
-      RECT 4.535000 0.350000 4.705000 1.010000 ;
-      RECT 5.390000 1.950000 5.640000 2.905000 ;
-      RECT 5.395000 0.350000 5.645000 1.010000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.980000 ;
+      RECT 0.115000  0.980000 2.100000 1.010000 ;
+      RECT 0.115000  1.010000 1.225000 1.150000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.545000  0.085000 0.875000 0.810000 ;
+      RECT 0.565000  1.820000 0.895000 1.950000 ;
+      RECT 0.565000  1.950000 1.795000 2.120000 ;
+      RECT 0.565000  2.120000 0.895000 2.980000 ;
+      RECT 1.055000  0.350000 1.225000 0.840000 ;
+      RECT 1.055000  0.840000 2.100000 0.980000 ;
+      RECT 1.095000  2.290000 1.265000 3.245000 ;
+      RECT 1.405000  0.085000 1.735000 0.670000 ;
+      RECT 1.465000  2.120000 1.795000 2.290000 ;
+      RECT 1.465000  2.290000 3.790000 2.460000 ;
+      RECT 1.465000  2.460000 1.795000 2.980000 ;
+      RECT 1.930000  0.255000 3.845000 0.425000 ;
+      RECT 1.930000  0.425000 2.100000 0.840000 ;
+      RECT 1.995000  2.630000 2.245000 3.245000 ;
+      RECT 2.710000  0.425000 3.040000 0.670000 ;
+      RECT 2.900000  2.630000 3.230000 3.245000 ;
+      RECT 3.460000  2.460000 3.790000 2.905000 ;
+      RECT 3.460000  2.905000 5.640000 3.075000 ;
+      RECT 3.675000  0.425000 3.845000 1.010000 ;
+      RECT 3.675000  1.010000 5.645000 1.180000 ;
+      RECT 4.025000  0.085000 4.355000 0.840000 ;
+      RECT 4.490000  2.290000 4.660000 2.905000 ;
+      RECT 4.535000  0.350000 4.705000 1.010000 ;
+      RECT 4.885000  0.085000 5.215000 0.840000 ;
+      RECT 5.390000  1.950000 5.640000 2.905000 ;
+      RECT 5.395000  0.350000 5.645000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21ai_4
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef
index 781f0d3..7e8f9bc 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.620000 ;
-        RECT 2.890000  0.085000 3.220000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -93,39 +80,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.115000 1.970000 0.445000 3.245000 ;
-        RECT 1.555000 2.660000 1.885000 3.245000 ;
-        RECT 2.895000 2.660000 3.225000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.790000 ;
-      RECT 0.115000 0.790000 1.445000 0.960000 ;
-      RECT 1.055000 1.970000 1.785000 2.320000 ;
-      RECT 1.055000 2.320000 3.225000 2.490000 ;
-      RECT 1.055000 2.490000 1.385000 2.980000 ;
-      RECT 1.115000 0.350000 1.445000 0.790000 ;
-      RECT 1.615000 0.350000 1.945000 1.030000 ;
-      RECT 1.615000 1.030000 1.785000 1.970000 ;
-      RECT 1.975000 1.220000 2.305000 1.820000 ;
-      RECT 1.975000 1.820000 2.690000 2.150000 ;
-      RECT 2.135000 0.680000 2.720000 1.010000 ;
-      RECT 2.135000 1.010000 2.305000 1.220000 ;
-      RECT 3.055000 1.320000 3.415000 1.650000 ;
-      RECT 3.055000 1.650000 3.225000 2.320000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 0.790000 ;
+      RECT 0.115000  0.790000 1.445000 0.960000 ;
+      RECT 0.115000  1.970000 0.445000 3.245000 ;
+      RECT 0.615000  0.085000 0.945000 0.620000 ;
+      RECT 1.055000  1.970000 1.785000 2.320000 ;
+      RECT 1.055000  2.320000 3.225000 2.490000 ;
+      RECT 1.055000  2.490000 1.385000 2.980000 ;
+      RECT 1.115000  0.350000 1.445000 0.790000 ;
+      RECT 1.555000  2.660000 1.885000 3.245000 ;
+      RECT 1.615000  0.350000 1.945000 1.030000 ;
+      RECT 1.615000  1.030000 1.785000 1.970000 ;
+      RECT 1.975000  1.220000 2.305000 1.820000 ;
+      RECT 1.975000  1.820000 2.690000 2.150000 ;
+      RECT 2.135000  0.680000 2.720000 1.010000 ;
+      RECT 2.135000  1.010000 2.305000 1.220000 ;
+      RECT 2.890000  0.085000 3.220000 1.010000 ;
+      RECT 2.895000  2.660000 3.225000 3.245000 ;
+      RECT 3.055000  1.320000 3.415000 1.650000 ;
+      RECT 3.055000  1.650000 3.225000 2.320000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef
index d7750ce..dbbf0db 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.magic.lef
@@ -72,20 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.535000  0.085000 0.785000 0.790000 ;
-        RECT 1.520000  0.085000 1.770000 0.820000 ;
-        RECT 2.910000  0.085000 3.240000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -94,43 +80,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.650000 2.580000 0.980000 3.245000 ;
-        RECT 1.565000 2.580000 2.235000 3.245000 ;
-        RECT 3.405000 1.820000 3.735000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.455000 0.355000 0.960000 ;
-      RECT 0.105000 0.960000 0.795000 1.130000 ;
-      RECT 0.115000 1.950000 0.795000 2.240000 ;
-      RECT 0.115000 2.240000 2.210000 2.410000 ;
-      RECT 0.115000 2.410000 0.445000 2.700000 ;
-      RECT 0.625000 1.130000 0.795000 1.950000 ;
-      RECT 1.350000 1.300000 1.680000 1.630000 ;
-      RECT 1.510000 1.010000 2.550000 1.180000 ;
-      RECT 1.510000 1.180000 1.680000 1.300000 ;
-      RECT 1.890000 1.350000 2.210000 2.240000 ;
-      RECT 1.980000 0.350000 2.230000 1.010000 ;
-      RECT 2.380000 1.180000 2.550000 1.820000 ;
-      RECT 2.380000 1.820000 2.775000 2.410000 ;
-      RECT 2.410000 0.350000 2.740000 0.670000 ;
-      RECT 2.410000 0.670000 3.740000 0.840000 ;
-      RECT 2.445000 2.410000 2.775000 2.860000 ;
-      RECT 3.410000 0.350000 3.740000 0.670000 ;
-      RECT 3.410000 0.840000 3.740000 1.010000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.105000  0.455000 0.355000 0.960000 ;
+      RECT 0.105000  0.960000 0.795000 1.130000 ;
+      RECT 0.115000  1.950000 0.795000 2.240000 ;
+      RECT 0.115000  2.240000 2.210000 2.410000 ;
+      RECT 0.115000  2.410000 0.445000 2.700000 ;
+      RECT 0.535000  0.085000 0.785000 0.790000 ;
+      RECT 0.625000  1.130000 0.795000 1.950000 ;
+      RECT 0.650000  2.580000 0.980000 3.245000 ;
+      RECT 1.350000  1.300000 1.680000 1.630000 ;
+      RECT 1.510000  1.010000 2.550000 1.180000 ;
+      RECT 1.510000  1.180000 1.680000 1.300000 ;
+      RECT 1.520000  0.085000 1.770000 0.820000 ;
+      RECT 1.565000  2.580000 2.235000 3.245000 ;
+      RECT 1.890000  1.350000 2.210000 2.240000 ;
+      RECT 1.980000  0.350000 2.230000 1.010000 ;
+      RECT 2.380000  1.180000 2.550000 1.820000 ;
+      RECT 2.380000  1.820000 2.775000 2.410000 ;
+      RECT 2.410000  0.350000 2.740000 0.670000 ;
+      RECT 2.410000  0.670000 3.740000 0.840000 ;
+      RECT 2.445000  2.410000 2.775000 2.860000 ;
+      RECT 2.910000  0.085000 3.240000 0.500000 ;
+      RECT 3.405000  1.820000 3.735000 3.245000 ;
+      RECT 3.410000  0.350000 3.740000 0.670000 ;
+      RECT 3.410000  0.840000 3.740000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef
index add3a89..a44253c 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.magic.lef
@@ -75,27 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.645000  0.085000 0.975000 1.010000 ;
-        RECT 1.530000  0.085000 1.780000 0.780000 ;
-        RECT 2.390000  0.085000 2.640000 1.120000 ;
-        RECT 4.500000  0.085000 4.750000 0.940000 ;
-        RECT 5.360000  0.085000 5.610000 0.940000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -104,59 +83,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.615000 2.730000 0.995000 3.245000 ;
-        RECT 1.565000 2.730000 1.895000 3.245000 ;
-        RECT 2.465000 2.730000 3.205000 3.245000 ;
-        RECT 3.945000 2.470000 4.275000 3.245000 ;
-        RECT 5.875000 1.950000 6.125000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.350000 0.475000 1.010000 ;
-      RECT 0.085000 1.010000 0.255000 1.820000 ;
-      RECT 0.085000 1.820000 0.445000 2.390000 ;
-      RECT 0.085000 2.390000 3.320000 2.560000 ;
-      RECT 0.085000 2.560000 0.445000 2.980000 ;
-      RECT 1.485000 1.290000 3.830000 1.460000 ;
-      RECT 1.485000 1.460000 2.980000 1.620000 ;
-      RECT 2.810000 0.255000 3.830000 0.425000 ;
-      RECT 2.810000 0.425000 2.980000 1.290000 ;
-      RECT 3.150000 0.595000 3.320000 0.950000 ;
-      RECT 3.150000 0.950000 4.330000 1.110000 ;
-      RECT 3.150000 1.110000 6.125000 1.120000 ;
-      RECT 3.150000 1.630000 3.490000 1.960000 ;
-      RECT 3.150000 1.960000 3.320000 2.390000 ;
-      RECT 3.490000 2.130000 5.145000 2.300000 ;
-      RECT 3.490000 2.300000 3.740000 2.980000 ;
-      RECT 3.500000 0.425000 3.830000 0.780000 ;
-      RECT 3.660000 1.460000 3.830000 1.950000 ;
-      RECT 3.660000 1.950000 5.145000 2.130000 ;
-      RECT 4.000000 0.605000 4.330000 0.950000 ;
-      RECT 4.000000 1.120000 6.125000 1.280000 ;
-      RECT 4.445000 2.470000 4.775000 2.905000 ;
-      RECT 4.445000 2.905000 5.675000 3.075000 ;
-      RECT 4.930000 0.605000 5.180000 1.110000 ;
-      RECT 4.975000 2.300000 5.145000 2.735000 ;
-      RECT 5.345000 1.950000 5.675000 2.905000 ;
-      RECT 5.790000 0.605000 6.125000 1.110000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.085000  0.350000 0.475000 1.010000 ;
+      RECT 0.085000  1.010000 0.255000 1.820000 ;
+      RECT 0.085000  1.820000 0.445000 2.390000 ;
+      RECT 0.085000  2.390000 3.320000 2.560000 ;
+      RECT 0.085000  2.560000 0.445000 2.980000 ;
+      RECT 0.615000  2.730000 0.995000 3.245000 ;
+      RECT 0.645000  0.085000 0.975000 1.010000 ;
+      RECT 1.485000  1.290000 3.830000 1.460000 ;
+      RECT 1.485000  1.460000 2.980000 1.620000 ;
+      RECT 1.530000  0.085000 1.780000 0.780000 ;
+      RECT 1.565000  2.730000 1.895000 3.245000 ;
+      RECT 2.390000  0.085000 2.640000 1.120000 ;
+      RECT 2.465000  2.730000 3.205000 3.245000 ;
+      RECT 2.810000  0.255000 3.830000 0.425000 ;
+      RECT 2.810000  0.425000 2.980000 1.290000 ;
+      RECT 3.150000  0.595000 3.320000 0.950000 ;
+      RECT 3.150000  0.950000 4.330000 1.110000 ;
+      RECT 3.150000  1.110000 6.125000 1.120000 ;
+      RECT 3.150000  1.630000 3.490000 1.960000 ;
+      RECT 3.150000  1.960000 3.320000 2.390000 ;
+      RECT 3.490000  2.130000 5.145000 2.300000 ;
+      RECT 3.490000  2.300000 3.740000 2.980000 ;
+      RECT 3.500000  0.425000 3.830000 0.780000 ;
+      RECT 3.660000  1.460000 3.830000 1.950000 ;
+      RECT 3.660000  1.950000 5.145000 2.130000 ;
+      RECT 3.945000  2.470000 4.275000 3.245000 ;
+      RECT 4.000000  0.605000 4.330000 0.950000 ;
+      RECT 4.000000  1.120000 6.125000 1.280000 ;
+      RECT 4.445000  2.470000 4.775000 2.905000 ;
+      RECT 4.445000  2.905000 5.675000 3.075000 ;
+      RECT 4.500000  0.085000 4.750000 0.940000 ;
+      RECT 4.930000  0.605000 5.180000 1.110000 ;
+      RECT 4.975000  2.300000 5.145000 2.735000 ;
+      RECT 5.345000  1.950000 5.675000 2.905000 ;
+      RECT 5.360000  0.085000 5.610000 0.940000 ;
+      RECT 5.790000  0.605000 6.125000 1.110000 ;
+      RECT 5.875000  1.950000 6.125000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21ba_4
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef
index a1e73dc..1396baf 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.magic.lef
@@ -74,17 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.540000  0.085000 0.870000 0.940000 ;
-        RECT 1.995000  0.085000 2.335000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -93,32 +82,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.635000 2.290000 1.305000 3.245000 ;
-        RECT 2.520000 1.950000 2.770000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.350000 0.360000 1.110000 ;
-      RECT 0.110000 1.110000 0.915000 1.280000 ;
-      RECT 0.135000 1.950000 0.915000 2.120000 ;
-      RECT 0.135000 2.120000 0.465000 2.980000 ;
-      RECT 0.745000 1.280000 0.915000 1.300000 ;
-      RECT 0.745000 1.300000 1.135000 1.630000 ;
-      RECT 0.745000 1.630000 0.915000 1.950000 ;
-      RECT 1.645000 0.350000 1.815000 0.960000 ;
-      RECT 1.645000 0.960000 2.765000 1.130000 ;
-      RECT 2.515000 0.350000 2.765000 0.960000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.110000  0.350000 0.360000 1.110000 ;
+      RECT 0.110000  1.110000 0.915000 1.280000 ;
+      RECT 0.135000  1.950000 0.915000 2.120000 ;
+      RECT 0.135000  2.120000 0.465000 2.980000 ;
+      RECT 0.540000  0.085000 0.870000 0.940000 ;
+      RECT 0.635000  2.290000 1.305000 3.245000 ;
+      RECT 0.745000  1.280000 0.915000 1.300000 ;
+      RECT 0.745000  1.300000 1.135000 1.630000 ;
+      RECT 0.745000  1.630000 0.915000 1.950000 ;
+      RECT 1.645000  0.350000 1.815000 0.960000 ;
+      RECT 1.645000  0.960000 2.765000 1.130000 ;
+      RECT 1.995000  0.085000 2.335000 0.680000 ;
+      RECT 2.515000  0.350000 2.765000 0.960000 ;
+      RECT 2.520000  1.950000 2.770000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef
index 9e8e4e3..30bc920 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.magic.lef
@@ -77,21 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.840000 ;
-        RECT 2.535000  0.085000 2.865000 0.840000 ;
-        RECT 3.425000  0.085000 3.755000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -100,42 +85,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.005000 1.820000 1.335000 3.245000 ;
-        RECT 1.980000 2.650000 2.350000 3.245000 ;
-        RECT 3.955000 1.820000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 1.360000 1.180000 ;
-      RECT 0.115000 1.180000 0.285000 1.950000 ;
-      RECT 0.115000 1.950000 0.640000 2.860000 ;
-      RECT 1.030000 1.180000 1.360000 1.550000 ;
-      RECT 1.105000 0.255000 2.365000 0.425000 ;
-      RECT 1.105000 0.425000 1.435000 0.840000 ;
-      RECT 2.035000 0.425000 2.365000 1.010000 ;
-      RECT 2.035000 1.010000 4.185000 1.150000 ;
-      RECT 2.035000 1.150000 3.245000 1.180000 ;
-      RECT 2.520000 2.630000 2.850000 2.905000 ;
-      RECT 2.520000 2.905000 3.755000 3.075000 ;
-      RECT 3.075000 0.350000 3.245000 0.980000 ;
-      RECT 3.075000 0.980000 4.185000 1.010000 ;
-      RECT 3.420000 2.290000 3.755000 2.905000 ;
-      RECT 3.935000 0.350000 4.185000 0.980000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.010000 ;
+      RECT 0.115000  1.010000 1.360000 1.180000 ;
+      RECT 0.115000  1.180000 0.285000 1.950000 ;
+      RECT 0.115000  1.950000 0.640000 2.860000 ;
+      RECT 0.545000  0.085000 0.875000 0.840000 ;
+      RECT 1.005000  1.820000 1.335000 3.245000 ;
+      RECT 1.030000  1.180000 1.360000 1.550000 ;
+      RECT 1.105000  0.255000 2.365000 0.425000 ;
+      RECT 1.105000  0.425000 1.435000 0.840000 ;
+      RECT 1.980000  2.650000 2.350000 3.245000 ;
+      RECT 2.035000  0.425000 2.365000 1.010000 ;
+      RECT 2.035000  1.010000 4.185000 1.150000 ;
+      RECT 2.035000  1.150000 3.245000 1.180000 ;
+      RECT 2.520000  2.630000 2.850000 2.905000 ;
+      RECT 2.520000  2.905000 3.755000 3.075000 ;
+      RECT 2.535000  0.085000 2.865000 0.840000 ;
+      RECT 3.075000  0.350000 3.245000 0.980000 ;
+      RECT 3.075000  0.980000 4.185000 1.010000 ;
+      RECT 3.420000  2.290000 3.755000 2.905000 ;
+      RECT 3.425000  0.085000 3.755000 0.810000 ;
+      RECT 3.935000  0.350000 4.185000 0.980000 ;
+      RECT 3.955000  1.820000 4.205000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef
index 01fa5c9..4474847 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.magic.lef
@@ -80,29 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.840000 ;
-        RECT 1.455000  0.085000 1.785000 0.840000 ;
-        RECT 2.315000  0.085000 2.645000 0.840000 ;
-        RECT 3.255000  0.085000 3.585000 0.500000 ;
-        RECT 6.755000  0.085000 7.085000 1.280000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -111,60 +88,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.570000 2.290000 0.820000 3.245000 ;
-        RECT 1.470000 2.290000 1.800000 3.245000 ;
-        RECT 4.910000 2.190000 5.080000 3.245000 ;
-        RECT 5.855000 2.290000 6.105000 3.245000 ;
-        RECT 6.755000 2.100000 7.085000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 3.075000 1.180000 ;
-      RECT 0.120000 1.950000 2.170000 2.120000 ;
-      RECT 0.120000 2.120000 0.370000 2.980000 ;
-      RECT 1.020000 2.120000 1.270000 2.980000 ;
-      RECT 1.105000 0.350000 1.275000 1.010000 ;
-      RECT 1.965000 0.350000 2.135000 1.010000 ;
-      RECT 2.000000 1.820000 2.170000 1.950000 ;
-      RECT 2.000000 2.120000 2.170000 2.905000 ;
-      RECT 2.000000 2.905000 4.150000 3.075000 ;
-      RECT 2.820000 2.290000 3.150000 2.905000 ;
-      RECT 2.825000 0.350000 3.075000 0.670000 ;
-      RECT 2.825000 0.670000 4.095000 0.840000 ;
-      RECT 2.825000 0.840000 3.075000 1.010000 ;
-      RECT 3.765000 0.255000 6.095000 0.425000 ;
-      RECT 3.765000 0.425000 4.095000 0.670000 ;
-      RECT 3.820000 2.290000 4.150000 2.905000 ;
-      RECT 4.370000 1.350000 5.965000 1.680000 ;
-      RECT 4.765000 0.425000 5.095000 0.840000 ;
-      RECT 5.765000 0.425000 6.095000 0.940000 ;
-      RECT 5.795000 1.110000 6.575000 1.280000 ;
-      RECT 5.795000 1.280000 5.965000 1.350000 ;
-      RECT 5.795000 1.680000 5.965000 1.950000 ;
-      RECT 5.795000 1.950000 6.555000 2.120000 ;
-      RECT 6.305000 2.120000 6.555000 2.980000 ;
-      RECT 6.325000 0.500000 6.575000 1.110000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.010000 ;
+      RECT 0.115000  1.010000 3.075000 1.180000 ;
+      RECT 0.120000  1.950000 2.170000 2.120000 ;
+      RECT 0.120000  2.120000 0.370000 2.980000 ;
+      RECT 0.545000  0.085000 0.875000 0.840000 ;
+      RECT 0.570000  2.290000 0.820000 3.245000 ;
+      RECT 1.020000  2.120000 1.270000 2.980000 ;
+      RECT 1.105000  0.350000 1.275000 1.010000 ;
+      RECT 1.455000  0.085000 1.785000 0.840000 ;
+      RECT 1.470000  2.290000 1.800000 3.245000 ;
+      RECT 1.965000  0.350000 2.135000 1.010000 ;
+      RECT 2.000000  1.820000 2.170000 1.950000 ;
+      RECT 2.000000  2.120000 2.170000 2.905000 ;
+      RECT 2.000000  2.905000 4.150000 3.075000 ;
+      RECT 2.315000  0.085000 2.645000 0.840000 ;
+      RECT 2.820000  2.290000 3.150000 2.905000 ;
+      RECT 2.825000  0.350000 3.075000 0.670000 ;
+      RECT 2.825000  0.670000 4.095000 0.840000 ;
+      RECT 2.825000  0.840000 3.075000 1.010000 ;
+      RECT 3.255000  0.085000 3.585000 0.500000 ;
+      RECT 3.765000  0.255000 6.095000 0.425000 ;
+      RECT 3.765000  0.425000 4.095000 0.670000 ;
+      RECT 3.820000  2.290000 4.150000 2.905000 ;
+      RECT 4.370000  1.350000 5.965000 1.680000 ;
+      RECT 4.765000  0.425000 5.095000 0.840000 ;
+      RECT 4.910000  2.190000 5.080000 3.245000 ;
+      RECT 5.765000  0.425000 6.095000 0.940000 ;
+      RECT 5.795000  1.110000 6.575000 1.280000 ;
+      RECT 5.795000  1.280000 5.965000 1.350000 ;
+      RECT 5.795000  1.680000 5.965000 1.950000 ;
+      RECT 5.795000  1.950000 6.555000 2.120000 ;
+      RECT 5.855000  2.290000 6.105000 3.245000 ;
+      RECT 6.305000  2.120000 6.555000 2.980000 ;
+      RECT 6.325000  0.500000 6.575000 1.110000 ;
+      RECT 6.755000  0.085000 7.085000 1.280000 ;
+      RECT 6.755000  2.100000 7.085000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__o21bai_4
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef
index b1521a4..bf84ce6 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_1.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.690000  0.085000 1.020000 1.130000 ;
-        RECT 1.700000  0.085000 2.030000 0.940000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -112,40 +98,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.680000 2.290000 1.060000 3.245000 ;
-        RECT 2.865000 2.300000 3.705000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.455000 1.320000 0.785000 1.650000 ;
-      RECT 0.615000 1.650000 0.785000 1.950000 ;
-      RECT 0.615000 1.950000 2.055000 1.960000 ;
-      RECT 0.615000 1.960000 4.205000 2.120000 ;
-      RECT 1.200000 0.450000 1.530000 1.110000 ;
-      RECT 1.200000 1.110000 3.100000 1.280000 ;
-      RECT 1.725000 2.120000 4.205000 2.130000 ;
-      RECT 1.725000 2.130000 2.055000 2.980000 ;
-      RECT 2.260000 0.255000 3.600000 0.425000 ;
-      RECT 2.260000 0.425000 2.590000 0.940000 ;
-      RECT 2.770000 0.595000 3.100000 1.110000 ;
-      RECT 3.270000 0.425000 3.600000 0.950000 ;
-      RECT 3.770000 0.360000 4.205000 0.950000 ;
-      RECT 3.875000 2.130000 4.205000 2.980000 ;
-      RECT 4.035000 0.950000 4.205000 1.960000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.455000  1.320000 0.785000 1.650000 ;
+      RECT 0.615000  1.650000 0.785000 1.950000 ;
+      RECT 0.615000  1.950000 2.055000 1.960000 ;
+      RECT 0.615000  1.960000 4.205000 2.120000 ;
+      RECT 0.680000  2.290000 1.060000 3.245000 ;
+      RECT 0.690000  0.085000 1.020000 1.130000 ;
+      RECT 1.200000  0.450000 1.530000 1.110000 ;
+      RECT 1.200000  1.110000 3.100000 1.280000 ;
+      RECT 1.700000  0.085000 2.030000 0.940000 ;
+      RECT 1.725000  2.120000 4.205000 2.130000 ;
+      RECT 1.725000  2.130000 2.055000 2.980000 ;
+      RECT 2.260000  0.255000 3.600000 0.425000 ;
+      RECT 2.260000  0.425000 2.590000 0.940000 ;
+      RECT 2.770000  0.595000 3.100000 1.110000 ;
+      RECT 2.865000  2.300000 3.705000 3.245000 ;
+      RECT 3.270000  0.425000 3.600000 0.950000 ;
+      RECT 3.770000  0.360000 4.205000 0.950000 ;
+      RECT 3.875000  2.130000 4.205000 2.980000 ;
+      RECT 4.035000  0.950000 4.205000 1.960000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef
index c72a4ee..35f7913 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_2.magic.lef
@@ -90,22 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 2.360000  0.085000 2.690000 0.830000 ;
-        RECT 3.290000  0.085000 3.620000 1.130000 ;
-        RECT 4.435000  0.085000 4.685000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -114,41 +98,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.615000 2.290000 1.525000 3.245000 ;
-        RECT 3.405000 2.290000 3.735000 3.245000 ;
-        RECT 4.435000 1.820000 4.685000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.820000 0.775000 1.950000 ;
-      RECT 0.115000 1.950000 3.735000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.860000 ;
-      RECT 0.370000 0.350000 0.775000 1.010000 ;
-      RECT 0.605000 1.010000 0.775000 1.820000 ;
-      RECT 0.945000 0.350000 2.130000 0.520000 ;
-      RECT 0.945000 0.520000 1.115000 1.130000 ;
-      RECT 1.295000 0.800000 1.620000 1.010000 ;
-      RECT 1.295000 1.010000 3.120000 1.180000 ;
-      RECT 1.800000 0.520000 2.130000 0.830000 ;
-      RECT 2.065000 2.120000 2.395000 2.860000 ;
-      RECT 2.870000 0.350000 3.120000 1.010000 ;
-      RECT 3.565000 1.320000 3.925000 1.650000 ;
-      RECT 3.565000 1.650000 3.735000 1.950000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  1.820000 0.775000 1.950000 ;
+      RECT 0.115000  1.950000 3.735000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.860000 ;
+      RECT 0.370000  0.350000 0.775000 1.010000 ;
+      RECT 0.605000  1.010000 0.775000 1.820000 ;
+      RECT 0.615000  2.290000 1.525000 3.245000 ;
+      RECT 0.945000  0.350000 2.130000 0.520000 ;
+      RECT 0.945000  0.520000 1.115000 1.130000 ;
+      RECT 1.295000  0.800000 1.620000 1.010000 ;
+      RECT 1.295000  1.010000 3.120000 1.180000 ;
+      RECT 1.800000  0.520000 2.130000 0.830000 ;
+      RECT 2.065000  2.120000 2.395000 2.860000 ;
+      RECT 2.360000  0.085000 2.690000 0.830000 ;
+      RECT 2.870000  0.350000 3.120000 1.010000 ;
+      RECT 3.290000  0.085000 3.620000 1.130000 ;
+      RECT 3.405000  2.290000 3.735000 3.245000 ;
+      RECT 3.565000  1.320000 3.925000 1.650000 ;
+      RECT 3.565000  1.650000 3.735000 1.950000 ;
+      RECT 4.435000  0.085000 4.685000 1.130000 ;
+      RECT 4.435000  1.820000 4.685000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef
index fa9a11a..b60aae2 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_4.magic.lef
@@ -96,30 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 3.430000  0.085000 3.760000 0.935000 ;
-        RECT 4.295000  0.085000 4.625000 0.840000 ;
-        RECT 5.235000  0.085000 5.565000 1.180000 ;
-        RECT 6.165000  0.085000 6.565000 0.805000 ;
-        RECT 7.235000  0.085000 7.565000 1.255000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -128,67 +104,88 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.115000 1.950000 0.365000 3.245000 ;
-        RECT 1.095000 2.290000 1.345000 3.245000 ;
-        RECT 2.915000 2.290000 3.630000 3.245000 ;
-        RECT 5.300000 2.290000 5.630000 3.245000 ;
-        RECT 6.360000 2.190000 6.610000 3.245000 ;
-        RECT 7.315000 1.950000 7.565000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.265000 2.305000 0.285000 ;
-      RECT 0.115000 0.285000 3.170000 0.435000 ;
-      RECT 0.115000 0.435000 0.365000 1.275000 ;
-      RECT 0.545000 0.605000 0.795000 1.105000 ;
-      RECT 0.545000 1.105000 1.230000 1.275000 ;
-      RECT 0.565000 1.950000 5.660000 2.120000 ;
-      RECT 0.565000 2.120000 0.895000 2.955000 ;
-      RECT 0.975000 0.435000 1.305000 0.935000 ;
-      RECT 1.060000 1.275000 1.230000 1.950000 ;
-      RECT 1.475000 0.605000 1.805000 1.025000 ;
-      RECT 1.475000 1.025000 2.740000 1.105000 ;
-      RECT 1.475000 1.105000 5.055000 1.180000 ;
-      RECT 1.475000 1.180000 4.115000 1.275000 ;
-      RECT 1.475000 1.275000 1.805000 1.285000 ;
-      RECT 1.515000 2.290000 1.845000 2.905000 ;
-      RECT 1.515000 2.905000 2.745000 3.075000 ;
-      RECT 1.975000 0.435000 3.170000 0.455000 ;
-      RECT 1.975000 0.455000 2.305000 0.855000 ;
-      RECT 2.045000 2.120000 2.215000 2.735000 ;
-      RECT 2.415000 2.290000 2.745000 2.905000 ;
-      RECT 2.475000 0.635000 2.670000 1.025000 ;
-      RECT 2.840000 0.455000 3.170000 0.855000 ;
-      RECT 3.800000 2.290000 4.130000 2.905000 ;
-      RECT 3.800000 2.905000 5.130000 3.075000 ;
-      RECT 3.940000 0.585000 4.115000 1.010000 ;
-      RECT 3.940000 1.010000 5.055000 1.105000 ;
-      RECT 4.300000 2.120000 4.630000 2.735000 ;
-      RECT 4.800000 2.290000 5.130000 2.905000 ;
-      RECT 4.805000 0.590000 5.055000 1.010000 ;
-      RECT 5.490000 1.350000 6.615000 1.680000 ;
-      RECT 5.490000 1.680000 5.660000 1.950000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.115000  0.265000 2.305000 0.285000 ;
+      RECT 0.115000  0.285000 3.170000 0.435000 ;
+      RECT 0.115000  0.435000 0.365000 1.275000 ;
+      RECT 0.115000  1.950000 0.365000 3.245000 ;
+      RECT 0.545000  0.605000 0.795000 1.105000 ;
+      RECT 0.545000  1.105000 1.230000 1.275000 ;
+      RECT 0.565000  1.950000 5.660000 2.120000 ;
+      RECT 0.565000  2.120000 0.895000 2.955000 ;
+      RECT 0.975000  0.435000 1.305000 0.935000 ;
+      RECT 1.060000  1.275000 1.230000 1.950000 ;
+      RECT 1.095000  2.290000 1.345000 3.245000 ;
+      RECT 1.475000  0.605000 1.805000 1.025000 ;
+      RECT 1.475000  1.025000 2.740000 1.105000 ;
+      RECT 1.475000  1.105000 5.055000 1.180000 ;
+      RECT 1.475000  1.180000 4.115000 1.275000 ;
+      RECT 1.475000  1.275000 1.805000 1.285000 ;
+      RECT 1.515000  2.290000 1.845000 2.905000 ;
+      RECT 1.515000  2.905000 2.745000 3.075000 ;
+      RECT 1.975000  0.435000 3.170000 0.455000 ;
+      RECT 1.975000  0.455000 2.305000 0.855000 ;
+      RECT 2.045000  2.120000 2.215000 2.735000 ;
+      RECT 2.415000  2.290000 2.745000 2.905000 ;
+      RECT 2.475000  0.635000 2.670000 1.025000 ;
+      RECT 2.840000  0.455000 3.170000 0.855000 ;
+      RECT 2.915000  2.290000 3.630000 3.245000 ;
+      RECT 3.430000  0.085000 3.760000 0.935000 ;
+      RECT 3.800000  2.290000 4.130000 2.905000 ;
+      RECT 3.800000  2.905000 5.130000 3.075000 ;
+      RECT 3.940000  0.585000 4.115000 1.010000 ;
+      RECT 3.940000  1.010000 5.055000 1.105000 ;
+      RECT 4.295000  0.085000 4.625000 0.840000 ;
+      RECT 4.300000  2.120000 4.630000 2.735000 ;
+      RECT 4.800000  2.290000 5.130000 2.905000 ;
+      RECT 4.805000  0.590000 5.055000 1.010000 ;
+      RECT 5.235000  0.085000 5.565000 1.180000 ;
+      RECT 5.300000  2.290000 5.630000 3.245000 ;
+      RECT 5.490000  1.350000 6.615000 1.680000 ;
+      RECT 5.490000  1.680000 5.660000 1.950000 ;
+      RECT 6.165000  0.085000 6.565000 0.805000 ;
+      RECT 6.360000  2.190000 6.610000 3.245000 ;
+      RECT 7.235000  0.085000 7.565000 1.255000 ;
+      RECT 7.315000  1.950000 7.565000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__o221a_4
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef
index f4a205f..04278d0 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.magic.lef
@@ -94,18 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 2.675000  0.085000 3.225000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -114,33 +102,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.745000 2.290000 1.560000 3.245000 ;
-        RECT 3.165000 1.950000 3.495000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.350000 2.005000 0.520000 ;
-      RECT 0.615000 0.520000 0.945000 0.770000 ;
-      RECT 1.175000 0.800000 1.505000 1.010000 ;
-      RECT 1.175000 1.010000 3.725000 1.130000 ;
-      RECT 1.175000 1.130000 2.505000 1.180000 ;
-      RECT 1.675000 0.520000 2.005000 0.795000 ;
-      RECT 2.175000 0.350000 2.505000 0.960000 ;
-      RECT 2.175000 0.960000 3.725000 1.010000 ;
-      RECT 3.395000 0.350000 3.725000 0.960000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.615000  0.350000 2.005000 0.520000 ;
+      RECT 0.615000  0.520000 0.945000 0.770000 ;
+      RECT 0.745000  2.290000 1.560000 3.245000 ;
+      RECT 1.175000  0.800000 1.505000 1.010000 ;
+      RECT 1.175000  1.010000 3.725000 1.130000 ;
+      RECT 1.175000  1.130000 2.505000 1.180000 ;
+      RECT 1.675000  0.520000 2.005000 0.795000 ;
+      RECT 2.175000  0.350000 2.505000 0.960000 ;
+      RECT 2.175000  0.960000 3.725000 1.010000 ;
+      RECT 2.675000  0.085000 3.225000 0.790000 ;
+      RECT 3.165000  1.950000 3.495000 3.245000 ;
+      RECT 3.395000  0.350000 3.725000 0.960000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef
index 9af1631..31e8912 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.magic.lef
@@ -96,23 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 3.880000  0.085000 4.210000 0.820000 ;
-        RECT 4.880000  0.085000 5.210000 0.820000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -121,49 +104,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.155000 1.950000 0.405000 3.245000 ;
-        RECT 1.055000 2.630000 1.695000 3.245000 ;
-        RECT 3.365000 2.630000 3.695000 3.245000 ;
-        RECT 5.315000 2.290000 5.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 1.305000 0.425000 ;
-      RECT 0.115000 0.425000 0.365000 1.130000 ;
-      RECT 1.055000 0.425000 1.305000 1.010000 ;
-      RECT 1.055000 1.010000 3.280000 1.180000 ;
-      RECT 1.535000 0.255000 3.710000 0.425000 ;
-      RECT 1.535000 0.425000 1.865000 0.820000 ;
-      RECT 1.865000 2.630000 2.195000 2.905000 ;
-      RECT 1.865000 2.905000 3.195000 3.075000 ;
-      RECT 2.045000 0.595000 2.215000 1.010000 ;
-      RECT 2.395000 0.425000 2.725000 0.820000 ;
-      RECT 2.865000 2.630000 3.195000 2.905000 ;
-      RECT 2.895000 0.595000 3.280000 1.010000 ;
-      RECT 3.460000 0.425000 3.710000 1.010000 ;
-      RECT 3.460000 1.010000 5.645000 1.180000 ;
-      RECT 3.865000 2.630000 4.195000 2.905000 ;
-      RECT 3.865000 2.905000 5.145000 3.075000 ;
-      RECT 4.380000 0.405000 4.710000 1.010000 ;
-      RECT 4.815000 2.290000 5.145000 2.905000 ;
-      RECT 5.390000 0.405000 5.645000 1.010000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.255000 1.305000 0.425000 ;
+      RECT 0.115000  0.425000 0.365000 1.130000 ;
+      RECT 0.155000  1.950000 0.405000 3.245000 ;
+      RECT 1.055000  0.425000 1.305000 1.010000 ;
+      RECT 1.055000  1.010000 3.280000 1.180000 ;
+      RECT 1.055000  2.630000 1.695000 3.245000 ;
+      RECT 1.535000  0.255000 3.710000 0.425000 ;
+      RECT 1.535000  0.425000 1.865000 0.820000 ;
+      RECT 1.865000  2.630000 2.195000 2.905000 ;
+      RECT 1.865000  2.905000 3.195000 3.075000 ;
+      RECT 2.045000  0.595000 2.215000 1.010000 ;
+      RECT 2.395000  0.425000 2.725000 0.820000 ;
+      RECT 2.865000  2.630000 3.195000 2.905000 ;
+      RECT 2.895000  0.595000 3.280000 1.010000 ;
+      RECT 3.365000  2.630000 3.695000 3.245000 ;
+      RECT 3.460000  0.425000 3.710000 1.010000 ;
+      RECT 3.460000  1.010000 5.645000 1.180000 ;
+      RECT 3.865000  2.630000 4.195000 2.905000 ;
+      RECT 3.865000  2.905000 5.145000 3.075000 ;
+      RECT 3.880000  0.085000 4.210000 0.820000 ;
+      RECT 4.380000  0.405000 4.710000 1.010000 ;
+      RECT 4.815000  2.290000 5.145000 2.905000 ;
+      RECT 4.880000  0.085000 5.210000 0.820000 ;
+      RECT 5.315000  2.290000 5.645000 3.245000 ;
+      RECT 5.390000  0.405000 5.645000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef
index d7e80db..adb54bf 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.magic.lef
@@ -107,34 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 6.405000  0.085000  6.735000 0.580000 ;
-        RECT 7.335000  0.085000  7.665000 0.580000 ;
-        RECT 8.265000  0.085000  8.605000 0.580000 ;
-        RECT 9.205000  0.085000  9.535000 0.750000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -143,73 +115,98 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.115000 1.950000  0.365000 3.245000 ;
-        RECT 1.065000 2.290000  1.395000 3.245000 ;
-        RECT 2.025000 2.390000  2.355000 3.245000 ;
-        RECT 3.025000 2.730000  3.355000 3.245000 ;
-        RECT 5.925000 2.390000  6.255000 3.245000 ;
-        RECT 8.730000 2.290000  8.980000 3.245000 ;
-        RECT 9.710000 1.950000  9.960000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 2.165000 0.425000 ;
-      RECT 0.115000 0.425000 0.375000 1.180000 ;
-      RECT 1.045000 0.425000 1.235000 0.840000 ;
-      RECT 1.915000 0.425000 2.165000 0.770000 ;
-      RECT 1.915000 0.770000 3.155000 1.010000 ;
-      RECT 1.915000 1.010000 4.015000 1.180000 ;
-      RECT 2.395000 0.350000 6.235000 0.600000 ;
-      RECT 2.525000 2.390000 3.855000 2.560000 ;
-      RECT 2.525000 2.560000 2.855000 2.980000 ;
-      RECT 3.335000 0.600000 3.505000 0.840000 ;
-      RECT 3.525000 2.560000 3.855000 2.905000 ;
-      RECT 3.525000 2.905000 5.755000 3.075000 ;
-      RECT 3.685000 0.770000 5.735000 1.010000 ;
-      RECT 4.425000 2.390000 4.755000 2.905000 ;
-      RECT 5.405000 1.010000 5.735000 1.050000 ;
-      RECT 5.425000 2.390000 5.755000 2.905000 ;
-      RECT 5.905000 0.600000 6.235000 0.750000 ;
-      RECT 5.905000 0.750000 9.025000 0.920000 ;
-      RECT 5.905000 0.920000 6.235000 1.090000 ;
-      RECT 6.425000 2.650000 6.675000 2.730000 ;
-      RECT 6.425000 2.730000 6.760000 2.905000 ;
-      RECT 6.425000 2.905000 8.530000 3.075000 ;
-      RECT 6.905000 0.350000 7.155000 0.750000 ;
-      RECT 7.460000 2.290000 7.630000 2.905000 ;
-      RECT 7.835000 0.350000 8.085000 0.750000 ;
-      RECT 8.360000 1.950000 9.510000 2.120000 ;
-      RECT 8.360000 2.120000 8.530000 2.905000 ;
-      RECT 8.775000 0.350000 9.025000 0.750000 ;
-      RECT 8.775000 0.920000 9.965000 1.090000 ;
-      RECT 9.180000 2.120000 9.510000 2.980000 ;
-      RECT 9.715000 0.350000 9.965000 0.920000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  0.255000  2.165000 0.425000 ;
+      RECT 0.115000  0.425000  0.375000 1.180000 ;
+      RECT 0.115000  1.950000  0.365000 3.245000 ;
+      RECT 1.045000  0.425000  1.235000 0.840000 ;
+      RECT 1.065000  2.290000  1.395000 3.245000 ;
+      RECT 1.915000  0.425000  2.165000 0.770000 ;
+      RECT 1.915000  0.770000  3.155000 1.010000 ;
+      RECT 1.915000  1.010000  4.015000 1.180000 ;
+      RECT 2.025000  2.390000  2.355000 3.245000 ;
+      RECT 2.395000  0.350000  6.235000 0.600000 ;
+      RECT 2.525000  2.390000  3.855000 2.560000 ;
+      RECT 2.525000  2.560000  2.855000 2.980000 ;
+      RECT 3.025000  2.730000  3.355000 3.245000 ;
+      RECT 3.335000  0.600000  3.505000 0.840000 ;
+      RECT 3.525000  2.560000  3.855000 2.905000 ;
+      RECT 3.525000  2.905000  5.755000 3.075000 ;
+      RECT 3.685000  0.770000  5.735000 1.010000 ;
+      RECT 4.425000  2.390000  4.755000 2.905000 ;
+      RECT 5.405000  1.010000  5.735000 1.050000 ;
+      RECT 5.425000  2.390000  5.755000 2.905000 ;
+      RECT 5.905000  0.600000  6.235000 0.750000 ;
+      RECT 5.905000  0.750000  9.025000 0.920000 ;
+      RECT 5.905000  0.920000  6.235000 1.090000 ;
+      RECT 5.925000  2.390000  6.255000 3.245000 ;
+      RECT 6.405000  0.085000  6.735000 0.580000 ;
+      RECT 6.425000  2.650000  6.675000 2.730000 ;
+      RECT 6.425000  2.730000  6.760000 2.905000 ;
+      RECT 6.425000  2.905000  8.530000 3.075000 ;
+      RECT 6.905000  0.350000  7.155000 0.750000 ;
+      RECT 7.335000  0.085000  7.665000 0.580000 ;
+      RECT 7.460000  2.290000  7.630000 2.905000 ;
+      RECT 7.835000  0.350000  8.085000 0.750000 ;
+      RECT 8.265000  0.085000  8.605000 0.580000 ;
+      RECT 8.360000  1.950000  9.510000 2.120000 ;
+      RECT 8.360000  2.120000  8.530000 2.905000 ;
+      RECT 8.730000  2.290000  8.980000 3.245000 ;
+      RECT 8.775000  0.350000  9.025000 0.750000 ;
+      RECT 8.775000  0.920000  9.965000 1.090000 ;
+      RECT 9.180000  2.120000  9.510000 2.980000 ;
+      RECT 9.205000  0.085000  9.535000 0.750000 ;
+      RECT 9.710000  1.950000  9.960000 3.245000 ;
+      RECT 9.715000  0.350000  9.965000 0.920000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__o221ai_4
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef
index 3f2687b..bb17b5c 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_1.magic.lef
@@ -82,19 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.960000 ;
-        RECT 2.885000  0.085000 3.225000 0.960000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -103,34 +90,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.615000 1.985000 1.850000 3.245000 ;
-        RECT 3.385000 1.970000 3.715000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.300000 1.095000 1.630000 ;
-      RECT 0.925000 1.130000 2.345000 1.300000 ;
-      RECT 1.475000 0.755000 2.705000 0.935000 ;
-      RECT 1.905000 1.105000 2.345000 1.130000 ;
-      RECT 2.175000 1.300000 2.345000 1.970000 ;
-      RECT 2.175000 1.970000 2.725000 2.140000 ;
-      RECT 2.395000 2.140000 2.725000 2.980000 ;
-      RECT 2.535000 0.935000 2.705000 1.130000 ;
-      RECT 2.535000 1.130000 3.725000 1.300000 ;
-      RECT 3.395000 0.630000 3.725000 1.130000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.425000  1.300000 1.095000 1.630000 ;
+      RECT 0.545000  0.085000 0.875000 0.960000 ;
+      RECT 0.615000  1.985000 1.850000 3.245000 ;
+      RECT 0.925000  1.130000 2.345000 1.300000 ;
+      RECT 1.475000  0.755000 2.705000 0.935000 ;
+      RECT 1.905000  1.105000 2.345000 1.130000 ;
+      RECT 2.175000  1.300000 2.345000 1.970000 ;
+      RECT 2.175000  1.970000 2.725000 2.140000 ;
+      RECT 2.395000  2.140000 2.725000 2.980000 ;
+      RECT 2.535000  0.935000 2.705000 1.130000 ;
+      RECT 2.535000  1.130000 3.725000 1.300000 ;
+      RECT 2.885000  0.085000 3.225000 0.960000 ;
+      RECT 3.385000  1.970000 3.715000 3.245000 ;
+      RECT 3.395000  0.630000 3.725000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef
index 628888e..04ef472 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_2.magic.lef
@@ -82,20 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.105000  0.085000 0.365000 1.130000 ;
-        RECT 0.965000  0.085000 1.295000 0.640000 ;
-        RECT 2.965000  0.085000 3.295000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -104,37 +90,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.135000 1.820000 0.465000 3.245000 ;
-        RECT 1.135000 2.290000 1.790000 3.245000 ;
-        RECT 3.400000 1.950000 3.730000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.975000 1.300000 1.305000 1.630000 ;
-      RECT 1.135000 0.880000 2.295000 1.130000 ;
-      RECT 1.135000 1.130000 1.305000 1.300000 ;
-      RECT 1.135000 1.630000 1.305000 1.950000 ;
-      RECT 1.135000 1.950000 2.680000 2.120000 ;
-      RECT 1.505000 0.350000 2.795000 0.520000 ;
-      RECT 1.505000 0.520000 1.835000 0.710000 ;
-      RECT 2.005000 0.800000 2.295000 0.880000 ;
-      RECT 2.350000 2.120000 2.680000 2.940000 ;
-      RECT 2.465000 0.520000 2.795000 0.960000 ;
-      RECT 2.465000 0.960000 3.725000 1.130000 ;
-      RECT 3.475000 0.350000 3.725000 0.960000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.105000  0.085000 0.365000 1.130000 ;
+      RECT 0.135000  1.820000 0.465000 3.245000 ;
+      RECT 0.965000  0.085000 1.295000 0.640000 ;
+      RECT 0.975000  1.300000 1.305000 1.630000 ;
+      RECT 1.135000  0.880000 2.295000 1.130000 ;
+      RECT 1.135000  1.130000 1.305000 1.300000 ;
+      RECT 1.135000  1.630000 1.305000 1.950000 ;
+      RECT 1.135000  1.950000 2.680000 2.120000 ;
+      RECT 1.135000  2.290000 1.790000 3.245000 ;
+      RECT 1.505000  0.350000 2.795000 0.520000 ;
+      RECT 1.505000  0.520000 1.835000 0.710000 ;
+      RECT 2.005000  0.800000 2.295000 0.880000 ;
+      RECT 2.350000  2.120000 2.680000 2.940000 ;
+      RECT 2.465000  0.520000 2.795000 0.960000 ;
+      RECT 2.465000  0.960000 3.725000 1.130000 ;
+      RECT 2.965000  0.085000 3.295000 0.790000 ;
+      RECT 3.400000  1.950000 3.730000 3.245000 ;
+      RECT 3.475000  0.350000 3.725000 0.960000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef
index 1661f16..eac9f76 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_4.magic.lef
@@ -87,28 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.940000 ;
-        RECT 1.545000  0.085000 1.875000 0.940000 ;
-        RECT 4.470000  0.085000 4.800000 0.580000 ;
-        RECT 5.410000  0.085000 5.740000 0.790000 ;
-        RECT 6.275000  0.085000 6.605000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -117,56 +95,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.115000 1.940000 0.365000 3.245000 ;
-        RECT 2.065000 2.290000 2.395000 3.245000 ;
-        RECT 4.100000 1.850000 4.430000 3.245000 ;
-        RECT 5.200000 2.190000 5.530000 3.245000 ;
-        RECT 6.275000 1.820000 6.605000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.660000 0.445000 1.110000 ;
-      RECT 0.115000 1.110000 4.240000 1.280000 ;
-      RECT 0.115000 1.280000 0.445000 1.340000 ;
-      RECT 0.565000 1.950000 0.895000 2.905000 ;
-      RECT 0.565000 2.905000 1.895000 3.075000 ;
-      RECT 1.065000 1.950000 3.845000 2.120000 ;
-      RECT 1.065000 2.120000 1.395000 2.735000 ;
-      RECT 1.125000 0.660000 1.375000 1.110000 ;
-      RECT 1.565000 2.290000 1.895000 2.905000 ;
-      RECT 2.045000 0.840000 2.375000 1.090000 ;
-      RECT 2.045000 1.090000 4.240000 1.110000 ;
-      RECT 2.545000 0.740000 3.810000 0.750000 ;
-      RECT 2.545000 0.750000 4.585000 0.920000 ;
-      RECT 2.565000 2.290000 2.895000 2.905000 ;
-      RECT 2.565000 2.905000 3.895000 3.075000 ;
-      RECT 3.065000 2.120000 3.395000 2.735000 ;
-      RECT 3.480000 0.660000 3.810000 0.740000 ;
-      RECT 3.565000 2.290000 3.895000 2.905000 ;
-      RECT 3.675000 1.510000 5.765000 1.680000 ;
-      RECT 3.675000 1.680000 3.845000 1.950000 ;
-      RECT 3.910000 1.280000 4.240000 1.340000 ;
-      RECT 4.415000 0.920000 4.585000 1.350000 ;
-      RECT 4.415000 1.350000 5.765000 1.510000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  0.660000 0.445000 1.110000 ;
+      RECT 0.115000  1.110000 4.240000 1.280000 ;
+      RECT 0.115000  1.280000 0.445000 1.340000 ;
+      RECT 0.115000  1.940000 0.365000 3.245000 ;
+      RECT 0.565000  1.950000 0.895000 2.905000 ;
+      RECT 0.565000  2.905000 1.895000 3.075000 ;
+      RECT 0.615000  0.085000 0.945000 0.940000 ;
+      RECT 1.065000  1.950000 3.845000 2.120000 ;
+      RECT 1.065000  2.120000 1.395000 2.735000 ;
+      RECT 1.125000  0.660000 1.375000 1.110000 ;
+      RECT 1.545000  0.085000 1.875000 0.940000 ;
+      RECT 1.565000  2.290000 1.895000 2.905000 ;
+      RECT 2.045000  0.840000 2.375000 1.090000 ;
+      RECT 2.045000  1.090000 4.240000 1.110000 ;
+      RECT 2.065000  2.290000 2.395000 3.245000 ;
+      RECT 2.545000  0.740000 3.810000 0.750000 ;
+      RECT 2.545000  0.750000 4.585000 0.920000 ;
+      RECT 2.565000  2.290000 2.895000 2.905000 ;
+      RECT 2.565000  2.905000 3.895000 3.075000 ;
+      RECT 3.065000  2.120000 3.395000 2.735000 ;
+      RECT 3.480000  0.660000 3.810000 0.740000 ;
+      RECT 3.565000  2.290000 3.895000 2.905000 ;
+      RECT 3.675000  1.510000 5.765000 1.680000 ;
+      RECT 3.675000  1.680000 3.845000 1.950000 ;
+      RECT 3.910000  1.280000 4.240000 1.340000 ;
+      RECT 4.100000  1.850000 4.430000 3.245000 ;
+      RECT 4.415000  0.920000 4.585000 1.350000 ;
+      RECT 4.415000  1.350000 5.765000 1.510000 ;
+      RECT 4.470000  0.085000 4.800000 0.580000 ;
+      RECT 5.200000  2.190000 5.530000 3.245000 ;
+      RECT 5.410000  0.085000 5.740000 0.790000 ;
+      RECT 6.275000  0.085000 6.605000 1.010000 ;
+      RECT 6.275000  1.820000 6.605000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__o22a_4
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef
index 8e54412..7d061fd 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.magic.lef
@@ -81,16 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.840000  0.085000 2.170000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -99,27 +89,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.125000 1.820000 0.455000 3.245000 ;
-        RECT 2.255000 1.950000 2.585000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.315000 1.670000 0.485000 ;
-      RECT 0.115000 0.485000 0.445000 1.010000 ;
-      RECT 1.340000 0.485000 1.670000 0.960000 ;
-      RECT 1.340000 0.960000 2.670000 1.130000 ;
-      RECT 2.340000 0.350000 2.670000 0.960000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.115000  0.315000 1.670000 0.485000 ;
+      RECT 0.115000  0.485000 0.445000 1.010000 ;
+      RECT 0.125000  1.820000 0.455000 3.245000 ;
+      RECT 1.340000  0.485000 1.670000 0.960000 ;
+      RECT 1.340000  0.960000 2.670000 1.130000 ;
+      RECT 1.840000  0.085000 2.170000 0.790000 ;
+      RECT 2.255000  1.950000 2.585000 3.245000 ;
+      RECT 2.340000  0.350000 2.670000 0.960000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef
index 46f29d5..c4880e4 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.magic.lef
@@ -89,21 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 2.955000  0.085000 3.285000 0.790000 ;
-        RECT 3.925000  0.085000 4.255000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -112,46 +97,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.570000 2.290000 0.900000 3.245000 ;
-        RECT 3.880000 2.290000 4.130000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 2.785000 0.425000 ;
-      RECT 0.115000 0.425000 0.445000 1.130000 ;
-      RECT 0.120000 1.950000 1.400000 2.120000 ;
-      RECT 0.120000 2.120000 0.370000 2.980000 ;
-      RECT 1.070000 2.120000 1.400000 2.905000 ;
-      RECT 1.070000 2.905000 2.300000 3.075000 ;
-      RECT 1.115000 0.425000 1.445000 0.840000 ;
-      RECT 1.970000 2.290000 2.300000 2.905000 ;
-      RECT 2.115000 0.425000 2.785000 0.840000 ;
-      RECT 2.455000 0.840000 2.785000 0.960000 ;
-      RECT 2.455000 0.960000 3.755000 1.010000 ;
-      RECT 2.455000 1.010000 4.685000 1.130000 ;
-      RECT 2.530000 2.140000 2.860000 2.905000 ;
-      RECT 2.530000 2.905000 3.680000 3.075000 ;
-      RECT 3.505000 0.350000 3.755000 0.960000 ;
-      RECT 3.505000 1.130000 4.685000 1.180000 ;
-      RECT 3.510000 1.950000 4.660000 2.120000 ;
-      RECT 3.510000 2.120000 3.680000 2.905000 ;
-      RECT 4.330000 2.120000 4.660000 2.980000 ;
-      RECT 4.435000 0.350000 4.685000 1.010000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.255000 2.785000 0.425000 ;
+      RECT 0.115000  0.425000 0.445000 1.130000 ;
+      RECT 0.120000  1.950000 1.400000 2.120000 ;
+      RECT 0.120000  2.120000 0.370000 2.980000 ;
+      RECT 0.570000  2.290000 0.900000 3.245000 ;
+      RECT 1.070000  2.120000 1.400000 2.905000 ;
+      RECT 1.070000  2.905000 2.300000 3.075000 ;
+      RECT 1.115000  0.425000 1.445000 0.840000 ;
+      RECT 1.970000  2.290000 2.300000 2.905000 ;
+      RECT 2.115000  0.425000 2.785000 0.840000 ;
+      RECT 2.455000  0.840000 2.785000 0.960000 ;
+      RECT 2.455000  0.960000 3.755000 1.010000 ;
+      RECT 2.455000  1.010000 4.685000 1.130000 ;
+      RECT 2.530000  2.140000 2.860000 2.905000 ;
+      RECT 2.530000  2.905000 3.680000 3.075000 ;
+      RECT 2.955000  0.085000 3.285000 0.790000 ;
+      RECT 3.505000  0.350000 3.755000 0.960000 ;
+      RECT 3.505000  1.130000 4.685000 1.180000 ;
+      RECT 3.510000  1.950000 4.660000 2.120000 ;
+      RECT 3.510000  2.120000 3.680000 2.905000 ;
+      RECT 3.880000  2.290000 4.130000 3.245000 ;
+      RECT 3.925000  0.085000 4.255000 0.840000 ;
+      RECT 4.330000  2.120000 4.660000 2.980000 ;
+      RECT 4.435000  0.350000 4.685000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef
index 8053346..defa35f 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.magic.lef
@@ -100,30 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.810000 ;
-        RECT 1.545000  0.085000 1.875000 0.670000 ;
-        RECT 2.475000  0.085000 2.805000 0.670000 ;
-        RECT 3.405000  0.085000 3.735000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -132,60 +108,81 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.120000 1.820000 0.370000 3.245000 ;
-        RECT 1.020000 2.400000 1.350000 3.245000 ;
-        RECT 3.870000 2.660000 4.200000 3.245000 ;
-        RECT 4.900000 2.530000 5.150000 3.245000 ;
-        RECT 7.670000 2.290000 8.000000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.980000 ;
-      RECT 0.115000 0.980000 4.235000 1.010000 ;
-      RECT 0.115000 1.010000 1.375000 1.150000 ;
-      RECT 0.570000 1.820000 0.900000 2.060000 ;
-      RECT 0.570000 2.060000 1.850000 2.230000 ;
-      RECT 0.570000 2.230000 0.850000 2.980000 ;
-      RECT 1.125000 0.350000 1.375000 0.840000 ;
-      RECT 1.125000 0.840000 4.235000 0.980000 ;
-      RECT 1.520000 2.230000 1.850000 2.660000 ;
-      RECT 1.520000 2.660000 3.700000 2.980000 ;
-      RECT 2.055000 0.350000 2.305000 0.840000 ;
-      RECT 2.985000 0.350000 3.235000 0.840000 ;
-      RECT 3.905000 0.255000 8.045000 0.425000 ;
-      RECT 3.905000 0.425000 6.035000 0.580000 ;
-      RECT 3.905000 0.580000 4.235000 0.840000 ;
-      RECT 3.905000 1.010000 4.235000 1.130000 ;
-      RECT 4.370000 2.190000 5.570000 2.360000 ;
-      RECT 4.370000 2.360000 4.700000 2.980000 ;
-      RECT 5.320000 2.360000 5.570000 2.905000 ;
-      RECT 5.320000 2.905000 7.500000 3.075000 ;
-      RECT 6.300000 2.290000 6.470000 2.905000 ;
-      RECT 6.705000 0.425000 7.035000 0.580000 ;
-      RECT 7.170000 2.290000 7.500000 2.905000 ;
-      RECT 7.715000 0.425000 8.045000 0.580000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 0.980000 ;
+      RECT 0.115000  0.980000 4.235000 1.010000 ;
+      RECT 0.115000  1.010000 1.375000 1.150000 ;
+      RECT 0.120000  1.820000 0.370000 3.245000 ;
+      RECT 0.570000  1.820000 0.900000 2.060000 ;
+      RECT 0.570000  2.060000 1.850000 2.230000 ;
+      RECT 0.570000  2.230000 0.850000 2.980000 ;
+      RECT 0.615000  0.085000 0.945000 0.810000 ;
+      RECT 1.020000  2.400000 1.350000 3.245000 ;
+      RECT 1.125000  0.350000 1.375000 0.840000 ;
+      RECT 1.125000  0.840000 4.235000 0.980000 ;
+      RECT 1.520000  2.230000 1.850000 2.660000 ;
+      RECT 1.520000  2.660000 3.700000 2.980000 ;
+      RECT 1.545000  0.085000 1.875000 0.670000 ;
+      RECT 2.055000  0.350000 2.305000 0.840000 ;
+      RECT 2.475000  0.085000 2.805000 0.670000 ;
+      RECT 2.985000  0.350000 3.235000 0.840000 ;
+      RECT 3.405000  0.085000 3.735000 0.670000 ;
+      RECT 3.870000  2.660000 4.200000 3.245000 ;
+      RECT 3.905000  0.255000 8.045000 0.425000 ;
+      RECT 3.905000  0.425000 6.035000 0.580000 ;
+      RECT 3.905000  0.580000 4.235000 0.840000 ;
+      RECT 3.905000  1.010000 4.235000 1.130000 ;
+      RECT 4.370000  2.190000 5.570000 2.360000 ;
+      RECT 4.370000  2.360000 4.700000 2.980000 ;
+      RECT 4.900000  2.530000 5.150000 3.245000 ;
+      RECT 5.320000  2.360000 5.570000 2.905000 ;
+      RECT 5.320000  2.905000 7.500000 3.075000 ;
+      RECT 6.300000  2.290000 6.470000 2.905000 ;
+      RECT 6.705000  0.425000 7.035000 0.580000 ;
+      RECT 7.170000  2.290000 7.500000 2.905000 ;
+      RECT 7.670000  2.290000 8.000000 3.245000 ;
+      RECT 7.715000  0.425000 8.045000 0.580000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__o22ai_4
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef
index 34d268c..4ea8133 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.magic.lef
@@ -82,20 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.625000  0.085000 1.120000 0.910000 ;
-        RECT 3.415000  0.085000 3.745000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -104,42 +90,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.615000 1.950000 0.945000 3.245000 ;
-        RECT 1.655000 2.450000 2.820000 3.245000 ;
-        RECT 3.870000 1.900000 4.200000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.300000 0.795000 1.630000 ;
-      RECT 0.625000 1.080000 1.460000 1.250000 ;
-      RECT 0.625000 1.250000 0.795000 1.300000 ;
-      RECT 1.150000 1.950000 2.380000 2.280000 ;
-      RECT 1.290000 0.255000 2.815000 0.425000 ;
-      RECT 1.290000 0.425000 1.460000 1.080000 ;
-      RECT 1.630000 0.595000 1.880000 1.090000 ;
-      RECT 1.630000 1.090000 2.380000 1.260000 ;
-      RECT 2.050000 1.260000 2.380000 1.950000 ;
-      RECT 2.485000 0.425000 2.815000 0.920000 ;
-      RECT 2.645000 0.920000 2.815000 1.900000 ;
-      RECT 2.645000 1.900000 3.320000 2.070000 ;
-      RECT 2.990000 2.070000 3.320000 2.780000 ;
-      RECT 2.995000 0.340000 3.245000 0.840000 ;
-      RECT 2.995000 0.840000 4.205000 1.010000 ;
-      RECT 3.955000 0.340000 4.205000 0.840000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.425000  1.300000 0.795000 1.630000 ;
+      RECT 0.615000  1.950000 0.945000 3.245000 ;
+      RECT 0.625000  0.085000 1.120000 0.910000 ;
+      RECT 0.625000  1.080000 1.460000 1.250000 ;
+      RECT 0.625000  1.250000 0.795000 1.300000 ;
+      RECT 1.150000  1.950000 2.380000 2.280000 ;
+      RECT 1.290000  0.255000 2.815000 0.425000 ;
+      RECT 1.290000  0.425000 1.460000 1.080000 ;
+      RECT 1.630000  0.595000 1.880000 1.090000 ;
+      RECT 1.630000  1.090000 2.380000 1.260000 ;
+      RECT 1.655000  2.450000 2.820000 3.245000 ;
+      RECT 2.050000  1.260000 2.380000 1.950000 ;
+      RECT 2.485000  0.425000 2.815000 0.920000 ;
+      RECT 2.645000  0.920000 2.815000 1.900000 ;
+      RECT 2.645000  1.900000 3.320000 2.070000 ;
+      RECT 2.990000  2.070000 3.320000 2.780000 ;
+      RECT 2.995000  0.340000 3.245000 0.840000 ;
+      RECT 2.995000  0.840000 4.205000 1.010000 ;
+      RECT 3.415000  0.085000 3.745000 0.670000 ;
+      RECT 3.870000  1.900000 4.200000 3.245000 ;
+      RECT 3.955000  0.340000 4.205000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef
index 1663763..c2c9412 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.magic.lef
@@ -81,21 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.940000 ;
-        RECT 2.885000  0.085000 3.215000 0.965000 ;
-        RECT 3.940000  0.085000 4.190000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -104,45 +89,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.120000 1.950000 0.450000 3.245000 ;
-        RECT 1.585000 2.735000 1.940000 3.245000 ;
-        RECT 2.770000 2.735000 3.220000 3.245000 ;
-        RECT 3.955000 1.820000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.110000 ;
-      RECT 0.115000 1.110000 1.305000 1.280000 ;
-      RECT 1.050000 1.950000 1.380000 2.395000 ;
-      RECT 1.050000 2.395000 3.255000 2.565000 ;
-      RECT 1.050000 2.565000 1.380000 2.980000 ;
-      RECT 1.055000 0.350000 1.305000 1.110000 ;
-      RECT 1.455000 1.450000 1.785000 1.780000 ;
-      RECT 1.475000 0.255000 2.715000 0.425000 ;
-      RECT 1.475000 0.425000 1.805000 0.965000 ;
-      RECT 1.615000 1.135000 2.375000 1.305000 ;
-      RECT 1.615000 1.305000 1.785000 1.450000 ;
-      RECT 1.615000 1.780000 1.785000 1.975000 ;
-      RECT 1.615000 1.975000 2.565000 2.225000 ;
-      RECT 2.045000 0.595000 2.375000 1.135000 ;
-      RECT 2.545000 0.425000 2.715000 1.135000 ;
-      RECT 2.545000 1.135000 3.255000 1.305000 ;
-      RECT 3.085000 1.305000 3.430000 1.635000 ;
-      RECT 3.085000 1.635000 3.255000 2.395000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.110000 ;
+      RECT 0.115000  1.110000 1.305000 1.280000 ;
+      RECT 0.120000  1.950000 0.450000 3.245000 ;
+      RECT 0.545000  0.085000 0.875000 0.940000 ;
+      RECT 1.050000  1.950000 1.380000 2.395000 ;
+      RECT 1.050000  2.395000 3.255000 2.565000 ;
+      RECT 1.050000  2.565000 1.380000 2.980000 ;
+      RECT 1.055000  0.350000 1.305000 1.110000 ;
+      RECT 1.455000  1.450000 1.785000 1.780000 ;
+      RECT 1.475000  0.255000 2.715000 0.425000 ;
+      RECT 1.475000  0.425000 1.805000 0.965000 ;
+      RECT 1.585000  2.735000 1.940000 3.245000 ;
+      RECT 1.615000  1.135000 2.375000 1.305000 ;
+      RECT 1.615000  1.305000 1.785000 1.450000 ;
+      RECT 1.615000  1.780000 1.785000 1.975000 ;
+      RECT 1.615000  1.975000 2.565000 2.225000 ;
+      RECT 2.045000  0.595000 2.375000 1.135000 ;
+      RECT 2.545000  0.425000 2.715000 1.135000 ;
+      RECT 2.545000  1.135000 3.255000 1.305000 ;
+      RECT 2.770000  2.735000 3.220000 3.245000 ;
+      RECT 2.885000  0.085000 3.215000 0.965000 ;
+      RECT 3.085000  1.305000 3.430000 1.635000 ;
+      RECT 3.085000  1.635000 3.255000 2.395000 ;
+      RECT 3.940000  0.085000 4.190000 1.130000 ;
+      RECT 3.955000  1.820000 4.205000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef
index 6cc68a3..94229c0 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.magic.lef
@@ -85,29 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.750000 ;
-        RECT 1.615000  0.085000 1.945000 0.610000 ;
-        RECT 4.540000  0.085000 5.080000 0.780000 ;
-        RECT 5.755000  0.085000 6.085000 0.640000 ;
-        RECT 6.755000  0.085000 7.085000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -116,65 +93,85 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.715000 2.290000 0.885000 3.245000 ;
-        RECT 2.545000 2.320000 2.875000 3.245000 ;
-        RECT 3.600000 2.790000 3.930000 3.245000 ;
-        RECT 4.670000 2.790000 5.000000 3.245000 ;
-        RECT 5.755000 2.060000 6.085000 3.245000 ;
-        RECT 6.755000 1.820000 7.085000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.920000 ;
-      RECT 0.115000 0.920000 3.335000 1.090000 ;
-      RECT 0.185000 1.940000 0.515000 1.950000 ;
-      RECT 0.185000 1.950000 1.415000 2.120000 ;
-      RECT 0.185000 2.120000 0.515000 2.980000 ;
-      RECT 1.085000 2.120000 1.415000 2.905000 ;
-      RECT 1.085000 2.905000 2.315000 3.075000 ;
-      RECT 1.115000 0.350000 1.445000 0.780000 ;
-      RECT 1.115000 0.780000 3.335000 0.920000 ;
-      RECT 1.615000 1.950000 3.335000 2.120000 ;
-      RECT 1.615000 2.120000 1.785000 2.735000 ;
-      RECT 1.985000 2.290000 2.315000 2.905000 ;
-      RECT 2.490000 1.300000 3.675000 1.630000 ;
-      RECT 2.505000 0.255000 4.370000 0.425000 ;
-      RECT 2.505000 0.425000 2.835000 0.610000 ;
-      RECT 2.995000 1.820000 3.335000 1.950000 ;
-      RECT 2.995000 2.120000 3.335000 2.150000 ;
-      RECT 3.005000 0.595000 3.335000 0.780000 ;
-      RECT 3.165000 2.150000 3.335000 2.450000 ;
-      RECT 3.165000 2.450000 5.085000 2.620000 ;
-      RECT 3.505000 0.960000 4.030000 1.130000 ;
-      RECT 3.505000 1.130000 3.675000 1.300000 ;
-      RECT 3.505000 1.630000 3.675000 1.950000 ;
-      RECT 3.505000 1.950000 4.465000 2.280000 ;
-      RECT 3.700000 0.635000 4.030000 0.960000 ;
-      RECT 4.200000 0.425000 4.370000 0.950000 ;
-      RECT 4.200000 0.950000 5.085000 1.120000 ;
-      RECT 4.915000 1.120000 5.085000 1.220000 ;
-      RECT 4.915000 1.220000 6.065000 1.550000 ;
-      RECT 4.915000 1.550000 5.085000 2.450000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 0.920000 ;
+      RECT 0.115000  0.920000 3.335000 1.090000 ;
+      RECT 0.185000  1.940000 0.515000 1.950000 ;
+      RECT 0.185000  1.950000 1.415000 2.120000 ;
+      RECT 0.185000  2.120000 0.515000 2.980000 ;
+      RECT 0.615000  0.085000 0.945000 0.750000 ;
+      RECT 0.715000  2.290000 0.885000 3.245000 ;
+      RECT 1.085000  2.120000 1.415000 2.905000 ;
+      RECT 1.085000  2.905000 2.315000 3.075000 ;
+      RECT 1.115000  0.350000 1.445000 0.780000 ;
+      RECT 1.115000  0.780000 3.335000 0.920000 ;
+      RECT 1.615000  0.085000 1.945000 0.610000 ;
+      RECT 1.615000  1.950000 3.335000 2.120000 ;
+      RECT 1.615000  2.120000 1.785000 2.735000 ;
+      RECT 1.985000  2.290000 2.315000 2.905000 ;
+      RECT 2.490000  1.300000 3.675000 1.630000 ;
+      RECT 2.505000  0.255000 4.370000 0.425000 ;
+      RECT 2.505000  0.425000 2.835000 0.610000 ;
+      RECT 2.545000  2.320000 2.875000 3.245000 ;
+      RECT 2.995000  1.820000 3.335000 1.950000 ;
+      RECT 2.995000  2.120000 3.335000 2.150000 ;
+      RECT 3.005000  0.595000 3.335000 0.780000 ;
+      RECT 3.165000  2.150000 3.335000 2.450000 ;
+      RECT 3.165000  2.450000 5.085000 2.620000 ;
+      RECT 3.505000  0.960000 4.030000 1.130000 ;
+      RECT 3.505000  1.130000 3.675000 1.300000 ;
+      RECT 3.505000  1.630000 3.675000 1.950000 ;
+      RECT 3.505000  1.950000 4.465000 2.280000 ;
+      RECT 3.600000  2.790000 3.930000 3.245000 ;
+      RECT 3.700000  0.635000 4.030000 0.960000 ;
+      RECT 4.200000  0.425000 4.370000 0.950000 ;
+      RECT 4.200000  0.950000 5.085000 1.120000 ;
+      RECT 4.540000  0.085000 5.080000 0.780000 ;
+      RECT 4.670000  2.790000 5.000000 3.245000 ;
+      RECT 4.915000  1.120000 5.085000 1.220000 ;
+      RECT 4.915000  1.220000 6.065000 1.550000 ;
+      RECT 4.915000  1.550000 5.085000 2.450000 ;
+      RECT 5.755000  0.085000 6.085000 0.640000 ;
+      RECT 5.755000  2.060000 6.085000 3.245000 ;
+      RECT 6.755000  0.085000 7.085000 1.130000 ;
+      RECT 6.755000  1.820000 7.085000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2bb2a_4
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef
index 8917f8b..9251ef2 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.magic.lef
@@ -82,18 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.950000 ;
-        RECT 2.540000  0.085000 2.710000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -102,33 +90,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.140000 1.895000 0.470000 3.245000 ;
-        RECT 1.140000 1.975000 1.690000 3.245000 ;
-        RECT 2.995000 1.950000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.640000 1.620000 1.690000 1.790000 ;
-      RECT 0.640000 1.790000 0.970000 2.775000 ;
-      RECT 0.935000 0.350000 1.440000 0.950000 ;
-      RECT 1.270000 0.950000 1.440000 1.350000 ;
-      RECT 1.270000 1.350000 1.690000 1.620000 ;
-      RECT 2.030000 0.445000 2.370000 0.840000 ;
-      RECT 2.200000 0.840000 2.370000 0.960000 ;
-      RECT 2.200000 0.960000 3.220000 1.130000 ;
-      RECT 2.890000 0.350000 3.220000 0.960000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.950000 ;
+      RECT 0.140000  1.895000 0.470000 3.245000 ;
+      RECT 0.640000  1.620000 1.690000 1.790000 ;
+      RECT 0.640000  1.790000 0.970000 2.775000 ;
+      RECT 0.935000  0.350000 1.440000 0.950000 ;
+      RECT 1.140000  1.975000 1.690000 3.245000 ;
+      RECT 1.270000  0.950000 1.440000 1.350000 ;
+      RECT 1.270000  1.350000 1.690000 1.620000 ;
+      RECT 2.030000  0.445000 2.370000 0.840000 ;
+      RECT 2.200000  0.840000 2.370000 0.960000 ;
+      RECT 2.200000  0.960000 3.220000 1.130000 ;
+      RECT 2.540000  0.085000 2.710000 0.790000 ;
+      RECT 2.890000  0.350000 3.220000 0.960000 ;
+      RECT 2.995000  1.950000 3.245000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef
index b593e74..b341065 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.magic.lef
@@ -92,25 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.145000  0.085000 0.475000 1.030000 ;
-        RECT 2.080000  0.085000 2.340000 0.825000 ;
-        RECT 3.960000  0.085000 4.290000 0.670000 ;
-        RECT 4.870000  0.085000 5.215000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -119,55 +100,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.115000 2.755000 0.445000 3.245000 ;
-        RECT 1.185000 2.790000 1.515000 3.245000 ;
-        RECT 2.505000 1.820000 2.835000 3.245000 ;
-        RECT 3.460000 2.400000 3.790000 3.245000 ;
-        RECT 5.395000 1.950000 5.645000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.645000 0.255000 1.910000 0.425000 ;
-      RECT 0.645000 0.425000 0.975000 0.935000 ;
-      RECT 0.650000 1.105000 2.675000 1.180000 ;
-      RECT 0.650000 1.180000 1.405000 1.275000 ;
-      RECT 0.650000 1.275000 0.980000 1.950000 ;
-      RECT 0.650000 1.950000 1.995000 2.245000 ;
-      RECT 1.155000 0.605000 1.405000 1.010000 ;
-      RECT 1.155000 1.010000 2.675000 1.105000 ;
-      RECT 1.580000 0.425000 1.910000 0.825000 ;
-      RECT 1.720000 2.245000 1.995000 2.280000 ;
-      RECT 2.505000 1.180000 2.675000 1.300000 ;
-      RECT 2.505000 1.300000 2.835000 1.630000 ;
-      RECT 2.570000 0.255000 3.790000 0.425000 ;
-      RECT 2.570000 0.425000 2.820000 0.825000 ;
-      RECT 3.460000 0.425000 3.790000 0.840000 ;
-      RECT 3.460000 0.840000 5.645000 1.010000 ;
-      RECT 3.460000 1.010000 3.790000 1.130000 ;
-      RECT 3.965000 2.400000 4.295000 2.905000 ;
-      RECT 3.965000 2.905000 5.195000 3.075000 ;
-      RECT 4.470000 0.350000 4.690000 0.770000 ;
-      RECT 4.470000 0.770000 5.645000 0.840000 ;
-      RECT 4.865000 2.060000 5.195000 2.905000 ;
-      RECT 5.315000 1.010000 5.645000 1.130000 ;
-      RECT 5.395000 0.350000 5.645000 0.770000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  2.755000 0.445000 3.245000 ;
+      RECT 0.145000  0.085000 0.475000 1.030000 ;
+      RECT 0.645000  0.255000 1.910000 0.425000 ;
+      RECT 0.645000  0.425000 0.975000 0.935000 ;
+      RECT 0.650000  1.105000 2.675000 1.180000 ;
+      RECT 0.650000  1.180000 1.405000 1.275000 ;
+      RECT 0.650000  1.275000 0.980000 1.950000 ;
+      RECT 0.650000  1.950000 1.995000 2.245000 ;
+      RECT 1.155000  0.605000 1.405000 1.010000 ;
+      RECT 1.155000  1.010000 2.675000 1.105000 ;
+      RECT 1.185000  2.790000 1.515000 3.245000 ;
+      RECT 1.580000  0.425000 1.910000 0.825000 ;
+      RECT 1.720000  2.245000 1.995000 2.280000 ;
+      RECT 2.080000  0.085000 2.340000 0.825000 ;
+      RECT 2.505000  1.180000 2.675000 1.300000 ;
+      RECT 2.505000  1.300000 2.835000 1.630000 ;
+      RECT 2.505000  1.820000 2.835000 3.245000 ;
+      RECT 2.570000  0.255000 3.790000 0.425000 ;
+      RECT 2.570000  0.425000 2.820000 0.825000 ;
+      RECT 3.460000  0.425000 3.790000 0.840000 ;
+      RECT 3.460000  0.840000 5.645000 1.010000 ;
+      RECT 3.460000  1.010000 3.790000 1.130000 ;
+      RECT 3.460000  2.400000 3.790000 3.245000 ;
+      RECT 3.960000  0.085000 4.290000 0.670000 ;
+      RECT 3.965000  2.400000 4.295000 2.905000 ;
+      RECT 3.965000  2.905000 5.195000 3.075000 ;
+      RECT 4.470000  0.350000 4.690000 0.770000 ;
+      RECT 4.470000  0.770000 5.645000 0.840000 ;
+      RECT 4.865000  2.060000 5.195000 2.905000 ;
+      RECT 4.870000  0.085000 5.215000 0.600000 ;
+      RECT 5.315000  1.010000 5.645000 1.130000 ;
+      RECT 5.395000  0.350000 5.645000 0.770000 ;
+      RECT 5.395000  1.950000 5.645000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef
index a12fb0e..2671337 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.magic.lef
@@ -90,36 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.545000  0.085000  0.875000 0.840000 ;
-        RECT 1.415000  0.085000  1.745000 0.840000 ;
-        RECT 6.415000  0.085000  6.745000 0.830000 ;
-        RECT 7.345000  0.085000  7.675000 0.830000 ;
-        RECT 8.275000  0.085000  8.605000 0.830000 ;
-        RECT 9.205000  0.085000  9.535000 0.830000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -128,78 +98,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.105000 1.950000  0.355000 3.245000 ;
-        RECT 1.085000 2.290000  1.255000 3.245000 ;
-        RECT 1.985000 2.290000  2.155000 3.245000 ;
-        RECT 2.885000 2.290000  3.055000 3.245000 ;
-        RECT 3.785000 1.820000  3.955000 3.245000 ;
-        RECT 4.685000 2.140000  4.855000 3.245000 ;
-        RECT 5.505000 2.320000  5.835000 3.245000 ;
-        RECT 8.295000 2.290000  8.560000 3.245000 ;
-        RECT 9.260000 2.290000  9.465000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 2.095000 1.180000 ;
-      RECT 0.555000 1.950000 3.585000 2.120000 ;
-      RECT 0.555000 2.120000 0.885000 2.980000 ;
-      RECT 1.055000 0.350000 1.235000 1.010000 ;
-      RECT 1.455000 2.120000 1.785000 2.980000 ;
-      RECT 1.925000 0.255000 4.035000 0.425000 ;
-      RECT 1.925000 0.425000 2.095000 1.010000 ;
-      RECT 2.275000 0.595000 2.605000 1.010000 ;
-      RECT 2.275000 1.010000 3.605000 1.180000 ;
-      RECT 2.355000 2.120000 2.685000 2.980000 ;
-      RECT 2.775000 0.425000 3.105000 0.840000 ;
-      RECT 3.255000 2.120000 3.585000 2.980000 ;
-      RECT 3.275000 0.595000 3.605000 1.010000 ;
-      RECT 3.415000 1.180000 3.605000 1.300000 ;
-      RECT 3.415000 1.300000 5.375000 1.630000 ;
-      RECT 3.415000 1.630000 3.585000 1.950000 ;
-      RECT 3.785000 0.425000 4.035000 1.130000 ;
-      RECT 4.265000 0.255000 6.235000 0.425000 ;
-      RECT 4.265000 0.425000 4.515000 1.130000 ;
-      RECT 5.205000 0.425000 5.375000 0.790000 ;
-      RECT 6.045000 2.290000 6.310000 2.905000 ;
-      RECT 6.045000 2.905000 8.110000 3.075000 ;
-      RECT 6.065000 0.425000 6.235000 1.010000 ;
-      RECT 6.065000 1.010000 9.965000 1.180000 ;
-      RECT 6.915000 0.350000 7.165000 1.010000 ;
-      RECT 7.010000 2.290000 7.210000 2.905000 ;
-      RECT 7.845000 0.350000 8.095000 1.010000 ;
-      RECT 7.910000 1.950000 9.975000 2.120000 ;
-      RECT 7.910000 2.120000 8.110000 2.905000 ;
-      RECT 8.745000 2.120000 9.075000 2.980000 ;
-      RECT 8.785000 0.350000 9.035000 1.010000 ;
-      RECT 9.645000 2.120000 9.975000 2.980000 ;
-      RECT 9.715000 0.350000 9.965000 1.010000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.105000  1.950000  0.355000 3.245000 ;
+      RECT 0.115000  0.350000  0.365000 1.010000 ;
+      RECT 0.115000  1.010000  2.095000 1.180000 ;
+      RECT 0.545000  0.085000  0.875000 0.840000 ;
+      RECT 0.555000  1.950000  3.585000 2.120000 ;
+      RECT 0.555000  2.120000  0.885000 2.980000 ;
+      RECT 1.055000  0.350000  1.235000 1.010000 ;
+      RECT 1.085000  2.290000  1.255000 3.245000 ;
+      RECT 1.415000  0.085000  1.745000 0.840000 ;
+      RECT 1.455000  2.120000  1.785000 2.980000 ;
+      RECT 1.925000  0.255000  4.035000 0.425000 ;
+      RECT 1.925000  0.425000  2.095000 1.010000 ;
+      RECT 1.985000  2.290000  2.155000 3.245000 ;
+      RECT 2.275000  0.595000  2.605000 1.010000 ;
+      RECT 2.275000  1.010000  3.605000 1.180000 ;
+      RECT 2.355000  2.120000  2.685000 2.980000 ;
+      RECT 2.775000  0.425000  3.105000 0.840000 ;
+      RECT 2.885000  2.290000  3.055000 3.245000 ;
+      RECT 3.255000  2.120000  3.585000 2.980000 ;
+      RECT 3.275000  0.595000  3.605000 1.010000 ;
+      RECT 3.415000  1.180000  3.605000 1.300000 ;
+      RECT 3.415000  1.300000  5.375000 1.630000 ;
+      RECT 3.415000  1.630000  3.585000 1.950000 ;
+      RECT 3.785000  0.425000  4.035000 1.130000 ;
+      RECT 3.785000  1.820000  3.955000 3.245000 ;
+      RECT 4.265000  0.255000  6.235000 0.425000 ;
+      RECT 4.265000  0.425000  4.515000 1.130000 ;
+      RECT 4.685000  2.140000  4.855000 3.245000 ;
+      RECT 5.205000  0.425000  5.375000 0.790000 ;
+      RECT 5.505000  2.320000  5.835000 3.245000 ;
+      RECT 6.045000  2.290000  6.310000 2.905000 ;
+      RECT 6.045000  2.905000  8.110000 3.075000 ;
+      RECT 6.065000  0.425000  6.235000 1.010000 ;
+      RECT 6.065000  1.010000  9.965000 1.180000 ;
+      RECT 6.415000  0.085000  6.745000 0.830000 ;
+      RECT 6.915000  0.350000  7.165000 1.010000 ;
+      RECT 7.010000  2.290000  7.210000 2.905000 ;
+      RECT 7.345000  0.085000  7.675000 0.830000 ;
+      RECT 7.845000  0.350000  8.095000 1.010000 ;
+      RECT 7.910000  1.950000  9.975000 2.120000 ;
+      RECT 7.910000  2.120000  8.110000 2.905000 ;
+      RECT 8.275000  0.085000  8.605000 0.830000 ;
+      RECT 8.295000  2.290000  8.560000 3.245000 ;
+      RECT 8.745000  2.120000  9.075000 2.980000 ;
+      RECT 8.785000  0.350000  9.035000 1.010000 ;
+      RECT 9.205000  0.085000  9.535000 0.830000 ;
+      RECT 9.260000  2.290000  9.465000 3.245000 ;
+      RECT 9.645000  2.120000  9.975000 2.980000 ;
+      RECT 9.715000  0.350000  9.965000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__o2bb2ai_4
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef
index d3a6873..545a0ca 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_1.magic.lef
@@ -93,20 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.560000  0.780000 3.690000 0.950000 ;
-        RECT 3.360000  0.085000 3.690000 0.780000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -115,37 +101,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.635000 1.980000 0.965000 3.245000 ;
-        RECT 3.355000 1.960000 3.685000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 1.640000 1.465000 1.810000 ;
-      RECT 0.135000 1.810000 0.465000 2.955000 ;
-      RECT 0.200000 0.350000 0.530000 0.800000 ;
-      RECT 0.200000 0.800000 0.750000 0.970000 ;
-      RECT 0.580000 0.970000 0.750000 1.640000 ;
-      RECT 1.060000 0.280000 3.180000 0.610000 ;
-      RECT 1.060000 0.610000 1.390000 0.970000 ;
-      RECT 1.135000 1.810000 1.465000 2.785000 ;
-      RECT 1.135000 2.785000 3.185000 2.955000 ;
-      RECT 3.015000 1.620000 3.895000 1.790000 ;
-      RECT 3.015000 1.790000 3.185000 2.785000 ;
-      RECT 3.595000 1.350000 3.895000 1.620000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.135000  1.640000 1.465000 1.810000 ;
+      RECT 0.135000  1.810000 0.465000 2.955000 ;
+      RECT 0.200000  0.350000 0.530000 0.800000 ;
+      RECT 0.200000  0.800000 0.750000 0.970000 ;
+      RECT 0.580000  0.970000 0.750000 1.640000 ;
+      RECT 0.635000  1.980000 0.965000 3.245000 ;
+      RECT 1.060000  0.280000 3.180000 0.610000 ;
+      RECT 1.060000  0.610000 1.390000 0.970000 ;
+      RECT 1.135000  1.810000 1.465000 2.785000 ;
+      RECT 1.135000  2.785000 3.185000 2.955000 ;
+      RECT 1.560000  0.780000 3.690000 0.950000 ;
+      RECT 3.015000  1.620000 3.895000 1.790000 ;
+      RECT 3.015000  1.790000 3.185000 2.785000 ;
+      RECT 3.355000  1.960000 3.685000 3.245000 ;
+      RECT 3.360000  0.085000 3.690000 0.780000 ;
+      RECT 3.595000  1.350000 3.895000 1.620000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o311a_1
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef
index bae23c6..d7ec8e4 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_2.magic.lef
@@ -92,21 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.690000  0.085000 2.150000 0.500000 ;
-        RECT 2.830000  0.085000 3.160000 0.840000 ;
-        RECT 3.855000  0.085000 4.205000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -115,38 +100,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.775000 2.290000 1.105000 3.245000 ;
-        RECT 2.745000 1.950000 3.075000 3.245000 ;
-        RECT 3.830000 2.060000 4.160000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.205000 0.350000 0.775000 1.010000 ;
-      RECT 0.225000 1.820000 0.775000 1.950000 ;
-      RECT 0.225000 1.950000 1.665000 2.120000 ;
-      RECT 0.225000 2.120000 0.605000 2.860000 ;
-      RECT 0.605000 1.010000 3.265000 1.180000 ;
-      RECT 0.605000 1.180000 0.775000 1.820000 ;
-      RECT 1.180000 0.350000 1.510000 0.670000 ;
-      RECT 1.180000 0.670000 2.660000 0.840000 ;
-      RECT 1.335000 2.120000 1.665000 2.980000 ;
-      RECT 2.330000 0.350000 2.660000 0.670000 ;
-      RECT 3.095000 1.180000 3.265000 1.220000 ;
-      RECT 3.095000 1.220000 3.510000 1.550000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.205000  0.350000 0.775000 1.010000 ;
+      RECT 0.225000  1.820000 0.775000 1.950000 ;
+      RECT 0.225000  1.950000 1.665000 2.120000 ;
+      RECT 0.225000  2.120000 0.605000 2.860000 ;
+      RECT 0.605000  1.010000 3.265000 1.180000 ;
+      RECT 0.605000  1.180000 0.775000 1.820000 ;
+      RECT 0.775000  2.290000 1.105000 3.245000 ;
+      RECT 1.180000  0.350000 1.510000 0.670000 ;
+      RECT 1.180000  0.670000 2.660000 0.840000 ;
+      RECT 1.335000  2.120000 1.665000 2.980000 ;
+      RECT 1.690000  0.085000 2.150000 0.500000 ;
+      RECT 2.330000  0.350000 2.660000 0.670000 ;
+      RECT 2.745000  1.950000 3.075000 3.245000 ;
+      RECT 2.830000  0.085000 3.160000 0.840000 ;
+      RECT 3.095000  1.180000 3.265000 1.220000 ;
+      RECT 3.095000  1.220000 3.510000 1.550000 ;
+      RECT 3.830000  2.060000 4.160000 3.245000 ;
+      RECT 3.855000  0.085000 4.205000 0.600000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o311a_2
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef
index 9160b19..5062fba 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_4.magic.lef
@@ -106,33 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.970000 ;
-        RECT 1.115000  0.085000 1.570000 0.680000 ;
-        RECT 2.240000  0.085000 2.570000 1.050000 ;
-        RECT 5.765000  0.085000 6.095000 0.620000 ;
-        RECT 6.765000  0.085000 7.095000 0.620000 ;
-        RECT 7.765000  0.085000 8.095000 0.620000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -141,73 +114,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.065000 2.060000 1.395000 3.245000 ;
-        RECT 2.150000 2.060000 2.480000 3.245000 ;
-        RECT 3.225000 2.290000 3.920000 3.245000 ;
-        RECT 4.590000 2.310000 4.920000 2.370000 ;
-        RECT 4.590000 2.370000 7.575000 2.395000 ;
-        RECT 4.590000 2.395000 6.550000 2.540000 ;
-        RECT 4.590000 2.540000 4.920000 3.245000 ;
-        RECT 6.380000 1.970000 7.575000 2.370000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.255000 1.220000 2.265000 1.550000 ;
-      RECT 2.095000 1.550000 2.265000 1.720000 ;
-      RECT 2.095000 1.720000 2.985000 1.890000 ;
-      RECT 2.655000 1.890000 2.985000 1.950000 ;
-      RECT 2.655000 1.950000 4.420000 1.970000 ;
-      RECT 2.655000 1.970000 6.100000 2.120000 ;
-      RECT 2.655000 2.120000 2.985000 2.980000 ;
-      RECT 2.800000 0.255000 5.595000 0.425000 ;
-      RECT 2.800000 0.425000 3.130000 0.925000 ;
-      RECT 3.300000 0.595000 5.095000 0.765000 ;
-      RECT 3.300000 0.765000 4.075000 0.925000 ;
-      RECT 4.090000 1.940000 4.420000 1.950000 ;
-      RECT 4.090000 2.120000 6.100000 2.140000 ;
-      RECT 4.090000 2.140000 4.420000 2.980000 ;
-      RECT 4.335000 0.935000 4.585000 1.130000 ;
-      RECT 4.335000 1.130000 5.700000 1.300000 ;
-      RECT 4.765000 0.765000 5.095000 0.960000 ;
-      RECT 5.150000 2.710000 6.550000 2.905000 ;
-      RECT 5.150000 2.905000 8.525000 2.960000 ;
-      RECT 5.265000 0.425000 5.595000 0.790000 ;
-      RECT 5.265000 0.790000 8.525000 0.960000 ;
-      RECT 5.530000 1.300000 5.700000 1.950000 ;
-      RECT 5.530000 1.950000 6.100000 1.970000 ;
-      RECT 5.750000 2.140000 6.100000 2.200000 ;
-      RECT 6.220000 2.960000 8.525000 3.075000 ;
-      RECT 6.265000 0.370000 6.595000 0.790000 ;
-      RECT 6.265000 0.960000 6.595000 1.050000 ;
-      RECT 6.720000 2.565000 8.025000 2.735000 ;
-      RECT 7.265000 0.350000 7.595000 0.790000 ;
-      RECT 7.775000 1.970000 8.025000 2.565000 ;
-      RECT 8.195000 1.970000 8.525000 2.905000 ;
-      RECT 8.275000 0.350000 8.525000 0.790000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.970000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 1.065000  2.060000 1.395000 3.245000 ;
+      RECT 1.115000  0.085000 1.570000 0.680000 ;
+      RECT 1.255000  1.220000 2.265000 1.550000 ;
+      RECT 2.095000  1.550000 2.265000 1.720000 ;
+      RECT 2.095000  1.720000 2.985000 1.890000 ;
+      RECT 2.150000  2.060000 2.480000 3.245000 ;
+      RECT 2.240000  0.085000 2.570000 1.050000 ;
+      RECT 2.655000  1.890000 2.985000 1.950000 ;
+      RECT 2.655000  1.950000 4.420000 1.970000 ;
+      RECT 2.655000  1.970000 6.100000 2.120000 ;
+      RECT 2.655000  2.120000 2.985000 2.980000 ;
+      RECT 2.800000  0.255000 5.595000 0.425000 ;
+      RECT 2.800000  0.425000 3.130000 0.925000 ;
+      RECT 3.225000  2.290000 3.920000 3.245000 ;
+      RECT 3.300000  0.595000 5.095000 0.765000 ;
+      RECT 3.300000  0.765000 4.075000 0.925000 ;
+      RECT 4.090000  1.940000 4.420000 1.950000 ;
+      RECT 4.090000  2.120000 6.100000 2.140000 ;
+      RECT 4.090000  2.140000 4.420000 2.980000 ;
+      RECT 4.335000  0.935000 4.585000 1.130000 ;
+      RECT 4.335000  1.130000 5.700000 1.300000 ;
+      RECT 4.590000  2.310000 4.920000 2.370000 ;
+      RECT 4.590000  2.370000 7.575000 2.395000 ;
+      RECT 4.590000  2.395000 6.550000 2.540000 ;
+      RECT 4.590000  2.540000 4.920000 3.245000 ;
+      RECT 4.765000  0.765000 5.095000 0.960000 ;
+      RECT 5.150000  2.710000 6.550000 2.905000 ;
+      RECT 5.150000  2.905000 8.525000 2.960000 ;
+      RECT 5.265000  0.425000 5.595000 0.790000 ;
+      RECT 5.265000  0.790000 8.525000 0.960000 ;
+      RECT 5.530000  1.300000 5.700000 1.950000 ;
+      RECT 5.530000  1.950000 6.100000 1.970000 ;
+      RECT 5.750000  2.140000 6.100000 2.200000 ;
+      RECT 5.765000  0.085000 6.095000 0.620000 ;
+      RECT 6.220000  2.960000 8.525000 3.075000 ;
+      RECT 6.265000  0.370000 6.595000 0.790000 ;
+      RECT 6.265000  0.960000 6.595000 1.050000 ;
+      RECT 6.380000  1.970000 7.575000 2.370000 ;
+      RECT 6.720000  2.565000 8.025000 2.735000 ;
+      RECT 6.765000  0.085000 7.095000 0.620000 ;
+      RECT 7.265000  0.350000 7.595000 0.790000 ;
+      RECT 7.765000  0.085000 8.095000 0.620000 ;
+      RECT 7.775000  1.970000 8.025000 2.565000 ;
+      RECT 8.195000  1.970000 8.525000 2.905000 ;
+      RECT 8.275000  0.350000 8.525000 0.790000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__o311a_4
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef
index 68f3f71..254e0a6 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.115000  0.085000 1.675000 0.650000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -112,27 +100,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.225000 1.950000 0.555000 3.245000 ;
-        RECT 2.285000 2.060000 2.615000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.350000 0.945000 0.840000 ;
-      RECT 0.615000 0.840000 2.220000 1.010000 ;
-      RECT 0.615000 1.010000 0.945000 1.130000 ;
-      RECT 1.890000 0.330000 2.220000 0.840000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.225000  1.950000 0.555000 3.245000 ;
+      RECT 0.615000  0.350000 0.945000 0.840000 ;
+      RECT 0.615000  0.840000 2.220000 1.010000 ;
+      RECT 0.615000  1.010000 0.945000 1.130000 ;
+      RECT 1.115000  0.085000 1.675000 0.650000 ;
+      RECT 1.890000  0.330000 2.220000 0.840000 ;
+      RECT 2.285000  2.060000 2.615000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__o311ai_1
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef
index c7bc9f4..08ce480 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.magic.lef
@@ -96,24 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.840000 ;
-        RECT 1.535000  0.085000 1.865000 0.840000 ;
-        RECT 2.465000  0.085000 2.795000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -122,45 +104,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.650000 2.290000 0.900000 3.245000 ;
-        RECT 3.950000 2.290000 4.280000 3.245000 ;
-        RECT 4.850000 2.290000 5.100000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 4.225000 1.180000 ;
-      RECT 0.120000 1.950000 2.370000 2.120000 ;
-      RECT 0.120000 2.120000 0.450000 2.980000 ;
-      RECT 1.070000 2.120000 1.400000 2.980000 ;
-      RECT 1.115000 0.350000 1.365000 1.010000 ;
-      RECT 1.590000 2.290000 1.920000 2.905000 ;
-      RECT 1.590000 2.905000 3.300000 3.075000 ;
-      RECT 2.045000 0.350000 2.295000 1.010000 ;
-      RECT 2.120000 2.120000 2.370000 2.735000 ;
-      RECT 2.975000 0.350000 3.225000 1.010000 ;
-      RECT 3.130000 2.290000 3.300000 2.905000 ;
-      RECT 3.395000 0.255000 5.215000 0.425000 ;
-      RECT 3.395000 0.425000 3.725000 0.840000 ;
-      RECT 3.895000 0.595000 4.225000 1.010000 ;
-      RECT 4.885000 0.425000 5.215000 0.790000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.010000 ;
+      RECT 0.115000  1.010000 4.225000 1.180000 ;
+      RECT 0.120000  1.950000 2.370000 2.120000 ;
+      RECT 0.120000  2.120000 0.450000 2.980000 ;
+      RECT 0.545000  0.085000 0.875000 0.840000 ;
+      RECT 0.650000  2.290000 0.900000 3.245000 ;
+      RECT 1.070000  2.120000 1.400000 2.980000 ;
+      RECT 1.115000  0.350000 1.365000 1.010000 ;
+      RECT 1.535000  0.085000 1.865000 0.840000 ;
+      RECT 1.590000  2.290000 1.920000 2.905000 ;
+      RECT 1.590000  2.905000 3.300000 3.075000 ;
+      RECT 2.045000  0.350000 2.295000 1.010000 ;
+      RECT 2.120000  2.120000 2.370000 2.735000 ;
+      RECT 2.465000  0.085000 2.795000 0.840000 ;
+      RECT 2.975000  0.350000 3.225000 1.010000 ;
+      RECT 3.130000  2.290000 3.300000 2.905000 ;
+      RECT 3.395000  0.255000 5.215000 0.425000 ;
+      RECT 3.395000  0.425000 3.725000 0.840000 ;
+      RECT 3.895000  0.595000 4.225000 1.010000 ;
+      RECT 3.950000  2.290000 4.280000 3.245000 ;
+      RECT 4.850000  2.290000 5.100000 3.245000 ;
+      RECT 4.885000  0.425000 5.215000 0.790000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__o311ai_2
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef
index bfee029..d95ee6a 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.magic.lef
@@ -99,39 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  4.410000  0.085000  4.740000 0.580000 ;
-        RECT  5.350000  0.085000  5.680000 0.580000 ;
-        RECT  6.370000  0.085000  6.710000 0.580000 ;
-        RECT  7.320000  0.085000  7.650000 0.825000 ;
-        RECT  8.295000  0.085000  8.545000 1.130000 ;
-        RECT  9.155000  0.085000  9.995000 0.790000 ;
-        RECT 10.595000  0.085000 10.925000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -140,74 +107,104 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.115000 1.950000  0.445000 3.245000 ;
-        RECT  1.240000 2.290000  1.570000 3.245000 ;
-        RECT  2.240000 2.290000  3.905000 3.245000 ;
-        RECT  8.795000 2.330000  9.125000 3.245000 ;
-        RECT  9.695000 2.330000 10.025000 3.245000 ;
-        RECT 10.675000 1.820000 10.925000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  2.090000 0.600000 ;
-      RECT  0.115000 0.600000  0.365000 1.130000 ;
-      RECT  1.920000 0.600000  2.090000 0.750000 ;
-      RECT  1.920000 0.750000  3.900000 0.920000 ;
-      RECT  2.270000 0.330000  4.240000 0.580000 ;
-      RECT  4.070000 0.580000  4.240000 0.750000 ;
-      RECT  4.070000 0.750000  7.140000 0.920000 ;
-      RECT  4.185000 2.290000  4.515000 2.905000 ;
-      RECT  4.185000 2.905000  8.565000 3.075000 ;
-      RECT  4.920000 0.350000  5.170000 0.750000 ;
-      RECT  5.185000 2.290000  5.515000 2.905000 ;
-      RECT  5.860000 0.350000  6.190000 0.750000 ;
-      RECT  6.285000 2.290000  6.615000 2.905000 ;
-      RECT  6.785000 1.950000 10.475000 2.120000 ;
-      RECT  6.785000 2.120000  7.115000 2.735000 ;
-      RECT  6.890000 0.350000  7.140000 0.750000 ;
-      RECT  6.890000 0.920000  7.140000 1.010000 ;
-      RECT  6.890000 1.010000  8.115000 1.180000 ;
-      RECT  7.285000 2.290000  7.615000 2.905000 ;
-      RECT  7.785000 2.120000 10.475000 2.150000 ;
-      RECT  7.785000 2.150000  8.065000 2.735000 ;
-      RECT  7.945000 0.350000  8.115000 1.010000 ;
-      RECT  7.945000 1.180000  8.115000 1.300000 ;
-      RECT  7.945000 1.300000  8.975000 1.470000 ;
-      RECT  8.235000 2.330000  8.565000 2.905000 ;
-      RECT  8.725000 0.350000  8.975000 0.960000 ;
-      RECT  8.725000 0.960000 10.415000 1.130000 ;
-      RECT  8.725000 1.130000  8.975000 1.300000 ;
-      RECT  9.295000 2.150000  9.525000 2.980000 ;
-      RECT 10.165000 0.350000 10.415000 0.960000 ;
-      RECT 10.195000 2.150000 10.475000 2.980000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.115000  0.350000  2.090000 0.600000 ;
+      RECT  0.115000  0.600000  0.365000 1.130000 ;
+      RECT  0.115000  1.950000  0.445000 3.245000 ;
+      RECT  1.240000  2.290000  1.570000 3.245000 ;
+      RECT  1.920000  0.600000  2.090000 0.750000 ;
+      RECT  1.920000  0.750000  3.900000 0.920000 ;
+      RECT  2.240000  2.290000  3.905000 3.245000 ;
+      RECT  2.270000  0.330000  4.240000 0.580000 ;
+      RECT  4.070000  0.580000  4.240000 0.750000 ;
+      RECT  4.070000  0.750000  7.140000 0.920000 ;
+      RECT  4.185000  2.290000  4.515000 2.905000 ;
+      RECT  4.185000  2.905000  8.565000 3.075000 ;
+      RECT  4.410000  0.085000  4.740000 0.580000 ;
+      RECT  4.920000  0.350000  5.170000 0.750000 ;
+      RECT  5.185000  2.290000  5.515000 2.905000 ;
+      RECT  5.350000  0.085000  5.680000 0.580000 ;
+      RECT  5.860000  0.350000  6.190000 0.750000 ;
+      RECT  6.285000  2.290000  6.615000 2.905000 ;
+      RECT  6.370000  0.085000  6.710000 0.580000 ;
+      RECT  6.785000  1.950000 10.475000 2.120000 ;
+      RECT  6.785000  2.120000  7.115000 2.735000 ;
+      RECT  6.890000  0.350000  7.140000 0.750000 ;
+      RECT  6.890000  0.920000  7.140000 1.010000 ;
+      RECT  6.890000  1.010000  8.115000 1.180000 ;
+      RECT  7.285000  2.290000  7.615000 2.905000 ;
+      RECT  7.320000  0.085000  7.650000 0.825000 ;
+      RECT  7.785000  2.120000 10.475000 2.150000 ;
+      RECT  7.785000  2.150000  8.065000 2.735000 ;
+      RECT  7.945000  0.350000  8.115000 1.010000 ;
+      RECT  7.945000  1.180000  8.115000 1.300000 ;
+      RECT  7.945000  1.300000  8.975000 1.470000 ;
+      RECT  8.235000  2.330000  8.565000 2.905000 ;
+      RECT  8.295000  0.085000  8.545000 1.130000 ;
+      RECT  8.725000  0.350000  8.975000 0.960000 ;
+      RECT  8.725000  0.960000 10.415000 1.130000 ;
+      RECT  8.725000  1.130000  8.975000 1.300000 ;
+      RECT  8.795000  2.330000  9.125000 3.245000 ;
+      RECT  9.155000  0.085000  9.995000 0.790000 ;
+      RECT  9.295000  2.150000  9.525000 2.980000 ;
+      RECT  9.695000  2.330000 10.025000 3.245000 ;
+      RECT 10.165000  0.350000 10.415000 0.960000 ;
+      RECT 10.195000  2.150000 10.475000 2.980000 ;
+      RECT 10.595000  0.085000 10.925000 1.130000 ;
+      RECT 10.675000  1.820000 10.925000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__o311ai_4
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef
index 686e5c6..4223feb 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_1.magic.lef
@@ -81,18 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 1.130000 ;
-        RECT 1.765000  0.085000 2.130000 0.780000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -101,32 +89,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.625000 2.290000 1.090000 3.245000 ;
-        RECT 2.735000 2.290000 3.050000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.320000 0.795000 1.650000 ;
-      RECT 0.625000 1.650000 0.795000 1.950000 ;
-      RECT 0.625000 1.950000 3.255000 2.120000 ;
-      RECT 1.125000 0.450000 1.460000 0.960000 ;
-      RECT 1.125000 0.960000 2.745000 1.130000 ;
-      RECT 2.195000 2.120000 2.525000 2.880000 ;
-      RECT 2.415000 0.450000 2.745000 0.960000 ;
-      RECT 2.915000 0.450000 3.255000 1.130000 ;
-      RECT 3.085000 1.130000 3.255000 1.950000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.425000  1.320000 0.795000 1.650000 ;
+      RECT 0.615000  0.085000 0.945000 1.130000 ;
+      RECT 0.625000  1.650000 0.795000 1.950000 ;
+      RECT 0.625000  1.950000 3.255000 2.120000 ;
+      RECT 0.625000  2.290000 1.090000 3.245000 ;
+      RECT 1.125000  0.450000 1.460000 0.960000 ;
+      RECT 1.125000  0.960000 2.745000 1.130000 ;
+      RECT 1.765000  0.085000 2.130000 0.780000 ;
+      RECT 2.195000  2.120000 2.525000 2.880000 ;
+      RECT 2.415000  0.450000 2.745000 0.960000 ;
+      RECT 2.735000  2.290000 3.050000 3.245000 ;
+      RECT 2.915000  0.450000 3.255000 1.130000 ;
+      RECT 3.085000  1.130000 3.255000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__o31a_1
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef
index ea4d97d..6d9f24e 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_2.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.115000  0.085000 1.445000 1.130000 ;
-        RECT 2.115000  0.085000 2.510000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -103,38 +89,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.115000 2.660000 0.445000 3.245000 ;
-        RECT 1.070000 2.660000 1.595000 3.245000 ;
-        RECT 3.395000 1.950000 3.725000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.225000 1.320000 0.605000 1.650000 ;
-      RECT 0.225000 1.650000 0.395000 2.320000 ;
-      RECT 0.225000 2.320000 3.225000 2.490000 ;
-      RECT 1.615000 0.350000 1.945000 0.770000 ;
-      RECT 1.615000 0.770000 3.225000 0.790000 ;
-      RECT 1.615000 0.790000 2.850000 0.940000 ;
-      RECT 1.615000 0.940000 1.945000 1.130000 ;
-      RECT 2.680000 0.460000 3.225000 0.770000 ;
-      RECT 2.765000 1.940000 3.225000 2.320000 ;
-      RECT 2.765000 2.490000 3.225000 2.980000 ;
-      RECT 3.055000 0.960000 3.725000 1.130000 ;
-      RECT 3.055000 1.130000 3.225000 1.940000 ;
-      RECT 3.395000 0.350000 3.725000 0.960000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.115000  2.660000 0.445000 3.245000 ;
+      RECT 0.225000  1.320000 0.605000 1.650000 ;
+      RECT 0.225000  1.650000 0.395000 2.320000 ;
+      RECT 0.225000  2.320000 3.225000 2.490000 ;
+      RECT 1.070000  2.660000 1.595000 3.245000 ;
+      RECT 1.115000  0.085000 1.445000 1.130000 ;
+      RECT 1.615000  0.350000 1.945000 0.770000 ;
+      RECT 1.615000  0.770000 3.225000 0.790000 ;
+      RECT 1.615000  0.790000 2.850000 0.940000 ;
+      RECT 1.615000  0.940000 1.945000 1.130000 ;
+      RECT 2.115000  0.085000 2.510000 0.600000 ;
+      RECT 2.680000  0.460000 3.225000 0.770000 ;
+      RECT 2.765000  1.940000 3.225000 2.320000 ;
+      RECT 2.765000  2.490000 3.225000 2.980000 ;
+      RECT 3.055000  0.960000 3.725000 1.130000 ;
+      RECT 3.055000  1.130000 3.225000 1.940000 ;
+      RECT 3.395000  0.350000 3.725000 0.960000 ;
+      RECT 3.395000  1.950000 3.725000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o31a_2
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef
index c295c2d..87eac6c 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_4.magic.lef
@@ -85,29 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.145000  0.085000 0.395000 1.130000 ;
-        RECT 1.085000  0.085000 1.255000 0.790000 ;
-        RECT 1.880000  0.085000 2.210000 1.130000 ;
-        RECT 3.960000  0.085000 4.210000 0.945000 ;
-        RECT 4.820000  0.085000 5.150000 0.945000 ;
-        RECT 5.750000  0.085000 6.080000 0.945000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -116,54 +93,74 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.130000 1.820000 0.380000 3.245000 ;
-        RECT 1.030000 2.140000 1.280000 3.245000 ;
-        RECT 2.010000 1.820000 2.260000 3.245000 ;
-        RECT 2.915000 2.715000 3.245000 3.245000 ;
-        RECT 5.275000 2.635000 5.605000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.005000 1.300000 2.715000 1.630000 ;
-      RECT 2.440000 0.265000 3.780000 0.435000 ;
-      RECT 2.440000 0.435000 2.770000 0.960000 ;
-      RECT 2.465000 1.630000 2.715000 2.375000 ;
-      RECT 2.465000 2.375000 4.255000 2.545000 ;
-      RECT 2.465000 2.545000 2.715000 2.980000 ;
-      RECT 2.545000 1.130000 3.270000 1.300000 ;
-      RECT 2.940000 0.605000 3.270000 1.130000 ;
-      RECT 3.450000 0.435000 3.780000 1.115000 ;
-      RECT 3.450000 1.115000 6.580000 1.285000 ;
-      RECT 3.475000 1.955000 6.605000 2.125000 ;
-      RECT 3.475000 2.125000 4.645000 2.205000 ;
-      RECT 3.925000 2.545000 4.255000 2.980000 ;
-      RECT 4.390000 0.605000 4.640000 1.115000 ;
-      RECT 4.435000 2.205000 4.645000 2.980000 ;
-      RECT 4.825000 2.295000 6.105000 2.465000 ;
-      RECT 4.825000 2.465000 5.075000 2.980000 ;
-      RECT 5.320000 0.605000 5.570000 1.115000 ;
-      RECT 5.775000 2.465000 6.105000 2.980000 ;
-      RECT 6.250000 0.605000 6.580000 1.115000 ;
-      RECT 6.275000 2.125000 6.605000 2.980000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.130000  1.820000 0.380000 3.245000 ;
+      RECT 0.145000  0.085000 0.395000 1.130000 ;
+      RECT 1.005000  1.300000 2.715000 1.630000 ;
+      RECT 1.030000  2.140000 1.280000 3.245000 ;
+      RECT 1.085000  0.085000 1.255000 0.790000 ;
+      RECT 1.880000  0.085000 2.210000 1.130000 ;
+      RECT 2.010000  1.820000 2.260000 3.245000 ;
+      RECT 2.440000  0.265000 3.780000 0.435000 ;
+      RECT 2.440000  0.435000 2.770000 0.960000 ;
+      RECT 2.465000  1.630000 2.715000 2.375000 ;
+      RECT 2.465000  2.375000 4.255000 2.545000 ;
+      RECT 2.465000  2.545000 2.715000 2.980000 ;
+      RECT 2.545000  1.130000 3.270000 1.300000 ;
+      RECT 2.915000  2.715000 3.245000 3.245000 ;
+      RECT 2.940000  0.605000 3.270000 1.130000 ;
+      RECT 3.450000  0.435000 3.780000 1.115000 ;
+      RECT 3.450000  1.115000 6.580000 1.285000 ;
+      RECT 3.475000  1.955000 6.605000 2.125000 ;
+      RECT 3.475000  2.125000 4.645000 2.205000 ;
+      RECT 3.925000  2.545000 4.255000 2.980000 ;
+      RECT 3.960000  0.085000 4.210000 0.945000 ;
+      RECT 4.390000  0.605000 4.640000 1.115000 ;
+      RECT 4.435000  2.205000 4.645000 2.980000 ;
+      RECT 4.820000  0.085000 5.150000 0.945000 ;
+      RECT 4.825000  2.295000 6.105000 2.465000 ;
+      RECT 4.825000  2.465000 5.075000 2.980000 ;
+      RECT 5.275000  2.635000 5.605000 3.245000 ;
+      RECT 5.320000  0.605000 5.570000 1.115000 ;
+      RECT 5.750000  0.085000 6.080000 0.945000 ;
+      RECT 5.775000  2.465000 6.105000 2.980000 ;
+      RECT 6.250000  0.605000 6.580000 1.115000 ;
+      RECT 6.275000  2.125000 6.605000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__o31a_4
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef
index 9d969d4..e3db754 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.magic.lef
@@ -82,17 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.010000 ;
-        RECT 1.055000  0.085000 1.755000 0.450000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -101,26 +90,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.130000 1.820000 0.380000 3.245000 ;
-        RECT 2.410000 1.950000 2.740000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.625000 0.350000 0.875000 0.620000 ;
-      RECT 0.625000 0.620000 2.265000 0.790000 ;
-      RECT 0.625000 0.790000 0.875000 1.130000 ;
-      RECT 1.935000 0.350000 2.265000 0.620000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.010000 ;
+      RECT 0.130000  1.820000 0.380000 3.245000 ;
+      RECT 0.625000  0.350000 0.875000 0.620000 ;
+      RECT 0.625000  0.620000 2.265000 0.790000 ;
+      RECT 0.625000  0.790000 0.875000 1.130000 ;
+      RECT 1.055000  0.085000 1.755000 0.450000 ;
+      RECT 1.935000  0.350000 2.265000 0.620000 ;
+      RECT 2.410000  1.950000 2.740000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef
index 00b1a40..f0459da 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.magic.lef
@@ -89,22 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.825000 ;
-        RECT 1.615000  0.085000 1.945000 0.825000 ;
-        RECT 2.625000  0.085000 3.240000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -113,42 +97,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.570000 2.290000 0.820000 3.245000 ;
-        RECT 3.985000 2.190000 4.155000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 2.445000 1.180000 ;
-      RECT 0.120000 1.950000 2.250000 2.120000 ;
-      RECT 0.120000 2.120000 0.370000 2.980000 ;
-      RECT 1.020000 2.120000 1.350000 2.980000 ;
-      RECT 1.115000 0.350000 1.445000 1.010000 ;
-      RECT 1.550000 2.290000 1.720000 2.905000 ;
-      RECT 1.550000 2.905000 3.285000 3.075000 ;
-      RECT 1.920000 2.120000 2.250000 2.735000 ;
-      RECT 2.115000 0.350000 2.445000 0.670000 ;
-      RECT 2.115000 0.670000 3.670000 0.840000 ;
-      RECT 2.115000 0.840000 2.445000 1.010000 ;
-      RECT 2.955000 2.290000 3.285000 2.905000 ;
-      RECT 3.420000 0.255000 4.680000 0.425000 ;
-      RECT 3.420000 0.425000 3.670000 0.670000 ;
-      RECT 4.350000 0.425000 4.680000 1.010000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 2.445000 1.180000 ;
+      RECT 0.120000  1.950000 2.250000 2.120000 ;
+      RECT 0.120000  2.120000 0.370000 2.980000 ;
+      RECT 0.570000  2.290000 0.820000 3.245000 ;
+      RECT 0.615000  0.085000 0.945000 0.825000 ;
+      RECT 1.020000  2.120000 1.350000 2.980000 ;
+      RECT 1.115000  0.350000 1.445000 1.010000 ;
+      RECT 1.550000  2.290000 1.720000 2.905000 ;
+      RECT 1.550000  2.905000 3.285000 3.075000 ;
+      RECT 1.615000  0.085000 1.945000 0.825000 ;
+      RECT 1.920000  2.120000 2.250000 2.735000 ;
+      RECT 2.115000  0.350000 2.445000 0.670000 ;
+      RECT 2.115000  0.670000 3.670000 0.840000 ;
+      RECT 2.115000  0.840000 2.445000 1.010000 ;
+      RECT 2.625000  0.085000 3.240000 0.500000 ;
+      RECT 2.955000  2.290000 3.285000 2.905000 ;
+      RECT 3.420000  0.255000 4.680000 0.425000 ;
+      RECT 3.420000  0.425000 3.670000 0.670000 ;
+      RECT 3.985000  2.190000 4.155000 3.245000 ;
+      RECT 4.350000  0.425000 4.680000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef
index 5bf3dce..5b71e4f 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.magic.lef
@@ -89,33 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.750000 ;
-        RECT 1.475000  0.085000 1.805000 0.750000 ;
-        RECT 2.495000  0.085000 2.960000 0.805000 ;
-        RECT 3.645000  0.085000 3.975000 0.840000 ;
-        RECT 4.585000  0.085000 5.265000 0.500000 ;
-        RECT 5.955000  0.085000 6.295000 0.410000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -124,64 +97,88 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.570000 2.290000 0.900000 3.245000 ;
-        RECT 1.470000 2.290000 1.800000 3.245000 ;
-        RECT 7.050000 2.290000 8.025000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.390000 0.445000 0.920000 ;
-      RECT 0.115000 0.920000 2.305000 1.010000 ;
-      RECT 0.115000 1.010000 4.325000 1.180000 ;
-      RECT 0.120000 1.950000 3.300000 2.120000 ;
-      RECT 0.120000 2.120000 0.370000 2.980000 ;
-      RECT 1.100000 2.120000 1.270000 2.980000 ;
-      RECT 1.970000 1.820000 2.300000 1.950000 ;
-      RECT 1.970000 2.120000 2.300000 2.980000 ;
-      RECT 1.975000 0.390000 2.305000 0.920000 ;
-      RECT 2.470000 2.290000 2.800000 2.905000 ;
-      RECT 2.470000 2.905000 6.380000 3.075000 ;
-      RECT 2.970000 2.120000 3.300000 2.370000 ;
-      RECT 2.970000 2.370000 4.470000 2.540000 ;
-      RECT 2.970000 2.540000 3.300000 2.735000 ;
-      RECT 3.145000 0.390000 3.475000 1.010000 ;
-      RECT 3.640000 2.710000 3.970000 2.905000 ;
-      RECT 4.140000 2.540000 4.470000 2.735000 ;
-      RECT 4.155000 0.390000 4.325000 0.670000 ;
-      RECT 4.155000 0.670000 6.805000 0.750000 ;
-      RECT 4.155000 0.750000 5.775000 0.840000 ;
-      RECT 4.155000 0.840000 4.325000 1.010000 ;
-      RECT 5.150000 2.290000 5.400000 2.905000 ;
-      RECT 5.445000 0.390000 5.775000 0.580000 ;
-      RECT 5.445000 0.580000 6.805000 0.670000 ;
-      RECT 6.130000 2.290000 6.380000 2.905000 ;
-      RECT 6.475000 0.390000 8.525000 0.560000 ;
-      RECT 6.475000 0.560000 6.805000 0.580000 ;
-      RECT 7.335000 0.560000 7.665000 0.750000 ;
-      RECT 8.265000 0.560000 8.525000 1.170000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  0.390000 0.445000 0.920000 ;
+      RECT 0.115000  0.920000 2.305000 1.010000 ;
+      RECT 0.115000  1.010000 4.325000 1.180000 ;
+      RECT 0.120000  1.950000 3.300000 2.120000 ;
+      RECT 0.120000  2.120000 0.370000 2.980000 ;
+      RECT 0.570000  2.290000 0.900000 3.245000 ;
+      RECT 0.615000  0.085000 0.945000 0.750000 ;
+      RECT 1.100000  2.120000 1.270000 2.980000 ;
+      RECT 1.470000  2.290000 1.800000 3.245000 ;
+      RECT 1.475000  0.085000 1.805000 0.750000 ;
+      RECT 1.970000  1.820000 2.300000 1.950000 ;
+      RECT 1.970000  2.120000 2.300000 2.980000 ;
+      RECT 1.975000  0.390000 2.305000 0.920000 ;
+      RECT 2.470000  2.290000 2.800000 2.905000 ;
+      RECT 2.470000  2.905000 6.380000 3.075000 ;
+      RECT 2.495000  0.085000 2.960000 0.805000 ;
+      RECT 2.970000  2.120000 3.300000 2.370000 ;
+      RECT 2.970000  2.370000 4.470000 2.540000 ;
+      RECT 2.970000  2.540000 3.300000 2.735000 ;
+      RECT 3.145000  0.390000 3.475000 1.010000 ;
+      RECT 3.640000  2.710000 3.970000 2.905000 ;
+      RECT 3.645000  0.085000 3.975000 0.840000 ;
+      RECT 4.140000  2.540000 4.470000 2.735000 ;
+      RECT 4.155000  0.390000 4.325000 0.670000 ;
+      RECT 4.155000  0.670000 6.805000 0.750000 ;
+      RECT 4.155000  0.750000 5.775000 0.840000 ;
+      RECT 4.155000  0.840000 4.325000 1.010000 ;
+      RECT 4.585000  0.085000 5.265000 0.500000 ;
+      RECT 5.150000  2.290000 5.400000 2.905000 ;
+      RECT 5.445000  0.390000 5.775000 0.580000 ;
+      RECT 5.445000  0.580000 6.805000 0.670000 ;
+      RECT 5.955000  0.085000 6.295000 0.410000 ;
+      RECT 6.130000  2.290000 6.380000 2.905000 ;
+      RECT 6.475000  0.390000 8.525000 0.560000 ;
+      RECT 6.475000  0.560000 6.805000 0.580000 ;
+      RECT 7.050000  2.290000 8.025000 3.245000 ;
+      RECT 7.335000  0.560000 7.665000 0.750000 ;
+      RECT 8.265000  0.560000 8.525000 1.170000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__o31ai_4
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef
index c309da7..49b9eb8 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_1.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.730000  0.085000 1.060000 1.030000 ;
-        RECT 1.730000  0.085000 2.060000 0.820000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -111,37 +98,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.615000 2.290000 0.945000 3.245000 ;
-        RECT 3.320000 2.290000 3.650000 3.245000 ;
-        RECT 3.410000 1.970000 3.650000 2.290000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.320000 0.785000 1.650000 ;
-      RECT 0.615000 1.650000 0.785000 1.950000 ;
-      RECT 0.615000 1.950000 3.235000 2.120000 ;
-      RECT 1.230000 0.350000 1.560000 1.010000 ;
-      RECT 1.230000 1.010000 2.560000 1.180000 ;
-      RECT 2.205000 2.120000 2.595000 2.880000 ;
-      RECT 2.230000 0.340000 3.655000 0.520000 ;
-      RECT 2.230000 0.520000 2.560000 1.010000 ;
-      RECT 2.730000 0.700000 3.225000 1.010000 ;
-      RECT 2.730000 1.010000 3.235000 1.180000 ;
-      RECT 3.065000 1.180000 3.235000 1.950000 ;
-      RECT 3.405000 0.520000 3.655000 1.010000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.425000  1.320000 0.785000 1.650000 ;
+      RECT 0.615000  1.650000 0.785000 1.950000 ;
+      RECT 0.615000  1.950000 3.235000 2.120000 ;
+      RECT 0.615000  2.290000 0.945000 3.245000 ;
+      RECT 0.730000  0.085000 1.060000 1.030000 ;
+      RECT 1.230000  0.350000 1.560000 1.010000 ;
+      RECT 1.230000  1.010000 2.560000 1.180000 ;
+      RECT 1.730000  0.085000 2.060000 0.820000 ;
+      RECT 2.205000  2.120000 2.595000 2.880000 ;
+      RECT 2.230000  0.340000 3.655000 0.520000 ;
+      RECT 2.230000  0.520000 2.560000 1.010000 ;
+      RECT 2.730000  0.700000 3.225000 1.010000 ;
+      RECT 2.730000  1.010000 3.235000 1.180000 ;
+      RECT 3.065000  1.180000 3.235000 1.950000 ;
+      RECT 3.320000  2.290000 3.650000 3.245000 ;
+      RECT 3.405000  0.520000 3.655000 1.010000 ;
+      RECT 3.410000  1.970000 3.650000 2.290000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__o32a_1
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef
index 5420163..96a9302 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_2.magic.lef
@@ -91,23 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.115000  0.085000 0.540000 0.790000 ;
-        RECT 0.115000  0.790000 0.365000 1.140000 ;
-        RECT 1.220000  0.085000 1.550000 1.130000 ;
-        RECT 2.220000  0.085000 2.550000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -116,38 +99,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.065000 2.290000 1.600000 3.245000 ;
-        RECT 3.815000 2.290000 4.145000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.875000 1.320000 1.235000 1.650000 ;
-      RECT 1.065000 1.650000 1.235000 1.950000 ;
-      RECT 1.065000 1.950000 4.185000 2.120000 ;
-      RECT 1.720000 0.350000 2.050000 1.010000 ;
-      RECT 1.720000 1.010000 3.050000 1.180000 ;
-      RECT 2.675000 2.120000 3.110000 2.880000 ;
-      RECT 2.720000 0.350000 4.615000 0.520000 ;
-      RECT 2.720000 0.520000 3.050000 1.010000 ;
-      RECT 3.220000 0.715000 4.185000 1.045000 ;
-      RECT 4.015000 1.045000 4.185000 1.950000 ;
-      RECT 4.355000 0.520000 4.615000 1.010000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.085000 0.540000 0.790000 ;
+      RECT 0.115000  0.790000 0.365000 1.140000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.875000  1.320000 1.235000 1.650000 ;
+      RECT 1.065000  1.650000 1.235000 1.950000 ;
+      RECT 1.065000  1.950000 4.185000 2.120000 ;
+      RECT 1.065000  2.290000 1.600000 3.245000 ;
+      RECT 1.220000  0.085000 1.550000 1.130000 ;
+      RECT 1.720000  0.350000 2.050000 1.010000 ;
+      RECT 1.720000  1.010000 3.050000 1.180000 ;
+      RECT 2.220000  0.085000 2.550000 0.840000 ;
+      RECT 2.675000  2.120000 3.110000 2.880000 ;
+      RECT 2.720000  0.350000 4.615000 0.520000 ;
+      RECT 2.720000  0.520000 3.050000 1.010000 ;
+      RECT 3.220000  0.715000 4.185000 1.045000 ;
+      RECT 3.815000  2.290000 4.145000 3.245000 ;
+      RECT 4.015000  1.045000 4.185000 1.950000 ;
+      RECT 4.355000  0.520000 4.615000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__o32a_2
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef
index 309f93d..1d6cea8 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_4.magic.lef
@@ -106,32 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.185000  0.085000 0.515000 0.970000 ;
-        RECT 1.185000  0.085000 1.515000 0.770000 ;
-        RECT 2.240000  0.085000 2.570000 0.940000 ;
-        RECT 5.230000  0.085000 5.560000 0.620000 ;
-        RECT 6.230000  0.085000 6.560000 0.610000 ;
-        RECT 7.160000  0.085000 7.545000 0.600000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -140,66 +114,89 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.065000 2.120000 1.395000 3.245000 ;
-        RECT 2.085000 1.950000 2.415000 3.245000 ;
-        RECT 4.195000 2.700000 4.525000 3.245000 ;
-        RECT 6.805000 2.730000 7.135000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.255000 1.280000 2.355000 1.610000 ;
-      RECT 2.185000 1.110000 3.560000 1.280000 ;
-      RECT 2.655000 2.700000 4.025000 2.960000 ;
-      RECT 2.800000 0.255000 5.060000 0.425000 ;
-      RECT 2.800000 0.425000 3.130000 0.940000 ;
-      RECT 3.230000 1.280000 3.560000 1.920000 ;
-      RECT 3.230000 1.920000 3.575000 2.020000 ;
-      RECT 3.230000 2.020000 5.565000 2.190000 ;
-      RECT 3.300000 0.595000 3.560000 0.930000 ;
-      RECT 3.300000 0.930000 4.560000 1.100000 ;
-      RECT 3.300000 1.100000 3.560000 1.110000 ;
-      RECT 3.730000 0.425000 4.060000 0.760000 ;
-      RECT 4.230000 0.595000 4.560000 0.930000 ;
-      RECT 4.730000 0.425000 5.060000 0.790000 ;
-      RECT 4.730000 0.790000 8.045000 0.950000 ;
-      RECT 4.730000 0.950000 6.060000 0.960000 ;
-      RECT 4.730000 0.960000 5.060000 1.010000 ;
-      RECT 4.785000 2.700000 6.245000 2.980000 ;
-      RECT 5.730000 0.350000 6.060000 0.780000 ;
-      RECT 5.730000 0.780000 8.045000 0.790000 ;
-      RECT 6.075000 2.390000 8.045000 2.560000 ;
-      RECT 6.075000 2.560000 6.245000 2.700000 ;
-      RECT 6.155000 1.970000 7.595000 2.200000 ;
-      RECT 6.155000 2.200000 6.675000 2.220000 ;
-      RECT 6.740000 0.350000 6.990000 0.780000 ;
-      RECT 7.265000 1.950000 7.595000 1.970000 ;
-      RECT 7.715000 0.350000 8.045000 0.780000 ;
-      RECT 7.715000 0.950000 8.045000 1.030000 ;
-      RECT 7.715000 2.560000 8.045000 2.980000 ;
-      RECT 7.765000 1.950000 8.045000 2.390000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.185000  0.085000 0.515000 0.970000 ;
+      RECT 1.065000  2.120000 1.395000 3.245000 ;
+      RECT 1.185000  0.085000 1.515000 0.770000 ;
+      RECT 1.255000  1.280000 2.355000 1.610000 ;
+      RECT 2.085000  1.950000 2.415000 3.245000 ;
+      RECT 2.185000  1.110000 3.560000 1.280000 ;
+      RECT 2.240000  0.085000 2.570000 0.940000 ;
+      RECT 2.655000  2.700000 4.025000 2.960000 ;
+      RECT 2.800000  0.255000 5.060000 0.425000 ;
+      RECT 2.800000  0.425000 3.130000 0.940000 ;
+      RECT 3.230000  1.280000 3.560000 1.920000 ;
+      RECT 3.230000  1.920000 3.575000 2.020000 ;
+      RECT 3.230000  2.020000 5.565000 2.190000 ;
+      RECT 3.300000  0.595000 3.560000 0.930000 ;
+      RECT 3.300000  0.930000 4.560000 1.100000 ;
+      RECT 3.300000  1.100000 3.560000 1.110000 ;
+      RECT 3.730000  0.425000 4.060000 0.760000 ;
+      RECT 4.195000  2.700000 4.525000 3.245000 ;
+      RECT 4.230000  0.595000 4.560000 0.930000 ;
+      RECT 4.730000  0.425000 5.060000 0.790000 ;
+      RECT 4.730000  0.790000 8.045000 0.950000 ;
+      RECT 4.730000  0.950000 6.060000 0.960000 ;
+      RECT 4.730000  0.960000 5.060000 1.010000 ;
+      RECT 4.785000  2.700000 6.245000 2.980000 ;
+      RECT 5.230000  0.085000 5.560000 0.620000 ;
+      RECT 5.730000  0.350000 6.060000 0.780000 ;
+      RECT 5.730000  0.780000 8.045000 0.790000 ;
+      RECT 6.075000  2.390000 8.045000 2.560000 ;
+      RECT 6.075000  2.560000 6.245000 2.700000 ;
+      RECT 6.155000  1.970000 7.595000 2.200000 ;
+      RECT 6.155000  2.200000 6.675000 2.220000 ;
+      RECT 6.230000  0.085000 6.560000 0.610000 ;
+      RECT 6.740000  0.350000 6.990000 0.780000 ;
+      RECT 6.805000  2.730000 7.135000 3.245000 ;
+      RECT 7.160000  0.085000 7.545000 0.600000 ;
+      RECT 7.265000  1.950000 7.595000 1.970000 ;
+      RECT 7.715000  0.350000 8.045000 0.780000 ;
+      RECT 7.715000  0.950000 8.045000 1.030000 ;
+      RECT 7.715000  2.560000 8.045000 2.980000 ;
+      RECT 7.765000  1.950000 8.045000 2.390000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__o32a_4
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef
index 48491f7..92827c1 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.magic.lef
@@ -90,18 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.850000  0.085000 2.180000 0.810000 ;
-        RECT 2.880000  0.085000 3.140000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -110,28 +98,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.135000 1.820000 0.465000 3.245000 ;
-        RECT 2.835000 1.820000 3.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 1.680000 0.520000 ;
-      RECT 0.115000 0.520000 0.445000 1.010000 ;
-      RECT 1.350000 0.520000 1.680000 1.010000 ;
-      RECT 1.350000 1.010000 2.710000 1.180000 ;
-      RECT 2.380000 0.350000 2.710000 1.010000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.350000 1.680000 0.520000 ;
+      RECT 0.115000  0.520000 0.445000 1.010000 ;
+      RECT 0.135000  1.820000 0.465000 3.245000 ;
+      RECT 1.350000  0.520000 1.680000 1.010000 ;
+      RECT 1.350000  1.010000 2.710000 1.180000 ;
+      RECT 1.850000  0.085000 2.180000 0.810000 ;
+      RECT 2.380000  0.350000 2.710000 1.010000 ;
+      RECT 2.835000  1.820000 3.165000 3.245000 ;
+      RECT 2.880000  0.085000 3.140000 1.010000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef
index c06e926..06a8591 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.magic.lef
@@ -95,25 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 2.555000  0.085000 3.125000 0.500000 ;
-        RECT 3.805000  0.085000 4.135000 0.800000 ;
-        RECT 4.805000  0.085000 5.625000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -122,52 +103,68 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 1.465000 2.630000 1.715000 3.245000 ;
-        RECT 4.835000 2.290000 5.165000 3.245000 ;
-        RECT 5.870000 1.950000 6.120000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 2.375000 0.425000 ;
-      RECT 0.115000 0.425000 0.365000 1.130000 ;
-      RECT 0.115000 1.950000 0.365000 2.905000 ;
-      RECT 0.115000 2.905000 1.265000 3.075000 ;
-      RECT 1.045000 0.425000 1.375000 0.825000 ;
-      RECT 1.095000 2.290000 2.245000 2.460000 ;
-      RECT 1.095000 2.460000 1.265000 2.905000 ;
-      RECT 1.915000 2.460000 2.245000 2.980000 ;
-      RECT 2.045000 0.425000 2.375000 0.670000 ;
-      RECT 2.045000 0.670000 3.635000 0.840000 ;
-      RECT 2.475000 2.290000 2.725000 2.905000 ;
-      RECT 2.475000 2.905000 4.605000 3.075000 ;
-      RECT 3.305000 0.350000 3.635000 0.670000 ;
-      RECT 3.305000 0.840000 3.635000 1.010000 ;
-      RECT 3.305000 1.010000 6.125000 1.180000 ;
-      RECT 3.455000 1.950000 3.625000 2.905000 ;
-      RECT 3.825000 1.950000 5.670000 2.120000 ;
-      RECT 3.825000 2.120000 4.075000 2.735000 ;
-      RECT 4.275000 2.290000 4.605000 2.905000 ;
-      RECT 4.305000 0.350000 4.635000 1.010000 ;
-      RECT 5.335000 2.120000 5.670000 2.980000 ;
-      RECT 5.795000 0.350000 6.125000 1.010000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.115000  0.255000 2.375000 0.425000 ;
+      RECT 0.115000  0.425000 0.365000 1.130000 ;
+      RECT 0.115000  1.950000 0.365000 2.905000 ;
+      RECT 0.115000  2.905000 1.265000 3.075000 ;
+      RECT 1.045000  0.425000 1.375000 0.825000 ;
+      RECT 1.095000  2.290000 2.245000 2.460000 ;
+      RECT 1.095000  2.460000 1.265000 2.905000 ;
+      RECT 1.465000  2.630000 1.715000 3.245000 ;
+      RECT 1.915000  2.460000 2.245000 2.980000 ;
+      RECT 2.045000  0.425000 2.375000 0.670000 ;
+      RECT 2.045000  0.670000 3.635000 0.840000 ;
+      RECT 2.475000  2.290000 2.725000 2.905000 ;
+      RECT 2.475000  2.905000 4.605000 3.075000 ;
+      RECT 2.555000  0.085000 3.125000 0.500000 ;
+      RECT 3.305000  0.350000 3.635000 0.670000 ;
+      RECT 3.305000  0.840000 3.635000 1.010000 ;
+      RECT 3.305000  1.010000 6.125000 1.180000 ;
+      RECT 3.455000  1.950000 3.625000 2.905000 ;
+      RECT 3.805000  0.085000 4.135000 0.800000 ;
+      RECT 3.825000  1.950000 5.670000 2.120000 ;
+      RECT 3.825000  2.120000 4.075000 2.735000 ;
+      RECT 4.275000  2.290000 4.605000 2.905000 ;
+      RECT 4.305000  0.350000 4.635000 1.010000 ;
+      RECT 4.805000  0.085000 5.625000 0.805000 ;
+      RECT 4.835000  2.290000 5.165000 3.245000 ;
+      RECT 5.335000  2.120000 5.670000 2.980000 ;
+      RECT 5.795000  0.350000 6.125000 1.010000 ;
+      RECT 5.870000  1.950000 6.120000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef
index 6ed954b..0e2bde4 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.magic.lef
@@ -98,38 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.040000 0.085000 ;
-        RECT 4.485000  0.085000  4.815000 0.580000 ;
-        RECT 5.495000  0.085000  5.825000 0.580000 ;
-        RECT 6.840000  0.085000  7.170000 0.840000 ;
-        RECT 7.840000  0.085000  8.170000 0.840000 ;
-        RECT 8.840000  0.085000  9.170000 0.840000 ;
-        RECT 9.840000  0.085000 10.170000 0.840000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -138,75 +106,104 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  2.445000 2.630000  2.615000 3.245000 ;
-        RECT  3.345000 2.630000  3.515000 3.245000 ;
-        RECT  8.695000 2.290000  8.945000 3.245000 ;
-        RECT  9.645000 2.290000  9.975000 3.245000 ;
-        RECT 10.675000 1.950000 10.925000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.255000  4.305000 0.425000 ;
-      RECT  0.115000 0.425000  0.365000 1.130000 ;
-      RECT  0.115000 1.950000  0.445000 2.905000 ;
-      RECT  0.115000 2.905000  2.245000 3.075000 ;
-      RECT  1.015000 2.290000  1.265000 2.905000 ;
-      RECT  1.045000 0.425000  1.375000 0.920000 ;
-      RECT  1.975000 0.425000  2.305000 0.920000 ;
-      RECT  1.995000 2.290000  4.055000 2.460000 ;
-      RECT  1.995000 2.460000  2.245000 2.905000 ;
-      RECT  2.815000 2.460000  3.145000 2.980000 ;
-      RECT  2.975000 0.425000  3.305000 0.920000 ;
-      RECT  3.725000 2.460000  4.055000 2.980000 ;
-      RECT  3.975000 0.425000  4.305000 0.750000 ;
-      RECT  3.975000 0.750000  6.670000 0.920000 ;
-      RECT  4.285000 2.290000  4.535000 2.905000 ;
-      RECT  4.285000 2.905000  8.465000 3.075000 ;
-      RECT  4.995000 0.330000  5.325000 0.750000 ;
-      RECT  5.265000 2.290000  5.435000 2.905000 ;
-      RECT  5.995000 0.330000  6.670000 0.750000 ;
-      RECT  6.145000 1.950000  6.465000 2.905000 ;
-      RECT  6.330000 0.920000  6.670000 1.010000 ;
-      RECT  6.330000 1.010000 10.670000 1.180000 ;
-      RECT  6.635000 1.950000 10.475000 2.120000 ;
-      RECT  6.635000 2.120000  6.965000 2.735000 ;
-      RECT  7.135000 2.290000  7.465000 2.905000 ;
-      RECT  7.340000 0.350000  7.670000 1.010000 ;
-      RECT  7.635000 2.120000  7.965000 2.735000 ;
-      RECT  8.135000 2.290000  8.465000 2.905000 ;
-      RECT  8.340000 0.350000  8.670000 1.010000 ;
-      RECT  9.145000 2.120000  9.475000 2.980000 ;
-      RECT  9.340000 0.350000  9.670000 1.010000 ;
-      RECT 10.145000 2.120000 10.475000 2.980000 ;
-      RECT 10.340000 0.350000 10.670000 1.010000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.115000  0.255000  4.305000 0.425000 ;
+      RECT  0.115000  0.425000  0.365000 1.130000 ;
+      RECT  0.115000  1.950000  0.445000 2.905000 ;
+      RECT  0.115000  2.905000  2.245000 3.075000 ;
+      RECT  1.015000  2.290000  1.265000 2.905000 ;
+      RECT  1.045000  0.425000  1.375000 0.920000 ;
+      RECT  1.975000  0.425000  2.305000 0.920000 ;
+      RECT  1.995000  2.290000  4.055000 2.460000 ;
+      RECT  1.995000  2.460000  2.245000 2.905000 ;
+      RECT  2.445000  2.630000  2.615000 3.245000 ;
+      RECT  2.815000  2.460000  3.145000 2.980000 ;
+      RECT  2.975000  0.425000  3.305000 0.920000 ;
+      RECT  3.345000  2.630000  3.515000 3.245000 ;
+      RECT  3.725000  2.460000  4.055000 2.980000 ;
+      RECT  3.975000  0.425000  4.305000 0.750000 ;
+      RECT  3.975000  0.750000  6.670000 0.920000 ;
+      RECT  4.285000  2.290000  4.535000 2.905000 ;
+      RECT  4.285000  2.905000  8.465000 3.075000 ;
+      RECT  4.485000  0.085000  4.815000 0.580000 ;
+      RECT  4.995000  0.330000  5.325000 0.750000 ;
+      RECT  5.265000  2.290000  5.435000 2.905000 ;
+      RECT  5.495000  0.085000  5.825000 0.580000 ;
+      RECT  5.995000  0.330000  6.670000 0.750000 ;
+      RECT  6.145000  1.950000  6.465000 2.905000 ;
+      RECT  6.330000  0.920000  6.670000 1.010000 ;
+      RECT  6.330000  1.010000 10.670000 1.180000 ;
+      RECT  6.635000  1.950000 10.475000 2.120000 ;
+      RECT  6.635000  2.120000  6.965000 2.735000 ;
+      RECT  6.840000  0.085000  7.170000 0.840000 ;
+      RECT  7.135000  2.290000  7.465000 2.905000 ;
+      RECT  7.340000  0.350000  7.670000 1.010000 ;
+      RECT  7.635000  2.120000  7.965000 2.735000 ;
+      RECT  7.840000  0.085000  8.170000 0.840000 ;
+      RECT  8.135000  2.290000  8.465000 2.905000 ;
+      RECT  8.340000  0.350000  8.670000 1.010000 ;
+      RECT  8.695000  2.290000  8.945000 3.245000 ;
+      RECT  8.840000  0.085000  9.170000 0.840000 ;
+      RECT  9.145000  2.120000  9.475000 2.980000 ;
+      RECT  9.340000  0.350000  9.670000 1.010000 ;
+      RECT  9.645000  2.290000  9.975000 3.245000 ;
+      RECT  9.840000  0.085000 10.170000 0.840000 ;
+      RECT 10.145000  2.120000 10.475000 2.980000 ;
+      RECT 10.340000  0.350000 10.670000 1.010000 ;
+      RECT 10.675000  1.950000 10.925000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__o32ai_4
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef
index c5bc332..d0a450b 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_1.magic.lef
@@ -90,21 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.545000  0.085000 0.945000 0.940000 ;
-        RECT 2.175000  0.085000 2.505000 0.680000 ;
-        RECT 3.175000  0.085000 3.705000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -113,36 +98,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.615000 2.290000 1.540000 3.245000 ;
-        RECT 3.760000 2.320000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.455000 1.350000 0.785000 1.950000 ;
-      RECT 0.455000 1.950000 2.080000 2.120000 ;
-      RECT 0.615000 1.110000 1.505000 1.280000 ;
-      RECT 0.615000 1.280000 0.785000 1.350000 ;
-      RECT 1.175000 0.350000 1.505000 1.110000 ;
-      RECT 1.675000 0.350000 2.005000 0.850000 ;
-      RECT 1.675000 0.850000 4.205000 1.020000 ;
-      RECT 1.750000 2.120000 2.080000 2.845000 ;
-      RECT 2.675000 0.350000 3.005000 0.850000 ;
-      RECT 3.875000 0.350000 4.205000 0.850000 ;
-      RECT 3.875000 1.020000 4.205000 1.030000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.455000  1.350000 0.785000 1.950000 ;
+      RECT 0.455000  1.950000 2.080000 2.120000 ;
+      RECT 0.545000  0.085000 0.945000 0.940000 ;
+      RECT 0.615000  1.110000 1.505000 1.280000 ;
+      RECT 0.615000  1.280000 0.785000 1.350000 ;
+      RECT 0.615000  2.290000 1.540000 3.245000 ;
+      RECT 1.175000  0.350000 1.505000 1.110000 ;
+      RECT 1.675000  0.350000 2.005000 0.850000 ;
+      RECT 1.675000  0.850000 4.205000 1.020000 ;
+      RECT 1.750000  2.120000 2.080000 2.845000 ;
+      RECT 2.175000  0.085000 2.505000 0.680000 ;
+      RECT 2.675000  0.350000 3.005000 0.850000 ;
+      RECT 3.175000  0.085000 3.705000 0.680000 ;
+      RECT 3.760000  2.320000 4.205000 3.245000 ;
+      RECT 3.875000  0.350000 4.205000 0.850000 ;
+      RECT 3.875000  1.020000 4.205000 1.030000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__o41a_1
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef
index e69faa4..b93196a 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_2.magic.lef
@@ -93,23 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.840000 ;
-        RECT 1.615000  0.085000 2.125000 0.815000 ;
-        RECT 3.355000  0.085000 3.685000 0.820000 ;
-        RECT 4.355000  0.085000 4.615000 1.010000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -118,37 +101,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.115000 1.950000 0.445000 3.245000 ;
-        RECT 2.695000 2.290000 3.780000 3.245000 ;
-        RECT 4.355000 1.820000 4.685000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.010000 ;
-      RECT 0.115000 1.010000 2.625000 1.180000 ;
-      RECT 1.115000 0.350000 1.445000 1.010000 ;
-      RECT 2.125000 1.950000 3.735000 2.120000 ;
-      RECT 2.125000 2.120000 2.455000 2.980000 ;
-      RECT 2.295000 0.350000 2.625000 1.010000 ;
-      RECT 2.795000 0.350000 3.125000 1.010000 ;
-      RECT 2.795000 1.010000 3.575000 1.180000 ;
-      RECT 3.405000 1.180000 3.575000 1.300000 ;
-      RECT 3.405000 1.300000 3.735000 1.950000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.010000 ;
+      RECT 0.115000  1.010000 2.625000 1.180000 ;
+      RECT 0.115000  1.950000 0.445000 3.245000 ;
+      RECT 0.615000  0.085000 0.945000 0.840000 ;
+      RECT 1.115000  0.350000 1.445000 1.010000 ;
+      RECT 1.615000  0.085000 2.125000 0.815000 ;
+      RECT 2.125000  1.950000 3.735000 2.120000 ;
+      RECT 2.125000  2.120000 2.455000 2.980000 ;
+      RECT 2.295000  0.350000 2.625000 1.010000 ;
+      RECT 2.695000  2.290000 3.780000 3.245000 ;
+      RECT 2.795000  0.350000 3.125000 1.010000 ;
+      RECT 2.795000  1.010000 3.575000 1.180000 ;
+      RECT 3.355000  0.085000 3.685000 0.820000 ;
+      RECT 3.405000  1.180000 3.575000 1.300000 ;
+      RECT 3.405000  1.300000 3.735000 1.950000 ;
+      RECT 4.355000  0.085000 4.615000 1.010000 ;
+      RECT 4.355000  1.820000 4.685000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__o41a_2
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef
index caacd05..ab5a37f 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_4.magic.lef
@@ -97,33 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.175000  0.085000 0.505000 0.760000 ;
-        RECT 1.105000  0.085000 1.435000 0.760000 ;
-        RECT 2.035000  0.085000 2.365000 1.100000 ;
-        RECT 4.375000  0.085000 4.545000 0.915000 ;
-        RECT 5.155000  0.085000 5.485000 0.915000 ;
-        RECT 6.025000  0.085000 6.275000 0.910000 ;
-        RECT 6.885000  0.085000 7.135000 0.910000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -132,66 +105,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.525000 2.110000 0.695000 3.245000 ;
-        RECT 1.425000 2.110000 1.595000 3.245000 ;
-        RECT 2.325000 1.910000 2.575000 3.245000 ;
-        RECT 3.310000 2.290000 3.560000 3.245000 ;
-        RECT 6.580000 2.650000 6.870000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.585000 1.270000 3.110000 1.600000 ;
-      RECT 2.595000 0.260000 3.705000 0.430000 ;
-      RECT 2.595000 0.430000 2.925000 0.930000 ;
-      RECT 2.780000 1.600000 3.110000 1.950000 ;
-      RECT 2.780000 1.950000 5.030000 2.120000 ;
-      RECT 2.780000 2.120000 3.110000 2.790000 ;
-      RECT 2.940000 1.100000 3.275000 1.270000 ;
-      RECT 3.105000 0.600000 3.275000 1.100000 ;
-      RECT 3.455000 0.430000 3.705000 1.085000 ;
-      RECT 3.455000 1.085000 7.635000 1.250000 ;
-      RECT 3.455000 1.250000 5.845000 1.255000 ;
-      RECT 3.455000 1.255000 3.705000 1.270000 ;
-      RECT 3.790000 2.290000 5.850000 2.460000 ;
-      RECT 3.790000 2.460000 4.040000 2.980000 ;
-      RECT 4.240000 2.630000 5.480000 2.980000 ;
-      RECT 4.725000 0.580000 4.975000 1.085000 ;
-      RECT 5.665000 0.580000 5.845000 1.080000 ;
-      RECT 5.665000 1.080000 7.635000 1.085000 ;
-      RECT 5.680000 1.820000 5.850000 1.950000 ;
-      RECT 5.680000 1.950000 7.870000 2.120000 ;
-      RECT 5.680000 2.120000 5.850000 2.290000 ;
-      RECT 5.680000 2.460000 5.850000 2.980000 ;
-      RECT 6.050000 2.290000 7.370000 2.460000 ;
-      RECT 6.050000 2.460000 6.380000 2.980000 ;
-      RECT 6.455000 0.580000 6.705000 1.080000 ;
-      RECT 7.040000 2.460000 7.370000 2.980000 ;
-      RECT 7.385000 0.675000 7.635000 1.080000 ;
-      RECT 7.385000 1.250000 7.635000 1.275000 ;
-      RECT 7.540000 1.820000 7.870000 1.950000 ;
-      RECT 7.540000 2.120000 7.870000 2.980000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.175000  0.085000 0.505000 0.760000 ;
+      RECT 0.525000  2.110000 0.695000 3.245000 ;
+      RECT 0.585000  1.270000 3.110000 1.600000 ;
+      RECT 1.105000  0.085000 1.435000 0.760000 ;
+      RECT 1.425000  2.110000 1.595000 3.245000 ;
+      RECT 2.035000  0.085000 2.365000 1.100000 ;
+      RECT 2.325000  1.910000 2.575000 3.245000 ;
+      RECT 2.595000  0.260000 3.705000 0.430000 ;
+      RECT 2.595000  0.430000 2.925000 0.930000 ;
+      RECT 2.780000  1.600000 3.110000 1.950000 ;
+      RECT 2.780000  1.950000 5.030000 2.120000 ;
+      RECT 2.780000  2.120000 3.110000 2.790000 ;
+      RECT 2.940000  1.100000 3.275000 1.270000 ;
+      RECT 3.105000  0.600000 3.275000 1.100000 ;
+      RECT 3.310000  2.290000 3.560000 3.245000 ;
+      RECT 3.455000  0.430000 3.705000 1.085000 ;
+      RECT 3.455000  1.085000 7.635000 1.250000 ;
+      RECT 3.455000  1.250000 5.845000 1.255000 ;
+      RECT 3.455000  1.255000 3.705000 1.270000 ;
+      RECT 3.790000  2.290000 5.850000 2.460000 ;
+      RECT 3.790000  2.460000 4.040000 2.980000 ;
+      RECT 4.240000  2.630000 5.480000 2.980000 ;
+      RECT 4.375000  0.085000 4.545000 0.915000 ;
+      RECT 4.725000  0.580000 4.975000 1.085000 ;
+      RECT 5.155000  0.085000 5.485000 0.915000 ;
+      RECT 5.665000  0.580000 5.845000 1.080000 ;
+      RECT 5.665000  1.080000 7.635000 1.085000 ;
+      RECT 5.680000  1.820000 5.850000 1.950000 ;
+      RECT 5.680000  1.950000 7.870000 2.120000 ;
+      RECT 5.680000  2.120000 5.850000 2.290000 ;
+      RECT 5.680000  2.460000 5.850000 2.980000 ;
+      RECT 6.025000  0.085000 6.275000 0.910000 ;
+      RECT 6.050000  2.290000 7.370000 2.460000 ;
+      RECT 6.050000  2.460000 6.380000 2.980000 ;
+      RECT 6.455000  0.580000 6.705000 1.080000 ;
+      RECT 6.580000  2.650000 6.870000 3.245000 ;
+      RECT 6.885000  0.085000 7.135000 0.910000 ;
+      RECT 7.040000  2.460000 7.370000 2.980000 ;
+      RECT 7.385000  0.675000 7.635000 1.080000 ;
+      RECT 7.385000  1.250000 7.635000 1.275000 ;
+      RECT 7.540000  1.820000 7.870000 1.950000 ;
+      RECT 7.540000  2.120000 7.870000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__o41a_4
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef
index bf9d49c..c95460b 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.magic.lef
@@ -96,18 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.375000  0.085000 1.705000 0.840000 ;
-        RECT 2.390000  0.085000 2.720000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -116,28 +104,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 1.820000 0.545000 2.650000 ;
-        RECT 0.115000 2.650000 0.665000 3.245000 ;
-        RECT 2.995000 1.950000 3.245000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.955000 0.350000 1.205000 1.010000 ;
-      RECT 0.955000 1.010000 3.220000 1.180000 ;
-      RECT 1.890000 0.350000 2.220000 1.010000 ;
-      RECT 2.890000 0.350000 3.220000 1.010000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  1.820000 0.545000 2.650000 ;
+      RECT 0.115000  2.650000 0.665000 3.245000 ;
+      RECT 0.955000  0.350000 1.205000 1.010000 ;
+      RECT 0.955000  1.010000 3.220000 1.180000 ;
+      RECT 1.375000  0.085000 1.705000 0.840000 ;
+      RECT 1.890000  0.350000 2.220000 1.010000 ;
+      RECT 2.390000  0.085000 2.720000 0.840000 ;
+      RECT 2.890000  0.350000 3.220000 1.010000 ;
+      RECT 2.995000  1.950000 3.245000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__o41ai_1
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef
index 8de7c52..d37f9fc 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.magic.lef
@@ -95,26 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 2.070000  0.085000 2.400000 0.795000 ;
-        RECT 3.000000  0.085000 3.330000 0.795000 ;
-        RECT 3.960000  0.085000 4.290000 0.795000 ;
-        RECT 4.960000  0.085000 5.290000 0.795000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -123,51 +103,68 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.105000 1.820000 0.435000 3.245000 ;
-        RECT 1.005000 2.060000 1.335000 3.245000 ;
-        RECT 5.435000 2.290000 5.605000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.640000 0.255000 1.900000 0.425000 ;
-      RECT 0.640000 0.425000 0.890000 1.010000 ;
-      RECT 1.535000 2.060000 1.865000 2.905000 ;
-      RECT 1.535000 2.905000 2.765000 3.075000 ;
-      RECT 1.570000 0.425000 1.900000 1.010000 ;
-      RECT 1.570000 1.010000 5.790000 1.180000 ;
-      RECT 2.435000 1.950000 3.800000 2.120000 ;
-      RECT 2.435000 2.120000 2.765000 2.905000 ;
-      RECT 2.580000 0.350000 2.830000 1.010000 ;
-      RECT 3.020000 2.290000 3.270000 2.905000 ;
-      RECT 3.020000 2.905000 4.705000 3.075000 ;
-      RECT 3.470000 2.120000 3.800000 2.735000 ;
-      RECT 3.510000 0.350000 3.790000 1.010000 ;
-      RECT 4.005000 1.850000 4.335000 1.950000 ;
-      RECT 4.005000 1.950000 6.135000 2.120000 ;
-      RECT 4.005000 2.120000 4.335000 2.735000 ;
-      RECT 4.460000 0.350000 4.790000 1.010000 ;
-      RECT 4.535000 2.290000 4.705000 2.905000 ;
-      RECT 4.905000 2.120000 5.235000 2.980000 ;
-      RECT 5.460000 0.350000 5.790000 1.010000 ;
-      RECT 5.805000 2.120000 6.135000 2.980000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.105000  1.820000 0.435000 3.245000 ;
+      RECT 0.640000  0.255000 1.900000 0.425000 ;
+      RECT 0.640000  0.425000 0.890000 1.010000 ;
+      RECT 1.005000  2.060000 1.335000 3.245000 ;
+      RECT 1.535000  2.060000 1.865000 2.905000 ;
+      RECT 1.535000  2.905000 2.765000 3.075000 ;
+      RECT 1.570000  0.425000 1.900000 1.010000 ;
+      RECT 1.570000  1.010000 5.790000 1.180000 ;
+      RECT 2.070000  0.085000 2.400000 0.795000 ;
+      RECT 2.435000  1.950000 3.800000 2.120000 ;
+      RECT 2.435000  2.120000 2.765000 2.905000 ;
+      RECT 2.580000  0.350000 2.830000 1.010000 ;
+      RECT 3.000000  0.085000 3.330000 0.795000 ;
+      RECT 3.020000  2.290000 3.270000 2.905000 ;
+      RECT 3.020000  2.905000 4.705000 3.075000 ;
+      RECT 3.470000  2.120000 3.800000 2.735000 ;
+      RECT 3.510000  0.350000 3.790000 1.010000 ;
+      RECT 3.960000  0.085000 4.290000 0.795000 ;
+      RECT 4.005000  1.850000 4.335000 1.950000 ;
+      RECT 4.005000  1.950000 6.135000 2.120000 ;
+      RECT 4.005000  2.120000 4.335000 2.735000 ;
+      RECT 4.460000  0.350000 4.790000 1.010000 ;
+      RECT 4.535000  2.290000 4.705000 2.905000 ;
+      RECT 4.905000  2.120000 5.235000 2.980000 ;
+      RECT 4.960000  0.085000 5.290000 0.795000 ;
+      RECT 5.435000  2.290000 5.605000 3.245000 ;
+      RECT 5.460000  0.350000 5.790000 1.010000 ;
+      RECT 5.805000  2.120000 6.135000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
   END
 END sky130_fd_sc_hs__o41ai_2
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef
index c1bbfc4..c36e25b 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.magic.lef
@@ -96,38 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 2.475000  0.085000  2.990000 0.600000 ;
-        RECT 3.670000  0.085000  3.840000 1.130000 ;
-        RECT 4.520000  0.085000  4.850000 0.670000 ;
-        RECT 5.450000  0.085000  5.780000 0.670000 ;
-        RECT 6.380000  0.085000  6.710000 0.670000 ;
-        RECT 7.240000  0.085000  7.570000 0.670000 ;
-        RECT 8.205000  0.085000  8.535000 0.670000 ;
-        RECT 9.205000  0.085000  9.535000 0.670000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -136,75 +104,104 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.115000 1.820000  0.445000 3.245000 ;
-        RECT 1.115000 2.060000  1.445000 3.245000 ;
-        RECT 8.185000 2.060000  8.515000 3.245000 ;
-        RECT 9.185000 2.060000  9.515000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 2.305000 0.425000 ;
-      RECT 0.115000 0.425000 0.445000 1.010000 ;
-      RECT 0.975000 0.425000 1.305000 0.670000 ;
-      RECT 1.675000 2.060000 1.980000 2.905000 ;
-      RECT 1.675000 2.905000 5.705000 3.075000 ;
-      RECT 1.975000 0.425000 2.305000 0.840000 ;
-      RECT 1.975000 0.840000 3.500000 1.010000 ;
-      RECT 2.600000 2.320000 2.880000 2.905000 ;
-      RECT 3.160000 0.350000 3.500000 0.840000 ;
-      RECT 3.330000 1.010000 3.500000 1.300000 ;
-      RECT 3.330000 1.300000 4.190000 1.470000 ;
-      RECT 3.500000 1.800000 3.805000 2.905000 ;
-      RECT 3.975000 1.720000 7.565000 1.890000 ;
-      RECT 3.975000 1.890000 4.305000 2.735000 ;
-      RECT 4.020000 0.350000 4.350000 0.840000 ;
-      RECT 4.020000 0.840000 9.965000 1.010000 ;
-      RECT 4.020000 1.010000 4.190000 1.300000 ;
-      RECT 4.475000 2.060000 4.805000 2.905000 ;
-      RECT 4.975000 1.890000 5.205000 2.735000 ;
-      RECT 5.030000 0.350000 5.280000 0.840000 ;
-      RECT 5.375000 2.060000 5.705000 2.905000 ;
-      RECT 5.935000 2.060000 6.265000 2.890000 ;
-      RECT 5.935000 2.890000 7.165000 2.905000 ;
-      RECT 5.935000 2.905000 8.015000 3.075000 ;
-      RECT 5.960000 0.350000 6.210000 0.840000 ;
-      RECT 6.435000 1.890000 6.665000 2.720000 ;
-      RECT 6.835000 2.060000 7.165000 2.890000 ;
-      RECT 6.890000 0.350000 7.060000 0.840000 ;
-      RECT 7.335000 1.890000 7.565000 2.735000 ;
-      RECT 7.735000 1.720000 9.965000 1.890000 ;
-      RECT 7.735000 1.890000 8.015000 2.905000 ;
-      RECT 7.785000 0.350000 8.035000 0.840000 ;
-      RECT 8.685000 1.890000 9.015000 3.000000 ;
-      RECT 8.705000 0.350000 9.035000 0.840000 ;
-      RECT 9.685000 1.890000 9.965000 3.000000 ;
-      RECT 9.715000 0.350000 9.965000 0.840000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  0.255000  2.305000 0.425000 ;
+      RECT 0.115000  0.425000  0.445000 1.010000 ;
+      RECT 0.115000  1.820000  0.445000 3.245000 ;
+      RECT 0.975000  0.425000  1.305000 0.670000 ;
+      RECT 1.115000  2.060000  1.445000 3.245000 ;
+      RECT 1.675000  2.060000  1.980000 2.905000 ;
+      RECT 1.675000  2.905000  5.705000 3.075000 ;
+      RECT 1.975000  0.425000  2.305000 0.840000 ;
+      RECT 1.975000  0.840000  3.500000 1.010000 ;
+      RECT 2.475000  0.085000  2.990000 0.600000 ;
+      RECT 2.600000  2.320000  2.880000 2.905000 ;
+      RECT 3.160000  0.350000  3.500000 0.840000 ;
+      RECT 3.330000  1.010000  3.500000 1.300000 ;
+      RECT 3.330000  1.300000  4.190000 1.470000 ;
+      RECT 3.500000  1.800000  3.805000 2.905000 ;
+      RECT 3.670000  0.085000  3.840000 1.130000 ;
+      RECT 3.975000  1.720000  7.565000 1.890000 ;
+      RECT 3.975000  1.890000  4.305000 2.735000 ;
+      RECT 4.020000  0.350000  4.350000 0.840000 ;
+      RECT 4.020000  0.840000  9.965000 1.010000 ;
+      RECT 4.020000  1.010000  4.190000 1.300000 ;
+      RECT 4.475000  2.060000  4.805000 2.905000 ;
+      RECT 4.520000  0.085000  4.850000 0.670000 ;
+      RECT 4.975000  1.890000  5.205000 2.735000 ;
+      RECT 5.030000  0.350000  5.280000 0.840000 ;
+      RECT 5.375000  2.060000  5.705000 2.905000 ;
+      RECT 5.450000  0.085000  5.780000 0.670000 ;
+      RECT 5.935000  2.060000  6.265000 2.890000 ;
+      RECT 5.935000  2.890000  7.165000 2.905000 ;
+      RECT 5.935000  2.905000  8.015000 3.075000 ;
+      RECT 5.960000  0.350000  6.210000 0.840000 ;
+      RECT 6.380000  0.085000  6.710000 0.670000 ;
+      RECT 6.435000  1.890000  6.665000 2.720000 ;
+      RECT 6.835000  2.060000  7.165000 2.890000 ;
+      RECT 6.890000  0.350000  7.060000 0.840000 ;
+      RECT 7.240000  0.085000  7.570000 0.670000 ;
+      RECT 7.335000  1.890000  7.565000 2.735000 ;
+      RECT 7.735000  1.720000  9.965000 1.890000 ;
+      RECT 7.735000  1.890000  8.015000 2.905000 ;
+      RECT 7.785000  0.350000  8.035000 0.840000 ;
+      RECT 8.185000  2.060000  8.515000 3.245000 ;
+      RECT 8.205000  0.085000  8.535000 0.670000 ;
+      RECT 8.685000  1.890000  9.015000 3.000000 ;
+      RECT 8.705000  0.350000  9.035000 0.840000 ;
+      RECT 9.185000  2.060000  9.515000 3.245000 ;
+      RECT 9.205000  0.085000  9.535000 0.670000 ;
+      RECT 9.685000  1.890000  9.965000 3.000000 ;
+      RECT 9.715000  0.350000  9.965000 0.840000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
   END
 END sky130_fd_sc_hs__o41ai_4
diff --git a/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef
index 93e0d3a..36b44c2 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hs__or2_1.magic.lef
@@ -63,16 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.295000  0.085000 0.650000 0.995000 ;
-        RECT 1.455000  0.085000 1.785000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -81,28 +71,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.165000 2.290000 1.785000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.295000 1.820000 0.625000 1.950000 ;
-      RECT 0.295000 1.950000 1.785000 2.120000 ;
-      RECT 0.295000 2.120000 0.625000 2.700000 ;
-      RECT 0.945000 0.540000 1.240000 1.010000 ;
-      RECT 0.945000 1.010000 1.785000 1.180000 ;
-      RECT 1.615000 1.180000 1.785000 1.300000 ;
-      RECT 1.615000 1.300000 1.970000 1.630000 ;
-      RECT 1.615000 1.630000 1.785000 1.950000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.295000  0.085000 0.650000 0.995000 ;
+      RECT 0.295000  1.820000 0.625000 1.950000 ;
+      RECT 0.295000  1.950000 1.785000 2.120000 ;
+      RECT 0.295000  2.120000 0.625000 2.700000 ;
+      RECT 0.945000  0.540000 1.240000 1.010000 ;
+      RECT 0.945000  1.010000 1.785000 1.180000 ;
+      RECT 1.165000  2.290000 1.785000 3.245000 ;
+      RECT 1.455000  0.085000 1.785000 0.840000 ;
+      RECT 1.615000  1.180000 1.785000 1.300000 ;
+      RECT 1.615000  1.300000 1.970000 1.630000 ;
+      RECT 1.615000  1.630000 1.785000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__or2_1
diff --git a/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef
index 5c38de5..5580578 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hs__or2_2.magic.lef
@@ -62,17 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 1.000000 ;
-        RECT 1.045000  0.085000 1.375000 0.825000 ;
-        RECT 1.970000  0.085000 2.300000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -81,29 +70,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.035000 2.660000 1.365000 3.245000 ;
-        RECT 1.955000 2.660000 2.285000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.820000 0.435000 2.320000 ;
-      RECT 0.105000 2.320000 2.295000 2.490000 ;
-      RECT 0.105000 2.490000 0.435000 2.860000 ;
-      RECT 0.620000 0.450000 0.870000 1.010000 ;
-      RECT 0.620000 1.010000 1.385000 1.180000 ;
-      RECT 1.215000 1.180000 1.385000 2.320000 ;
-      RECT 1.965000 1.300000 2.295000 1.630000 ;
-      RECT 2.125000 1.630000 2.295000 2.320000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.105000  1.820000 0.435000 2.320000 ;
+      RECT 0.105000  2.320000 2.295000 2.490000 ;
+      RECT 0.105000  2.490000 0.435000 2.860000 ;
+      RECT 0.110000  0.085000 0.440000 1.000000 ;
+      RECT 0.620000  0.450000 0.870000 1.010000 ;
+      RECT 0.620000  1.010000 1.385000 1.180000 ;
+      RECT 1.035000  2.660000 1.365000 3.245000 ;
+      RECT 1.045000  0.085000 1.375000 0.825000 ;
+      RECT 1.215000  1.180000 1.385000 2.320000 ;
+      RECT 1.955000  2.660000 2.285000 3.245000 ;
+      RECT 1.965000  1.300000 2.295000 1.630000 ;
+      RECT 1.970000  0.085000 2.300000 1.130000 ;
+      RECT 2.125000  1.630000 2.295000 2.320000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__or2_2
diff --git a/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef
index 300d5b1..471b6a9 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hs__or2_4.magic.lef
@@ -69,22 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 0.790000 ;
-        RECT 0.975000  0.085000 1.225000 0.790000 ;
-        RECT 1.920000  0.085000 2.250000 0.840000 ;
-        RECT 2.920000  0.085000 4.205000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -93,37 +77,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.115000 2.140000 0.365000 3.245000 ;
-        RECT 1.095000 2.140000 1.265000 3.245000 ;
-        RECT 1.995000 2.120000 2.245000 3.245000 ;
-        RECT 3.930000 2.630000 4.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 1.300000 2.040000 1.630000 ;
-      RECT 1.870000 1.010000 4.235000 1.180000 ;
-      RECT 1.870000 1.180000 2.040000 1.300000 ;
-      RECT 2.420000 0.350000 2.750000 1.010000 ;
-      RECT 2.450000 2.290000 2.780000 2.905000 ;
-      RECT 2.450000 2.905000 3.730000 3.075000 ;
-      RECT 2.980000 2.290000 4.235000 2.460000 ;
-      RECT 2.980000 2.460000 3.230000 2.735000 ;
-      RECT 3.400000 2.630000 3.730000 2.905000 ;
-      RECT 4.065000 1.180000 4.235000 2.290000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.085000 0.365000 0.790000 ;
+      RECT 0.115000  2.140000 0.365000 3.245000 ;
+      RECT 0.595000  1.300000 2.040000 1.630000 ;
+      RECT 0.975000  0.085000 1.225000 0.790000 ;
+      RECT 1.095000  2.140000 1.265000 3.245000 ;
+      RECT 1.870000  1.010000 4.235000 1.180000 ;
+      RECT 1.870000  1.180000 2.040000 1.300000 ;
+      RECT 1.920000  0.085000 2.250000 0.840000 ;
+      RECT 1.995000  2.120000 2.245000 3.245000 ;
+      RECT 2.420000  0.350000 2.750000 1.010000 ;
+      RECT 2.450000  2.290000 2.780000 2.905000 ;
+      RECT 2.450000  2.905000 3.730000 3.075000 ;
+      RECT 2.920000  0.085000 4.205000 0.840000 ;
+      RECT 2.980000  2.290000 4.235000 2.460000 ;
+      RECT 2.980000  2.460000 3.230000 2.735000 ;
+      RECT 3.400000  2.630000 3.730000 2.905000 ;
+      RECT 3.930000  2.630000 4.205000 3.245000 ;
+      RECT 4.065000  1.180000 4.235000 2.290000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__or2_4
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef
index a11c292..25b2731 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_1.magic.lef
@@ -63,18 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.000000  0.085000 1.525000 1.130000 ;
-        RECT 2.265000  0.085000 2.680000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -83,36 +71,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.615000 2.100000 0.945000 3.245000 ;
-        RECT 2.255000 1.950000 2.585000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.680000 0.830000 1.010000 ;
-      RECT 0.115000 1.760000 0.830000 1.930000 ;
-      RECT 0.115000 1.930000 0.445000 2.980000 ;
-      RECT 0.660000 1.010000 0.830000 1.300000 ;
-      RECT 0.660000 1.300000 1.525000 1.630000 ;
-      RECT 0.660000 1.630000 0.830000 1.760000 ;
-      RECT 1.300000 1.820000 1.865000 1.990000 ;
-      RECT 1.300000 1.990000 1.630000 2.860000 ;
-      RECT 1.695000 0.540000 2.045000 1.010000 ;
-      RECT 1.695000 1.010000 2.705000 1.180000 ;
-      RECT 1.695000 1.180000 1.865000 1.820000 ;
-      RECT 2.535000 1.180000 2.705000 1.300000 ;
-      RECT 2.535000 1.300000 2.935000 1.630000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.680000 0.830000 1.010000 ;
+      RECT 0.115000  1.760000 0.830000 1.930000 ;
+      RECT 0.115000  1.930000 0.445000 2.980000 ;
+      RECT 0.615000  2.100000 0.945000 3.245000 ;
+      RECT 0.660000  1.010000 0.830000 1.300000 ;
+      RECT 0.660000  1.300000 1.525000 1.630000 ;
+      RECT 0.660000  1.630000 0.830000 1.760000 ;
+      RECT 1.000000  0.085000 1.525000 1.130000 ;
+      RECT 1.300000  1.820000 1.865000 1.990000 ;
+      RECT 1.300000  1.990000 1.630000 2.860000 ;
+      RECT 1.695000  0.540000 2.045000 1.010000 ;
+      RECT 1.695000  1.010000 2.705000 1.180000 ;
+      RECT 1.695000  1.180000 1.865000 1.820000 ;
+      RECT 2.255000  1.950000 2.585000 3.245000 ;
+      RECT 2.265000  0.085000 2.680000 0.840000 ;
+      RECT 2.535000  1.180000 2.705000 1.300000 ;
+      RECT 2.535000  1.300000 2.935000 1.630000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef
index 033d344..725fc98 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_2.magic.lef
@@ -63,19 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.630000  0.085000 0.880000 0.840000 ;
-        RECT 1.560000  0.085000 2.235000 0.810000 ;
-        RECT 2.915000  0.085000 3.245000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -84,37 +71,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.650000 2.580000 0.980000 3.245000 ;
-        RECT 1.765000 2.580000 2.095000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.890000 2.240000 ;
-      RECT 0.115000 2.240000 2.705000 2.410000 ;
-      RECT 0.115000 2.410000 0.445000 2.700000 ;
-      RECT 0.120000 0.540000 0.450000 1.010000 ;
-      RECT 0.120000 1.010000 0.890000 1.180000 ;
-      RECT 0.720000 1.180000 0.890000 1.950000 ;
-      RECT 1.465000 1.300000 1.795000 1.630000 ;
-      RECT 1.625000 0.980000 3.275000 1.150000 ;
-      RECT 1.625000 1.150000 1.795000 1.300000 ;
-      RECT 2.405000 0.350000 2.735000 0.980000 ;
-      RECT 2.535000 1.320000 2.935000 1.650000 ;
-      RECT 2.535000 1.650000 2.705000 2.240000 ;
-      RECT 2.875000 1.820000 3.275000 2.860000 ;
-      RECT 3.105000 1.150000 3.275000 1.820000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  1.950000 0.890000 2.240000 ;
+      RECT 0.115000  2.240000 2.705000 2.410000 ;
+      RECT 0.115000  2.410000 0.445000 2.700000 ;
+      RECT 0.120000  0.540000 0.450000 1.010000 ;
+      RECT 0.120000  1.010000 0.890000 1.180000 ;
+      RECT 0.630000  0.085000 0.880000 0.840000 ;
+      RECT 0.650000  2.580000 0.980000 3.245000 ;
+      RECT 0.720000  1.180000 0.890000 1.950000 ;
+      RECT 1.465000  1.300000 1.795000 1.630000 ;
+      RECT 1.560000  0.085000 2.235000 0.810000 ;
+      RECT 1.625000  0.980000 3.275000 1.150000 ;
+      RECT 1.625000  1.150000 1.795000 1.300000 ;
+      RECT 1.765000  2.580000 2.095000 3.245000 ;
+      RECT 2.405000  0.350000 2.735000 0.980000 ;
+      RECT 2.535000  1.320000 2.935000 1.650000 ;
+      RECT 2.535000  1.650000 2.705000 2.240000 ;
+      RECT 2.875000  1.820000 3.275000 2.860000 ;
+      RECT 2.915000  0.085000 3.245000 0.810000 ;
+      RECT 3.105000  1.150000 3.275000 1.820000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef
index 39dd9bf..8bfbf5b 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_4.magic.lef
@@ -69,26 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 1.010000 ;
-        RECT 0.975000  0.085000 1.305000 0.765000 ;
-        RECT 1.975000  0.085000 2.305000 0.940000 ;
-        RECT 3.005000  0.085000 3.335000 0.940000 ;
-        RECT 3.935000  0.085000 4.265000 1.030000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -97,48 +77,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.105000 1.820000 0.435000 3.245000 ;
-        RECT 1.005000 2.140000 1.255000 3.245000 ;
-        RECT 1.985000 1.940000 2.235000 3.245000 ;
-        RECT 2.960000 2.290000 3.210000 3.245000 ;
-        RECT 4.875000 1.960000 5.205000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.945000 1.300000 2.145000 1.630000 ;
-      RECT 1.975000 1.110000 3.755000 1.280000 ;
-      RECT 1.975000 1.280000 2.145000 1.300000 ;
-      RECT 2.430000 1.950000 3.675000 2.120000 ;
-      RECT 2.430000 2.120000 2.760000 2.980000 ;
-      RECT 2.475000 0.350000 2.805000 1.110000 ;
-      RECT 3.425000 1.915000 3.675000 1.950000 ;
-      RECT 3.425000 2.120000 3.675000 2.905000 ;
-      RECT 3.425000 2.905000 4.655000 3.075000 ;
-      RECT 3.505000 0.350000 3.755000 1.110000 ;
-      RECT 3.505000 1.280000 4.125000 1.450000 ;
-      RECT 3.875000 1.450000 4.125000 2.735000 ;
-      RECT 4.295000 1.445000 4.625000 1.775000 ;
-      RECT 4.325000 1.945000 4.655000 2.905000 ;
-      RECT 4.435000 0.350000 5.655000 0.950000 ;
-      RECT 4.435000 0.950000 4.625000 1.445000 ;
-      RECT 5.405000 0.950000 5.655000 2.980000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.105000  1.820000 0.435000 3.245000 ;
+      RECT 0.115000  0.085000 0.365000 1.010000 ;
+      RECT 0.945000  1.300000 2.145000 1.630000 ;
+      RECT 0.975000  0.085000 1.305000 0.765000 ;
+      RECT 1.005000  2.140000 1.255000 3.245000 ;
+      RECT 1.975000  0.085000 2.305000 0.940000 ;
+      RECT 1.975000  1.110000 3.755000 1.280000 ;
+      RECT 1.975000  1.280000 2.145000 1.300000 ;
+      RECT 1.985000  1.940000 2.235000 3.245000 ;
+      RECT 2.430000  1.950000 3.675000 2.120000 ;
+      RECT 2.430000  2.120000 2.760000 2.980000 ;
+      RECT 2.475000  0.350000 2.805000 1.110000 ;
+      RECT 2.960000  2.290000 3.210000 3.245000 ;
+      RECT 3.005000  0.085000 3.335000 0.940000 ;
+      RECT 3.425000  1.915000 3.675000 1.950000 ;
+      RECT 3.425000  2.120000 3.675000 2.905000 ;
+      RECT 3.425000  2.905000 4.655000 3.075000 ;
+      RECT 3.505000  0.350000 3.755000 1.110000 ;
+      RECT 3.505000  1.280000 4.125000 1.450000 ;
+      RECT 3.875000  1.450000 4.125000 2.735000 ;
+      RECT 3.935000  0.085000 4.265000 1.030000 ;
+      RECT 4.295000  1.445000 4.625000 1.775000 ;
+      RECT 4.325000  1.945000 4.655000 2.905000 ;
+      RECT 4.435000  0.350000 5.655000 0.950000 ;
+      RECT 4.435000  0.950000 4.625000 1.445000 ;
+      RECT 4.875000  1.960000 5.205000 3.245000 ;
+      RECT 5.405000  0.950000 5.655000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__or2b_4
diff --git a/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef
index a82a419..9150905 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hs__or3_1.magic.lef
@@ -72,17 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.810000 ;
-        RECT 1.930000  0.085000 2.260000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -91,29 +80,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.555000 2.290000 2.315000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 1.010000 ;
-      RECT 0.115000 1.010000 2.260000 1.180000 ;
-      RECT 0.115000 1.950000 2.260000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.860000 ;
-      RECT 1.045000 0.455000 1.760000 1.010000 ;
-      RECT 2.090000 1.180000 2.260000 1.300000 ;
-      RECT 2.090000 1.300000 2.455000 1.630000 ;
-      RECT 2.090000 1.630000 2.260000 1.950000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 1.010000 ;
+      RECT 0.115000  1.010000 2.260000 1.180000 ;
+      RECT 0.115000  1.950000 2.260000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.860000 ;
+      RECT 0.545000  0.085000 0.875000 0.810000 ;
+      RECT 1.045000  0.455000 1.760000 1.010000 ;
+      RECT 1.555000  2.290000 2.315000 3.245000 ;
+      RECT 1.930000  0.085000 2.260000 0.810000 ;
+      RECT 2.090000  1.180000 2.260000 1.300000 ;
+      RECT 2.090000  1.300000 2.455000 1.630000 ;
+      RECT 2.090000  1.630000 2.260000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__or3_1
diff --git a/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef
index cc1fe4f..615cee1 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hs__or3_2.magic.lef
@@ -74,19 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 1.030000 0.600000 ;
-        RECT 1.700000  0.085000 2.245000 0.600000 ;
-        RECT 2.915000  0.085000 3.245000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -95,33 +82,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.725000 1.940000 2.055000 3.245000 ;
-        RECT 2.835000 2.140000 3.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.350000 0.445000 0.780000 ;
-      RECT 0.095000 0.780000 1.530000 0.790000 ;
-      RECT 0.095000 0.790000 2.245000 0.950000 ;
-      RECT 0.095000 0.950000 0.265000 1.960000 ;
-      RECT 0.095000 1.960000 0.615000 2.130000 ;
-      RECT 0.285000 2.130000 0.615000 2.980000 ;
-      RECT 1.200000 0.350000 1.530000 0.780000 ;
-      RECT 1.200000 0.950000 2.245000 0.960000 ;
-      RECT 2.075000 0.960000 2.245000 1.300000 ;
-      RECT 2.075000 1.300000 2.815000 1.630000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.350000 0.445000 0.780000 ;
+      RECT 0.095000  0.780000 1.530000 0.790000 ;
+      RECT 0.095000  0.790000 2.245000 0.950000 ;
+      RECT 0.095000  0.950000 0.265000 1.960000 ;
+      RECT 0.095000  1.960000 0.615000 2.130000 ;
+      RECT 0.285000  2.130000 0.615000 2.980000 ;
+      RECT 0.615000  0.085000 1.030000 0.600000 ;
+      RECT 1.200000  0.350000 1.530000 0.780000 ;
+      RECT 1.200000  0.950000 2.245000 0.960000 ;
+      RECT 1.700000  0.085000 2.245000 0.600000 ;
+      RECT 1.725000  1.940000 2.055000 3.245000 ;
+      RECT 2.075000  0.960000 2.245000 1.300000 ;
+      RECT 2.075000  1.300000 2.815000 1.630000 ;
+      RECT 2.835000  2.140000 3.165000 3.245000 ;
+      RECT 2.915000  0.085000 3.245000 0.790000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__or3_2
diff --git a/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef
index 34aadee..bdcbea5 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hs__or3_4.magic.lef
@@ -79,24 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 2.050000  0.085000 2.380000 0.600000 ;
-        RECT 3.050000  0.085000 3.380000 0.600000 ;
-        RECT 3.915000  0.085000 4.165000 0.790000 ;
-        RECT 4.835000  0.085000 5.165000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -105,43 +87,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.115000 1.920000 0.365000 3.245000 ;
-        RECT 3.035000 2.290000 3.365000 3.245000 ;
-        RECT 3.935000 2.140000 4.185000 3.245000 ;
-        RECT 4.915000 2.140000 5.165000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 1.950000 0.815000 2.370000 ;
-      RECT 0.565000 2.370000 2.830000 2.540000 ;
-      RECT 0.565000 2.540000 0.815000 2.960000 ;
-      RECT 1.015000 2.710000 2.330000 2.960000 ;
-      RECT 1.495000 1.950000 3.395000 2.120000 ;
-      RECT 1.495000 2.120000 1.825000 2.200000 ;
-      RECT 1.550000 0.350000 1.880000 0.770000 ;
-      RECT 1.550000 0.770000 3.395000 0.940000 ;
-      RECT 2.500000 2.290000 2.830000 2.370000 ;
-      RECT 2.500000 2.540000 2.830000 2.960000 ;
-      RECT 2.550000 0.350000 2.880000 0.770000 ;
-      RECT 3.225000 0.940000 3.395000 1.300000 ;
-      RECT 3.225000 1.300000 4.685000 1.630000 ;
-      RECT 3.225000 1.630000 3.395000 1.950000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  1.920000 0.365000 3.245000 ;
+      RECT 0.565000  1.950000 0.815000 2.370000 ;
+      RECT 0.565000  2.370000 2.830000 2.540000 ;
+      RECT 0.565000  2.540000 0.815000 2.960000 ;
+      RECT 1.015000  2.710000 2.330000 2.960000 ;
+      RECT 1.495000  1.950000 3.395000 2.120000 ;
+      RECT 1.495000  2.120000 1.825000 2.200000 ;
+      RECT 1.550000  0.350000 1.880000 0.770000 ;
+      RECT 1.550000  0.770000 3.395000 0.940000 ;
+      RECT 2.050000  0.085000 2.380000 0.600000 ;
+      RECT 2.500000  2.290000 2.830000 2.370000 ;
+      RECT 2.500000  2.540000 2.830000 2.960000 ;
+      RECT 2.550000  0.350000 2.880000 0.770000 ;
+      RECT 3.035000  2.290000 3.365000 3.245000 ;
+      RECT 3.050000  0.085000 3.380000 0.600000 ;
+      RECT 3.225000  0.940000 3.395000 1.300000 ;
+      RECT 3.225000  1.300000 4.685000 1.630000 ;
+      RECT 3.225000  1.630000 3.395000 1.950000 ;
+      RECT 3.915000  0.085000 4.165000 0.790000 ;
+      RECT 3.935000  2.140000 4.185000 3.245000 ;
+      RECT 4.835000  0.085000 5.165000 0.790000 ;
+      RECT 4.915000  2.140000 5.165000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__or3_4
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef
index 4206664..40ab29f 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_1.magic.lef
@@ -72,20 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.940000 ;
-        RECT 1.675000  0.085000 2.005000 0.680000 ;
-        RECT 2.675000  0.085000 3.225000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -94,35 +80,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.115000 2.100000 0.445000 3.245000 ;
-        RECT 2.750000 1.950000 3.080000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.350000 0.945000 0.940000 ;
-      RECT 0.615000 2.100000 0.945000 2.980000 ;
-      RECT 0.775000 0.940000 0.945000 1.210000 ;
-      RECT 0.775000 1.210000 1.205000 1.880000 ;
-      RECT 0.775000 1.880000 0.945000 2.100000 ;
-      RECT 1.175000 0.350000 1.505000 0.850000 ;
-      RECT 1.175000 0.850000 3.225000 1.020000 ;
-      RECT 1.375000 1.020000 1.705000 2.975000 ;
-      RECT 2.175000 0.350000 2.505000 0.850000 ;
-      RECT 3.055000 1.020000 3.225000 1.300000 ;
-      RECT 3.055000 1.300000 3.415000 1.630000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 0.940000 ;
+      RECT 0.115000  2.100000 0.445000 3.245000 ;
+      RECT 0.615000  0.350000 0.945000 0.940000 ;
+      RECT 0.615000  2.100000 0.945000 2.980000 ;
+      RECT 0.775000  0.940000 0.945000 1.210000 ;
+      RECT 0.775000  1.210000 1.205000 1.880000 ;
+      RECT 0.775000  1.880000 0.945000 2.100000 ;
+      RECT 1.175000  0.350000 1.505000 0.850000 ;
+      RECT 1.175000  0.850000 3.225000 1.020000 ;
+      RECT 1.375000  1.020000 1.705000 2.975000 ;
+      RECT 1.675000  0.085000 2.005000 0.680000 ;
+      RECT 2.175000  0.350000 2.505000 0.850000 ;
+      RECT 2.675000  0.085000 3.225000 0.680000 ;
+      RECT 2.750000  1.950000 3.080000 3.245000 ;
+      RECT 3.055000  1.020000 3.225000 1.300000 ;
+      RECT 3.055000  1.300000 3.415000 1.630000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef
index 7039983..c234405 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_2.magic.lef
@@ -73,20 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.775000  0.085000 0.945000 0.790000 ;
-        RECT 1.625000  0.085000 2.135000 0.780000 ;
-        RECT 2.850000  0.085000 3.180000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -95,40 +81,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.650000 2.660000 0.980000 3.245000 ;
-        RECT 1.635000 2.660000 2.070000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.775000 2.320000 ;
-      RECT 0.115000 2.320000 2.645000 2.490000 ;
-      RECT 0.115000 2.490000 0.445000 2.700000 ;
-      RECT 0.185000 0.540000 0.605000 0.960000 ;
-      RECT 0.185000 0.960000 0.775000 1.130000 ;
-      RECT 0.605000 1.130000 0.775000 1.950000 ;
-      RECT 1.405000 1.300000 1.795000 1.630000 ;
-      RECT 1.625000 1.010000 3.755000 1.180000 ;
-      RECT 1.625000 1.180000 1.795000 1.300000 ;
-      RECT 2.350000 0.450000 2.680000 1.010000 ;
-      RECT 2.475000 1.950000 3.415000 2.120000 ;
-      RECT 2.475000 2.120000 2.645000 2.320000 ;
-      RECT 3.085000 1.350000 3.415000 1.950000 ;
-      RECT 3.235000 2.290000 3.755000 2.860000 ;
-      RECT 3.350000 0.450000 3.755000 1.010000 ;
-      RECT 3.585000 1.180000 3.755000 2.290000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  1.950000 0.775000 2.320000 ;
+      RECT 0.115000  2.320000 2.645000 2.490000 ;
+      RECT 0.115000  2.490000 0.445000 2.700000 ;
+      RECT 0.185000  0.540000 0.605000 0.960000 ;
+      RECT 0.185000  0.960000 0.775000 1.130000 ;
+      RECT 0.605000  1.130000 0.775000 1.950000 ;
+      RECT 0.650000  2.660000 0.980000 3.245000 ;
+      RECT 0.775000  0.085000 0.945000 0.790000 ;
+      RECT 1.405000  1.300000 1.795000 1.630000 ;
+      RECT 1.625000  0.085000 2.135000 0.780000 ;
+      RECT 1.625000  1.010000 3.755000 1.180000 ;
+      RECT 1.625000  1.180000 1.795000 1.300000 ;
+      RECT 1.635000  2.660000 2.070000 3.245000 ;
+      RECT 2.350000  0.450000 2.680000 1.010000 ;
+      RECT 2.475000  1.950000 3.415000 2.120000 ;
+      RECT 2.475000  2.120000 2.645000 2.320000 ;
+      RECT 2.850000  0.085000 3.180000 0.840000 ;
+      RECT 3.085000  1.350000 3.415000 1.950000 ;
+      RECT 3.235000  2.290000 3.755000 2.860000 ;
+      RECT 3.350000  0.450000 3.755000 1.010000 ;
+      RECT 3.585000  1.180000 3.755000 2.290000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef
index ae27de8..b260360 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_4.magic.lef
@@ -80,26 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.945000  0.085000 1.410000 0.640000 ;
-        RECT 2.580000  0.085000 2.910000 0.640000 ;
-        RECT 3.510000  0.085000 3.850000 0.600000 ;
-        RECT 4.405000  0.085000 4.655000 0.790000 ;
-        RECT 5.315000  0.085000 5.645000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -108,48 +88,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.560000 1.940000 0.890000 3.245000 ;
-        RECT 3.505000 2.310000 3.835000 3.245000 ;
-        RECT 4.425000 2.140000 4.675000 3.245000 ;
-        RECT 5.405000 2.140000 5.655000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.810000 1.910000 0.980000 ;
-      RECT 0.110000 0.980000 0.465000 1.340000 ;
-      RECT 0.110000 1.340000 0.360000 2.980000 ;
-      RECT 1.070000 1.970000 1.400000 2.360000 ;
-      RECT 1.070000 2.360000 3.335000 2.530000 ;
-      RECT 1.070000 2.530000 1.400000 2.980000 ;
-      RECT 1.580000 0.310000 1.910000 0.810000 ;
-      RECT 1.580000 2.700000 2.835000 2.980000 ;
-      RECT 2.030000 1.970000 3.885000 2.140000 ;
-      RECT 2.030000 2.140000 2.385000 2.190000 ;
-      RECT 2.080000 0.350000 2.410000 0.810000 ;
-      RECT 2.080000 0.810000 3.885000 0.980000 ;
-      RECT 3.005000 2.310000 3.335000 2.360000 ;
-      RECT 3.005000 2.530000 3.335000 2.980000 ;
-      RECT 3.090000 0.350000 3.340000 0.810000 ;
-      RECT 3.715000 0.980000 3.885000 1.300000 ;
-      RECT 3.715000 1.300000 5.175000 1.630000 ;
-      RECT 3.715000 1.630000 3.885000 1.970000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.110000  0.810000 1.910000 0.980000 ;
+      RECT 0.110000  0.980000 0.465000 1.340000 ;
+      RECT 0.110000  1.340000 0.360000 2.980000 ;
+      RECT 0.560000  1.940000 0.890000 3.245000 ;
+      RECT 0.945000  0.085000 1.410000 0.640000 ;
+      RECT 1.070000  1.970000 1.400000 2.360000 ;
+      RECT 1.070000  2.360000 3.335000 2.530000 ;
+      RECT 1.070000  2.530000 1.400000 2.980000 ;
+      RECT 1.580000  0.310000 1.910000 0.810000 ;
+      RECT 1.580000  2.700000 2.835000 2.980000 ;
+      RECT 2.030000  1.970000 3.885000 2.140000 ;
+      RECT 2.030000  2.140000 2.385000 2.190000 ;
+      RECT 2.080000  0.350000 2.410000 0.810000 ;
+      RECT 2.080000  0.810000 3.885000 0.980000 ;
+      RECT 2.580000  0.085000 2.910000 0.640000 ;
+      RECT 3.005000  2.310000 3.335000 2.360000 ;
+      RECT 3.005000  2.530000 3.335000 2.980000 ;
+      RECT 3.090000  0.350000 3.340000 0.810000 ;
+      RECT 3.505000  2.310000 3.835000 3.245000 ;
+      RECT 3.510000  0.085000 3.850000 0.600000 ;
+      RECT 3.715000  0.980000 3.885000 1.300000 ;
+      RECT 3.715000  1.300000 5.175000 1.630000 ;
+      RECT 3.715000  1.630000 3.885000 1.970000 ;
+      RECT 4.405000  0.085000 4.655000 0.790000 ;
+      RECT 4.425000  2.140000 4.675000 3.245000 ;
+      RECT 5.315000  0.085000 5.645000 0.790000 ;
+      RECT 5.405000  2.140000 5.655000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__or3b_4
diff --git a/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef
index 3bbaf63..05d7651 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hs__or4_1.magic.lef
@@ -81,19 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.125000  0.085000 1.600000 0.840000 ;
-        RECT 2.450000  0.085000 2.780000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -102,30 +89,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 2.150000 2.290000 2.565000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.200000 1.950000 2.730000 2.120000 ;
-      RECT 0.200000 2.120000 0.530000 2.980000 ;
-      RECT 0.615000 0.540000 0.945000 1.010000 ;
-      RECT 0.615000 1.010000 2.730000 1.180000 ;
-      RECT 1.860000 0.540000 2.190000 1.010000 ;
-      RECT 2.560000 1.180000 2.730000 1.300000 ;
-      RECT 2.560000 1.300000 2.935000 1.630000 ;
-      RECT 2.560000 1.630000 2.730000 1.950000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.200000  1.950000 2.730000 2.120000 ;
+      RECT 0.200000  2.120000 0.530000 2.980000 ;
+      RECT 0.615000  0.540000 0.945000 1.010000 ;
+      RECT 0.615000  1.010000 2.730000 1.180000 ;
+      RECT 1.125000  0.085000 1.600000 0.840000 ;
+      RECT 1.860000  0.540000 2.190000 1.010000 ;
+      RECT 2.150000  2.290000 2.565000 3.245000 ;
+      RECT 2.450000  0.085000 2.780000 0.840000 ;
+      RECT 2.560000  1.180000 2.730000 1.300000 ;
+      RECT 2.560000  1.300000 2.935000 1.630000 ;
+      RECT 2.560000  1.630000 2.730000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4_1
diff --git a/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef
index 28671a9..91afcae 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hs__or4_2.magic.lef
@@ -83,21 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.115000  0.085000 0.510000 0.655000 ;
-        RECT 1.200000  0.085000 1.680000 0.655000 ;
-        RECT 2.360000  0.085000 2.795000 0.825000 ;
-        RECT 3.395000  0.085000 3.725000 0.775000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -106,34 +91,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 2.360000 1.950000 2.690000 3.245000 ;
-        RECT 3.360000 2.140000 3.690000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.825000 2.190000 0.995000 ;
-      RECT 0.085000 0.995000 0.255000 1.940000 ;
-      RECT 0.085000 1.940000 0.735000 2.110000 ;
-      RECT 0.405000 2.110000 0.735000 2.980000 ;
-      RECT 0.690000 0.350000 1.020000 0.825000 ;
-      RECT 1.860000 0.350000 2.190000 0.825000 ;
-      RECT 1.860000 0.995000 2.190000 1.010000 ;
-      RECT 1.860000 1.010000 2.795000 1.180000 ;
-      RECT 2.625000 1.180000 2.795000 1.300000 ;
-      RECT 2.625000 1.300000 3.040000 1.630000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.085000  0.825000 2.190000 0.995000 ;
+      RECT 0.085000  0.995000 0.255000 1.940000 ;
+      RECT 0.085000  1.940000 0.735000 2.110000 ;
+      RECT 0.115000  0.085000 0.510000 0.655000 ;
+      RECT 0.405000  2.110000 0.735000 2.980000 ;
+      RECT 0.690000  0.350000 1.020000 0.825000 ;
+      RECT 1.200000  0.085000 1.680000 0.655000 ;
+      RECT 1.860000  0.350000 2.190000 0.825000 ;
+      RECT 1.860000  0.995000 2.190000 1.010000 ;
+      RECT 1.860000  1.010000 2.795000 1.180000 ;
+      RECT 2.360000  0.085000 2.795000 0.825000 ;
+      RECT 2.360000  1.950000 2.690000 3.245000 ;
+      RECT 2.625000  1.180000 2.795000 1.300000 ;
+      RECT 2.625000  1.300000 3.040000 1.630000 ;
+      RECT 3.360000  2.140000 3.690000 3.245000 ;
+      RECT 3.395000  0.085000 3.725000 0.775000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4_2
diff --git a/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef
index e4f1a6a..014607a 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hs__or4_4.magic.lef
@@ -90,28 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.130000 ;
-        RECT 1.115000  0.085000 1.445000 0.810000 ;
-        RECT 2.380000  0.085000 2.740000 0.620000 ;
-        RECT 3.430000  0.085000 4.590000 0.620000 ;
-        RECT 5.270000  0.085000 6.115000 0.680000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -120,57 +98,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.115000 2.320000 0.445000 3.245000 ;
-        RECT 1.015000 2.320000 1.345000 3.245000 ;
-        RECT 1.915000 2.320000 2.245000 3.245000 ;
-        RECT 3.375000 2.730000 3.705000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.315000 1.320000 2.325000 1.650000 ;
-      RECT 2.155000 0.790000 5.100000 0.960000 ;
-      RECT 2.155000 0.960000 2.325000 1.320000 ;
-      RECT 2.475000 1.940000 2.805000 1.970000 ;
-      RECT 2.475000 1.970000 4.675000 2.140000 ;
-      RECT 2.475000 2.140000 2.805000 2.190000 ;
-      RECT 2.475000 2.190000 2.755000 2.980000 ;
-      RECT 2.920000 0.350000 3.250000 0.790000 ;
-      RECT 2.925000 2.360000 4.175000 2.560000 ;
-      RECT 2.925000 2.560000 3.205000 2.980000 ;
-      RECT 3.825000 2.310000 4.175000 2.360000 ;
-      RECT 3.895000 2.560000 4.175000 2.980000 ;
-      RECT 4.345000 1.940000 4.675000 1.970000 ;
-      RECT 4.345000 2.140000 4.675000 2.360000 ;
-      RECT 4.345000 2.360000 6.575000 2.530000 ;
-      RECT 4.345000 2.530000 4.675000 2.980000 ;
-      RECT 4.770000 0.350000 5.100000 0.790000 ;
-      RECT 4.770000 0.960000 5.100000 1.025000 ;
-      RECT 4.770000 1.025000 6.635000 1.195000 ;
-      RECT 4.845000 2.700000 6.075000 2.980000 ;
-      RECT 5.295000 1.950000 6.635000 2.120000 ;
-      RECT 5.295000 2.120000 5.625000 2.190000 ;
-      RECT 6.245000 2.290000 6.575000 2.360000 ;
-      RECT 6.245000 2.530000 6.575000 2.980000 ;
-      RECT 6.465000 1.195000 6.635000 1.950000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.130000 ;
+      RECT 0.115000  2.320000 0.445000 3.245000 ;
+      RECT 1.015000  2.320000 1.345000 3.245000 ;
+      RECT 1.115000  0.085000 1.445000 0.810000 ;
+      RECT 1.315000  1.320000 2.325000 1.650000 ;
+      RECT 1.915000  2.320000 2.245000 3.245000 ;
+      RECT 2.155000  0.790000 5.100000 0.960000 ;
+      RECT 2.155000  0.960000 2.325000 1.320000 ;
+      RECT 2.380000  0.085000 2.740000 0.620000 ;
+      RECT 2.475000  1.940000 2.805000 1.970000 ;
+      RECT 2.475000  1.970000 4.675000 2.140000 ;
+      RECT 2.475000  2.140000 2.805000 2.190000 ;
+      RECT 2.475000  2.190000 2.755000 2.980000 ;
+      RECT 2.920000  0.350000 3.250000 0.790000 ;
+      RECT 2.925000  2.360000 4.175000 2.560000 ;
+      RECT 2.925000  2.560000 3.205000 2.980000 ;
+      RECT 3.375000  2.730000 3.705000 3.245000 ;
+      RECT 3.430000  0.085000 4.590000 0.620000 ;
+      RECT 3.825000  2.310000 4.175000 2.360000 ;
+      RECT 3.895000  2.560000 4.175000 2.980000 ;
+      RECT 4.345000  1.940000 4.675000 1.970000 ;
+      RECT 4.345000  2.140000 4.675000 2.360000 ;
+      RECT 4.345000  2.360000 6.575000 2.530000 ;
+      RECT 4.345000  2.530000 4.675000 2.980000 ;
+      RECT 4.770000  0.350000 5.100000 0.790000 ;
+      RECT 4.770000  0.960000 5.100000 1.025000 ;
+      RECT 4.770000  1.025000 6.635000 1.195000 ;
+      RECT 4.845000  2.700000 6.075000 2.980000 ;
+      RECT 5.270000  0.085000 6.115000 0.680000 ;
+      RECT 5.295000  1.950000 6.635000 2.120000 ;
+      RECT 5.295000  2.120000 5.625000 2.190000 ;
+      RECT 6.245000  2.290000 6.575000 2.360000 ;
+      RECT 6.245000  2.530000 6.575000 2.980000 ;
+      RECT 6.465000  1.195000 6.635000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4_4
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef
index 37ff8e4..1e992b6 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_1.magic.lef
@@ -81,21 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.940000 ;
-        RECT 2.260000  0.085000 2.590000 0.875000 ;
-        RECT 3.295000  0.085000 3.625000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -104,42 +89,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.620000 2.290000 0.950000 3.245000 ;
-        RECT 3.335000 2.290000 3.665000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 1.110000 ;
-      RECT 0.115000 1.110000 0.980000 1.280000 ;
-      RECT 0.120000 1.950000 0.980000 2.120000 ;
-      RECT 0.120000 2.120000 0.450000 2.980000 ;
-      RECT 0.810000 1.280000 0.980000 1.580000 ;
-      RECT 0.810000 1.580000 1.140000 1.910000 ;
-      RECT 0.810000 1.910000 0.980000 1.950000 ;
-      RECT 1.115000 0.545000 2.090000 0.875000 ;
-      RECT 1.315000 0.875000 1.645000 1.950000 ;
-      RECT 1.315000 1.950000 3.665000 2.120000 ;
-      RECT 1.315000 2.120000 1.645000 2.860000 ;
-      RECT 2.760000 0.350000 3.125000 0.940000 ;
-      RECT 2.955000 0.940000 3.125000 1.010000 ;
-      RECT 2.955000 1.010000 3.665000 1.180000 ;
-      RECT 3.495000 1.180000 3.665000 1.300000 ;
-      RECT 3.495000 1.300000 3.895000 1.630000 ;
-      RECT 3.495000 1.630000 3.665000 1.950000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 1.110000 ;
+      RECT 0.115000  1.110000 0.980000 1.280000 ;
+      RECT 0.120000  1.950000 0.980000 2.120000 ;
+      RECT 0.120000  2.120000 0.450000 2.980000 ;
+      RECT 0.615000  0.085000 0.945000 0.940000 ;
+      RECT 0.620000  2.290000 0.950000 3.245000 ;
+      RECT 0.810000  1.280000 0.980000 1.580000 ;
+      RECT 0.810000  1.580000 1.140000 1.910000 ;
+      RECT 0.810000  1.910000 0.980000 1.950000 ;
+      RECT 1.115000  0.545000 2.090000 0.875000 ;
+      RECT 1.315000  0.875000 1.645000 1.950000 ;
+      RECT 1.315000  1.950000 3.665000 2.120000 ;
+      RECT 1.315000  2.120000 1.645000 2.860000 ;
+      RECT 2.260000  0.085000 2.590000 0.875000 ;
+      RECT 2.760000  0.350000 3.125000 0.940000 ;
+      RECT 2.955000  0.940000 3.125000 1.010000 ;
+      RECT 2.955000  1.010000 3.665000 1.180000 ;
+      RECT 3.295000  0.085000 3.625000 0.840000 ;
+      RECT 3.335000  2.290000 3.665000 3.245000 ;
+      RECT 3.495000  1.180000 3.665000 1.300000 ;
+      RECT 3.495000  1.300000 3.895000 1.630000 ;
+      RECT 3.495000  1.630000 3.665000 1.950000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef
index 0140cfa..ba78575 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_2.magic.lef
@@ -81,22 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.640000  0.085000 0.890000 0.840000 ;
-        RECT 1.575000  0.085000 1.995000 0.780000 ;
-        RECT 2.685000  0.085000 3.205000 0.780000 ;
-        RECT 3.875000  0.085000 4.205000 0.930000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -105,44 +89,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.650000 2.660000 0.980000 3.245000 ;
-        RECT 1.550000 2.730000 2.125000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.950000 0.890000 2.320000 ;
-      RECT 0.115000 2.320000 2.465000 2.490000 ;
-      RECT 0.115000 2.490000 0.445000 2.700000 ;
-      RECT 0.130000 0.540000 0.460000 1.010000 ;
-      RECT 0.130000 1.010000 0.890000 1.180000 ;
-      RECT 0.720000 1.180000 0.890000 1.950000 ;
-      RECT 1.400000 1.300000 1.745000 1.630000 ;
-      RECT 1.575000 0.960000 3.705000 1.100000 ;
-      RECT 1.575000 1.100000 4.235000 1.130000 ;
-      RECT 1.575000 1.130000 1.745000 1.300000 ;
-      RECT 2.175000 0.450000 2.505000 0.960000 ;
-      RECT 2.295000 2.490000 2.465000 2.690000 ;
-      RECT 2.295000 2.690000 3.695000 2.860000 ;
-      RECT 3.375000 0.450000 3.705000 0.960000 ;
-      RECT 3.375000 1.130000 4.235000 1.270000 ;
-      RECT 3.525000 1.440000 3.895000 1.770000 ;
-      RECT 3.525000 1.770000 3.695000 2.690000 ;
-      RECT 3.865000 1.940000 4.235000 2.980000 ;
-      RECT 4.065000 1.270000 4.235000 1.940000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  1.950000 0.890000 2.320000 ;
+      RECT 0.115000  2.320000 2.465000 2.490000 ;
+      RECT 0.115000  2.490000 0.445000 2.700000 ;
+      RECT 0.130000  0.540000 0.460000 1.010000 ;
+      RECT 0.130000  1.010000 0.890000 1.180000 ;
+      RECT 0.640000  0.085000 0.890000 0.840000 ;
+      RECT 0.650000  2.660000 0.980000 3.245000 ;
+      RECT 0.720000  1.180000 0.890000 1.950000 ;
+      RECT 1.400000  1.300000 1.745000 1.630000 ;
+      RECT 1.550000  2.730000 2.125000 3.245000 ;
+      RECT 1.575000  0.085000 1.995000 0.780000 ;
+      RECT 1.575000  0.960000 3.705000 1.100000 ;
+      RECT 1.575000  1.100000 4.235000 1.130000 ;
+      RECT 1.575000  1.130000 1.745000 1.300000 ;
+      RECT 2.175000  0.450000 2.505000 0.960000 ;
+      RECT 2.295000  2.490000 2.465000 2.690000 ;
+      RECT 2.295000  2.690000 3.695000 2.860000 ;
+      RECT 2.685000  0.085000 3.205000 0.780000 ;
+      RECT 3.375000  0.450000 3.705000 0.960000 ;
+      RECT 3.375000  1.130000 4.235000 1.270000 ;
+      RECT 3.525000  1.440000 3.895000 1.770000 ;
+      RECT 3.525000  1.770000 3.695000 2.690000 ;
+      RECT 3.865000  1.940000 4.235000 2.980000 ;
+      RECT 3.875000  0.085000 4.205000 0.930000 ;
+      RECT 4.065000  1.270000 4.235000 1.940000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef
index 3e839fb..d86dc90 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_4.magic.lef
@@ -55,12 +55,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 2.245000 1.180000 2.725000 1.780000 ;
-        RECT 3.865000 1.180000 4.195000 1.510000 ;
-      LAYER mcon ;
-        RECT 2.555000 1.210000 2.725000 1.380000 ;
-        RECT 3.995000 1.210000 4.165000 1.380000 ;
       LAYER met1 ;
         RECT 2.495000 1.180000 2.785000 1.225000 ;
         RECT 2.495000 1.225000 4.225000 1.365000 ;
@@ -99,29 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.615000  0.085000 0.945000 0.600000 ;
-        RECT 2.370000  0.085000 2.725000 0.600000 ;
-        RECT 4.825000  0.085000 5.155000 0.670000 ;
-        RECT 5.825000  0.085000 6.155000 0.810000 ;
-        RECT 6.755000  0.085000 7.085000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -130,61 +101,85 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 1.015000 2.630000 1.345000 3.245000 ;
-        RECT 4.960000 1.820000 5.210000 3.245000 ;
-        RECT 5.860000 2.320000 6.190000 3.245000 ;
-        RECT 6.760000 2.320000 7.090000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.445000 0.770000 ;
-      RECT 0.115000 0.770000 3.270000 0.840000 ;
-      RECT 0.115000 0.840000 5.155000 0.940000 ;
-      RECT 0.115000 1.940000 0.445000 1.950000 ;
-      RECT 0.115000 1.950000 2.345000 2.120000 ;
-      RECT 0.115000 2.120000 0.445000 2.980000 ;
-      RECT 0.645000 2.290000 1.845000 2.460000 ;
-      RECT 0.645000 2.460000 0.815000 2.980000 ;
-      RECT 1.115000 0.350000 2.200000 0.770000 ;
-      RECT 1.515000 2.460000 1.845000 2.980000 ;
-      RECT 2.015000 2.120000 2.345000 2.360000 ;
-      RECT 2.015000 2.360000 4.195000 2.530000 ;
-      RECT 2.015000 2.530000 2.345000 2.980000 ;
-      RECT 2.515000 2.700000 3.745000 2.980000 ;
-      RECT 2.895000 0.350000 3.270000 0.770000 ;
-      RECT 2.895000 0.940000 5.155000 1.010000 ;
-      RECT 2.895000 1.010000 3.270000 1.130000 ;
-      RECT 2.895000 1.130000 3.065000 2.020000 ;
-      RECT 2.895000 2.020000 3.295000 2.190000 ;
-      RECT 3.235000 1.470000 3.635000 1.720000 ;
-      RECT 3.235000 1.720000 4.755000 1.800000 ;
-      RECT 3.440000 0.340000 4.565000 0.670000 ;
-      RECT 3.465000 1.800000 4.755000 1.890000 ;
-      RECT 3.945000 2.060000 4.195000 2.360000 ;
-      RECT 3.945000 2.530000 4.195000 2.980000 ;
-      RECT 4.425000 1.890000 4.755000 2.860000 ;
-      RECT 4.985000 1.010000 5.155000 1.320000 ;
-      RECT 4.985000 1.320000 6.155000 1.650000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.115000  0.350000 0.445000 0.770000 ;
+      RECT 0.115000  0.770000 3.270000 0.840000 ;
+      RECT 0.115000  0.840000 5.155000 0.940000 ;
+      RECT 0.115000  1.940000 0.445000 1.950000 ;
+      RECT 0.115000  1.950000 2.345000 2.120000 ;
+      RECT 0.115000  2.120000 0.445000 2.980000 ;
+      RECT 0.615000  0.085000 0.945000 0.600000 ;
+      RECT 0.645000  2.290000 1.845000 2.460000 ;
+      RECT 0.645000  2.460000 0.815000 2.980000 ;
+      RECT 1.015000  2.630000 1.345000 3.245000 ;
+      RECT 1.115000  0.350000 2.200000 0.770000 ;
+      RECT 1.515000  2.460000 1.845000 2.980000 ;
+      RECT 2.015000  2.120000 2.345000 2.360000 ;
+      RECT 2.015000  2.360000 4.195000 2.530000 ;
+      RECT 2.015000  2.530000 2.345000 2.980000 ;
+      RECT 2.245000  1.180000 2.725000 1.780000 ;
+      RECT 2.370000  0.085000 2.725000 0.600000 ;
+      RECT 2.515000  2.700000 3.745000 2.980000 ;
+      RECT 2.895000  0.350000 3.270000 0.770000 ;
+      RECT 2.895000  0.940000 5.155000 1.010000 ;
+      RECT 2.895000  1.010000 3.270000 1.130000 ;
+      RECT 2.895000  1.130000 3.065000 2.020000 ;
+      RECT 2.895000  2.020000 3.295000 2.190000 ;
+      RECT 3.235000  1.470000 3.635000 1.720000 ;
+      RECT 3.235000  1.720000 4.755000 1.800000 ;
+      RECT 3.440000  0.340000 4.565000 0.670000 ;
+      RECT 3.465000  1.800000 4.755000 1.890000 ;
+      RECT 3.865000  1.180000 4.195000 1.510000 ;
+      RECT 3.945000  2.060000 4.195000 2.360000 ;
+      RECT 3.945000  2.530000 4.195000 2.980000 ;
+      RECT 4.425000  1.890000 4.755000 2.860000 ;
+      RECT 4.825000  0.085000 5.155000 0.670000 ;
+      RECT 4.960000  1.820000 5.210000 3.245000 ;
+      RECT 4.985000  1.010000 5.155000 1.320000 ;
+      RECT 4.985000  1.320000 6.155000 1.650000 ;
+      RECT 5.825000  0.085000 6.155000 0.810000 ;
+      RECT 5.860000  2.320000 6.190000 3.245000 ;
+      RECT 6.755000  0.085000 7.085000 1.130000 ;
+      RECT 6.760000  2.320000 7.090000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  1.210000 2.725000 1.380000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  1.210000 4.165000 1.380000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4b_4
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef
index b61da63..3f16838 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.magic.lef
@@ -81,23 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.640000  0.085000 0.970000 0.790000 ;
-        RECT 1.825000  0.085000 2.075000 0.680000 ;
-        RECT 2.745000  0.085000 3.140000 0.680000 ;
-        RECT 3.810000  0.085000 4.140000 0.840000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -106,49 +89,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.615000 2.650000 0.945000 3.245000 ;
-        RECT 3.740000 1.950000 4.070000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 2.100000 0.795000 2.310000 ;
-      RECT 0.115000 2.310000 1.285000 2.480000 ;
-      RECT 0.115000 2.480000 0.445000 2.980000 ;
-      RECT 0.140000 0.350000 0.470000 0.960000 ;
-      RECT 0.140000 0.960000 0.795000 1.130000 ;
-      RECT 0.625000 1.130000 0.795000 2.100000 ;
-      RECT 1.115000 2.480000 1.285000 2.905000 ;
-      RECT 1.115000 2.905000 2.755000 3.075000 ;
-      RECT 1.140000 0.350000 1.655000 0.880000 ;
-      RECT 1.150000 1.890000 1.655000 2.140000 ;
-      RECT 1.485000 0.880000 1.655000 1.030000 ;
-      RECT 1.485000 1.030000 1.905000 1.700000 ;
-      RECT 1.485000 1.700000 1.655000 1.890000 ;
-      RECT 1.845000 1.870000 2.245000 2.735000 ;
-      RECT 2.075000 0.850000 3.640000 1.010000 ;
-      RECT 2.075000 1.010000 4.175000 1.020000 ;
-      RECT 2.075000 1.020000 2.245000 1.870000 ;
-      RECT 2.245000 0.350000 2.575000 0.850000 ;
-      RECT 2.425000 1.190000 2.755000 2.905000 ;
-      RECT 3.310000 0.350000 3.640000 0.850000 ;
-      RECT 3.310000 1.020000 4.175000 1.180000 ;
-      RECT 4.005000 1.180000 4.175000 1.300000 ;
-      RECT 4.005000 1.300000 4.375000 1.630000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  2.100000 0.795000 2.310000 ;
+      RECT 0.115000  2.310000 1.285000 2.480000 ;
+      RECT 0.115000  2.480000 0.445000 2.980000 ;
+      RECT 0.140000  0.350000 0.470000 0.960000 ;
+      RECT 0.140000  0.960000 0.795000 1.130000 ;
+      RECT 0.615000  2.650000 0.945000 3.245000 ;
+      RECT 0.625000  1.130000 0.795000 2.100000 ;
+      RECT 0.640000  0.085000 0.970000 0.790000 ;
+      RECT 1.115000  2.480000 1.285000 2.905000 ;
+      RECT 1.115000  2.905000 2.755000 3.075000 ;
+      RECT 1.140000  0.350000 1.655000 0.880000 ;
+      RECT 1.150000  1.890000 1.655000 2.140000 ;
+      RECT 1.485000  0.880000 1.655000 1.030000 ;
+      RECT 1.485000  1.030000 1.905000 1.700000 ;
+      RECT 1.485000  1.700000 1.655000 1.890000 ;
+      RECT 1.825000  0.085000 2.075000 0.680000 ;
+      RECT 1.845000  1.870000 2.245000 2.735000 ;
+      RECT 2.075000  0.850000 3.640000 1.010000 ;
+      RECT 2.075000  1.010000 4.175000 1.020000 ;
+      RECT 2.075000  1.020000 2.245000 1.870000 ;
+      RECT 2.245000  0.350000 2.575000 0.850000 ;
+      RECT 2.425000  1.190000 2.755000 2.905000 ;
+      RECT 2.745000  0.085000 3.140000 0.680000 ;
+      RECT 3.310000  0.350000 3.640000 0.850000 ;
+      RECT 3.310000  1.020000 4.175000 1.180000 ;
+      RECT 3.740000  1.950000 4.070000 3.245000 ;
+      RECT 3.810000  0.085000 4.140000 0.840000 ;
+      RECT 4.005000  1.180000 4.175000 1.300000 ;
+      RECT 4.005000  1.300000 4.375000 1.630000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef
index 1501dcb..f32ac19 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.magic.lef
@@ -82,24 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.630000  0.085000 0.880000 0.840000 ;
-        RECT 1.575000  0.085000 2.035000 0.910000 ;
-        RECT 2.810000  0.085000 2.980000 0.740000 ;
-        RECT 2.810000  0.740000 3.195000 0.960000 ;
-        RECT 3.925000  0.085000 4.255000 0.790000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -108,49 +90,64 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.605000 2.610000 0.935000 3.245000 ;
-        RECT 1.510000 2.610000 1.840000 3.245000 ;
-        RECT 3.820000 2.310000 4.150000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 2.100000 0.890000 2.270000 ;
-      RECT 0.105000 2.270000 2.265000 2.440000 ;
-      RECT 0.105000 2.440000 0.435000 2.980000 ;
-      RECT 0.120000 0.670000 0.450000 1.010000 ;
-      RECT 0.120000 1.010000 0.890000 1.180000 ;
-      RECT 0.720000 1.180000 0.890000 2.100000 ;
-      RECT 1.400000 1.350000 1.730000 1.680000 ;
-      RECT 1.560000 1.130000 3.735000 1.300000 ;
-      RECT 1.560000 1.300000 1.730000 1.350000 ;
-      RECT 1.970000 1.470000 2.265000 2.270000 ;
-      RECT 2.050000 2.610000 2.605000 2.780000 ;
-      RECT 2.050000 2.780000 2.380000 2.980000 ;
-      RECT 2.310000 0.580000 2.640000 1.130000 ;
-      RECT 2.435000 1.300000 2.605000 2.610000 ;
-      RECT 2.775000 1.470000 3.070000 1.970000 ;
-      RECT 2.775000 1.970000 4.690000 2.140000 ;
-      RECT 3.405000 0.840000 3.735000 1.130000 ;
-      RECT 4.095000 0.960000 4.685000 1.130000 ;
-      RECT 4.095000 1.130000 4.265000 1.950000 ;
-      RECT 4.095000 1.950000 4.690000 1.970000 ;
-      RECT 4.360000 2.140000 4.690000 2.820000 ;
-      RECT 4.435000 0.435000 4.685000 0.960000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.105000  2.100000 0.890000 2.270000 ;
+      RECT 0.105000  2.270000 2.265000 2.440000 ;
+      RECT 0.105000  2.440000 0.435000 2.980000 ;
+      RECT 0.120000  0.670000 0.450000 1.010000 ;
+      RECT 0.120000  1.010000 0.890000 1.180000 ;
+      RECT 0.605000  2.610000 0.935000 3.245000 ;
+      RECT 0.630000  0.085000 0.880000 0.840000 ;
+      RECT 0.720000  1.180000 0.890000 2.100000 ;
+      RECT 1.400000  1.350000 1.730000 1.680000 ;
+      RECT 1.510000  2.610000 1.840000 3.245000 ;
+      RECT 1.560000  1.130000 3.735000 1.300000 ;
+      RECT 1.560000  1.300000 1.730000 1.350000 ;
+      RECT 1.575000  0.085000 2.035000 0.910000 ;
+      RECT 1.970000  1.470000 2.265000 2.270000 ;
+      RECT 2.050000  2.610000 2.605000 2.780000 ;
+      RECT 2.050000  2.780000 2.380000 2.980000 ;
+      RECT 2.310000  0.580000 2.640000 1.130000 ;
+      RECT 2.435000  1.300000 2.605000 2.610000 ;
+      RECT 2.775000  1.470000 3.070000 1.970000 ;
+      RECT 2.775000  1.970000 4.690000 2.140000 ;
+      RECT 2.810000  0.085000 2.980000 0.740000 ;
+      RECT 2.810000  0.740000 3.195000 0.960000 ;
+      RECT 3.405000  0.840000 3.735000 1.130000 ;
+      RECT 3.820000  2.310000 4.150000 3.245000 ;
+      RECT 3.925000  0.085000 4.255000 0.790000 ;
+      RECT 4.095000  0.960000 4.685000 1.130000 ;
+      RECT 4.095000  1.130000 4.265000 1.950000 ;
+      RECT 4.095000  1.950000 4.690000 1.970000 ;
+      RECT 4.360000  2.140000 4.690000 2.820000 ;
+      RECT 4.435000  0.435000 4.685000 0.960000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef
index f3933d6..8f50b08 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.magic.lef
@@ -84,33 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.615000  0.085000 0.915000 1.130000 ;
-        RECT 1.630000  0.085000 1.960000 0.410000 ;
-        RECT 2.945000  0.085000 3.275000 0.750000 ;
-        RECT 4.015000  0.085000 4.605000 0.410000 ;
-        RECT 6.450000  0.085000 6.780000 0.920000 ;
-        RECT 7.640000  0.085000 8.310000 0.985000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -119,76 +92,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.650000 2.730000 0.995000 3.245000 ;
-        RECT 1.565000 2.730000 1.990000 3.245000 ;
-        RECT 2.840000 2.730000 3.170000 3.245000 ;
-        RECT 7.745000 2.410000 8.075000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.445000 1.130000 ;
-      RECT 0.085000 1.130000 0.255000 1.950000 ;
-      RECT 0.085000 1.950000 0.445000 2.390000 ;
-      RECT 0.085000 2.390000 2.865000 2.560000 ;
-      RECT 0.085000 2.560000 0.445000 2.860000 ;
-      RECT 1.620000 0.920000 4.275000 1.090000 ;
-      RECT 1.620000 1.090000 1.790000 1.710000 ;
-      RECT 1.620000 1.710000 2.865000 1.880000 ;
-      RECT 1.960000 1.260000 3.205000 1.540000 ;
-      RECT 2.695000 1.880000 2.865000 2.390000 ;
-      RECT 3.035000 1.540000 3.205000 2.290000 ;
-      RECT 3.035000 2.290000 4.715000 2.460000 ;
-      RECT 3.375000 1.950000 4.055000 2.120000 ;
-      RECT 3.455000 0.450000 3.785000 0.580000 ;
-      RECT 3.455000 0.580000 4.615000 0.750000 ;
-      RECT 3.885000 1.420000 5.805000 1.590000 ;
-      RECT 3.885000 1.590000 4.055000 1.950000 ;
-      RECT 3.935000 2.630000 5.165000 2.905000 ;
-      RECT 3.935000 2.905000 6.115000 2.980000 ;
-      RECT 3.945000 1.090000 4.275000 1.250000 ;
-      RECT 4.385000 1.760000 6.145000 1.930000 ;
-      RECT 4.385000 1.930000 4.715000 2.290000 ;
-      RECT 4.445000 0.750000 4.615000 1.260000 ;
-      RECT 4.445000 1.260000 5.805000 1.420000 ;
-      RECT 4.785000 0.350000 6.280000 1.090000 ;
-      RECT 4.835000 2.980000 6.115000 3.075000 ;
-      RECT 5.335000 2.100000 7.045000 2.270000 ;
-      RECT 5.335000 2.270000 5.665000 2.735000 ;
-      RECT 5.865000 2.440000 6.115000 2.905000 ;
-      RECT 5.975000 1.090000 7.355000 1.260000 ;
-      RECT 5.975000 1.260000 6.145000 1.760000 ;
-      RECT 6.345000 2.440000 6.675000 2.905000 ;
-      RECT 6.345000 2.905000 7.575000 3.075000 ;
-      RECT 6.575000 1.950000 7.045000 2.100000 ;
-      RECT 6.875000 2.270000 7.045000 2.735000 ;
-      RECT 7.025000 0.350000 7.355000 1.090000 ;
-      RECT 7.245000 1.950000 8.525000 2.240000 ;
-      RECT 7.245000 2.240000 7.575000 2.905000 ;
-      RECT 8.195000 1.940000 8.525000 1.950000 ;
-      RECT 8.250000 2.240000 8.525000 2.990000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.085000  0.450000 0.445000 1.130000 ;
+      RECT 0.085000  1.130000 0.255000 1.950000 ;
+      RECT 0.085000  1.950000 0.445000 2.390000 ;
+      RECT 0.085000  2.390000 2.865000 2.560000 ;
+      RECT 0.085000  2.560000 0.445000 2.860000 ;
+      RECT 0.615000  0.085000 0.915000 1.130000 ;
+      RECT 0.650000  2.730000 0.995000 3.245000 ;
+      RECT 1.565000  2.730000 1.990000 3.245000 ;
+      RECT 1.620000  0.920000 4.275000 1.090000 ;
+      RECT 1.620000  1.090000 1.790000 1.710000 ;
+      RECT 1.620000  1.710000 2.865000 1.880000 ;
+      RECT 1.630000  0.085000 1.960000 0.410000 ;
+      RECT 1.960000  1.260000 3.205000 1.540000 ;
+      RECT 2.695000  1.880000 2.865000 2.390000 ;
+      RECT 2.840000  2.730000 3.170000 3.245000 ;
+      RECT 2.945000  0.085000 3.275000 0.750000 ;
+      RECT 3.035000  1.540000 3.205000 2.290000 ;
+      RECT 3.035000  2.290000 4.715000 2.460000 ;
+      RECT 3.375000  1.950000 4.055000 2.120000 ;
+      RECT 3.455000  0.450000 3.785000 0.580000 ;
+      RECT 3.455000  0.580000 4.615000 0.750000 ;
+      RECT 3.885000  1.420000 5.805000 1.590000 ;
+      RECT 3.885000  1.590000 4.055000 1.950000 ;
+      RECT 3.935000  2.630000 5.165000 2.905000 ;
+      RECT 3.935000  2.905000 6.115000 2.980000 ;
+      RECT 3.945000  1.090000 4.275000 1.250000 ;
+      RECT 4.015000  0.085000 4.605000 0.410000 ;
+      RECT 4.385000  1.760000 6.145000 1.930000 ;
+      RECT 4.385000  1.930000 4.715000 2.290000 ;
+      RECT 4.445000  0.750000 4.615000 1.260000 ;
+      RECT 4.445000  1.260000 5.805000 1.420000 ;
+      RECT 4.785000  0.350000 6.280000 1.090000 ;
+      RECT 4.835000  2.980000 6.115000 3.075000 ;
+      RECT 5.335000  2.100000 7.045000 2.270000 ;
+      RECT 5.335000  2.270000 5.665000 2.735000 ;
+      RECT 5.865000  2.440000 6.115000 2.905000 ;
+      RECT 5.975000  1.090000 7.355000 1.260000 ;
+      RECT 5.975000  1.260000 6.145000 1.760000 ;
+      RECT 6.345000  2.440000 6.675000 2.905000 ;
+      RECT 6.345000  2.905000 7.575000 3.075000 ;
+      RECT 6.450000  0.085000 6.780000 0.920000 ;
+      RECT 6.575000  1.950000 7.045000 2.100000 ;
+      RECT 6.875000  2.270000 7.045000 2.735000 ;
+      RECT 7.025000  0.350000 7.355000 1.090000 ;
+      RECT 7.245000  1.950000 8.525000 2.240000 ;
+      RECT 7.245000  2.240000 7.575000 2.905000 ;
+      RECT 7.640000  0.085000 8.310000 0.985000 ;
+      RECT 7.745000  2.410000 8.075000 3.245000 ;
+      RECT 8.195000  1.940000 8.525000 1.950000 ;
+      RECT 8.250000  2.240000 8.525000 2.990000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__or4bb_4
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef
index 6f5f499..08465a8 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.magic.lef
@@ -93,14 +93,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  8.285000 1.790000  8.990000 1.960000 ;
-        RECT  8.285000 1.960000  8.490000 2.140000 ;
-        RECT  8.660000 1.630000  8.990000 1.790000 ;
-        RECT 11.630000 1.470000 11.960000 2.120000 ;
-      LAYER mcon ;
-        RECT  8.315000 1.950000  8.485000 2.120000 ;
-        RECT 11.675000 1.950000 11.845000 2.120000 ;
       LAYER met1 ;
         RECT  8.255000 1.920000  8.545000 1.965000 ;
         RECT  8.255000 1.965000 11.905000 2.105000 ;
@@ -122,52 +114,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.800000 0.085000 ;
-        RECT  0.140000  0.085000  0.470000 1.035000 ;
-        RECT  1.890000  0.085000  2.220000 0.970000 ;
-        RECT  3.800000  0.085000  4.130000 0.410000 ;
-        RECT  5.300000  0.085000  5.630000 1.035000 ;
-        RECT  8.795000  0.085000  9.125000 1.080000 ;
-        RECT 11.415000  0.085000 11.755000 0.410000 ;
-        RECT 14.415000  0.085000 14.735000 0.680000 ;
-        RECT 15.905000  0.085000 16.155000 1.050000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
-        RECT 16.475000 -0.085000 16.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
@@ -176,178 +122,226 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 16.800000 3.415000 ;
-        RECT  0.565000 2.385000  0.895000 3.245000 ;
-        RECT  2.470000 2.300000  2.720000 3.245000 ;
-        RECT  3.930000 2.290000  4.180000 3.245000 ;
-        RECT  5.020000 2.465000  5.270000 3.245000 ;
-        RECT  8.125000 2.650000  8.295000 3.245000 ;
-        RECT  9.050000 2.470000  9.380000 3.245000 ;
-        RECT 10.900000 2.970000 11.230000 3.245000 ;
-        RECT 11.995000 2.970000 12.325000 3.245000 ;
-        RECT 14.000000 2.550000 14.690000 3.245000 ;
-        RECT 15.905000 1.900000 16.155000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
-        RECT 16.475000 3.245000 16.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 16.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 2.045000  1.235000 2.215000 ;
-      RECT  0.115000 2.215000  0.395000 2.980000 ;
-      RECT  0.960000 0.575000  1.290000 0.865000 ;
-      RECT  0.960000 0.865000  1.655000 1.035000 ;
-      RECT  1.065000 2.215000  1.235000 2.905000 ;
-      RECT  1.065000 2.905000  2.245000 3.075000 ;
-      RECT  1.465000 2.300000  1.715000 2.735000 ;
-      RECT  1.485000 1.035000  1.655000 1.140000 ;
-      RECT  1.485000 1.140000  2.560000 1.310000 ;
-      RECT  1.545000 1.980000  2.155000 2.150000 ;
-      RECT  1.545000 2.150000  1.715000 2.300000 ;
-      RECT  1.915000 2.320000  2.245000 2.905000 ;
-      RECT  1.985000 1.310000  2.155000 1.980000 ;
-      RECT  2.390000 0.255000  3.400000 0.425000 ;
-      RECT  2.390000 0.425000  2.560000 1.140000 ;
-      RECT  2.510000 1.480000  3.060000 1.810000 ;
-      RECT  2.730000 0.595000  3.060000 1.480000 ;
-      RECT  2.890000 1.810000  3.060000 2.300000 ;
-      RECT  2.890000 2.300000  3.250000 2.980000 ;
-      RECT  3.230000 0.425000  3.400000 0.580000 ;
-      RECT  3.230000 0.580000  5.130000 0.750000 ;
-      RECT  3.290000 0.920000  4.140000 1.170000 ;
-      RECT  3.480000 1.950000  4.140000 2.120000 ;
-      RECT  3.480000 2.120000  3.730000 2.980000 ;
-      RECT  3.970000 1.170000  4.140000 1.340000 ;
-      RECT  3.970000 1.340000  4.440000 1.670000 ;
-      RECT  3.970000 1.670000  4.140000 1.950000 ;
-      RECT  4.310000 0.920000  4.790000 1.170000 ;
-      RECT  4.380000 1.840000  4.780000 2.980000 ;
-      RECT  4.610000 1.170000  4.790000 1.550000 ;
-      RECT  4.610000 1.550000  6.710000 1.720000 ;
-      RECT  4.610000 1.720000  4.780000 1.840000 ;
-      RECT  4.950000 1.965000  5.215000 2.125000 ;
-      RECT  4.950000 2.125000  5.610000 2.295000 ;
-      RECT  4.960000 0.750000  5.130000 1.205000 ;
-      RECT  4.960000 1.205000  5.970000 1.375000 ;
-      RECT  5.405000 1.720000  6.710000 1.800000 ;
-      RECT  5.405000 1.800000  5.755000 1.905000 ;
-      RECT  5.440000 2.295000  5.610000 2.905000 ;
-      RECT  5.440000 2.905000  7.505000 3.075000 ;
-      RECT  5.800000 0.255000  6.925000 0.425000 ;
-      RECT  5.800000 0.425000  5.970000 1.205000 ;
-      RECT  5.865000 2.245000  6.195000 2.735000 ;
-      RECT  6.025000 1.970000  7.250000 2.140000 ;
-      RECT  6.025000 2.140000  6.195000 2.245000 ;
-      RECT  6.170000 0.595000  6.420000 1.130000 ;
-      RECT  6.170000 1.130000  7.250000 1.300000 ;
-      RECT  6.365000 2.310000  7.590000 2.480000 ;
-      RECT  6.365000 2.480000  6.695000 2.735000 ;
-      RECT  6.380000 1.470000  6.710000 1.550000 ;
-      RECT  6.595000 0.425000  6.925000 0.790000 ;
-      RECT  6.595000 0.790000  7.590000 0.960000 ;
-      RECT  6.920000 1.300000  7.250000 1.970000 ;
-      RECT  6.925000 2.650000  7.930000 2.820000 ;
-      RECT  6.925000 2.820000  7.505000 2.905000 ;
-      RECT  7.150000 0.255000  8.590000 0.425000 ;
-      RECT  7.150000 0.425000  7.480000 0.620000 ;
-      RECT  7.420000 0.960000  7.590000 2.310000 ;
-      RECT  7.760000 0.595000  8.090000 1.080000 ;
-      RECT  7.760000 1.080000  7.930000 2.310000 ;
-      RECT  7.760000 2.310000  8.830000 2.480000 ;
-      RECT  7.760000 2.480000  7.930000 2.650000 ;
-      RECT  8.100000 1.290000  9.555000 1.460000 ;
-      RECT  8.100000 1.460000  8.430000 1.620000 ;
-      RECT  8.260000 0.425000  8.590000 1.080000 ;
-      RECT  8.495000 2.480000  8.830000 2.980000 ;
-      RECT  8.660000 2.130000  9.530000 2.300000 ;
-      RECT  8.660000 2.300000  8.830000 2.310000 ;
-      RECT  9.200000 1.630000  9.530000 2.130000 ;
-      RECT  9.385000 0.365000 10.920000 0.535000 ;
-      RECT  9.385000 0.535000  9.555000 1.290000 ;
-      RECT  9.725000 1.260000 11.000000 1.555000 ;
-      RECT  9.725000 1.555000 10.070000 1.940000 ;
-      RECT  9.745000 0.705000 10.580000 0.920000 ;
-      RECT  9.745000 0.920000 11.340000 1.090000 ;
-      RECT  9.890000 2.110000 10.410000 2.280000 ;
-      RECT  9.890000 2.280000 10.220000 2.980000 ;
-      RECT 10.240000 1.725000 11.340000 1.895000 ;
-      RECT 10.240000 1.895000 10.410000 2.110000 ;
-      RECT 10.665000 2.065000 10.995000 2.630000 ;
-      RECT 10.665000 2.630000 13.280000 2.800000 ;
-      RECT 10.750000 0.535000 10.920000 0.580000 ;
-      RECT 10.750000 0.580000 11.680000 0.750000 ;
-      RECT 11.170000 1.090000 11.340000 1.725000 ;
-      RECT 11.170000 1.895000 11.340000 2.290000 ;
-      RECT 11.170000 2.290000 12.780000 2.460000 ;
-      RECT 11.460000 2.800000 11.790000 2.980000 ;
-      RECT 11.510000 0.750000 11.680000 1.130000 ;
-      RECT 11.510000 1.130000 13.905000 1.300000 ;
-      RECT 11.935000 0.255000 13.225000 0.425000 ;
-      RECT 11.935000 0.425000 12.265000 0.960000 ;
-      RECT 12.200000 1.300000 12.530000 1.550000 ;
-      RECT 12.465000 0.595000 12.795000 0.790000 ;
-      RECT 12.465000 0.790000 13.565000 0.960000 ;
-      RECT 12.610000 1.720000 13.440000 1.890000 ;
-      RECT 12.610000 1.890000 12.780000 2.290000 ;
-      RECT 12.770000 1.470000 13.440000 1.720000 ;
-      RECT 12.950000 2.060000 13.280000 2.210000 ;
-      RECT 12.950000 2.210000 14.720000 2.380000 ;
-      RECT 12.950000 2.380000 13.280000 2.630000 ;
-      RECT 12.950000 2.800000 13.280000 2.980000 ;
-      RECT 12.975000 0.425000 13.225000 0.620000 ;
-      RECT 13.395000 0.330000 14.245000 0.500000 ;
-      RECT 13.395000 0.500000 13.565000 0.790000 ;
-      RECT 13.610000 1.300000 13.780000 1.790000 ;
-      RECT 13.610000 1.790000 14.130000 2.040000 ;
-      RECT 13.735000 0.670000 13.905000 1.130000 ;
-      RECT 14.075000 0.500000 14.245000 0.850000 ;
-      RECT 14.075000 0.850000 14.720000 1.020000 ;
-      RECT 14.550000 1.020000 14.720000 1.300000 ;
-      RECT 14.550000 1.300000 14.935000 1.630000 ;
-      RECT 14.550000 1.630000 14.720000 2.210000 ;
-      RECT 15.450000 0.350000 15.725000 1.220000 ;
-      RECT 15.450000 1.220000 16.375000 1.550000 ;
-      RECT 15.450000 1.550000 15.700000 2.780000 ;
+      RECT  0.000000 -0.085000 16.800000 0.085000 ;
+      RECT  0.000000  3.245000 16.800000 3.415000 ;
+      RECT  0.115000  2.045000  1.235000 2.215000 ;
+      RECT  0.115000  2.215000  0.395000 2.980000 ;
+      RECT  0.140000  0.085000  0.470000 1.035000 ;
+      RECT  0.565000  2.385000  0.895000 3.245000 ;
+      RECT  0.960000  0.575000  1.290000 0.865000 ;
+      RECT  0.960000  0.865000  1.655000 1.035000 ;
+      RECT  1.065000  2.215000  1.235000 2.905000 ;
+      RECT  1.065000  2.905000  2.245000 3.075000 ;
+      RECT  1.465000  2.300000  1.715000 2.735000 ;
+      RECT  1.485000  1.035000  1.655000 1.140000 ;
+      RECT  1.485000  1.140000  2.560000 1.310000 ;
+      RECT  1.545000  1.980000  2.155000 2.150000 ;
+      RECT  1.545000  2.150000  1.715000 2.300000 ;
+      RECT  1.890000  0.085000  2.220000 0.970000 ;
+      RECT  1.915000  2.320000  2.245000 2.905000 ;
+      RECT  1.985000  1.310000  2.155000 1.980000 ;
+      RECT  2.390000  0.255000  3.400000 0.425000 ;
+      RECT  2.390000  0.425000  2.560000 1.140000 ;
+      RECT  2.470000  2.300000  2.720000 3.245000 ;
+      RECT  2.510000  1.480000  3.060000 1.810000 ;
+      RECT  2.730000  0.595000  3.060000 1.480000 ;
+      RECT  2.890000  1.810000  3.060000 2.300000 ;
+      RECT  2.890000  2.300000  3.250000 2.980000 ;
+      RECT  3.230000  0.425000  3.400000 0.580000 ;
+      RECT  3.230000  0.580000  5.130000 0.750000 ;
+      RECT  3.290000  0.920000  4.140000 1.170000 ;
+      RECT  3.480000  1.950000  4.140000 2.120000 ;
+      RECT  3.480000  2.120000  3.730000 2.980000 ;
+      RECT  3.800000  0.085000  4.130000 0.410000 ;
+      RECT  3.930000  2.290000  4.180000 3.245000 ;
+      RECT  3.970000  1.170000  4.140000 1.340000 ;
+      RECT  3.970000  1.340000  4.440000 1.670000 ;
+      RECT  3.970000  1.670000  4.140000 1.950000 ;
+      RECT  4.310000  0.920000  4.790000 1.170000 ;
+      RECT  4.380000  1.840000  4.780000 2.980000 ;
+      RECT  4.610000  1.170000  4.790000 1.550000 ;
+      RECT  4.610000  1.550000  6.710000 1.720000 ;
+      RECT  4.610000  1.720000  4.780000 1.840000 ;
+      RECT  4.950000  1.965000  5.215000 2.125000 ;
+      RECT  4.950000  2.125000  5.610000 2.295000 ;
+      RECT  4.960000  0.750000  5.130000 1.205000 ;
+      RECT  4.960000  1.205000  5.970000 1.375000 ;
+      RECT  5.020000  2.465000  5.270000 3.245000 ;
+      RECT  5.300000  0.085000  5.630000 1.035000 ;
+      RECT  5.405000  1.720000  6.710000 1.800000 ;
+      RECT  5.405000  1.800000  5.755000 1.905000 ;
+      RECT  5.440000  2.295000  5.610000 2.905000 ;
+      RECT  5.440000  2.905000  7.505000 3.075000 ;
+      RECT  5.800000  0.255000  6.925000 0.425000 ;
+      RECT  5.800000  0.425000  5.970000 1.205000 ;
+      RECT  5.865000  2.245000  6.195000 2.735000 ;
+      RECT  6.025000  1.970000  7.250000 2.140000 ;
+      RECT  6.025000  2.140000  6.195000 2.245000 ;
+      RECT  6.170000  0.595000  6.420000 1.130000 ;
+      RECT  6.170000  1.130000  7.250000 1.300000 ;
+      RECT  6.365000  2.310000  7.590000 2.480000 ;
+      RECT  6.365000  2.480000  6.695000 2.735000 ;
+      RECT  6.380000  1.470000  6.710000 1.550000 ;
+      RECT  6.595000  0.425000  6.925000 0.790000 ;
+      RECT  6.595000  0.790000  7.590000 0.960000 ;
+      RECT  6.920000  1.300000  7.250000 1.970000 ;
+      RECT  6.925000  2.650000  7.930000 2.820000 ;
+      RECT  6.925000  2.820000  7.505000 2.905000 ;
+      RECT  7.150000  0.255000  8.590000 0.425000 ;
+      RECT  7.150000  0.425000  7.480000 0.620000 ;
+      RECT  7.420000  0.960000  7.590000 2.310000 ;
+      RECT  7.760000  0.595000  8.090000 1.080000 ;
+      RECT  7.760000  1.080000  7.930000 2.310000 ;
+      RECT  7.760000  2.310000  8.830000 2.480000 ;
+      RECT  7.760000  2.480000  7.930000 2.650000 ;
+      RECT  8.100000  1.290000  9.555000 1.460000 ;
+      RECT  8.100000  1.460000  8.430000 1.620000 ;
+      RECT  8.125000  2.650000  8.295000 3.245000 ;
+      RECT  8.260000  0.425000  8.590000 1.080000 ;
+      RECT  8.285000  1.790000  8.990000 1.960000 ;
+      RECT  8.285000  1.960000  8.490000 2.140000 ;
+      RECT  8.495000  2.480000  8.830000 2.980000 ;
+      RECT  8.660000  1.630000  8.990000 1.790000 ;
+      RECT  8.660000  2.130000  9.530000 2.300000 ;
+      RECT  8.660000  2.300000  8.830000 2.310000 ;
+      RECT  8.795000  0.085000  9.125000 1.080000 ;
+      RECT  9.050000  2.470000  9.380000 3.245000 ;
+      RECT  9.200000  1.630000  9.530000 2.130000 ;
+      RECT  9.385000  0.365000 10.920000 0.535000 ;
+      RECT  9.385000  0.535000  9.555000 1.290000 ;
+      RECT  9.725000  1.260000 11.000000 1.555000 ;
+      RECT  9.725000  1.555000 10.070000 1.940000 ;
+      RECT  9.745000  0.705000 10.580000 0.920000 ;
+      RECT  9.745000  0.920000 11.340000 1.090000 ;
+      RECT  9.890000  2.110000 10.410000 2.280000 ;
+      RECT  9.890000  2.280000 10.220000 2.980000 ;
+      RECT 10.240000  1.725000 11.340000 1.895000 ;
+      RECT 10.240000  1.895000 10.410000 2.110000 ;
+      RECT 10.665000  2.065000 10.995000 2.630000 ;
+      RECT 10.665000  2.630000 13.280000 2.800000 ;
+      RECT 10.750000  0.535000 10.920000 0.580000 ;
+      RECT 10.750000  0.580000 11.680000 0.750000 ;
+      RECT 10.900000  2.970000 11.230000 3.245000 ;
+      RECT 11.170000  1.090000 11.340000 1.725000 ;
+      RECT 11.170000  1.895000 11.340000 2.290000 ;
+      RECT 11.170000  2.290000 12.780000 2.460000 ;
+      RECT 11.415000  0.085000 11.755000 0.410000 ;
+      RECT 11.460000  2.800000 11.790000 2.980000 ;
+      RECT 11.510000  0.750000 11.680000 1.130000 ;
+      RECT 11.510000  1.130000 13.905000 1.300000 ;
+      RECT 11.630000  1.470000 11.960000 2.120000 ;
+      RECT 11.935000  0.255000 13.225000 0.425000 ;
+      RECT 11.935000  0.425000 12.265000 0.960000 ;
+      RECT 11.995000  2.970000 12.325000 3.245000 ;
+      RECT 12.200000  1.300000 12.530000 1.550000 ;
+      RECT 12.465000  0.595000 12.795000 0.790000 ;
+      RECT 12.465000  0.790000 13.565000 0.960000 ;
+      RECT 12.610000  1.720000 13.440000 1.890000 ;
+      RECT 12.610000  1.890000 12.780000 2.290000 ;
+      RECT 12.770000  1.470000 13.440000 1.720000 ;
+      RECT 12.950000  2.060000 13.280000 2.210000 ;
+      RECT 12.950000  2.210000 14.720000 2.380000 ;
+      RECT 12.950000  2.380000 13.280000 2.630000 ;
+      RECT 12.950000  2.800000 13.280000 2.980000 ;
+      RECT 12.975000  0.425000 13.225000 0.620000 ;
+      RECT 13.395000  0.330000 14.245000 0.500000 ;
+      RECT 13.395000  0.500000 13.565000 0.790000 ;
+      RECT 13.610000  1.300000 13.780000 1.790000 ;
+      RECT 13.610000  1.790000 14.130000 2.040000 ;
+      RECT 13.735000  0.670000 13.905000 1.130000 ;
+      RECT 14.000000  2.550000 14.690000 3.245000 ;
+      RECT 14.075000  0.500000 14.245000 0.850000 ;
+      RECT 14.075000  0.850000 14.720000 1.020000 ;
+      RECT 14.415000  0.085000 14.735000 0.680000 ;
+      RECT 14.550000  1.020000 14.720000 1.300000 ;
+      RECT 14.550000  1.300000 14.935000 1.630000 ;
+      RECT 14.550000  1.630000 14.720000 2.210000 ;
+      RECT 15.450000  0.350000 15.725000 1.220000 ;
+      RECT 15.450000  1.220000 16.375000 1.550000 ;
+      RECT 15.450000  1.550000 15.700000 2.780000 ;
+      RECT 15.905000  0.085000 16.155000 1.050000 ;
+      RECT 15.905000  1.900000 16.155000 3.245000 ;
     LAYER mcon ;
-      RECT 5.435000 1.580000 5.605000 1.750000 ;
-      RECT 9.755000 1.580000 9.925000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.580000  5.605000 1.750000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.950000  8.485000 2.120000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  1.580000  9.925000 1.750000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  1.950000 11.845000 2.120000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
     LAYER met1 ;
       RECT 5.375000 1.550000 5.665000 1.595000 ;
       RECT 5.375000 1.595000 9.985000 1.735000 ;
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef
index bf7985e..d0699a8 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.magic.lef
@@ -94,12 +94,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  8.790000 1.450000  9.445000 1.780000 ;
-        RECT 11.955000 1.180000 12.325000 1.750000 ;
-      LAYER mcon ;
-        RECT  9.275000 1.580000  9.445000 1.750000 ;
-        RECT 12.155000 1.580000 12.325000 1.750000 ;
       LAYER met1 ;
         RECT  9.215000 1.550000  9.505000 1.595000 ;
         RECT  9.215000 1.595000 12.385000 1.735000 ;
@@ -121,57 +115,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 18.240000 0.085000 ;
-        RECT  0.140000  0.085000  0.470000 0.955000 ;
-        RECT  2.180000  0.085000  2.430000 0.950000 ;
-        RECT  3.930000  0.085000  4.180000 0.490000 ;
-        RECT  5.450000  0.085000  5.720000 0.670000 ;
-        RECT  9.055000  0.085000  9.385000 0.940000 ;
-        RECT 11.680000  0.085000 12.055000 0.430000 ;
-        RECT 14.825000  0.085000 15.110000 1.130000 ;
-        RECT 15.780000  0.085000 16.110000 1.130000 ;
-        RECT 16.870000  0.085000 17.200000 1.050000 ;
-        RECT 17.880000  0.085000 18.130000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
-        RECT 16.475000 -0.085000 16.645000 0.085000 ;
-        RECT 16.955000 -0.085000 17.125000 0.085000 ;
-        RECT 17.435000 -0.085000 17.605000 0.085000 ;
-        RECT 17.915000 -0.085000 18.085000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 18.240000 0.245000 ;
     END
@@ -180,186 +123,237 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 18.240000 3.415000 ;
-        RECT  0.565000 2.645000  0.895000 3.245000 ;
-        RECT  2.415000 2.300000  2.745000 3.245000 ;
-        RECT  3.875000 2.290000  4.205000 3.245000 ;
-        RECT  4.965000 2.350000  5.215000 3.245000 ;
-        RECT  8.365000 2.465000  8.695000 3.245000 ;
-        RECT  9.465000 2.290000  9.795000 3.245000 ;
-        RECT 11.230000 2.600000 11.560000 3.245000 ;
-        RECT 12.305000 2.600000 12.635000 3.245000 ;
-        RECT 14.280000 2.845000 15.170000 3.245000 ;
-        RECT 14.825000 1.950000 15.170000 2.845000 ;
-        RECT 15.825000 1.950000 16.155000 3.245000 ;
-        RECT 16.895000 1.820000 17.225000 3.245000 ;
-        RECT 17.875000 1.820000 18.125000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
-        RECT 16.475000 3.245000 16.645000 3.415000 ;
-        RECT 16.955000 3.245000 17.125000 3.415000 ;
-        RECT 17.435000 3.245000 17.605000 3.415000 ;
-        RECT 17.915000 3.245000 18.085000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 18.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 2.305000  1.235000 2.475000 ;
-      RECT  0.115000 2.475000  0.365000 2.980000 ;
-      RECT  0.960000 0.625000  1.690000 0.955000 ;
-      RECT  1.065000 2.475000  1.235000 2.905000 ;
-      RECT  1.065000 2.905000  2.185000 3.075000 ;
-      RECT  1.405000 2.300000  1.655000 2.735000 ;
-      RECT  1.485000 0.955000  1.690000 1.120000 ;
-      RECT  1.485000 1.120000  2.770000 1.290000 ;
-      RECT  1.485000 1.960000  2.155000 2.130000 ;
-      RECT  1.485000 2.130000  1.655000 2.300000 ;
-      RECT  1.855000 2.300000  2.185000 2.905000 ;
-      RECT  1.985000 1.290000  2.155000 1.960000 ;
-      RECT  2.600000 0.255000  3.535000 0.425000 ;
-      RECT  2.600000 0.425000  2.770000 1.120000 ;
-      RECT  2.605000 1.480000  3.195000 1.810000 ;
-      RECT  2.940000 0.595000  3.195000 1.480000 ;
-      RECT  2.945000 1.810000  3.195000 2.980000 ;
-      RECT  3.365000 0.425000  3.535000 0.660000 ;
-      RECT  3.365000 0.660000  4.520000 0.830000 ;
-      RECT  3.420000 1.000000  4.235000 1.170000 ;
-      RECT  3.425000 1.950000  4.235000 2.120000 ;
-      RECT  3.425000 2.120000  3.675000 2.980000 ;
-      RECT  4.065000 1.170000  4.235000 1.340000 ;
-      RECT  4.065000 1.340000  4.445000 1.670000 ;
-      RECT  4.065000 1.670000  4.235000 1.950000 ;
-      RECT  4.350000 0.255000  5.280000 0.425000 ;
-      RECT  4.350000 0.425000  4.520000 0.660000 ;
-      RECT  4.405000 1.840000  4.785000 2.980000 ;
-      RECT  4.615000 1.180000  6.115000 1.350000 ;
-      RECT  4.615000 1.350000  4.785000 1.840000 ;
-      RECT  4.690000 0.595000  4.940000 1.180000 ;
-      RECT  5.035000 1.830000  5.365000 2.010000 ;
-      RECT  5.035000 2.010000  5.555000 2.180000 ;
-      RECT  5.110000 0.425000  5.280000 0.840000 ;
-      RECT  5.110000 0.840000  6.115000 1.010000 ;
-      RECT  5.385000 2.180000  5.555000 2.905000 ;
-      RECT  5.385000 2.905000  7.825000 3.075000 ;
-      RECT  5.595000 1.350000  6.115000 1.525000 ;
-      RECT  5.595000 1.525000  6.825000 1.840000 ;
-      RECT  5.840000 2.040000  7.365000 2.210000 ;
-      RECT  5.840000 2.210000  6.170000 2.735000 ;
-      RECT  5.945000 0.265000  7.115000 0.435000 ;
-      RECT  5.945000 0.435000  6.115000 0.840000 ;
-      RECT  6.285000 0.605000  6.615000 1.185000 ;
-      RECT  6.285000 1.185000  7.365000 1.355000 ;
-      RECT  6.340000 2.380000  7.705000 2.550000 ;
-      RECT  6.340000 2.550000  6.670000 2.735000 ;
-      RECT  6.495000 1.840000  6.825000 1.855000 ;
-      RECT  6.785000 0.435000  7.115000 0.845000 ;
-      RECT  6.785000 0.845000  7.705000 1.015000 ;
-      RECT  6.900000 2.730000  8.045000 2.900000 ;
-      RECT  6.900000 2.900000  7.825000 2.905000 ;
-      RECT  7.035000 1.355000  7.365000 2.040000 ;
-      RECT  7.345000 0.265000  8.620000 0.435000 ;
-      RECT  7.345000 0.435000  7.770000 0.675000 ;
-      RECT  7.535000 1.015000  7.705000 2.380000 ;
-      RECT  7.875000 0.945000  8.280000 1.115000 ;
-      RECT  7.875000 1.115000  8.045000 2.125000 ;
-      RECT  7.875000 2.125000  9.235000 2.295000 ;
-      RECT  7.875000 2.295000  8.045000 2.730000 ;
-      RECT  7.950000 0.605000  8.280000 0.945000 ;
-      RECT  8.215000 1.285000  8.620000 1.955000 ;
-      RECT  8.450000 0.435000  8.620000 0.605000 ;
-      RECT  8.450000 0.605000  8.885000 0.935000 ;
-      RECT  8.450000 1.110000  9.725000 1.280000 ;
-      RECT  8.450000 1.280000  8.620000 1.285000 ;
-      RECT  8.905000 1.950000  9.945000 2.120000 ;
-      RECT  8.905000 2.120000  9.235000 2.125000 ;
-      RECT  8.905000 2.295000  9.235000 2.980000 ;
-      RECT  9.555000 0.260000 11.510000 0.430000 ;
-      RECT  9.555000 0.430000  9.725000 1.110000 ;
-      RECT  9.615000 1.580000  9.945000 1.950000 ;
-      RECT  9.960000 0.600000 11.110000 0.850000 ;
-      RECT 10.155000 1.180000 10.485000 1.280000 ;
-      RECT 10.155000 1.280000 11.385000 1.580000 ;
-      RECT 10.155000 1.580000 10.485000 1.755000 ;
-      RECT 10.305000 2.100000 10.910000 2.270000 ;
-      RECT 10.305000 2.270000 10.635000 2.980000 ;
-      RECT 10.740000 1.750000 11.750000 1.920000 ;
-      RECT 10.740000 1.920000 10.910000 2.100000 ;
-      RECT 10.940000 0.850000 11.110000 0.940000 ;
-      RECT 10.940000 0.940000 11.725000 1.110000 ;
-      RECT 11.080000 2.090000 11.410000 2.260000 ;
-      RECT 11.080000 2.260000 13.435000 2.430000 ;
-      RECT 11.340000 0.430000 11.510000 0.600000 ;
-      RECT 11.340000 0.600000 12.065000 0.770000 ;
-      RECT 11.555000 1.110000 11.725000 1.750000 ;
-      RECT 11.580000 1.920000 12.665000 2.090000 ;
-      RECT 11.805000 2.430000 12.135000 2.980000 ;
-      RECT 11.895000 0.770000 12.665000 0.940000 ;
-      RECT 12.235000 0.255000 13.595000 0.425000 ;
-      RECT 12.235000 0.425000 12.655000 0.600000 ;
-      RECT 12.495000 0.940000 12.665000 1.130000 ;
-      RECT 12.495000 1.130000 14.150000 1.300000 ;
-      RECT 12.495000 1.300000 12.825000 1.550000 ;
-      RECT 12.495000 1.720000 13.365000 1.890000 ;
-      RECT 12.495000 1.890000 12.665000 1.920000 ;
-      RECT 12.835000 0.595000 13.085000 0.665000 ;
-      RECT 12.835000 0.665000 14.490000 0.835000 ;
-      RECT 12.835000 0.835000 13.085000 0.960000 ;
-      RECT 13.035000 1.470000 13.365000 1.720000 ;
-      RECT 13.185000 2.060000 13.435000 2.260000 ;
-      RECT 13.185000 2.430000 13.435000 2.505000 ;
-      RECT 13.185000 2.505000 14.655000 2.675000 ;
-      RECT 13.185000 2.675000 13.435000 2.980000 ;
-      RECT 13.265000 0.425000 13.595000 0.495000 ;
-      RECT 13.605000 1.005000 14.150000 1.130000 ;
-      RECT 13.605000 1.300000 14.150000 1.335000 ;
-      RECT 13.605000 1.335000 13.775000 2.005000 ;
-      RECT 13.605000 2.005000 14.075000 2.335000 ;
-      RECT 14.320000 0.835000 14.655000 1.005000 ;
-      RECT 14.485000 1.005000 14.655000 1.430000 ;
-      RECT 14.485000 1.430000 14.815000 1.760000 ;
-      RECT 14.485000 1.760000 14.655000 2.505000 ;
-      RECT 16.340000 0.540000 16.670000 1.220000 ;
-      RECT 16.340000 1.220000 17.365000 1.550000 ;
-      RECT 16.340000 1.550000 16.700000 2.940000 ;
+      RECT  0.000000 -0.085000 18.240000 0.085000 ;
+      RECT  0.000000  3.245000 18.240000 3.415000 ;
+      RECT  0.115000  2.305000  1.235000 2.475000 ;
+      RECT  0.115000  2.475000  0.365000 2.980000 ;
+      RECT  0.140000  0.085000  0.470000 0.955000 ;
+      RECT  0.565000  2.645000  0.895000 3.245000 ;
+      RECT  0.960000  0.625000  1.690000 0.955000 ;
+      RECT  1.065000  2.475000  1.235000 2.905000 ;
+      RECT  1.065000  2.905000  2.185000 3.075000 ;
+      RECT  1.405000  2.300000  1.655000 2.735000 ;
+      RECT  1.485000  0.955000  1.690000 1.120000 ;
+      RECT  1.485000  1.120000  2.770000 1.290000 ;
+      RECT  1.485000  1.960000  2.155000 2.130000 ;
+      RECT  1.485000  2.130000  1.655000 2.300000 ;
+      RECT  1.855000  2.300000  2.185000 2.905000 ;
+      RECT  1.985000  1.290000  2.155000 1.960000 ;
+      RECT  2.180000  0.085000  2.430000 0.950000 ;
+      RECT  2.415000  2.300000  2.745000 3.245000 ;
+      RECT  2.600000  0.255000  3.535000 0.425000 ;
+      RECT  2.600000  0.425000  2.770000 1.120000 ;
+      RECT  2.605000  1.480000  3.195000 1.810000 ;
+      RECT  2.940000  0.595000  3.195000 1.480000 ;
+      RECT  2.945000  1.810000  3.195000 2.980000 ;
+      RECT  3.365000  0.425000  3.535000 0.660000 ;
+      RECT  3.365000  0.660000  4.520000 0.830000 ;
+      RECT  3.420000  1.000000  4.235000 1.170000 ;
+      RECT  3.425000  1.950000  4.235000 2.120000 ;
+      RECT  3.425000  2.120000  3.675000 2.980000 ;
+      RECT  3.875000  2.290000  4.205000 3.245000 ;
+      RECT  3.930000  0.085000  4.180000 0.490000 ;
+      RECT  4.065000  1.170000  4.235000 1.340000 ;
+      RECT  4.065000  1.340000  4.445000 1.670000 ;
+      RECT  4.065000  1.670000  4.235000 1.950000 ;
+      RECT  4.350000  0.255000  5.280000 0.425000 ;
+      RECT  4.350000  0.425000  4.520000 0.660000 ;
+      RECT  4.405000  1.840000  4.785000 2.980000 ;
+      RECT  4.615000  1.180000  6.115000 1.350000 ;
+      RECT  4.615000  1.350000  4.785000 1.840000 ;
+      RECT  4.690000  0.595000  4.940000 1.180000 ;
+      RECT  4.965000  2.350000  5.215000 3.245000 ;
+      RECT  5.035000  1.830000  5.365000 2.010000 ;
+      RECT  5.035000  2.010000  5.555000 2.180000 ;
+      RECT  5.110000  0.425000  5.280000 0.840000 ;
+      RECT  5.110000  0.840000  6.115000 1.010000 ;
+      RECT  5.385000  2.180000  5.555000 2.905000 ;
+      RECT  5.385000  2.905000  7.825000 3.075000 ;
+      RECT  5.450000  0.085000  5.720000 0.670000 ;
+      RECT  5.595000  1.350000  6.115000 1.525000 ;
+      RECT  5.595000  1.525000  6.825000 1.840000 ;
+      RECT  5.840000  2.040000  7.365000 2.210000 ;
+      RECT  5.840000  2.210000  6.170000 2.735000 ;
+      RECT  5.945000  0.265000  7.115000 0.435000 ;
+      RECT  5.945000  0.435000  6.115000 0.840000 ;
+      RECT  6.285000  0.605000  6.615000 1.185000 ;
+      RECT  6.285000  1.185000  7.365000 1.355000 ;
+      RECT  6.340000  2.380000  7.705000 2.550000 ;
+      RECT  6.340000  2.550000  6.670000 2.735000 ;
+      RECT  6.495000  1.840000  6.825000 1.855000 ;
+      RECT  6.785000  0.435000  7.115000 0.845000 ;
+      RECT  6.785000  0.845000  7.705000 1.015000 ;
+      RECT  6.900000  2.730000  8.045000 2.900000 ;
+      RECT  6.900000  2.900000  7.825000 2.905000 ;
+      RECT  7.035000  1.355000  7.365000 2.040000 ;
+      RECT  7.345000  0.265000  8.620000 0.435000 ;
+      RECT  7.345000  0.435000  7.770000 0.675000 ;
+      RECT  7.535000  1.015000  7.705000 2.380000 ;
+      RECT  7.875000  0.945000  8.280000 1.115000 ;
+      RECT  7.875000  1.115000  8.045000 2.125000 ;
+      RECT  7.875000  2.125000  9.235000 2.295000 ;
+      RECT  7.875000  2.295000  8.045000 2.730000 ;
+      RECT  7.950000  0.605000  8.280000 0.945000 ;
+      RECT  8.215000  1.285000  8.620000 1.955000 ;
+      RECT  8.365000  2.465000  8.695000 3.245000 ;
+      RECT  8.450000  0.435000  8.620000 0.605000 ;
+      RECT  8.450000  0.605000  8.885000 0.935000 ;
+      RECT  8.450000  1.110000  9.725000 1.280000 ;
+      RECT  8.450000  1.280000  8.620000 1.285000 ;
+      RECT  8.790000  1.450000  9.445000 1.780000 ;
+      RECT  8.905000  1.950000  9.945000 2.120000 ;
+      RECT  8.905000  2.120000  9.235000 2.125000 ;
+      RECT  8.905000  2.295000  9.235000 2.980000 ;
+      RECT  9.055000  0.085000  9.385000 0.940000 ;
+      RECT  9.465000  2.290000  9.795000 3.245000 ;
+      RECT  9.555000  0.260000 11.510000 0.430000 ;
+      RECT  9.555000  0.430000  9.725000 1.110000 ;
+      RECT  9.615000  1.580000  9.945000 1.950000 ;
+      RECT  9.960000  0.600000 11.110000 0.850000 ;
+      RECT 10.155000  1.180000 10.485000 1.280000 ;
+      RECT 10.155000  1.280000 11.385000 1.580000 ;
+      RECT 10.155000  1.580000 10.485000 1.755000 ;
+      RECT 10.305000  2.100000 10.910000 2.270000 ;
+      RECT 10.305000  2.270000 10.635000 2.980000 ;
+      RECT 10.740000  1.750000 11.750000 1.920000 ;
+      RECT 10.740000  1.920000 10.910000 2.100000 ;
+      RECT 10.940000  0.850000 11.110000 0.940000 ;
+      RECT 10.940000  0.940000 11.725000 1.110000 ;
+      RECT 11.080000  2.090000 11.410000 2.260000 ;
+      RECT 11.080000  2.260000 13.435000 2.430000 ;
+      RECT 11.230000  2.600000 11.560000 3.245000 ;
+      RECT 11.340000  0.430000 11.510000 0.600000 ;
+      RECT 11.340000  0.600000 12.065000 0.770000 ;
+      RECT 11.555000  1.110000 11.725000 1.750000 ;
+      RECT 11.580000  1.920000 12.665000 2.090000 ;
+      RECT 11.680000  0.085000 12.055000 0.430000 ;
+      RECT 11.805000  2.430000 12.135000 2.980000 ;
+      RECT 11.895000  0.770000 12.665000 0.940000 ;
+      RECT 11.955000  1.180000 12.325000 1.750000 ;
+      RECT 12.235000  0.255000 13.595000 0.425000 ;
+      RECT 12.235000  0.425000 12.655000 0.600000 ;
+      RECT 12.305000  2.600000 12.635000 3.245000 ;
+      RECT 12.495000  0.940000 12.665000 1.130000 ;
+      RECT 12.495000  1.130000 14.150000 1.300000 ;
+      RECT 12.495000  1.300000 12.825000 1.550000 ;
+      RECT 12.495000  1.720000 13.365000 1.890000 ;
+      RECT 12.495000  1.890000 12.665000 1.920000 ;
+      RECT 12.835000  0.595000 13.085000 0.665000 ;
+      RECT 12.835000  0.665000 14.490000 0.835000 ;
+      RECT 12.835000  0.835000 13.085000 0.960000 ;
+      RECT 13.035000  1.470000 13.365000 1.720000 ;
+      RECT 13.185000  2.060000 13.435000 2.260000 ;
+      RECT 13.185000  2.430000 13.435000 2.505000 ;
+      RECT 13.185000  2.505000 14.655000 2.675000 ;
+      RECT 13.185000  2.675000 13.435000 2.980000 ;
+      RECT 13.265000  0.425000 13.595000 0.495000 ;
+      RECT 13.605000  1.005000 14.150000 1.130000 ;
+      RECT 13.605000  1.300000 14.150000 1.335000 ;
+      RECT 13.605000  1.335000 13.775000 2.005000 ;
+      RECT 13.605000  2.005000 14.075000 2.335000 ;
+      RECT 14.280000  2.845000 15.170000 3.245000 ;
+      RECT 14.320000  0.835000 14.655000 1.005000 ;
+      RECT 14.485000  1.005000 14.655000 1.430000 ;
+      RECT 14.485000  1.430000 14.815000 1.760000 ;
+      RECT 14.485000  1.760000 14.655000 2.505000 ;
+      RECT 14.825000  0.085000 15.110000 1.130000 ;
+      RECT 14.825000  1.950000 15.170000 2.845000 ;
+      RECT 15.780000  0.085000 16.110000 1.130000 ;
+      RECT 15.825000  1.950000 16.155000 3.245000 ;
+      RECT 16.340000  0.540000 16.670000 1.220000 ;
+      RECT 16.340000  1.220000 17.365000 1.550000 ;
+      RECT 16.340000  1.550000 16.700000 2.940000 ;
+      RECT 16.870000  0.085000 17.200000 1.050000 ;
+      RECT 16.895000  1.820000 17.225000 3.245000 ;
+      RECT 17.875000  1.820000 18.125000 3.245000 ;
+      RECT 17.880000  0.085000 18.130000 1.130000 ;
     LAYER mcon ;
-      RECT  5.915000 1.210000  6.085000 1.380000 ;
-      RECT 10.235000 1.210000 10.405000 1.380000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  1.210000  6.085000 1.380000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  1.580000  9.445000 1.750000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  1.210000 10.405000 1.380000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  1.580000 12.325000 1.750000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
+      RECT 16.955000 -0.085000 17.125000 0.085000 ;
+      RECT 16.955000  3.245000 17.125000 3.415000 ;
+      RECT 17.435000 -0.085000 17.605000 0.085000 ;
+      RECT 17.435000  3.245000 17.605000 3.415000 ;
+      RECT 17.915000 -0.085000 18.085000 0.085000 ;
+      RECT 17.915000  3.245000 18.085000 3.415000 ;
     LAYER met1 ;
       RECT  5.855000 1.180000  6.145000 1.225000 ;
       RECT  5.855000 1.225000 10.465000 1.365000 ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef
index 44add7a..216ac32 100644
--- a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.magic.lef
@@ -121,50 +121,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.840000 0.085000 ;
-        RECT  0.140000  0.085000  0.470000 0.955000 ;
-        RECT  1.830000  0.085000  2.080000 1.015000 ;
-        RECT  3.850000  0.085000  4.180000 0.490000 ;
-        RECT  6.490000  0.085000  6.885000 0.560000 ;
-        RECT  9.025000  0.085000  9.275000 1.050000 ;
-        RECT 10.900000  0.085000 11.150000 1.010000 ;
-        RECT 13.295000  0.085000 13.590000 1.000000 ;
-        RECT 14.895000  0.085000 15.225000 0.940000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
@@ -173,149 +129,189 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.840000 3.415000 ;
-        RECT  0.615000 2.645000  0.945000 3.245000 ;
-        RECT  2.505000 2.520000  2.755000 3.245000 ;
-        RECT  4.045000 2.180000  4.215000 3.245000 ;
-        RECT  6.595000 2.075000  6.925000 3.245000 ;
-        RECT  8.315000 2.505000  8.685000 3.245000 ;
-        RECT 10.435000 2.660000 11.150000 3.245000 ;
-        RECT 12.295000 2.480000 12.625000 3.245000 ;
-        RECT 13.340000 2.480000 13.670000 3.245000 ;
-        RECT 14.945000 2.115000 15.205000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 15.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 2.305000  1.285000 2.475000 ;
-      RECT  0.115000 2.475000  0.445000 2.980000 ;
-      RECT  1.040000 0.575000  1.370000 1.185000 ;
-      RECT  1.040000 1.185000  2.420000 1.355000 ;
-      RECT  1.115000 2.475000  1.285000 2.905000 ;
-      RECT  1.115000 2.905000  2.275000 3.075000 ;
-      RECT  1.495000 2.025000  2.105000 2.195000 ;
-      RECT  1.495000 2.195000  1.745000 2.735000 ;
-      RECT  1.935000 1.355000  2.105000 2.025000 ;
-      RECT  1.945000 2.520000  2.275000 2.905000 ;
-      RECT  2.250000 0.255000  3.680000 0.425000 ;
-      RECT  2.250000 0.425000  2.420000 1.185000 ;
-      RECT  2.275000 1.830000  2.780000 2.180000 ;
-      RECT  2.275000 2.180000  3.285000 2.350000 ;
-      RECT  2.610000 0.595000  2.860000 1.035000 ;
-      RECT  2.610000 1.035000  2.780000 1.830000 ;
-      RECT  2.955000 2.350000  3.285000 2.980000 ;
-      RECT  3.090000 0.595000  3.340000 1.010000 ;
-      RECT  3.090000 1.010000  3.260000 1.840000 ;
-      RECT  3.090000 1.840000  4.245000 2.010000 ;
-      RECT  3.510000 0.425000  3.680000 0.660000 ;
-      RECT  3.510000 0.660000  5.335000 0.830000 ;
-      RECT  3.515000 2.010000  3.845000 2.980000 ;
-      RECT  4.075000 1.340000  4.565000 1.670000 ;
-      RECT  4.075000 1.670000  4.245000 1.840000 ;
-      RECT  4.360000 1.000000  4.905000 1.170000 ;
-      RECT  4.415000 1.840000  4.905000 2.980000 ;
-      RECT  4.735000 1.170000  4.905000 1.365000 ;
-      RECT  4.735000 1.365000  5.445000 1.695000 ;
-      RECT  4.735000 1.695000  4.905000 1.840000 ;
-      RECT  5.005000 0.460000  5.335000 0.660000 ;
-      RECT  5.075000 1.865000  5.785000 2.035000 ;
-      RECT  5.075000 2.035000  5.405000 2.755000 ;
-      RECT  5.165000 0.830000  5.335000 1.025000 ;
-      RECT  5.165000 1.025000  5.785000 1.195000 ;
-      RECT  5.505000 0.460000  5.835000 0.685000 ;
-      RECT  5.505000 0.685000  6.125000 0.855000 ;
-      RECT  5.575000 2.205000  6.125000 2.535000 ;
-      RECT  5.615000 1.195000  5.785000 1.865000 ;
-      RECT  5.955000 0.855000  6.125000 1.655000 ;
-      RECT  5.955000 1.655000  6.875000 1.825000 ;
-      RECT  5.955000 1.825000  6.125000 2.205000 ;
-      RECT  6.295000 0.730000  8.855000 0.900000 ;
-      RECT  6.295000 0.900000  6.535000 1.485000 ;
-      RECT  6.705000 1.070000  7.915000 1.240000 ;
-      RECT  6.705000 1.240000  6.875000 1.655000 ;
-      RECT  7.145000 0.310000  8.715000 0.480000 ;
-      RECT  7.145000 0.480000  7.640000 0.560000 ;
-      RECT  7.435000 1.825000  9.015000 1.995000 ;
-      RECT  7.435000 1.995000  7.765000 2.735000 ;
-      RECT  7.585000 1.240000  7.915000 1.585000 ;
-      RECT  7.820000 0.655000  8.150000 0.730000 ;
-      RECT  8.125000 1.180000  8.515000 1.585000 ;
-      RECT  8.330000 0.480000  8.715000 0.560000 ;
-      RECT  8.685000 0.900000  8.855000 1.335000 ;
-      RECT  8.685000 1.335000  9.015000 1.825000 ;
-      RECT  9.255000 1.335000  9.615000 1.505000 ;
-      RECT  9.255000 1.505000  9.585000 1.940000 ;
-      RECT  9.375000 2.110000  9.925000 2.735000 ;
-      RECT  9.445000 0.255000 10.485000 0.425000 ;
-      RECT  9.445000 0.425000  9.615000 1.335000 ;
-      RECT  9.755000 1.675000  9.955000 1.845000 ;
-      RECT  9.755000 1.845000  9.925000 2.110000 ;
-      RECT  9.785000 0.595000  9.985000 1.350000 ;
-      RECT  9.785000 1.350000 10.885000 1.520000 ;
-      RECT  9.785000 1.520000  9.955000 1.675000 ;
-      RECT 10.155000 0.425000 10.485000 1.180000 ;
-      RECT 10.465000 2.030000 10.795000 2.320000 ;
-      RECT 10.465000 2.320000 11.785000 2.490000 ;
-      RECT 10.715000 1.180000 11.875000 1.350000 ;
-      RECT 11.330000 0.255000 12.555000 0.425000 ;
-      RECT 11.330000 0.425000 11.660000 1.010000 ;
-      RECT 11.535000 1.970000 12.215000 2.140000 ;
-      RECT 11.535000 2.140000 13.700000 2.310000 ;
-      RECT 11.535000 2.310000 11.785000 2.320000 ;
-      RECT 11.535000 2.490000 11.785000 2.980000 ;
-      RECT 11.595000 1.350000 11.875000 1.550000 ;
-      RECT 11.870000 0.595000 12.215000 1.010000 ;
-      RECT 12.045000 1.010000 12.215000 1.970000 ;
-      RECT 12.385000 0.425000 12.555000 1.010000 ;
-      RECT 12.445000 1.180000 12.895000 1.720000 ;
-      RECT 12.725000 0.670000 13.115000 1.010000 ;
-      RECT 12.725000 1.010000 12.895000 1.180000 ;
-      RECT 12.725000 1.720000 13.155000 1.970000 ;
-      RECT 13.530000 1.220000 13.915000 1.550000 ;
-      RECT 13.530000 1.550000 13.700000 2.140000 ;
-      RECT 14.445000 0.350000 14.715000 1.355000 ;
-      RECT 14.445000 1.355000 14.845000 1.685000 ;
-      RECT 14.445000 1.685000 14.775000 2.980000 ;
+      RECT  0.000000 -0.085000 15.840000 0.085000 ;
+      RECT  0.000000  3.245000 15.840000 3.415000 ;
+      RECT  0.115000  2.305000  1.285000 2.475000 ;
+      RECT  0.115000  2.475000  0.445000 2.980000 ;
+      RECT  0.140000  0.085000  0.470000 0.955000 ;
+      RECT  0.615000  2.645000  0.945000 3.245000 ;
+      RECT  1.040000  0.575000  1.370000 1.185000 ;
+      RECT  1.040000  1.185000  2.420000 1.355000 ;
+      RECT  1.115000  2.475000  1.285000 2.905000 ;
+      RECT  1.115000  2.905000  2.275000 3.075000 ;
+      RECT  1.495000  2.025000  2.105000 2.195000 ;
+      RECT  1.495000  2.195000  1.745000 2.735000 ;
+      RECT  1.830000  0.085000  2.080000 1.015000 ;
+      RECT  1.935000  1.355000  2.105000 2.025000 ;
+      RECT  1.945000  2.520000  2.275000 2.905000 ;
+      RECT  2.250000  0.255000  3.680000 0.425000 ;
+      RECT  2.250000  0.425000  2.420000 1.185000 ;
+      RECT  2.275000  1.830000  2.780000 2.180000 ;
+      RECT  2.275000  2.180000  3.285000 2.350000 ;
+      RECT  2.505000  2.520000  2.755000 3.245000 ;
+      RECT  2.610000  0.595000  2.860000 1.035000 ;
+      RECT  2.610000  1.035000  2.780000 1.830000 ;
+      RECT  2.955000  2.350000  3.285000 2.980000 ;
+      RECT  3.090000  0.595000  3.340000 1.010000 ;
+      RECT  3.090000  1.010000  3.260000 1.840000 ;
+      RECT  3.090000  1.840000  4.245000 2.010000 ;
+      RECT  3.510000  0.425000  3.680000 0.660000 ;
+      RECT  3.510000  0.660000  5.335000 0.830000 ;
+      RECT  3.515000  2.010000  3.845000 2.980000 ;
+      RECT  3.850000  0.085000  4.180000 0.490000 ;
+      RECT  4.045000  2.180000  4.215000 3.245000 ;
+      RECT  4.075000  1.340000  4.565000 1.670000 ;
+      RECT  4.075000  1.670000  4.245000 1.840000 ;
+      RECT  4.360000  1.000000  4.905000 1.170000 ;
+      RECT  4.415000  1.840000  4.905000 2.980000 ;
+      RECT  4.735000  1.170000  4.905000 1.365000 ;
+      RECT  4.735000  1.365000  5.445000 1.695000 ;
+      RECT  4.735000  1.695000  4.905000 1.840000 ;
+      RECT  5.005000  0.460000  5.335000 0.660000 ;
+      RECT  5.075000  1.865000  5.785000 2.035000 ;
+      RECT  5.075000  2.035000  5.405000 2.755000 ;
+      RECT  5.165000  0.830000  5.335000 1.025000 ;
+      RECT  5.165000  1.025000  5.785000 1.195000 ;
+      RECT  5.505000  0.460000  5.835000 0.685000 ;
+      RECT  5.505000  0.685000  6.125000 0.855000 ;
+      RECT  5.575000  2.205000  6.125000 2.535000 ;
+      RECT  5.615000  1.195000  5.785000 1.865000 ;
+      RECT  5.955000  0.855000  6.125000 1.655000 ;
+      RECT  5.955000  1.655000  6.875000 1.825000 ;
+      RECT  5.955000  1.825000  6.125000 2.205000 ;
+      RECT  6.295000  0.730000  8.855000 0.900000 ;
+      RECT  6.295000  0.900000  6.535000 1.485000 ;
+      RECT  6.490000  0.085000  6.885000 0.560000 ;
+      RECT  6.595000  2.075000  6.925000 3.245000 ;
+      RECT  6.705000  1.070000  7.915000 1.240000 ;
+      RECT  6.705000  1.240000  6.875000 1.655000 ;
+      RECT  7.145000  0.310000  8.715000 0.480000 ;
+      RECT  7.145000  0.480000  7.640000 0.560000 ;
+      RECT  7.435000  1.825000  9.015000 1.995000 ;
+      RECT  7.435000  1.995000  7.765000 2.735000 ;
+      RECT  7.585000  1.240000  7.915000 1.585000 ;
+      RECT  7.820000  0.655000  8.150000 0.730000 ;
+      RECT  8.125000  1.180000  8.515000 1.585000 ;
+      RECT  8.315000  2.505000  8.685000 3.245000 ;
+      RECT  8.330000  0.480000  8.715000 0.560000 ;
+      RECT  8.685000  0.900000  8.855000 1.335000 ;
+      RECT  8.685000  1.335000  9.015000 1.825000 ;
+      RECT  9.025000  0.085000  9.275000 1.050000 ;
+      RECT  9.255000  1.335000  9.615000 1.505000 ;
+      RECT  9.255000  1.505000  9.585000 1.940000 ;
+      RECT  9.375000  2.110000  9.925000 2.735000 ;
+      RECT  9.445000  0.255000 10.485000 0.425000 ;
+      RECT  9.445000  0.425000  9.615000 1.335000 ;
+      RECT  9.755000  1.675000  9.955000 1.845000 ;
+      RECT  9.755000  1.845000  9.925000 2.110000 ;
+      RECT  9.785000  0.595000  9.985000 1.350000 ;
+      RECT  9.785000  1.350000 10.885000 1.520000 ;
+      RECT  9.785000  1.520000  9.955000 1.675000 ;
+      RECT 10.155000  0.425000 10.485000 1.180000 ;
+      RECT 10.435000  2.660000 11.150000 3.245000 ;
+      RECT 10.465000  2.030000 10.795000 2.320000 ;
+      RECT 10.465000  2.320000 11.785000 2.490000 ;
+      RECT 10.715000  1.180000 11.875000 1.350000 ;
+      RECT 10.900000  0.085000 11.150000 1.010000 ;
+      RECT 11.330000  0.255000 12.555000 0.425000 ;
+      RECT 11.330000  0.425000 11.660000 1.010000 ;
+      RECT 11.535000  1.970000 12.215000 2.140000 ;
+      RECT 11.535000  2.140000 13.700000 2.310000 ;
+      RECT 11.535000  2.310000 11.785000 2.320000 ;
+      RECT 11.535000  2.490000 11.785000 2.980000 ;
+      RECT 11.595000  1.350000 11.875000 1.550000 ;
+      RECT 11.870000  0.595000 12.215000 1.010000 ;
+      RECT 12.045000  1.010000 12.215000 1.970000 ;
+      RECT 12.295000  2.480000 12.625000 3.245000 ;
+      RECT 12.385000  0.425000 12.555000 1.010000 ;
+      RECT 12.445000  1.180000 12.895000 1.720000 ;
+      RECT 12.725000  0.670000 13.115000 1.010000 ;
+      RECT 12.725000  1.010000 12.895000 1.180000 ;
+      RECT 12.725000  1.720000 13.155000 1.970000 ;
+      RECT 13.295000  0.085000 13.590000 1.000000 ;
+      RECT 13.340000  2.480000 13.670000 3.245000 ;
+      RECT 13.530000  1.220000 13.915000 1.550000 ;
+      RECT 13.530000  1.550000 13.700000 2.140000 ;
+      RECT 14.445000  0.350000 14.715000 1.355000 ;
+      RECT 14.445000  1.355000 14.845000 1.685000 ;
+      RECT 14.445000  1.685000 14.775000 2.980000 ;
+      RECT 14.895000  0.085000 15.225000 0.940000 ;
+      RECT 14.945000  2.115000 15.205000 3.245000 ;
     LAYER mcon ;
-      RECT  8.315000 1.210000  8.485000 1.380000 ;
-      RECT 12.635000 1.210000 12.805000 1.380000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.210000  8.485000 1.380000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  1.210000 12.805000 1.380000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
     LAYER met1 ;
       RECT  8.255000 1.180000  8.545000 1.225000 ;
       RECT  8.255000 1.225000 12.865000 1.365000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef
index f5e1f7d..8fb6d8b 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.magic.lef
@@ -64,14 +64,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.785000 1.820000  4.165000 2.150000 ;
-        RECT  7.745000 1.820000  8.035000 2.150000 ;
-        RECT 10.695000 1.685000 11.065000 2.150000 ;
-      LAYER mcon ;
-        RECT  3.995000 1.950000  4.165000 2.120000 ;
-        RECT  7.835000 1.950000  8.005000 2.120000 ;
-        RECT 10.715000 1.950000 10.885000 2.120000 ;
       LAYER met1 ;
         RECT  3.935000 1.920000  4.225000 1.965000 ;
         RECT  3.935000 1.965000 10.945000 2.105000 ;
@@ -115,45 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.810000 ;
-        RECT  3.670000  0.085000  4.000000 0.750000 ;
-        RECT  4.660000  0.085000  4.990000 0.670000 ;
-        RECT  7.440000  0.085000  7.770000 0.425000 ;
-        RECT 10.165000  0.085000 10.495000 0.760000 ;
-        RECT 11.510000  0.085000 11.840000 0.410000 ;
-        RECT 13.120000  0.085000 13.290000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
@@ -162,133 +115,175 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  1.225000 2.390000  1.555000 3.245000 ;
-        RECT  3.085000 2.730000  3.445000 3.245000 ;
-        RECT  4.705000 2.690000  5.035000 3.245000 ;
-        RECT  7.090000 2.660000  7.420000 3.245000 ;
-        RECT  8.235000 1.715000  8.485000 3.245000 ;
-        RECT 10.305000 2.660000 10.650000 3.245000 ;
-        RECT 11.370000 2.695000 11.815000 3.245000 ;
-        RECT 11.585000 1.970000 11.815000 2.695000 ;
-        RECT 13.045000 1.820000 13.325000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.365000 0.980000 ;
-      RECT  0.115000 0.980000  1.395000 1.310000 ;
-      RECT  0.115000 1.310000  0.285000 2.050000 ;
-      RECT  0.115000 2.050000  2.695000 2.220000 ;
-      RECT  0.115000 2.220000  1.055000 2.975000 ;
-      RECT  1.105000 0.255000  3.500000 0.425000 ;
-      RECT  1.105000 0.425000  1.355000 0.810000 ;
-      RECT  2.095000 2.390000  5.975000 2.520000 ;
-      RECT  2.095000 2.520000  3.985000 2.560000 ;
-      RECT  2.095000 2.560000  2.425000 3.000000 ;
-      RECT  2.270000 0.595000  2.600000 0.920000 ;
-      RECT  2.270000 0.920000  3.615000 1.090000 ;
-      RECT  2.365000 1.830000  2.695000 2.050000 ;
-      RECT  3.170000 0.425000  3.500000 0.750000 ;
-      RECT  3.445000 1.090000  3.615000 2.320000 ;
-      RECT  3.445000 2.320000  3.985000 2.350000 ;
-      RECT  3.445000 2.350000  5.975000 2.390000 ;
-      RECT  3.615000 2.560000  3.985000 3.000000 ;
-      RECT  4.230000 0.350000  4.480000 0.840000 ;
-      RECT  4.230000 0.840000  4.985000 1.010000 ;
-      RECT  4.335000 1.800000  4.985000 1.970000 ;
-      RECT  4.335000 1.970000  4.585000 2.180000 ;
-      RECT  4.815000 1.010000  4.985000 1.300000 ;
-      RECT  4.815000 1.300000  5.280000 1.630000 ;
-      RECT  4.815000 1.630000  4.985000 1.800000 ;
-      RECT  5.155000 1.800000  6.165000 1.905000 ;
-      RECT  5.155000 1.905000  5.620000 2.130000 ;
-      RECT  5.170000 0.255000  7.185000 0.425000 ;
-      RECT  5.170000 0.425000  5.420000 0.960000 ;
-      RECT  5.170000 0.960000  5.620000 1.130000 ;
-      RECT  5.450000 1.130000  5.620000 1.575000 ;
-      RECT  5.450000 1.575000  6.165000 1.800000 ;
-      RECT  5.650000 0.595000  5.980000 0.790000 ;
-      RECT  5.725000 2.300000  5.975000 2.350000 ;
-      RECT  5.725000 2.520000  5.975000 2.755000 ;
-      RECT  5.805000 2.075000  6.505000 2.245000 ;
-      RECT  5.805000 2.245000  5.975000 2.300000 ;
-      RECT  5.810000 0.790000  5.980000 1.095000 ;
-      RECT  5.810000 1.095000  6.505000 1.265000 ;
-      RECT  6.150000 0.595000  6.845000 0.925000 ;
-      RECT  6.175000 2.415000  7.945000 2.490000 ;
-      RECT  6.175000 2.490000  6.845000 2.755000 ;
-      RECT  6.335000 1.265000  6.505000 2.075000 ;
-      RECT  6.675000 0.925000  6.845000 2.320000 ;
-      RECT  6.675000 2.320000  7.945000 2.415000 ;
-      RECT  7.015000 0.425000  7.185000 0.595000 ;
-      RECT  7.015000 0.595000  8.110000 0.765000 ;
-      RECT  7.015000 0.935000  8.610000 1.105000 ;
-      RECT  7.015000 1.105000  7.235000 1.760000 ;
-      RECT  7.405000 1.275000  8.270000 1.545000 ;
-      RECT  7.405000 1.545000  7.575000 2.320000 ;
-      RECT  7.615000 2.490000  7.945000 2.755000 ;
-      RECT  7.940000 0.255000  8.950000 0.425000 ;
-      RECT  7.940000 0.425000  8.110000 0.595000 ;
-      RECT  8.280000 0.595000  8.610000 0.935000 ;
-      RECT  8.440000 1.105000  8.610000 1.245000 ;
-      RECT  8.440000 1.245000  8.935000 1.415000 ;
-      RECT  8.685000 1.415000  8.935000 2.755000 ;
-      RECT  8.780000 0.425000  8.950000 0.905000 ;
-      RECT  8.780000 0.905000  9.435000 1.075000 ;
-      RECT  9.105000 1.075000  9.435000 1.345000 ;
-      RECT  9.105000 1.345000  9.755000 1.575000 ;
-      RECT  9.105000 1.755000  9.325000 2.425000 ;
-      RECT  9.105000 2.425000 10.095000 2.755000 ;
-      RECT  9.135000 0.405000  9.775000 0.735000 ;
-      RECT  9.505000 1.575000  9.755000 2.230000 ;
-      RECT  9.605000 0.735000  9.775000 1.005000 ;
-      RECT  9.605000 1.005000 11.425000 1.175000 ;
-      RECT  9.925000 1.175000 11.425000 1.435000 ;
-      RECT  9.925000 1.435000 10.095000 2.425000 ;
-      RECT 10.265000 1.650000 10.525000 2.320000 ;
-      RECT 10.265000 2.320000 11.405000 2.490000 ;
-      RECT 10.855000 2.490000 11.185000 2.885000 ;
-      RECT 10.955000 0.350000 11.285000 0.580000 ;
-      RECT 10.955000 0.580000 11.845000 0.750000 ;
-      RECT 11.235000 1.630000 11.845000 1.800000 ;
-      RECT 11.235000 1.800000 11.405000 2.320000 ;
-      RECT 11.675000 0.750000 11.845000 1.630000 ;
-      RECT 12.570000 0.455000 12.855000 1.300000 ;
-      RECT 12.570000 1.300000 13.485000 1.630000 ;
-      RECT 12.570000 1.630000 12.855000 2.980000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.115000  0.350000  0.365000 0.980000 ;
+      RECT  0.115000  0.980000  1.395000 1.310000 ;
+      RECT  0.115000  1.310000  0.285000 2.050000 ;
+      RECT  0.115000  2.050000  2.695000 2.220000 ;
+      RECT  0.115000  2.220000  1.055000 2.975000 ;
+      RECT  0.545000  0.085000  0.875000 0.810000 ;
+      RECT  1.105000  0.255000  3.500000 0.425000 ;
+      RECT  1.105000  0.425000  1.355000 0.810000 ;
+      RECT  1.225000  2.390000  1.555000 3.245000 ;
+      RECT  2.095000  2.390000  5.975000 2.520000 ;
+      RECT  2.095000  2.520000  3.985000 2.560000 ;
+      RECT  2.095000  2.560000  2.425000 3.000000 ;
+      RECT  2.270000  0.595000  2.600000 0.920000 ;
+      RECT  2.270000  0.920000  3.615000 1.090000 ;
+      RECT  2.365000  1.830000  2.695000 2.050000 ;
+      RECT  3.085000  2.730000  3.445000 3.245000 ;
+      RECT  3.170000  0.425000  3.500000 0.750000 ;
+      RECT  3.445000  1.090000  3.615000 2.320000 ;
+      RECT  3.445000  2.320000  3.985000 2.350000 ;
+      RECT  3.445000  2.350000  5.975000 2.390000 ;
+      RECT  3.615000  2.560000  3.985000 3.000000 ;
+      RECT  3.670000  0.085000  4.000000 0.750000 ;
+      RECT  3.785000  1.820000  4.165000 2.150000 ;
+      RECT  4.230000  0.350000  4.480000 0.840000 ;
+      RECT  4.230000  0.840000  4.985000 1.010000 ;
+      RECT  4.335000  1.800000  4.985000 1.970000 ;
+      RECT  4.335000  1.970000  4.585000 2.180000 ;
+      RECT  4.660000  0.085000  4.990000 0.670000 ;
+      RECT  4.705000  2.690000  5.035000 3.245000 ;
+      RECT  4.815000  1.010000  4.985000 1.300000 ;
+      RECT  4.815000  1.300000  5.280000 1.630000 ;
+      RECT  4.815000  1.630000  4.985000 1.800000 ;
+      RECT  5.155000  1.800000  6.165000 1.905000 ;
+      RECT  5.155000  1.905000  5.620000 2.130000 ;
+      RECT  5.170000  0.255000  7.185000 0.425000 ;
+      RECT  5.170000  0.425000  5.420000 0.960000 ;
+      RECT  5.170000  0.960000  5.620000 1.130000 ;
+      RECT  5.450000  1.130000  5.620000 1.575000 ;
+      RECT  5.450000  1.575000  6.165000 1.800000 ;
+      RECT  5.650000  0.595000  5.980000 0.790000 ;
+      RECT  5.725000  2.300000  5.975000 2.350000 ;
+      RECT  5.725000  2.520000  5.975000 2.755000 ;
+      RECT  5.805000  2.075000  6.505000 2.245000 ;
+      RECT  5.805000  2.245000  5.975000 2.300000 ;
+      RECT  5.810000  0.790000  5.980000 1.095000 ;
+      RECT  5.810000  1.095000  6.505000 1.265000 ;
+      RECT  6.150000  0.595000  6.845000 0.925000 ;
+      RECT  6.175000  2.415000  7.945000 2.490000 ;
+      RECT  6.175000  2.490000  6.845000 2.755000 ;
+      RECT  6.335000  1.265000  6.505000 2.075000 ;
+      RECT  6.675000  0.925000  6.845000 2.320000 ;
+      RECT  6.675000  2.320000  7.945000 2.415000 ;
+      RECT  7.015000  0.425000  7.185000 0.595000 ;
+      RECT  7.015000  0.595000  8.110000 0.765000 ;
+      RECT  7.015000  0.935000  8.610000 1.105000 ;
+      RECT  7.015000  1.105000  7.235000 1.760000 ;
+      RECT  7.090000  2.660000  7.420000 3.245000 ;
+      RECT  7.405000  1.275000  8.270000 1.545000 ;
+      RECT  7.405000  1.545000  7.575000 2.320000 ;
+      RECT  7.440000  0.085000  7.770000 0.425000 ;
+      RECT  7.615000  2.490000  7.945000 2.755000 ;
+      RECT  7.745000  1.820000  8.035000 2.150000 ;
+      RECT  7.940000  0.255000  8.950000 0.425000 ;
+      RECT  7.940000  0.425000  8.110000 0.595000 ;
+      RECT  8.235000  1.715000  8.485000 3.245000 ;
+      RECT  8.280000  0.595000  8.610000 0.935000 ;
+      RECT  8.440000  1.105000  8.610000 1.245000 ;
+      RECT  8.440000  1.245000  8.935000 1.415000 ;
+      RECT  8.685000  1.415000  8.935000 2.755000 ;
+      RECT  8.780000  0.425000  8.950000 0.905000 ;
+      RECT  8.780000  0.905000  9.435000 1.075000 ;
+      RECT  9.105000  1.075000  9.435000 1.345000 ;
+      RECT  9.105000  1.345000  9.755000 1.575000 ;
+      RECT  9.105000  1.755000  9.325000 2.425000 ;
+      RECT  9.105000  2.425000 10.095000 2.755000 ;
+      RECT  9.135000  0.405000  9.775000 0.735000 ;
+      RECT  9.505000  1.575000  9.755000 2.230000 ;
+      RECT  9.605000  0.735000  9.775000 1.005000 ;
+      RECT  9.605000  1.005000 11.425000 1.175000 ;
+      RECT  9.925000  1.175000 11.425000 1.435000 ;
+      RECT  9.925000  1.435000 10.095000 2.425000 ;
+      RECT 10.165000  0.085000 10.495000 0.760000 ;
+      RECT 10.265000  1.650000 10.525000 2.320000 ;
+      RECT 10.265000  2.320000 11.405000 2.490000 ;
+      RECT 10.305000  2.660000 10.650000 3.245000 ;
+      RECT 10.695000  1.685000 11.065000 2.150000 ;
+      RECT 10.855000  2.490000 11.185000 2.885000 ;
+      RECT 10.955000  0.350000 11.285000 0.580000 ;
+      RECT 10.955000  0.580000 11.845000 0.750000 ;
+      RECT 11.235000  1.630000 11.845000 1.800000 ;
+      RECT 11.235000  1.800000 11.405000 2.320000 ;
+      RECT 11.370000  2.695000 11.815000 3.245000 ;
+      RECT 11.510000  0.085000 11.840000 0.410000 ;
+      RECT 11.585000  1.970000 11.815000 2.695000 ;
+      RECT 11.675000  0.750000 11.845000 1.630000 ;
+      RECT 12.570000  0.455000 12.855000 1.300000 ;
+      RECT 12.570000  1.300000 13.485000 1.630000 ;
+      RECT 12.570000  1.630000 12.855000 2.980000 ;
+      RECT 13.045000  1.820000 13.325000 3.245000 ;
+      RECT 13.120000  0.085000 13.290000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  1.950000  4.165000 2.120000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.950000  8.005000 2.120000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  1.950000 10.885000 2.120000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef
index 2db56b0..604da81 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.magic.lef
@@ -64,14 +64,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.785000 1.820000  4.165000 2.150000 ;
-        RECT  7.720000 1.795000  8.020000 2.150000 ;
-        RECT 10.715000 1.820000 11.395000 2.150000 ;
-      LAYER mcon ;
-        RECT  3.995000 1.950000  4.165000 2.120000 ;
-        RECT  7.835000 1.950000  8.005000 2.120000 ;
-        RECT 10.715000 1.950000 10.885000 2.120000 ;
       LAYER met1 ;
         RECT  3.935000 1.920000  4.225000 1.965000 ;
         RECT  3.935000 1.965000 10.945000 2.105000 ;
@@ -115,49 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.880000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.835000 ;
-        RECT  3.640000  0.085000  3.970000 0.835000 ;
-        RECT  4.750000  0.085000  4.920000 1.130000 ;
-        RECT  7.450000  0.085000  7.985000 0.410000 ;
-        RECT 10.335000  0.085000 10.665000 0.810000 ;
-        RECT 11.645000  0.085000 11.895000 0.535000 ;
-        RECT 12.635000  0.085000 12.895000 1.050000 ;
-        RECT 13.670000  0.085000 13.840000 1.130000 ;
-        RECT 14.495000  0.085000 14.780000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
@@ -166,130 +115,176 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.880000 3.415000 ;
-        RECT  0.615000 2.730000  1.400000 3.245000 ;
-        RECT  3.115000 2.660000  3.445000 3.245000 ;
-        RECT  4.705000 2.690000  5.035000 3.245000 ;
-        RECT  7.070000 2.680000  7.320000 3.245000 ;
-        RECT  8.190000 1.745000  8.440000 3.245000 ;
-        RECT 10.265000 2.660000 10.860000 3.245000 ;
-        RECT 11.600000 1.820000 11.850000 3.245000 ;
-        RECT 12.540000 1.920000 12.830000 3.245000 ;
-        RECT 13.545000 1.820000 13.875000 3.245000 ;
-        RECT 14.495000 1.820000 14.775000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.375000  0.365000 1.250000 ;
-      RECT  0.115000 1.250000  1.395000 1.580000 ;
-      RECT  0.115000 1.580000  0.285000 2.320000 ;
-      RECT  0.115000 2.320000  2.605000 2.490000 ;
-      RECT  0.115000 2.490000  0.445000 2.980000 ;
-      RECT  1.095000 0.255000  3.430000 0.425000 ;
-      RECT  1.095000 0.425000  1.345000 0.835000 ;
-      RECT  1.940000 2.660000  2.945000 2.910000 ;
-      RECT  2.260000 0.595000  2.610000 1.005000 ;
-      RECT  2.260000 1.005000  3.615000 1.175000 ;
-      RECT  2.275000 1.830000  2.605000 2.320000 ;
-      RECT  2.775000 2.320000  3.995000 2.350000 ;
-      RECT  2.775000 2.350000  5.985000 2.490000 ;
-      RECT  2.775000 2.490000  2.945000 2.660000 ;
-      RECT  3.100000 0.425000  3.430000 0.835000 ;
-      RECT  3.445000 1.175000  3.615000 2.320000 ;
-      RECT  3.615000 2.490000  5.985000 2.520000 ;
-      RECT  3.615000 2.520000  3.995000 2.980000 ;
-      RECT  4.240000 0.350000  4.575000 1.010000 ;
-      RECT  4.335000 1.820000  4.985000 1.990000 ;
-      RECT  4.335000 1.990000  4.585000 2.180000 ;
-      RECT  4.405000 1.010000  4.575000 1.330000 ;
-      RECT  4.405000 1.330000  5.305000 1.500000 ;
-      RECT  4.815000 1.500000  5.305000 1.660000 ;
-      RECT  4.815000 1.660000  4.985000 1.820000 ;
-      RECT  5.100000 0.310000  7.170000 0.480000 ;
-      RECT  5.100000 0.480000  5.430000 0.990000 ;
-      RECT  5.100000 0.990000  5.645000 1.160000 ;
-      RECT  5.155000 1.830000  5.645000 2.160000 ;
-      RECT  5.475000 1.160000  5.645000 1.500000 ;
-      RECT  5.475000 1.500000  6.150000 1.830000 ;
-      RECT  5.660000 0.650000  5.990000 0.820000 ;
-      RECT  5.710000 2.330000  5.985000 2.350000 ;
-      RECT  5.710000 2.520000  5.985000 2.725000 ;
-      RECT  5.815000 2.000000  6.490000 2.170000 ;
-      RECT  5.815000 2.170000  5.985000 2.330000 ;
-      RECT  5.820000 0.820000  5.990000 1.120000 ;
-      RECT  5.820000 1.120000  6.490000 1.290000 ;
-      RECT  6.160000 0.650000  6.830000 0.950000 ;
-      RECT  6.160000 2.340000  7.915000 2.510000 ;
-      RECT  6.160000 2.510000  6.660000 2.725000 ;
-      RECT  6.320000 1.290000  6.490000 2.000000 ;
-      RECT  6.660000 0.950000  6.830000 2.340000 ;
-      RECT  7.000000 0.480000  7.170000 0.580000 ;
-      RECT  7.000000 0.580000  8.325000 0.750000 ;
-      RECT  7.000000 0.920000  8.930000 1.090000 ;
-      RECT  7.000000 1.090000  7.210000 1.775000 ;
-      RECT  7.380000 1.260000  8.590000 1.575000 ;
-      RECT  7.380000 1.575000  7.550000 2.320000 ;
-      RECT  7.380000 2.320000  7.915000 2.340000 ;
-      RECT  7.550000 2.510000  7.915000 2.725000 ;
-      RECT  8.155000 0.255000  9.270000 0.425000 ;
-      RECT  8.155000 0.425000  8.325000 0.580000 ;
-      RECT  8.495000 0.595000  8.930000 0.920000 ;
-      RECT  8.640000 1.745000  8.930000 2.755000 ;
-      RECT  8.760000 1.090000  8.930000 1.745000 ;
-      RECT  9.100000 0.425000  9.270000 0.905000 ;
-      RECT  9.100000 0.905000  9.640000 1.235000 ;
-      RECT  9.100000 2.365000 10.095000 2.695000 ;
-      RECT  9.310000 1.235000  9.640000 1.865000 ;
-      RECT  9.310000 1.865000  9.755000 2.195000 ;
-      RECT  9.440000 0.405000 10.095000 0.735000 ;
-      RECT  9.925000 0.735000 10.095000 1.045000 ;
-      RECT  9.925000 1.045000 11.520000 1.310000 ;
-      RECT  9.925000 1.310000 10.095000 2.365000 ;
-      RECT 10.265000 1.480000 11.860000 1.650000 ;
-      RECT 10.265000 1.650000 10.545000 2.320000 ;
-      RECT 10.265000 2.320000 11.395000 2.490000 ;
-      RECT 11.065000 2.490000 11.395000 2.795000 ;
-      RECT 11.125000 0.350000 11.455000 0.705000 ;
-      RECT 11.125000 0.705000 11.860000 0.875000 ;
-      RECT 11.690000 0.875000 11.860000 1.480000 ;
-      RECT 13.065000 0.350000 13.325000 1.300000 ;
-      RECT 13.065000 1.300000 13.885000 1.630000 ;
-      RECT 13.065000 1.630000 13.325000 2.980000 ;
+      RECT  0.000000 -0.085000 14.880000 0.085000 ;
+      RECT  0.000000  3.245000 14.880000 3.415000 ;
+      RECT  0.115000  0.375000  0.365000 1.250000 ;
+      RECT  0.115000  1.250000  1.395000 1.580000 ;
+      RECT  0.115000  1.580000  0.285000 2.320000 ;
+      RECT  0.115000  2.320000  2.605000 2.490000 ;
+      RECT  0.115000  2.490000  0.445000 2.980000 ;
+      RECT  0.545000  0.085000  0.875000 0.835000 ;
+      RECT  0.615000  2.730000  1.400000 3.245000 ;
+      RECT  1.095000  0.255000  3.430000 0.425000 ;
+      RECT  1.095000  0.425000  1.345000 0.835000 ;
+      RECT  1.940000  2.660000  2.945000 2.910000 ;
+      RECT  2.260000  0.595000  2.610000 1.005000 ;
+      RECT  2.260000  1.005000  3.615000 1.175000 ;
+      RECT  2.275000  1.830000  2.605000 2.320000 ;
+      RECT  2.775000  2.320000  3.995000 2.350000 ;
+      RECT  2.775000  2.350000  5.985000 2.490000 ;
+      RECT  2.775000  2.490000  2.945000 2.660000 ;
+      RECT  3.100000  0.425000  3.430000 0.835000 ;
+      RECT  3.115000  2.660000  3.445000 3.245000 ;
+      RECT  3.445000  1.175000  3.615000 2.320000 ;
+      RECT  3.615000  2.490000  5.985000 2.520000 ;
+      RECT  3.615000  2.520000  3.995000 2.980000 ;
+      RECT  3.640000  0.085000  3.970000 0.835000 ;
+      RECT  3.785000  1.820000  4.165000 2.150000 ;
+      RECT  4.240000  0.350000  4.575000 1.010000 ;
+      RECT  4.335000  1.820000  4.985000 1.990000 ;
+      RECT  4.335000  1.990000  4.585000 2.180000 ;
+      RECT  4.405000  1.010000  4.575000 1.330000 ;
+      RECT  4.405000  1.330000  5.305000 1.500000 ;
+      RECT  4.705000  2.690000  5.035000 3.245000 ;
+      RECT  4.750000  0.085000  4.920000 1.130000 ;
+      RECT  4.815000  1.500000  5.305000 1.660000 ;
+      RECT  4.815000  1.660000  4.985000 1.820000 ;
+      RECT  5.100000  0.310000  7.170000 0.480000 ;
+      RECT  5.100000  0.480000  5.430000 0.990000 ;
+      RECT  5.100000  0.990000  5.645000 1.160000 ;
+      RECT  5.155000  1.830000  5.645000 2.160000 ;
+      RECT  5.475000  1.160000  5.645000 1.500000 ;
+      RECT  5.475000  1.500000  6.150000 1.830000 ;
+      RECT  5.660000  0.650000  5.990000 0.820000 ;
+      RECT  5.710000  2.330000  5.985000 2.350000 ;
+      RECT  5.710000  2.520000  5.985000 2.725000 ;
+      RECT  5.815000  2.000000  6.490000 2.170000 ;
+      RECT  5.815000  2.170000  5.985000 2.330000 ;
+      RECT  5.820000  0.820000  5.990000 1.120000 ;
+      RECT  5.820000  1.120000  6.490000 1.290000 ;
+      RECT  6.160000  0.650000  6.830000 0.950000 ;
+      RECT  6.160000  2.340000  7.915000 2.510000 ;
+      RECT  6.160000  2.510000  6.660000 2.725000 ;
+      RECT  6.320000  1.290000  6.490000 2.000000 ;
+      RECT  6.660000  0.950000  6.830000 2.340000 ;
+      RECT  7.000000  0.480000  7.170000 0.580000 ;
+      RECT  7.000000  0.580000  8.325000 0.750000 ;
+      RECT  7.000000  0.920000  8.930000 1.090000 ;
+      RECT  7.000000  1.090000  7.210000 1.775000 ;
+      RECT  7.070000  2.680000  7.320000 3.245000 ;
+      RECT  7.380000  1.260000  8.590000 1.575000 ;
+      RECT  7.380000  1.575000  7.550000 2.320000 ;
+      RECT  7.380000  2.320000  7.915000 2.340000 ;
+      RECT  7.450000  0.085000  7.985000 0.410000 ;
+      RECT  7.550000  2.510000  7.915000 2.725000 ;
+      RECT  7.720000  1.795000  8.020000 2.150000 ;
+      RECT  8.155000  0.255000  9.270000 0.425000 ;
+      RECT  8.155000  0.425000  8.325000 0.580000 ;
+      RECT  8.190000  1.745000  8.440000 3.245000 ;
+      RECT  8.495000  0.595000  8.930000 0.920000 ;
+      RECT  8.640000  1.745000  8.930000 2.755000 ;
+      RECT  8.760000  1.090000  8.930000 1.745000 ;
+      RECT  9.100000  0.425000  9.270000 0.905000 ;
+      RECT  9.100000  0.905000  9.640000 1.235000 ;
+      RECT  9.100000  2.365000 10.095000 2.695000 ;
+      RECT  9.310000  1.235000  9.640000 1.865000 ;
+      RECT  9.310000  1.865000  9.755000 2.195000 ;
+      RECT  9.440000  0.405000 10.095000 0.735000 ;
+      RECT  9.925000  0.735000 10.095000 1.045000 ;
+      RECT  9.925000  1.045000 11.520000 1.310000 ;
+      RECT  9.925000  1.310000 10.095000 2.365000 ;
+      RECT 10.265000  1.480000 11.860000 1.650000 ;
+      RECT 10.265000  1.650000 10.545000 2.320000 ;
+      RECT 10.265000  2.320000 11.395000 2.490000 ;
+      RECT 10.265000  2.660000 10.860000 3.245000 ;
+      RECT 10.335000  0.085000 10.665000 0.810000 ;
+      RECT 10.715000  1.820000 11.395000 2.150000 ;
+      RECT 11.065000  2.490000 11.395000 2.795000 ;
+      RECT 11.125000  0.350000 11.455000 0.705000 ;
+      RECT 11.125000  0.705000 11.860000 0.875000 ;
+      RECT 11.600000  1.820000 11.850000 3.245000 ;
+      RECT 11.645000  0.085000 11.895000 0.535000 ;
+      RECT 11.690000  0.875000 11.860000 1.480000 ;
+      RECT 12.540000  1.920000 12.830000 3.245000 ;
+      RECT 12.635000  0.085000 12.895000 1.050000 ;
+      RECT 13.065000  0.350000 13.325000 1.300000 ;
+      RECT 13.065000  1.300000 13.885000 1.630000 ;
+      RECT 13.065000  1.630000 13.325000 2.980000 ;
+      RECT 13.545000  1.820000 13.875000 3.245000 ;
+      RECT 13.670000  0.085000 13.840000 1.130000 ;
+      RECT 14.495000  0.085000 14.780000 1.130000 ;
+      RECT 14.495000  1.820000 14.775000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  1.950000  4.165000 2.120000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.950000  8.005000 2.120000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  1.950000 10.885000 2.120000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfrbp_2
diff --git a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef
index bef9d06..8d83384 100644
--- a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.magic.lef
@@ -53,15 +53,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.405000 1.355000  3.735000 2.025000 ;
-        RECT  7.685000 1.470000  8.035000 1.800000 ;
-        RECT 10.995000 1.210000 11.395000 1.540000 ;
-        RECT 11.195000 1.540000 11.395000 1.780000 ;
-      LAYER mcon ;
-        RECT  3.515000 1.580000  3.685000 1.750000 ;
-        RECT  7.835000 1.580000  8.005000 1.750000 ;
-        RECT 11.195000 1.580000 11.365000 1.750000 ;
       LAYER met1 ;
         RECT  3.455000 1.550000  3.745000 1.595000 ;
         RECT  3.455000 1.595000 11.425000 1.735000 ;
@@ -105,44 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.615000  0.085000  0.945000 0.880000 ;
-        RECT  3.575000  0.085000  4.065000 0.360000 ;
-        RECT  4.805000  0.085000  5.165000 0.360000 ;
-        RECT  7.890000  0.085000  8.220000 0.620000 ;
-        RECT 10.730000  0.085000 11.200000 0.680000 ;
-        RECT 12.975000  0.085000 13.305000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
@@ -151,125 +104,167 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.565000 2.630000  0.895000 3.245000 ;
-        RECT  2.815000 2.970000  3.145000 3.245000 ;
-        RECT  3.910000 2.645000  4.240000 3.245000 ;
-        RECT  4.995000 2.645000  5.325000 3.245000 ;
-        RECT  7.295000 2.615000  7.545000 3.245000 ;
-        RECT  8.295000 2.310000  8.625000 3.245000 ;
-        RECT 10.605000 2.650000 11.210000 3.245000 ;
-        RECT 11.880000 2.630000 12.210000 3.245000 ;
-        RECT 12.975000 1.820000 13.305000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.420000  0.445000 1.050000 ;
-      RECT  0.115000 1.050000  1.620000 1.240000 ;
-      RECT  0.115000 1.240000  0.365000 2.290000 ;
-      RECT  0.115000 2.290000  2.545000 2.460000 ;
-      RECT  0.115000 2.460000  0.365000 2.980000 ;
-      RECT  1.165000 0.255000  3.390000 0.425000 ;
-      RECT  1.165000 0.425000  1.495000 0.765000 ;
-      RECT  1.290000 0.935000  1.620000 1.050000 ;
-      RECT  1.405000 2.630000  3.680000 2.800000 ;
-      RECT  1.405000 2.800000  2.220000 2.960000 ;
-      RECT  1.955000 0.595000  2.890000 0.765000 ;
-      RECT  2.215000 1.580000  2.545000 2.290000 ;
-      RECT  2.720000 0.765000  2.890000 1.015000 ;
-      RECT  2.720000 1.015000  4.075000 1.185000 ;
-      RECT  3.060000 0.425000  3.390000 0.845000 ;
-      RECT  3.430000 2.300000  4.075000 2.305000 ;
-      RECT  3.430000 2.305000  6.255000 2.475000 ;
-      RECT  3.430000 2.475000  3.680000 2.630000 ;
-      RECT  3.430000 2.800000  3.680000 2.980000 ;
-      RECT  3.905000 0.530000  6.155000 0.700000 ;
-      RECT  3.905000 0.700000  4.075000 1.015000 ;
-      RECT  3.905000 1.185000  4.075000 2.300000 ;
-      RECT  4.245000 0.870000  5.015000 1.040000 ;
-      RECT  4.435000 1.820000  5.015000 2.135000 ;
-      RECT  4.845000 1.040000  5.015000 1.290000 ;
-      RECT  4.845000 1.290000  5.175000 1.620000 ;
-      RECT  4.845000 1.620000  5.015000 1.820000 ;
-      RECT  5.345000 0.870000  5.675000 1.265000 ;
-      RECT  5.345000 1.265000  6.495000 1.435000 ;
-      RECT  5.345000 1.435000  5.675000 1.820000 ;
-      RECT  5.345000 1.820000  6.590000 2.105000 ;
-      RECT  5.345000 2.105000  5.775000 2.135000 ;
-      RECT  5.905000 0.700000  6.155000 1.095000 ;
-      RECT  6.005000 2.475000  6.255000 2.980000 ;
-      RECT  6.260000 1.775000  6.590000 1.820000 ;
-      RECT  6.325000 0.255000  7.270000 0.545000 ;
-      RECT  6.325000 0.545000  6.495000 1.265000 ;
-      RECT  6.455000 2.275000  8.075000 2.445000 ;
-      RECT  6.455000 2.445000  6.785000 2.980000 ;
-      RECT  6.665000 0.765000  6.930000 1.095000 ;
-      RECT  6.760000 1.095000  6.930000 2.275000 ;
-      RECT  7.100000 0.545000  7.270000 0.790000 ;
-      RECT  7.100000 0.790000  9.825000 0.960000 ;
-      RECT  7.145000 1.130000  9.010000 1.300000 ;
-      RECT  7.145000 1.300000  7.475000 1.870000 ;
-      RECT  7.745000 2.445000  8.075000 2.980000 ;
-      RECT  7.905000 1.970000  8.520000 2.140000 ;
-      RECT  7.905000 2.140000  8.075000 2.275000 ;
-      RECT  8.225000 1.470000  8.520000 1.970000 ;
-      RECT  8.690000 1.300000  8.860000 1.970000 ;
-      RECT  8.690000 1.970000  9.565000 2.140000 ;
-      RECT  8.795000 2.140000  9.565000 2.980000 ;
-      RECT  9.030000 1.470000 10.395000 1.540000 ;
-      RECT  9.030000 1.540000  9.350000 1.800000 ;
-      RECT  9.180000 1.370000 10.395000 1.470000 ;
-      RECT  9.190000 0.290000 10.165000 0.620000 ;
-      RECT  9.495000 0.960000  9.825000 1.200000 ;
-      RECT  9.735000 1.710000 11.025000 1.880000 ;
-      RECT  9.735000 1.880000 10.065000 2.980000 ;
-      RECT  9.995000 0.620000 10.165000 0.870000 ;
-      RECT  9.995000 0.870000 11.895000 1.040000 ;
-      RECT 10.065000 1.225000 10.395000 1.370000 ;
-      RECT 10.435000 2.050000 10.685000 2.290000 ;
-      RECT 10.435000 2.290000 12.235000 2.460000 ;
-      RECT 10.855000 1.880000 11.025000 1.950000 ;
-      RECT 10.855000 1.950000 11.895000 2.120000 ;
-      RECT 11.380000 2.460000 11.710000 2.980000 ;
-      RECT 11.565000 1.040000 11.895000 1.950000 ;
-      RECT 11.690000 0.450000 12.235000 0.700000 ;
-      RECT 12.065000 0.700000 12.235000 2.290000 ;
-      RECT 12.440000 0.350000 12.795000 1.355000 ;
-      RECT 12.440000 1.355000 12.810000 1.685000 ;
-      RECT 12.440000 1.685000 12.795000 2.980000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.115000  0.420000  0.445000 1.050000 ;
+      RECT  0.115000  1.050000  1.620000 1.240000 ;
+      RECT  0.115000  1.240000  0.365000 2.290000 ;
+      RECT  0.115000  2.290000  2.545000 2.460000 ;
+      RECT  0.115000  2.460000  0.365000 2.980000 ;
+      RECT  0.565000  2.630000  0.895000 3.245000 ;
+      RECT  0.615000  0.085000  0.945000 0.880000 ;
+      RECT  1.165000  0.255000  3.390000 0.425000 ;
+      RECT  1.165000  0.425000  1.495000 0.765000 ;
+      RECT  1.290000  0.935000  1.620000 1.050000 ;
+      RECT  1.405000  2.630000  3.680000 2.800000 ;
+      RECT  1.405000  2.800000  2.220000 2.960000 ;
+      RECT  1.955000  0.595000  2.890000 0.765000 ;
+      RECT  2.215000  1.580000  2.545000 2.290000 ;
+      RECT  2.720000  0.765000  2.890000 1.015000 ;
+      RECT  2.720000  1.015000  4.075000 1.185000 ;
+      RECT  2.815000  2.970000  3.145000 3.245000 ;
+      RECT  3.060000  0.425000  3.390000 0.845000 ;
+      RECT  3.405000  1.355000  3.735000 2.025000 ;
+      RECT  3.430000  2.300000  4.075000 2.305000 ;
+      RECT  3.430000  2.305000  6.255000 2.475000 ;
+      RECT  3.430000  2.475000  3.680000 2.630000 ;
+      RECT  3.430000  2.800000  3.680000 2.980000 ;
+      RECT  3.575000  0.085000  4.065000 0.360000 ;
+      RECT  3.905000  0.530000  6.155000 0.700000 ;
+      RECT  3.905000  0.700000  4.075000 1.015000 ;
+      RECT  3.905000  1.185000  4.075000 2.300000 ;
+      RECT  3.910000  2.645000  4.240000 3.245000 ;
+      RECT  4.245000  0.870000  5.015000 1.040000 ;
+      RECT  4.435000  1.820000  5.015000 2.135000 ;
+      RECT  4.805000  0.085000  5.165000 0.360000 ;
+      RECT  4.845000  1.040000  5.015000 1.290000 ;
+      RECT  4.845000  1.290000  5.175000 1.620000 ;
+      RECT  4.845000  1.620000  5.015000 1.820000 ;
+      RECT  4.995000  2.645000  5.325000 3.245000 ;
+      RECT  5.345000  0.870000  5.675000 1.265000 ;
+      RECT  5.345000  1.265000  6.495000 1.435000 ;
+      RECT  5.345000  1.435000  5.675000 1.820000 ;
+      RECT  5.345000  1.820000  6.590000 2.105000 ;
+      RECT  5.345000  2.105000  5.775000 2.135000 ;
+      RECT  5.905000  0.700000  6.155000 1.095000 ;
+      RECT  6.005000  2.475000  6.255000 2.980000 ;
+      RECT  6.260000  1.775000  6.590000 1.820000 ;
+      RECT  6.325000  0.255000  7.270000 0.545000 ;
+      RECT  6.325000  0.545000  6.495000 1.265000 ;
+      RECT  6.455000  2.275000  8.075000 2.445000 ;
+      RECT  6.455000  2.445000  6.785000 2.980000 ;
+      RECT  6.665000  0.765000  6.930000 1.095000 ;
+      RECT  6.760000  1.095000  6.930000 2.275000 ;
+      RECT  7.100000  0.545000  7.270000 0.790000 ;
+      RECT  7.100000  0.790000  9.825000 0.960000 ;
+      RECT  7.145000  1.130000  9.010000 1.300000 ;
+      RECT  7.145000  1.300000  7.475000 1.870000 ;
+      RECT  7.295000  2.615000  7.545000 3.245000 ;
+      RECT  7.685000  1.470000  8.035000 1.800000 ;
+      RECT  7.745000  2.445000  8.075000 2.980000 ;
+      RECT  7.890000  0.085000  8.220000 0.620000 ;
+      RECT  7.905000  1.970000  8.520000 2.140000 ;
+      RECT  7.905000  2.140000  8.075000 2.275000 ;
+      RECT  8.225000  1.470000  8.520000 1.970000 ;
+      RECT  8.295000  2.310000  8.625000 3.245000 ;
+      RECT  8.690000  1.300000  8.860000 1.970000 ;
+      RECT  8.690000  1.970000  9.565000 2.140000 ;
+      RECT  8.795000  2.140000  9.565000 2.980000 ;
+      RECT  9.030000  1.470000 10.395000 1.540000 ;
+      RECT  9.030000  1.540000  9.350000 1.800000 ;
+      RECT  9.180000  1.370000 10.395000 1.470000 ;
+      RECT  9.190000  0.290000 10.165000 0.620000 ;
+      RECT  9.495000  0.960000  9.825000 1.200000 ;
+      RECT  9.735000  1.710000 11.025000 1.880000 ;
+      RECT  9.735000  1.880000 10.065000 2.980000 ;
+      RECT  9.995000  0.620000 10.165000 0.870000 ;
+      RECT  9.995000  0.870000 11.895000 1.040000 ;
+      RECT 10.065000  1.225000 10.395000 1.370000 ;
+      RECT 10.435000  2.050000 10.685000 2.290000 ;
+      RECT 10.435000  2.290000 12.235000 2.460000 ;
+      RECT 10.605000  2.650000 11.210000 3.245000 ;
+      RECT 10.730000  0.085000 11.200000 0.680000 ;
+      RECT 10.855000  1.880000 11.025000 1.950000 ;
+      RECT 10.855000  1.950000 11.895000 2.120000 ;
+      RECT 10.995000  1.210000 11.395000 1.540000 ;
+      RECT 11.195000  1.540000 11.395000 1.780000 ;
+      RECT 11.380000  2.460000 11.710000 2.980000 ;
+      RECT 11.565000  1.040000 11.895000 1.950000 ;
+      RECT 11.690000  0.450000 12.235000 0.700000 ;
+      RECT 11.880000  2.630000 12.210000 3.245000 ;
+      RECT 12.065000  0.700000 12.235000 2.290000 ;
+      RECT 12.440000  0.350000 12.795000 1.355000 ;
+      RECT 12.440000  1.355000 12.810000 1.685000 ;
+      RECT 12.440000  1.685000 12.795000 2.980000 ;
+      RECT 12.975000  0.085000 13.305000 1.130000 ;
+      RECT 12.975000  1.820000 13.305000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  1.580000  3.685000 1.750000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.580000  8.005000 1.750000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  1.580000 11.365000 1.750000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfrtn_1
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef
index b627e02..d5716fc 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.785000 1.830000  4.165000 2.160000 ;
-        RECT  7.835000 1.815000  8.165000 2.150000 ;
-        RECT 10.640000 1.820000 10.970000 2.150000 ;
-      LAYER mcon ;
-        RECT  3.995000 1.950000  4.165000 2.120000 ;
-        RECT  7.835000 1.950000  8.005000 2.120000 ;
-        RECT 10.715000 1.950000 10.885000 2.120000 ;
       LAYER met1 ;
         RECT  3.935000 1.920000  4.225000 1.965000 ;
         RECT  3.935000 1.965000 10.945000 2.105000 ;
@@ -106,44 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.880000 ;
-        RECT  3.785000  0.085000  3.955000 0.750000 ;
-        RECT  4.715000  0.085000  4.965000 0.750000 ;
-        RECT  7.430000  0.085000  7.760000 0.410000 ;
-        RECT 10.195000  0.085000 10.525000 0.810000 ;
-        RECT 11.570000  0.085000 11.905000 0.585000 ;
-        RECT 12.565000  0.085000 12.815000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
@@ -152,129 +106,170 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  0.615000 2.345000  0.945000 3.245000 ;
-        RECT  3.095000 2.685000  3.425000 3.245000 ;
-        RECT  4.705000 2.730000  5.035000 3.245000 ;
-        RECT  7.205000 2.660000  7.540000 3.245000 ;
-        RECT  8.385000 1.745000  8.555000 3.245000 ;
-        RECT 10.485000 2.520000 10.735000 3.245000 ;
-        RECT 11.480000 2.100000 11.810000 3.245000 ;
-        RECT 12.540000 1.820000 12.870000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.420000  0.365000 1.050000 ;
-      RECT  0.115000 1.050000  1.375000 1.265000 ;
-      RECT  0.115000 1.265000  0.285000 2.005000 ;
-      RECT  0.115000 2.005000  2.705000 2.175000 ;
-      RECT  0.115000 2.175000  0.445000 2.980000 ;
-      RECT  1.045000 0.935000  1.375000 1.050000 ;
-      RECT  1.105000 0.255000  3.605000 0.425000 ;
-      RECT  1.105000 0.425000  1.435000 0.640000 ;
-      RECT  1.485000 2.345000  3.995000 2.390000 ;
-      RECT  1.485000 2.390000  6.075000 2.515000 ;
-      RECT  1.485000 2.515000  2.555000 2.980000 ;
-      RECT  2.035000 1.830000  2.705000 2.005000 ;
-      RECT  2.270000 0.595000  2.600000 0.920000 ;
-      RECT  2.270000 0.920000  3.615000 1.090000 ;
-      RECT  3.090000 0.425000  3.605000 0.715000 ;
-      RECT  3.445000 1.090000  3.615000 2.330000 ;
-      RECT  3.445000 2.330000  3.995000 2.345000 ;
-      RECT  3.665000 2.515000  6.075000 2.560000 ;
-      RECT  3.665000 2.560000  3.995000 2.980000 ;
-      RECT  4.335000 1.820000  4.980000 1.990000 ;
-      RECT  4.335000 1.990000  4.585000 2.220000 ;
-      RECT  4.365000 0.350000  4.535000 0.920000 ;
-      RECT  4.365000 0.920000  4.980000 1.090000 ;
-      RECT  4.810000 1.090000  4.980000 1.300000 ;
-      RECT  4.810000 1.300000  5.280000 1.630000 ;
-      RECT  4.810000 1.630000  4.980000 1.820000 ;
-      RECT  5.150000 0.255000  7.220000 0.425000 ;
-      RECT  5.150000 0.425000  5.620000 1.130000 ;
-      RECT  5.155000 1.820000  6.200000 1.875000 ;
-      RECT  5.155000 1.875000  5.620000 2.220000 ;
-      RECT  5.450000 1.130000  5.620000 1.545000 ;
-      RECT  5.450000 1.545000  6.200000 1.820000 ;
-      RECT  5.790000 0.595000  5.960000 1.200000 ;
-      RECT  5.790000 1.200000  6.540000 1.370000 ;
-      RECT  5.825000 2.045000  6.540000 2.215000 ;
-      RECT  5.825000 2.215000  6.075000 2.390000 ;
-      RECT  5.825000 2.560000  6.075000 2.725000 ;
-      RECT  6.140000 0.595000  6.470000 0.860000 ;
-      RECT  6.140000 0.860000  6.880000 1.030000 ;
-      RECT  6.250000 2.385000  8.075000 2.490000 ;
-      RECT  6.250000 2.490000  6.880000 2.725000 ;
-      RECT  6.370000 1.370000  6.540000 2.045000 ;
-      RECT  6.710000 1.030000  6.880000 2.320000 ;
-      RECT  6.710000 2.320000  8.075000 2.385000 ;
-      RECT  7.050000 0.425000  7.220000 0.580000 ;
-      RECT  7.050000 0.580000  8.100000 0.750000 ;
-      RECT  7.050000 0.920000  8.895000 1.090000 ;
-      RECT  7.050000 1.090000  7.325000 1.805000 ;
-      RECT  7.495000 1.260000  8.315000 1.575000 ;
-      RECT  7.495000 1.575000  7.665000 2.320000 ;
-      RECT  7.745000 2.490000  8.075000 2.745000 ;
-      RECT  7.930000 0.255000  9.235000 0.425000 ;
-      RECT  7.930000 0.425000  8.100000 0.580000 ;
-      RECT  8.270000 0.595000  8.655000 0.920000 ;
-      RECT  8.725000 1.090000  8.895000 1.715000 ;
-      RECT  8.725000 1.715000  9.005000 2.755000 ;
-      RECT  9.065000 0.425000  9.235000 0.940000 ;
-      RECT  9.065000 0.940000  9.415000 1.270000 ;
-      RECT  9.245000 1.270000  9.415000 2.125000 ;
-      RECT  9.245000 2.125000  9.975000 2.380000 ;
-      RECT  9.290000 2.550000 10.315000 2.880000 ;
-      RECT  9.405000 0.350000  9.755000 0.770000 ;
-      RECT  9.585000 0.770000  9.755000 1.095000 ;
-      RECT  9.585000 1.095000 11.395000 1.265000 ;
-      RECT  9.585000 1.265000  9.755000 1.785000 ;
-      RECT  9.585000 1.785000 10.315000 1.955000 ;
-      RECT  9.985000 1.435000 10.315000 1.445000 ;
-      RECT  9.985000 1.445000 11.735000 1.615000 ;
-      RECT 10.145000 1.955000 10.315000 2.550000 ;
-      RECT 10.945000 2.520000 11.310000 2.980000 ;
-      RECT 11.010000 0.350000 11.340000 0.755000 ;
-      RECT 11.010000 0.755000 11.735000 0.925000 ;
-      RECT 11.065000 1.265000 11.395000 1.275000 ;
-      RECT 11.140000 1.615000 11.310000 2.520000 ;
-      RECT 11.565000 0.925000 11.735000 1.445000 ;
-      RECT 11.980000 2.100000 12.310000 2.980000 ;
-      RECT 12.085000 0.350000 12.335000 1.300000 ;
-      RECT 12.085000 1.300000 12.870000 1.630000 ;
-      RECT 12.085000 1.630000 12.310000 2.100000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.115000  0.420000  0.365000 1.050000 ;
+      RECT  0.115000  1.050000  1.375000 1.265000 ;
+      RECT  0.115000  1.265000  0.285000 2.005000 ;
+      RECT  0.115000  2.005000  2.705000 2.175000 ;
+      RECT  0.115000  2.175000  0.445000 2.980000 ;
+      RECT  0.545000  0.085000  0.875000 0.880000 ;
+      RECT  0.615000  2.345000  0.945000 3.245000 ;
+      RECT  1.045000  0.935000  1.375000 1.050000 ;
+      RECT  1.105000  0.255000  3.605000 0.425000 ;
+      RECT  1.105000  0.425000  1.435000 0.640000 ;
+      RECT  1.485000  2.345000  3.995000 2.390000 ;
+      RECT  1.485000  2.390000  6.075000 2.515000 ;
+      RECT  1.485000  2.515000  2.555000 2.980000 ;
+      RECT  2.035000  1.830000  2.705000 2.005000 ;
+      RECT  2.270000  0.595000  2.600000 0.920000 ;
+      RECT  2.270000  0.920000  3.615000 1.090000 ;
+      RECT  3.090000  0.425000  3.605000 0.715000 ;
+      RECT  3.095000  2.685000  3.425000 3.245000 ;
+      RECT  3.445000  1.090000  3.615000 2.330000 ;
+      RECT  3.445000  2.330000  3.995000 2.345000 ;
+      RECT  3.665000  2.515000  6.075000 2.560000 ;
+      RECT  3.665000  2.560000  3.995000 2.980000 ;
+      RECT  3.785000  0.085000  3.955000 0.750000 ;
+      RECT  3.785000  1.830000  4.165000 2.160000 ;
+      RECT  4.335000  1.820000  4.980000 1.990000 ;
+      RECT  4.335000  1.990000  4.585000 2.220000 ;
+      RECT  4.365000  0.350000  4.535000 0.920000 ;
+      RECT  4.365000  0.920000  4.980000 1.090000 ;
+      RECT  4.705000  2.730000  5.035000 3.245000 ;
+      RECT  4.715000  0.085000  4.965000 0.750000 ;
+      RECT  4.810000  1.090000  4.980000 1.300000 ;
+      RECT  4.810000  1.300000  5.280000 1.630000 ;
+      RECT  4.810000  1.630000  4.980000 1.820000 ;
+      RECT  5.150000  0.255000  7.220000 0.425000 ;
+      RECT  5.150000  0.425000  5.620000 1.130000 ;
+      RECT  5.155000  1.820000  6.200000 1.875000 ;
+      RECT  5.155000  1.875000  5.620000 2.220000 ;
+      RECT  5.450000  1.130000  5.620000 1.545000 ;
+      RECT  5.450000  1.545000  6.200000 1.820000 ;
+      RECT  5.790000  0.595000  5.960000 1.200000 ;
+      RECT  5.790000  1.200000  6.540000 1.370000 ;
+      RECT  5.825000  2.045000  6.540000 2.215000 ;
+      RECT  5.825000  2.215000  6.075000 2.390000 ;
+      RECT  5.825000  2.560000  6.075000 2.725000 ;
+      RECT  6.140000  0.595000  6.470000 0.860000 ;
+      RECT  6.140000  0.860000  6.880000 1.030000 ;
+      RECT  6.250000  2.385000  8.075000 2.490000 ;
+      RECT  6.250000  2.490000  6.880000 2.725000 ;
+      RECT  6.370000  1.370000  6.540000 2.045000 ;
+      RECT  6.710000  1.030000  6.880000 2.320000 ;
+      RECT  6.710000  2.320000  8.075000 2.385000 ;
+      RECT  7.050000  0.425000  7.220000 0.580000 ;
+      RECT  7.050000  0.580000  8.100000 0.750000 ;
+      RECT  7.050000  0.920000  8.895000 1.090000 ;
+      RECT  7.050000  1.090000  7.325000 1.805000 ;
+      RECT  7.205000  2.660000  7.540000 3.245000 ;
+      RECT  7.430000  0.085000  7.760000 0.410000 ;
+      RECT  7.495000  1.260000  8.315000 1.575000 ;
+      RECT  7.495000  1.575000  7.665000 2.320000 ;
+      RECT  7.745000  2.490000  8.075000 2.745000 ;
+      RECT  7.835000  1.815000  8.165000 2.150000 ;
+      RECT  7.930000  0.255000  9.235000 0.425000 ;
+      RECT  7.930000  0.425000  8.100000 0.580000 ;
+      RECT  8.270000  0.595000  8.655000 0.920000 ;
+      RECT  8.385000  1.745000  8.555000 3.245000 ;
+      RECT  8.725000  1.090000  8.895000 1.715000 ;
+      RECT  8.725000  1.715000  9.005000 2.755000 ;
+      RECT  9.065000  0.425000  9.235000 0.940000 ;
+      RECT  9.065000  0.940000  9.415000 1.270000 ;
+      RECT  9.245000  1.270000  9.415000 2.125000 ;
+      RECT  9.245000  2.125000  9.975000 2.380000 ;
+      RECT  9.290000  2.550000 10.315000 2.880000 ;
+      RECT  9.405000  0.350000  9.755000 0.770000 ;
+      RECT  9.585000  0.770000  9.755000 1.095000 ;
+      RECT  9.585000  1.095000 11.395000 1.265000 ;
+      RECT  9.585000  1.265000  9.755000 1.785000 ;
+      RECT  9.585000  1.785000 10.315000 1.955000 ;
+      RECT  9.985000  1.435000 10.315000 1.445000 ;
+      RECT  9.985000  1.445000 11.735000 1.615000 ;
+      RECT 10.145000  1.955000 10.315000 2.550000 ;
+      RECT 10.195000  0.085000 10.525000 0.810000 ;
+      RECT 10.485000  2.520000 10.735000 3.245000 ;
+      RECT 10.640000  1.820000 10.970000 2.150000 ;
+      RECT 10.945000  2.520000 11.310000 2.980000 ;
+      RECT 11.010000  0.350000 11.340000 0.755000 ;
+      RECT 11.010000  0.755000 11.735000 0.925000 ;
+      RECT 11.065000  1.265000 11.395000 1.275000 ;
+      RECT 11.140000  1.615000 11.310000 2.520000 ;
+      RECT 11.480000  2.100000 11.810000 3.245000 ;
+      RECT 11.565000  0.925000 11.735000 1.445000 ;
+      RECT 11.570000  0.085000 11.905000 0.585000 ;
+      RECT 11.980000  2.100000 12.310000 2.980000 ;
+      RECT 12.085000  0.350000 12.335000 1.300000 ;
+      RECT 12.085000  1.300000 12.870000 1.630000 ;
+      RECT 12.085000  1.630000 12.310000 2.100000 ;
+      RECT 12.540000  1.820000 12.870000 3.245000 ;
+      RECT 12.565000  0.085000 12.815000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  1.950000  4.165000 2.120000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.950000  8.005000 2.120000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  1.950000 10.885000 2.120000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfrtp_1
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef
index aedaf73..059b9c7 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.785000 1.830000  4.165000 2.160000 ;
-        RECT  7.825000 1.795000  8.515000 2.150000 ;
-        RECT 11.110000 1.920000 11.440000 2.220000 ;
-      LAYER mcon ;
-        RECT  3.995000 1.950000  4.165000 2.120000 ;
-        RECT  8.315000 1.950000  8.485000 2.120000 ;
-        RECT 11.195000 1.950000 11.365000 2.120000 ;
       LAYER met1 ;
         RECT  3.935000 1.920000  4.225000 1.965000 ;
         RECT  3.935000 1.965000 11.425000 2.105000 ;
@@ -106,47 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.765000 ;
-        RECT  3.715000  0.085000  4.045000 0.845000 ;
-        RECT  4.740000  0.085000  5.070000 0.750000 ;
-        RECT  7.605000  0.085000  8.080000 0.410000 ;
-        RECT 10.755000  0.085000 11.085000 0.810000 ;
-        RECT 12.105000  0.085000 12.435000 0.600000 ;
-        RECT 13.095000  0.085000 13.345000 1.130000 ;
-        RECT 14.035000  0.085000 14.285000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
@@ -155,133 +106,177 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.615000 2.345000  1.565000 3.245000 ;
-        RECT  3.095000 2.685000  3.425000 3.245000 ;
-        RECT  4.705000 2.730000  5.035000 3.245000 ;
-        RECT  7.150000 2.660000  7.485000 3.245000 ;
-        RECT  8.250000 2.320000  8.580000 3.245000 ;
-        RECT 10.560000 2.730000 11.240000 3.245000 ;
-        RECT 11.945000 1.940000 12.275000 3.245000 ;
-        RECT 13.005000 1.820000 13.335000 3.245000 ;
-        RECT 13.955000 1.820000 14.285000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.365000 0.935000 ;
-      RECT  0.115000 0.935000  1.140000 1.265000 ;
-      RECT  0.115000 1.265000  0.285000 2.005000 ;
-      RECT  0.115000 2.005000  2.705000 2.175000 ;
-      RECT  0.115000 2.175000  0.445000 2.980000 ;
-      RECT  1.105000 0.255000  3.545000 0.425000 ;
-      RECT  1.105000 0.425000  1.435000 0.640000 ;
-      RECT  2.105000 2.345000  3.995000 2.390000 ;
-      RECT  2.105000 2.390000  5.995000 2.515000 ;
-      RECT  2.105000 2.515000  2.435000 2.980000 ;
-      RECT  2.270000 0.595000  3.045000 0.845000 ;
-      RECT  2.375000 1.830000  2.705000 2.005000 ;
-      RECT  2.875000 0.845000  3.045000 1.140000 ;
-      RECT  2.875000 1.140000  3.615000 1.310000 ;
-      RECT  3.215000 0.425000  3.545000 0.845000 ;
-      RECT  3.445000 1.310000  3.615000 2.330000 ;
-      RECT  3.445000 2.330000  3.995000 2.345000 ;
-      RECT  3.615000 2.515000  5.995000 2.560000 ;
-      RECT  3.615000 2.560000  3.995000 2.980000 ;
-      RECT  4.335000 1.820000  4.985000 1.990000 ;
-      RECT  4.335000 1.990000  4.585000 2.220000 ;
-      RECT  4.390000 0.350000  4.560000 0.920000 ;
-      RECT  4.390000 0.920000  4.985000 1.090000 ;
-      RECT  4.815000 1.090000  4.985000 1.295000 ;
-      RECT  4.815000 1.295000  5.305000 1.625000 ;
-      RECT  4.815000 1.625000  4.985000 1.820000 ;
-      RECT  5.155000 1.795000  6.190000 1.965000 ;
-      RECT  5.155000 1.965000  5.485000 2.220000 ;
-      RECT  5.240000 0.330000  7.210000 0.500000 ;
-      RECT  5.240000 0.500000  5.645000 1.125000 ;
-      RECT  5.475000 1.125000  5.645000 1.635000 ;
-      RECT  5.475000 1.635000  6.190000 1.795000 ;
-      RECT  5.745000 2.135000  6.530000 2.305000 ;
-      RECT  5.745000 2.305000  5.995000 2.390000 ;
-      RECT  5.745000 2.560000  5.995000 2.725000 ;
-      RECT  5.815000 0.670000  6.145000 1.295000 ;
-      RECT  5.815000 1.295000  6.530000 1.465000 ;
-      RECT  6.195000 2.475000  8.020000 2.490000 ;
-      RECT  6.195000 2.490000  6.870000 2.725000 ;
-      RECT  6.315000 0.670000  6.645000 0.955000 ;
-      RECT  6.315000 0.955000  6.870000 1.125000 ;
-      RECT  6.360000 1.465000  6.530000 2.135000 ;
-      RECT  6.700000 1.125000  6.870000 2.320000 ;
-      RECT  6.700000 2.320000  8.020000 2.475000 ;
-      RECT  7.040000 0.500000  7.210000 0.580000 ;
-      RECT  7.040000 0.580000  8.420000 0.750000 ;
-      RECT  7.040000 0.920000  8.920000 1.090000 ;
-      RECT  7.040000 1.090000  7.315000 2.075000 ;
-      RECT  7.485000 1.260000  8.420000 1.575000 ;
-      RECT  7.485000 1.575000  7.655000 2.320000 ;
-      RECT  7.690000 2.490000  8.020000 2.725000 ;
-      RECT  8.250000 0.255000  9.260000 0.425000 ;
-      RECT  8.250000 0.425000  8.420000 0.580000 ;
-      RECT  8.590000 0.595000  8.920000 0.920000 ;
-      RECT  8.590000 1.090000  8.920000 1.130000 ;
-      RECT  8.750000 1.130000  8.920000 1.715000 ;
-      RECT  8.750000 1.715000  9.115000 2.755000 ;
-      RECT  9.090000 0.425000  9.260000 1.005000 ;
-      RECT  9.090000 1.005000 10.050000 1.335000 ;
-      RECT  9.320000 1.840000  9.600000 2.520000 ;
-      RECT  9.320000 2.520000 10.390000 2.850000 ;
-      RECT  9.430000 0.480000 10.390000 0.810000 ;
-      RECT  9.785000 1.335000 10.050000 2.330000 ;
-      RECT 10.220000 0.810000 10.390000 1.030000 ;
-      RECT 10.220000 1.030000 11.190000 1.110000 ;
-      RECT 10.220000 1.110000 11.890000 1.200000 ;
-      RECT 10.220000 1.200000 10.390000 2.520000 ;
-      RECT 10.560000 1.370000 10.850000 1.580000 ;
-      RECT 10.560000 1.580000 12.230000 1.750000 ;
-      RECT 10.560000 1.750000 10.850000 2.390000 ;
-      RECT 10.560000 2.390000 11.740000 2.560000 ;
-      RECT 11.020000 1.200000 11.890000 1.410000 ;
-      RECT 11.410000 2.560000 11.740000 2.980000 ;
-      RECT 11.545000 0.350000 11.875000 0.770000 ;
-      RECT 11.545000 0.770000 12.230000 0.940000 ;
-      RECT 12.060000 0.940000 12.230000 1.580000 ;
-      RECT 12.445000 1.940000 12.775000 2.980000 ;
-      RECT 12.605000 0.350000 12.865000 1.300000 ;
-      RECT 12.605000 1.300000 13.355000 1.630000 ;
-      RECT 12.605000 1.630000 12.775000 1.940000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.115000  0.350000  0.365000 0.935000 ;
+      RECT  0.115000  0.935000  1.140000 1.265000 ;
+      RECT  0.115000  1.265000  0.285000 2.005000 ;
+      RECT  0.115000  2.005000  2.705000 2.175000 ;
+      RECT  0.115000  2.175000  0.445000 2.980000 ;
+      RECT  0.545000  0.085000  0.875000 0.765000 ;
+      RECT  0.615000  2.345000  1.565000 3.245000 ;
+      RECT  1.105000  0.255000  3.545000 0.425000 ;
+      RECT  1.105000  0.425000  1.435000 0.640000 ;
+      RECT  2.105000  2.345000  3.995000 2.390000 ;
+      RECT  2.105000  2.390000  5.995000 2.515000 ;
+      RECT  2.105000  2.515000  2.435000 2.980000 ;
+      RECT  2.270000  0.595000  3.045000 0.845000 ;
+      RECT  2.375000  1.830000  2.705000 2.005000 ;
+      RECT  2.875000  0.845000  3.045000 1.140000 ;
+      RECT  2.875000  1.140000  3.615000 1.310000 ;
+      RECT  3.095000  2.685000  3.425000 3.245000 ;
+      RECT  3.215000  0.425000  3.545000 0.845000 ;
+      RECT  3.445000  1.310000  3.615000 2.330000 ;
+      RECT  3.445000  2.330000  3.995000 2.345000 ;
+      RECT  3.615000  2.515000  5.995000 2.560000 ;
+      RECT  3.615000  2.560000  3.995000 2.980000 ;
+      RECT  3.715000  0.085000  4.045000 0.845000 ;
+      RECT  3.785000  1.830000  4.165000 2.160000 ;
+      RECT  4.335000  1.820000  4.985000 1.990000 ;
+      RECT  4.335000  1.990000  4.585000 2.220000 ;
+      RECT  4.390000  0.350000  4.560000 0.920000 ;
+      RECT  4.390000  0.920000  4.985000 1.090000 ;
+      RECT  4.705000  2.730000  5.035000 3.245000 ;
+      RECT  4.740000  0.085000  5.070000 0.750000 ;
+      RECT  4.815000  1.090000  4.985000 1.295000 ;
+      RECT  4.815000  1.295000  5.305000 1.625000 ;
+      RECT  4.815000  1.625000  4.985000 1.820000 ;
+      RECT  5.155000  1.795000  6.190000 1.965000 ;
+      RECT  5.155000  1.965000  5.485000 2.220000 ;
+      RECT  5.240000  0.330000  7.210000 0.500000 ;
+      RECT  5.240000  0.500000  5.645000 1.125000 ;
+      RECT  5.475000  1.125000  5.645000 1.635000 ;
+      RECT  5.475000  1.635000  6.190000 1.795000 ;
+      RECT  5.745000  2.135000  6.530000 2.305000 ;
+      RECT  5.745000  2.305000  5.995000 2.390000 ;
+      RECT  5.745000  2.560000  5.995000 2.725000 ;
+      RECT  5.815000  0.670000  6.145000 1.295000 ;
+      RECT  5.815000  1.295000  6.530000 1.465000 ;
+      RECT  6.195000  2.475000  8.020000 2.490000 ;
+      RECT  6.195000  2.490000  6.870000 2.725000 ;
+      RECT  6.315000  0.670000  6.645000 0.955000 ;
+      RECT  6.315000  0.955000  6.870000 1.125000 ;
+      RECT  6.360000  1.465000  6.530000 2.135000 ;
+      RECT  6.700000  1.125000  6.870000 2.320000 ;
+      RECT  6.700000  2.320000  8.020000 2.475000 ;
+      RECT  7.040000  0.500000  7.210000 0.580000 ;
+      RECT  7.040000  0.580000  8.420000 0.750000 ;
+      RECT  7.040000  0.920000  8.920000 1.090000 ;
+      RECT  7.040000  1.090000  7.315000 2.075000 ;
+      RECT  7.150000  2.660000  7.485000 3.245000 ;
+      RECT  7.485000  1.260000  8.420000 1.575000 ;
+      RECT  7.485000  1.575000  7.655000 2.320000 ;
+      RECT  7.605000  0.085000  8.080000 0.410000 ;
+      RECT  7.690000  2.490000  8.020000 2.725000 ;
+      RECT  7.825000  1.795000  8.515000 2.150000 ;
+      RECT  8.250000  0.255000  9.260000 0.425000 ;
+      RECT  8.250000  0.425000  8.420000 0.580000 ;
+      RECT  8.250000  2.320000  8.580000 3.245000 ;
+      RECT  8.590000  0.595000  8.920000 0.920000 ;
+      RECT  8.590000  1.090000  8.920000 1.130000 ;
+      RECT  8.750000  1.130000  8.920000 1.715000 ;
+      RECT  8.750000  1.715000  9.115000 2.755000 ;
+      RECT  9.090000  0.425000  9.260000 1.005000 ;
+      RECT  9.090000  1.005000 10.050000 1.335000 ;
+      RECT  9.320000  1.840000  9.600000 2.520000 ;
+      RECT  9.320000  2.520000 10.390000 2.850000 ;
+      RECT  9.430000  0.480000 10.390000 0.810000 ;
+      RECT  9.785000  1.335000 10.050000 2.330000 ;
+      RECT 10.220000  0.810000 10.390000 1.030000 ;
+      RECT 10.220000  1.030000 11.190000 1.110000 ;
+      RECT 10.220000  1.110000 11.890000 1.200000 ;
+      RECT 10.220000  1.200000 10.390000 2.520000 ;
+      RECT 10.560000  1.370000 10.850000 1.580000 ;
+      RECT 10.560000  1.580000 12.230000 1.750000 ;
+      RECT 10.560000  1.750000 10.850000 2.390000 ;
+      RECT 10.560000  2.390000 11.740000 2.560000 ;
+      RECT 10.560000  2.730000 11.240000 3.245000 ;
+      RECT 10.755000  0.085000 11.085000 0.810000 ;
+      RECT 11.020000  1.200000 11.890000 1.410000 ;
+      RECT 11.110000  1.920000 11.440000 2.220000 ;
+      RECT 11.410000  2.560000 11.740000 2.980000 ;
+      RECT 11.545000  0.350000 11.875000 0.770000 ;
+      RECT 11.545000  0.770000 12.230000 0.940000 ;
+      RECT 11.945000  1.940000 12.275000 3.245000 ;
+      RECT 12.060000  0.940000 12.230000 1.580000 ;
+      RECT 12.105000  0.085000 12.435000 0.600000 ;
+      RECT 12.445000  1.940000 12.775000 2.980000 ;
+      RECT 12.605000  0.350000 12.865000 1.300000 ;
+      RECT 12.605000  1.300000 13.355000 1.630000 ;
+      RECT 12.605000  1.630000 12.775000 1.940000 ;
+      RECT 13.005000  1.820000 13.335000 3.245000 ;
+      RECT 13.095000  0.085000 13.345000 1.130000 ;
+      RECT 13.955000  1.820000 14.285000 3.245000 ;
+      RECT 14.035000  0.085000 14.285000 1.130000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  1.950000  4.165000 2.120000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.950000  8.485000 2.120000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  1.950000 11.365000 2.120000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfrtp_2
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef
index 0bc67a3..223e73d 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.magic.lef
@@ -60,14 +60,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.785000 1.830000  4.165000 2.160000 ;
-        RECT  7.835000 1.820000  8.145000 2.150000 ;
-        RECT 10.585000 1.820000 10.915000 2.150000 ;
-      LAYER mcon ;
-        RECT  3.995000 1.950000  4.165000 2.120000 ;
-        RECT  7.835000 1.950000  8.005000 2.120000 ;
-        RECT 10.715000 1.950000 10.885000 2.120000 ;
       LAYER met1 ;
         RECT  3.935000 1.920000  4.225000 1.965000 ;
         RECT  3.935000 1.965000 10.945000 2.105000 ;
@@ -112,48 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.880000 0.085000 ;
-        RECT  0.545000  0.085000  0.875000 0.765000 ;
-        RECT  3.725000  0.085000  4.055000 0.750000 ;
-        RECT  4.715000  0.085000  4.965000 0.750000 ;
-        RECT  7.430000  0.085000  7.760000 0.410000 ;
-        RECT 10.140000  0.085000 10.580000 0.680000 ;
-        RECT 12.105000  0.085000 12.365000 1.100000 ;
-        RECT 13.035000  0.085000 13.905000 0.760000 ;
-        RECT 14.435000  0.085000 14.765000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
@@ -162,133 +112,178 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.880000 3.415000 ;
-        RECT  0.615000 2.345000  1.565000 3.245000 ;
-        RECT  3.095000 2.685000  3.425000 3.245000 ;
-        RECT  4.705000 2.730000  5.035000 3.245000 ;
-        RECT  7.170000 2.660000  7.520000 3.245000 ;
-        RECT  8.365000 1.745000  8.535000 3.245000 ;
-        RECT 10.465000 2.520000 10.795000 3.245000 ;
-        RECT 11.650000 1.820000 11.900000 3.245000 ;
-        RECT 12.635000 1.820000 12.885000 3.245000 ;
-        RECT 13.615000 2.110000 13.865000 3.245000 ;
-        RECT 14.470000 2.110000 14.765000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.365000 0.935000 ;
-      RECT  0.115000 0.935000  1.140000 1.265000 ;
-      RECT  0.115000 1.265000  0.285000 2.005000 ;
-      RECT  0.115000 2.005000  2.705000 2.175000 ;
-      RECT  0.115000 2.175000  0.445000 2.980000 ;
-      RECT  1.105000 0.255000  3.555000 0.425000 ;
-      RECT  1.105000 0.425000  1.435000 0.640000 ;
-      RECT  2.105000 2.345000  3.995000 2.390000 ;
-      RECT  2.105000 2.390000  6.075000 2.515000 ;
-      RECT  2.105000 2.515000  2.435000 2.980000 ;
-      RECT  2.270000 0.595000  2.735000 0.845000 ;
-      RECT  2.375000 1.830000  2.705000 2.005000 ;
-      RECT  2.565000 0.845000  2.735000 0.920000 ;
-      RECT  2.565000 0.920000  3.615000 1.090000 ;
-      RECT  3.225000 0.425000  3.555000 0.750000 ;
-      RECT  3.445000 1.090000  3.615000 2.330000 ;
-      RECT  3.445000 2.330000  3.995000 2.345000 ;
-      RECT  3.615000 2.515000  6.075000 2.560000 ;
-      RECT  3.615000 2.560000  3.995000 2.980000 ;
-      RECT  4.335000 1.820000  4.975000 1.990000 ;
-      RECT  4.335000 1.990000  4.585000 2.220000 ;
-      RECT  4.365000 0.350000  4.535000 0.920000 ;
-      RECT  4.365000 0.920000  4.975000 1.090000 ;
-      RECT  4.805000 1.090000  4.975000 1.245000 ;
-      RECT  4.805000 1.245000  5.280000 1.575000 ;
-      RECT  4.805000 1.575000  4.975000 1.820000 ;
-      RECT  5.145000 0.330000  7.225000 0.500000 ;
-      RECT  5.145000 0.500000  5.620000 1.075000 ;
-      RECT  5.155000 1.745000  6.205000 1.915000 ;
-      RECT  5.155000 1.915000  5.485000 2.220000 ;
-      RECT  5.450000 1.075000  5.620000 1.585000 ;
-      RECT  5.450000 1.585000  6.205000 1.745000 ;
-      RECT  5.745000 2.085000  6.545000 2.255000 ;
-      RECT  5.745000 2.255000  6.075000 2.390000 ;
-      RECT  5.745000 2.560000  6.075000 2.755000 ;
-      RECT  5.790000 0.670000  5.960000 1.245000 ;
-      RECT  5.790000 1.245000  6.545000 1.415000 ;
-      RECT  6.140000 0.670000  6.470000 0.905000 ;
-      RECT  6.140000 0.905000  6.885000 1.075000 ;
-      RECT  6.245000 2.425000  8.055000 2.490000 ;
-      RECT  6.245000 2.490000  6.885000 2.755000 ;
-      RECT  6.375000 1.415000  6.545000 2.085000 ;
-      RECT  6.715000 1.075000  6.885000 2.320000 ;
-      RECT  6.715000 2.320000  8.055000 2.425000 ;
-      RECT  7.055000 0.500000  7.225000 0.580000 ;
-      RECT  7.055000 0.580000  8.100000 0.750000 ;
-      RECT  7.055000 0.920000  8.655000 1.090000 ;
-      RECT  7.055000 1.090000  7.325000 1.945000 ;
-      RECT  7.495000 1.260000  8.315000 1.575000 ;
-      RECT  7.495000 1.575000  7.665000 2.320000 ;
-      RECT  7.725000 2.490000  8.055000 2.755000 ;
-      RECT  7.930000 0.255000  8.995000 0.425000 ;
-      RECT  7.930000 0.425000  8.100000 0.580000 ;
-      RECT  8.270000 0.595000  8.655000 0.920000 ;
-      RECT  8.485000 1.090000  8.655000 1.405000 ;
-      RECT  8.485000 1.405000  9.065000 1.575000 ;
-      RECT  8.735000 1.575000  9.065000 2.755000 ;
-      RECT  8.825000 0.425000  8.995000 0.905000 ;
-      RECT  8.825000 0.905000  9.415000 1.235000 ;
-      RECT  9.165000 0.405000  9.755000 0.735000 ;
-      RECT  9.245000 1.235000  9.415000 2.065000 ;
-      RECT  9.245000 2.065000  9.955000 2.380000 ;
-      RECT  9.270000 2.550000 10.295000 2.880000 ;
-      RECT  9.585000 0.735000  9.755000 0.885000 ;
-      RECT  9.585000 0.885000 11.245000 1.055000 ;
-      RECT  9.585000 1.055000  9.755000 1.725000 ;
-      RECT  9.585000 1.725000 10.295000 1.895000 ;
-      RECT 10.015000 1.225000 10.345000 1.385000 ;
-      RECT 10.015000 1.385000 11.585000 1.555000 ;
-      RECT 10.125000 1.895000 10.295000 2.550000 ;
-      RECT 10.915000 1.055000 11.245000 1.215000 ;
-      RECT 11.000000 2.520000 11.330000 2.980000 ;
-      RECT 11.040000 0.385000 11.585000 0.715000 ;
-      RECT 11.160000 1.555000 11.330000 2.520000 ;
-      RECT 11.415000 0.715000 11.585000 1.385000 ;
-      RECT 11.755000 0.350000 11.925000 1.270000 ;
-      RECT 11.755000 1.270000 13.850000 1.600000 ;
-      RECT 12.100000 1.600000 12.430000 2.700000 ;
+      RECT  0.000000 -0.085000 14.880000 0.085000 ;
+      RECT  0.000000  3.245000 14.880000 3.415000 ;
+      RECT  0.115000  0.350000  0.365000 0.935000 ;
+      RECT  0.115000  0.935000  1.140000 1.265000 ;
+      RECT  0.115000  1.265000  0.285000 2.005000 ;
+      RECT  0.115000  2.005000  2.705000 2.175000 ;
+      RECT  0.115000  2.175000  0.445000 2.980000 ;
+      RECT  0.545000  0.085000  0.875000 0.765000 ;
+      RECT  0.615000  2.345000  1.565000 3.245000 ;
+      RECT  1.105000  0.255000  3.555000 0.425000 ;
+      RECT  1.105000  0.425000  1.435000 0.640000 ;
+      RECT  2.105000  2.345000  3.995000 2.390000 ;
+      RECT  2.105000  2.390000  6.075000 2.515000 ;
+      RECT  2.105000  2.515000  2.435000 2.980000 ;
+      RECT  2.270000  0.595000  2.735000 0.845000 ;
+      RECT  2.375000  1.830000  2.705000 2.005000 ;
+      RECT  2.565000  0.845000  2.735000 0.920000 ;
+      RECT  2.565000  0.920000  3.615000 1.090000 ;
+      RECT  3.095000  2.685000  3.425000 3.245000 ;
+      RECT  3.225000  0.425000  3.555000 0.750000 ;
+      RECT  3.445000  1.090000  3.615000 2.330000 ;
+      RECT  3.445000  2.330000  3.995000 2.345000 ;
+      RECT  3.615000  2.515000  6.075000 2.560000 ;
+      RECT  3.615000  2.560000  3.995000 2.980000 ;
+      RECT  3.725000  0.085000  4.055000 0.750000 ;
+      RECT  3.785000  1.830000  4.165000 2.160000 ;
+      RECT  4.335000  1.820000  4.975000 1.990000 ;
+      RECT  4.335000  1.990000  4.585000 2.220000 ;
+      RECT  4.365000  0.350000  4.535000 0.920000 ;
+      RECT  4.365000  0.920000  4.975000 1.090000 ;
+      RECT  4.705000  2.730000  5.035000 3.245000 ;
+      RECT  4.715000  0.085000  4.965000 0.750000 ;
+      RECT  4.805000  1.090000  4.975000 1.245000 ;
+      RECT  4.805000  1.245000  5.280000 1.575000 ;
+      RECT  4.805000  1.575000  4.975000 1.820000 ;
+      RECT  5.145000  0.330000  7.225000 0.500000 ;
+      RECT  5.145000  0.500000  5.620000 1.075000 ;
+      RECT  5.155000  1.745000  6.205000 1.915000 ;
+      RECT  5.155000  1.915000  5.485000 2.220000 ;
+      RECT  5.450000  1.075000  5.620000 1.585000 ;
+      RECT  5.450000  1.585000  6.205000 1.745000 ;
+      RECT  5.745000  2.085000  6.545000 2.255000 ;
+      RECT  5.745000  2.255000  6.075000 2.390000 ;
+      RECT  5.745000  2.560000  6.075000 2.755000 ;
+      RECT  5.790000  0.670000  5.960000 1.245000 ;
+      RECT  5.790000  1.245000  6.545000 1.415000 ;
+      RECT  6.140000  0.670000  6.470000 0.905000 ;
+      RECT  6.140000  0.905000  6.885000 1.075000 ;
+      RECT  6.245000  2.425000  8.055000 2.490000 ;
+      RECT  6.245000  2.490000  6.885000 2.755000 ;
+      RECT  6.375000  1.415000  6.545000 2.085000 ;
+      RECT  6.715000  1.075000  6.885000 2.320000 ;
+      RECT  6.715000  2.320000  8.055000 2.425000 ;
+      RECT  7.055000  0.500000  7.225000 0.580000 ;
+      RECT  7.055000  0.580000  8.100000 0.750000 ;
+      RECT  7.055000  0.920000  8.655000 1.090000 ;
+      RECT  7.055000  1.090000  7.325000 1.945000 ;
+      RECT  7.170000  2.660000  7.520000 3.245000 ;
+      RECT  7.430000  0.085000  7.760000 0.410000 ;
+      RECT  7.495000  1.260000  8.315000 1.575000 ;
+      RECT  7.495000  1.575000  7.665000 2.320000 ;
+      RECT  7.725000  2.490000  8.055000 2.755000 ;
+      RECT  7.835000  1.820000  8.145000 2.150000 ;
+      RECT  7.930000  0.255000  8.995000 0.425000 ;
+      RECT  7.930000  0.425000  8.100000 0.580000 ;
+      RECT  8.270000  0.595000  8.655000 0.920000 ;
+      RECT  8.365000  1.745000  8.535000 3.245000 ;
+      RECT  8.485000  1.090000  8.655000 1.405000 ;
+      RECT  8.485000  1.405000  9.065000 1.575000 ;
+      RECT  8.735000  1.575000  9.065000 2.755000 ;
+      RECT  8.825000  0.425000  8.995000 0.905000 ;
+      RECT  8.825000  0.905000  9.415000 1.235000 ;
+      RECT  9.165000  0.405000  9.755000 0.735000 ;
+      RECT  9.245000  1.235000  9.415000 2.065000 ;
+      RECT  9.245000  2.065000  9.955000 2.380000 ;
+      RECT  9.270000  2.550000 10.295000 2.880000 ;
+      RECT  9.585000  0.735000  9.755000 0.885000 ;
+      RECT  9.585000  0.885000 11.245000 1.055000 ;
+      RECT  9.585000  1.055000  9.755000 1.725000 ;
+      RECT  9.585000  1.725000 10.295000 1.895000 ;
+      RECT 10.015000  1.225000 10.345000 1.385000 ;
+      RECT 10.015000  1.385000 11.585000 1.555000 ;
+      RECT 10.125000  1.895000 10.295000 2.550000 ;
+      RECT 10.140000  0.085000 10.580000 0.680000 ;
+      RECT 10.465000  2.520000 10.795000 3.245000 ;
+      RECT 10.585000  1.820000 10.915000 2.150000 ;
+      RECT 10.915000  1.055000 11.245000 1.215000 ;
+      RECT 11.000000  2.520000 11.330000 2.980000 ;
+      RECT 11.040000  0.385000 11.585000 0.715000 ;
+      RECT 11.160000  1.555000 11.330000 2.520000 ;
+      RECT 11.415000  0.715000 11.585000 1.385000 ;
+      RECT 11.650000  1.820000 11.900000 3.245000 ;
+      RECT 11.755000  0.350000 11.925000 1.270000 ;
+      RECT 11.755000  1.270000 13.850000 1.600000 ;
+      RECT 12.100000  1.600000 12.430000 2.700000 ;
+      RECT 12.105000  0.085000 12.365000 1.100000 ;
+      RECT 12.635000  1.820000 12.885000 3.245000 ;
+      RECT 13.035000  0.085000 13.905000 0.760000 ;
+      RECT 13.615000  2.110000 13.865000 3.245000 ;
+      RECT 14.435000  0.085000 14.765000 1.130000 ;
+      RECT 14.470000  2.110000 14.765000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  1.950000  4.165000 2.120000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.950000  8.005000 2.120000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  1.950000 10.885000 2.120000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfrtp_4
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef
index 501336e..6ebf6db 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.magic.lef
@@ -84,14 +84,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.295000 1.245000  7.625000 1.780000 ;
-        RECT  9.725000 1.550000 10.915000 1.780000 ;
-        RECT 10.585000 1.255000 10.915000 1.550000 ;
-        RECT 10.585000 1.780000 10.915000 1.925000 ;
-      LAYER mcon ;
-        RECT 7.355000 1.580000 7.525000 1.750000 ;
-        RECT 9.755000 1.580000 9.925000 1.750000 ;
       LAYER met1 ;
         RECT 7.295000 1.550000 7.585000 1.595000 ;
         RECT 7.295000 1.595000 9.985000 1.735000 ;
@@ -113,47 +105,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.615000  0.085000  0.945000 0.780000 ;
-        RECT  2.325000  0.085000  2.655000 0.750000 ;
-        RECT  3.380000  0.085000  3.710000 1.010000 ;
-        RECT  6.020000  0.085000  6.370000 0.565000 ;
-        RECT  7.500000  0.085000  8.295000 0.735000 ;
-        RECT 10.285000  0.085000 10.895000 0.680000 ;
-        RECT 11.625000  0.085000 11.955000 1.130000 ;
-        RECT 13.455000  0.085000 13.785000 1.050000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.400000 0.245000 ;
     END
@@ -162,135 +113,179 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.565000 2.630000  0.895000 3.245000 ;
-        RECT  2.555000 2.660000  2.820000 3.245000 ;
-        RECT  3.575000 2.660000  3.905000 3.245000 ;
-        RECT  6.175000 2.425000  6.425000 3.245000 ;
-        RECT  7.615000 2.295000  7.785000 3.245000 ;
-        RECT 10.580000 2.520000 10.750000 3.245000 ;
-        RECT 11.950000 2.520000 12.280000 3.245000 ;
-        RECT 13.455000 1.995000 13.785000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.445000 0.950000 ;
-      RECT  0.115000 0.950000  1.140000 1.280000 ;
-      RECT  0.115000 1.280000  0.335000 2.290000 ;
-      RECT  0.115000 2.290000  2.045000 2.460000 ;
-      RECT  0.115000 2.460000  0.365000 2.980000 ;
-      RECT  1.435000 2.630000  2.385000 2.800000 ;
-      RECT  1.435000 2.800000  1.945000 2.960000 ;
-      RECT  1.505000 0.350000  1.835000 0.920000 ;
-      RECT  1.505000 0.920000  2.385000 1.090000 ;
-      RECT  1.795000 1.830000  2.045000 2.290000 ;
-      RECT  2.215000 1.090000  2.385000 2.320000 ;
-      RECT  2.215000 2.320000  4.925000 2.380000 ;
-      RECT  2.215000 2.380000  3.795000 2.490000 ;
-      RECT  2.215000 2.490000  2.385000 2.630000 ;
-      RECT  2.935000 0.340000  3.200000 1.010000 ;
-      RECT  2.935000 1.010000  3.105000 1.820000 ;
-      RECT  2.935000 1.820000  4.215000 1.990000 ;
-      RECT  2.935000 1.990000  3.455000 2.150000 ;
-      RECT  3.625000 2.210000  4.925000 2.320000 ;
-      RECT  3.880000 0.255000  5.030000 0.425000 ;
-      RECT  3.880000 0.425000  4.210000 1.010000 ;
-      RECT  3.885000 1.220000  4.215000 1.820000 ;
-      RECT  4.105000 2.550000  4.355000 2.905000 ;
-      RECT  4.105000 2.905000  5.810000 3.075000 ;
-      RECT  4.420000 0.595000  4.690000 0.925000 ;
-      RECT  4.420000 0.925000  4.590000 2.210000 ;
-      RECT  4.590000 2.380000  4.925000 2.735000 ;
-      RECT  4.760000 1.370000  5.030000 2.040000 ;
-      RECT  4.860000 0.425000  5.030000 1.370000 ;
-      RECT  5.120000 2.370000  5.450000 2.735000 ;
-      RECT  5.200000 0.350000  5.450000 1.350000 ;
-      RECT  5.200000 1.350000  7.110000 1.520000 ;
-      RECT  5.200000 1.520000  5.370000 2.370000 ;
-      RECT  5.540000 1.690000  5.810000 2.020000 ;
-      RECT  5.640000 2.020000  5.810000 2.085000 ;
-      RECT  5.640000 2.085000  6.765000 2.255000 ;
-      RECT  5.640000 2.255000  5.810000 2.905000 ;
-      RECT  5.815000 0.735000  6.770000 0.905000 ;
-      RECT  5.815000 0.905000  6.485000 1.180000 ;
-      RECT  6.050000 1.690000  7.105000 1.915000 ;
-      RECT  6.595000 2.255000  6.765000 2.905000 ;
-      RECT  6.595000 2.905000  7.445000 3.075000 ;
-      RECT  6.600000 0.350000  6.930000 0.735000 ;
-      RECT  6.725000 1.190000  7.110000 1.350000 ;
-      RECT  6.935000 1.915000  7.105000 2.735000 ;
-      RECT  6.940000 0.905000  8.165000 1.075000 ;
-      RECT  6.940000 1.075000  7.110000 1.190000 ;
-      RECT  7.275000 1.950000  8.830000 2.120000 ;
-      RECT  7.275000 2.120000  7.445000 2.905000 ;
-      RECT  7.835000 1.075000  8.165000 1.450000 ;
-      RECT  7.985000 2.290000  8.315000 2.350000 ;
-      RECT  7.985000 2.350000  9.830000 2.520000 ;
-      RECT  7.985000 2.520000  8.315000 2.755000 ;
-      RECT  8.530000 2.690000  8.860000 2.905000 ;
-      RECT  8.530000 2.905000 10.380000 3.075000 ;
-      RECT  8.660000 1.350000  8.990000 1.680000 ;
-      RECT  8.660000 1.680000  8.830000 1.950000 ;
-      RECT  8.785000 0.350000  9.380000 1.050000 ;
-      RECT  9.045000 1.850000  9.380000 1.950000 ;
-      RECT  9.045000 1.950000 10.170000 2.095000 ;
-      RECT  9.045000 2.095000 11.280000 2.120000 ;
-      RECT  9.045000 2.120000  9.380000 2.180000 ;
-      RECT  9.210000 1.050000  9.380000 1.850000 ;
-      RECT  9.580000 2.290000  9.830000 2.350000 ;
-      RECT  9.580000 2.520000  9.830000 2.735000 ;
-      RECT  9.620000 0.900000 11.395000 1.070000 ;
-      RECT  9.620000 1.070000  9.950000 1.230000 ;
-      RECT 10.000000 2.120000 11.280000 2.265000 ;
-      RECT 10.050000 2.520000 10.380000 2.905000 ;
-      RECT 10.950000 2.520000 11.280000 2.980000 ;
-      RECT 11.065000 0.350000 11.395000 0.900000 ;
-      RECT 11.110000 1.640000 11.895000 1.970000 ;
-      RECT 11.110000 1.970000 11.280000 2.095000 ;
-      RECT 11.110000 2.265000 11.280000 2.520000 ;
-      RECT 11.225000 1.070000 11.395000 1.300000 ;
-      RECT 11.225000 1.300000 12.235000 1.470000 ;
-      RECT 11.500000 2.180000 12.235000 2.350000 ;
-      RECT 11.500000 2.350000 11.750000 2.980000 ;
-      RECT 12.065000 1.470000 12.235000 2.180000 ;
-      RECT 12.840000 0.540000 13.255000 1.130000 ;
-      RECT 13.005000 1.130000 13.255000 1.220000 ;
-      RECT 13.005000 1.220000 13.785000 1.550000 ;
-      RECT 13.005000 1.550000 13.255000 2.875000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.115000  0.350000  0.445000 0.950000 ;
+      RECT  0.115000  0.950000  1.140000 1.280000 ;
+      RECT  0.115000  1.280000  0.335000 2.290000 ;
+      RECT  0.115000  2.290000  2.045000 2.460000 ;
+      RECT  0.115000  2.460000  0.365000 2.980000 ;
+      RECT  0.565000  2.630000  0.895000 3.245000 ;
+      RECT  0.615000  0.085000  0.945000 0.780000 ;
+      RECT  1.435000  2.630000  2.385000 2.800000 ;
+      RECT  1.435000  2.800000  1.945000 2.960000 ;
+      RECT  1.505000  0.350000  1.835000 0.920000 ;
+      RECT  1.505000  0.920000  2.385000 1.090000 ;
+      RECT  1.795000  1.830000  2.045000 2.290000 ;
+      RECT  2.215000  1.090000  2.385000 2.320000 ;
+      RECT  2.215000  2.320000  4.925000 2.380000 ;
+      RECT  2.215000  2.380000  3.795000 2.490000 ;
+      RECT  2.215000  2.490000  2.385000 2.630000 ;
+      RECT  2.325000  0.085000  2.655000 0.750000 ;
+      RECT  2.555000  2.660000  2.820000 3.245000 ;
+      RECT  2.935000  0.340000  3.200000 1.010000 ;
+      RECT  2.935000  1.010000  3.105000 1.820000 ;
+      RECT  2.935000  1.820000  4.215000 1.990000 ;
+      RECT  2.935000  1.990000  3.455000 2.150000 ;
+      RECT  3.380000  0.085000  3.710000 1.010000 ;
+      RECT  3.575000  2.660000  3.905000 3.245000 ;
+      RECT  3.625000  2.210000  4.925000 2.320000 ;
+      RECT  3.880000  0.255000  5.030000 0.425000 ;
+      RECT  3.880000  0.425000  4.210000 1.010000 ;
+      RECT  3.885000  1.220000  4.215000 1.820000 ;
+      RECT  4.105000  2.550000  4.355000 2.905000 ;
+      RECT  4.105000  2.905000  5.810000 3.075000 ;
+      RECT  4.420000  0.595000  4.690000 0.925000 ;
+      RECT  4.420000  0.925000  4.590000 2.210000 ;
+      RECT  4.590000  2.380000  4.925000 2.735000 ;
+      RECT  4.760000  1.370000  5.030000 2.040000 ;
+      RECT  4.860000  0.425000  5.030000 1.370000 ;
+      RECT  5.120000  2.370000  5.450000 2.735000 ;
+      RECT  5.200000  0.350000  5.450000 1.350000 ;
+      RECT  5.200000  1.350000  7.110000 1.520000 ;
+      RECT  5.200000  1.520000  5.370000 2.370000 ;
+      RECT  5.540000  1.690000  5.810000 2.020000 ;
+      RECT  5.640000  2.020000  5.810000 2.085000 ;
+      RECT  5.640000  2.085000  6.765000 2.255000 ;
+      RECT  5.640000  2.255000  5.810000 2.905000 ;
+      RECT  5.815000  0.735000  6.770000 0.905000 ;
+      RECT  5.815000  0.905000  6.485000 1.180000 ;
+      RECT  6.020000  0.085000  6.370000 0.565000 ;
+      RECT  6.050000  1.690000  7.105000 1.915000 ;
+      RECT  6.175000  2.425000  6.425000 3.245000 ;
+      RECT  6.595000  2.255000  6.765000 2.905000 ;
+      RECT  6.595000  2.905000  7.445000 3.075000 ;
+      RECT  6.600000  0.350000  6.930000 0.735000 ;
+      RECT  6.725000  1.190000  7.110000 1.350000 ;
+      RECT  6.935000  1.915000  7.105000 2.735000 ;
+      RECT  6.940000  0.905000  8.165000 1.075000 ;
+      RECT  6.940000  1.075000  7.110000 1.190000 ;
+      RECT  7.275000  1.950000  8.830000 2.120000 ;
+      RECT  7.275000  2.120000  7.445000 2.905000 ;
+      RECT  7.295000  1.245000  7.625000 1.780000 ;
+      RECT  7.500000  0.085000  8.295000 0.735000 ;
+      RECT  7.615000  2.295000  7.785000 3.245000 ;
+      RECT  7.835000  1.075000  8.165000 1.450000 ;
+      RECT  7.985000  2.290000  8.315000 2.350000 ;
+      RECT  7.985000  2.350000  9.830000 2.520000 ;
+      RECT  7.985000  2.520000  8.315000 2.755000 ;
+      RECT  8.530000  2.690000  8.860000 2.905000 ;
+      RECT  8.530000  2.905000 10.380000 3.075000 ;
+      RECT  8.660000  1.350000  8.990000 1.680000 ;
+      RECT  8.660000  1.680000  8.830000 1.950000 ;
+      RECT  8.785000  0.350000  9.380000 1.050000 ;
+      RECT  9.045000  1.850000  9.380000 1.950000 ;
+      RECT  9.045000  1.950000 10.170000 2.095000 ;
+      RECT  9.045000  2.095000 11.280000 2.120000 ;
+      RECT  9.045000  2.120000  9.380000 2.180000 ;
+      RECT  9.210000  1.050000  9.380000 1.850000 ;
+      RECT  9.580000  2.290000  9.830000 2.350000 ;
+      RECT  9.580000  2.520000  9.830000 2.735000 ;
+      RECT  9.620000  0.900000 11.395000 1.070000 ;
+      RECT  9.620000  1.070000  9.950000 1.230000 ;
+      RECT  9.725000  1.550000 10.915000 1.780000 ;
+      RECT 10.000000  2.120000 11.280000 2.265000 ;
+      RECT 10.050000  2.520000 10.380000 2.905000 ;
+      RECT 10.285000  0.085000 10.895000 0.680000 ;
+      RECT 10.580000  2.520000 10.750000 3.245000 ;
+      RECT 10.585000  1.255000 10.915000 1.550000 ;
+      RECT 10.585000  1.780000 10.915000 1.925000 ;
+      RECT 10.950000  2.520000 11.280000 2.980000 ;
+      RECT 11.065000  0.350000 11.395000 0.900000 ;
+      RECT 11.110000  1.640000 11.895000 1.970000 ;
+      RECT 11.110000  1.970000 11.280000 2.095000 ;
+      RECT 11.110000  2.265000 11.280000 2.520000 ;
+      RECT 11.225000  1.070000 11.395000 1.300000 ;
+      RECT 11.225000  1.300000 12.235000 1.470000 ;
+      RECT 11.500000  2.180000 12.235000 2.350000 ;
+      RECT 11.500000  2.350000 11.750000 2.980000 ;
+      RECT 11.625000  0.085000 11.955000 1.130000 ;
+      RECT 11.950000  2.520000 12.280000 3.245000 ;
+      RECT 12.065000  1.470000 12.235000 2.180000 ;
+      RECT 12.840000  0.540000 13.255000 1.130000 ;
+      RECT 13.005000  1.130000 13.255000 1.220000 ;
+      RECT 13.005000  1.220000 13.785000 1.550000 ;
+      RECT 13.005000  1.550000 13.255000 2.875000 ;
+      RECT 13.455000  0.085000 13.785000 1.050000 ;
+      RECT 13.455000  1.995000 13.785000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  1.580000  7.525000 1.750000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  1.580000  9.925000 1.750000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef
index bbbc9f3..051c452 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.magic.lef
@@ -85,12 +85,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.835000 1.550000  8.225000 1.880000 ;
-        RECT 13.085000 1.300000 13.435000 1.970000 ;
-      LAYER mcon ;
-        RECT  7.835000 1.580000  8.005000 1.750000 ;
-        RECT 13.115000 1.580000 13.285000 1.750000 ;
       LAYER met1 ;
         RECT  7.775000 1.550000  8.065000 1.595000 ;
         RECT  7.775000 1.595000 13.345000 1.735000 ;
@@ -112,57 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.760000 0.085000 ;
-        RECT  0.615000  0.085000  1.020000 0.680000 ;
-        RECT  2.840000  0.085000  3.170000 0.780000 ;
-        RECT  3.830000  0.085000  4.160000 1.010000 ;
-        RECT  6.815000  0.085000  7.150000 0.700000 ;
-        RECT  8.200000  0.085000  8.530000 0.680000 ;
-        RECT  9.450000  0.085000  9.780000 0.835000 ;
-        RECT 13.260000  0.085000 13.590000 0.790000 ;
-        RECT 14.350000  0.085000 14.680000 0.790000 ;
-        RECT 15.405000  0.085000 15.655000 1.130000 ;
-        RECT 16.455000  0.085000 16.705000 1.130000 ;
-        RECT 17.395000  0.085000 17.645000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
-        RECT 16.475000 -0.085000 16.645000 0.085000 ;
-        RECT 16.955000 -0.085000 17.125000 0.085000 ;
-        RECT 17.435000 -0.085000 17.605000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 17.760000 0.245000 ;
     END
@@ -171,153 +114,205 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 17.760000 3.415000 ;
-        RECT  0.635000 2.310000  0.965000 3.245000 ;
-        RECT  2.495000 2.650000  2.845000 3.245000 ;
-        RECT  3.525000 2.650000  4.220000 3.245000 ;
-        RECT  6.410000 2.505000  6.985000 3.245000 ;
-        RECT  8.335000 2.390000  8.665000 3.245000 ;
-        RECT  9.425000 2.470000  9.675000 3.245000 ;
-        RECT 12.940000 2.520000 13.110000 3.245000 ;
-        RECT 14.485000 1.820000 14.655000 3.245000 ;
-        RECT 15.305000 1.820000 15.635000 3.245000 ;
-        RECT 16.415000 1.820000 16.665000 3.245000 ;
-        RECT 17.395000 1.820000 17.645000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
-        RECT 16.475000 3.245000 16.645000 3.415000 ;
-        RECT 16.955000 3.245000 17.125000 3.415000 ;
-        RECT 17.435000 3.245000 17.605000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 17.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.350000  0.445000 0.900000 ;
-      RECT  0.085000 0.900000  1.145000 1.230000 ;
-      RECT  0.085000 1.230000  0.255000 1.970000 ;
-      RECT  0.085000 1.970000  2.105000 2.140000 ;
-      RECT  0.085000 2.140000  0.465000 2.980000 ;
-      RECT  1.505000 2.310000  3.885000 2.480000 ;
-      RECT  1.505000 2.480000  1.955000 2.980000 ;
-      RECT  1.775000 1.810000  2.105000 1.970000 ;
-      RECT  1.965000 0.400000  2.350000 0.560000 ;
-      RECT  1.965000 0.560000  2.635000 0.730000 ;
-      RECT  2.465000 0.730000  2.635000 2.310000 ;
-      RECT  3.075000 1.790000  4.720000 1.960000 ;
-      RECT  3.075000 1.960000  3.545000 2.140000 ;
-      RECT  3.375000 0.340000  3.650000 1.010000 ;
-      RECT  3.375000 1.010000  3.545000 1.790000 ;
-      RECT  3.715000 2.130000  5.370000 2.300000 ;
-      RECT  3.715000 2.300000  3.885000 2.310000 ;
-      RECT  4.330000 0.255000  5.560000 0.425000 ;
-      RECT  4.330000 0.425000  4.660000 1.010000 ;
-      RECT  4.390000 1.350000  4.720000 1.790000 ;
-      RECT  4.390000 2.470000  4.720000 2.905000 ;
-      RECT  4.390000 2.905000  6.240000 3.075000 ;
-      RECT  4.890000 0.595000  5.220000 0.845000 ;
-      RECT  4.890000 0.845000  5.060000 2.130000 ;
-      RECT  4.890000 2.300000  5.370000 2.735000 ;
-      RECT  5.230000 1.290000  5.560000 1.960000 ;
-      RECT  5.390000 0.425000  5.560000 1.290000 ;
-      RECT  5.540000 2.295000  5.900000 2.735000 ;
-      RECT  5.730000 0.470000  6.645000 0.800000 ;
-      RECT  5.730000 0.800000  5.900000 2.295000 ;
-      RECT  6.070000 0.970000  6.305000 2.165000 ;
-      RECT  6.070000 2.165000  7.325000 2.335000 ;
-      RECT  6.070000 2.335000  6.240000 2.905000 ;
-      RECT  6.475000 0.800000  6.645000 1.395000 ;
-      RECT  6.475000 1.395000  7.665000 1.565000 ;
-      RECT  6.635000 1.735000  7.665000 1.995000 ;
-      RECT  6.815000 0.870000  7.710000 1.040000 ;
-      RECT  6.815000 1.040000  7.145000 1.225000 ;
-      RECT  7.155000 2.335000  7.325000 2.905000 ;
-      RECT  7.155000 2.905000  8.165000 3.075000 ;
-      RECT  7.355000 1.210000  8.050000 1.380000 ;
-      RECT  7.355000 1.380000  7.665000 1.395000 ;
-      RECT  7.380000 0.350000  7.710000 0.870000 ;
-      RECT  7.495000 1.995000  7.665000 2.295000 ;
-      RECT  7.495000 2.295000  7.825000 2.735000 ;
-      RECT  7.880000 0.900000  8.860000 1.175000 ;
-      RECT  7.880000 1.175000  8.050000 1.210000 ;
-      RECT  7.995000 2.050000  8.565000 2.220000 ;
-      RECT  7.995000 2.220000  8.165000 2.905000 ;
-      RECT  8.395000 1.345000 11.390000 1.515000 ;
-      RECT  8.395000 1.515000  8.565000 2.050000 ;
-      RECT  8.735000 1.685000  9.065000 1.700000 ;
-      RECT  8.735000 1.700000 12.050000 1.870000 ;
-      RECT  8.735000 1.870000  9.065000 1.960000 ;
-      RECT  8.925000 2.130000 10.125000 2.300000 ;
-      RECT  8.925000 2.300000  9.255000 2.980000 ;
-      RECT  9.030000 0.350000  9.280000 1.005000 ;
-      RECT  9.030000 1.005000 10.210000 1.175000 ;
-      RECT  9.875000 2.100000 10.125000 2.130000 ;
-      RECT  9.875000 2.300000 10.125000 2.905000 ;
-      RECT  9.875000 2.905000 11.105000 3.075000 ;
-      RECT  9.960000 0.255000 11.210000 0.425000 ;
-      RECT  9.960000 0.425000 10.210000 1.005000 ;
-      RECT 10.325000 2.040000 12.390000 2.140000 ;
-      RECT 10.325000 2.140000 13.975000 2.210000 ;
-      RECT 10.325000 2.210000 10.575000 2.700000 ;
-      RECT 10.380000 0.595000 10.710000 0.860000 ;
-      RECT 10.380000 0.860000 11.550000 1.030000 ;
-      RECT 10.380000 1.200000 11.390000 1.345000 ;
-      RECT 10.380000 1.515000 11.390000 1.530000 ;
-      RECT 10.775000 2.380000 11.105000 2.905000 ;
-      RECT 10.880000 0.425000 11.210000 0.690000 ;
-      RECT 11.365000 2.385000 11.620000 2.885000 ;
-      RECT 11.365000 2.885000 12.740000 3.055000 ;
-      RECT 11.380000 0.400000 12.390000 0.730000 ;
-      RECT 11.380000 0.730000 11.550000 0.860000 ;
-      RECT 11.720000 0.900000 12.050000 1.700000 ;
-      RECT 11.820000 2.210000 13.975000 2.310000 ;
-      RECT 11.820000 2.310000 12.220000 2.715000 ;
-      RECT 12.220000 0.730000 12.390000 2.040000 ;
-      RECT 12.410000 2.520000 12.740000 2.885000 ;
-      RECT 12.565000 0.960000 14.315000 1.130000 ;
-      RECT 12.565000 1.130000 12.895000 1.960000 ;
-      RECT 13.310000 2.310000 13.640000 2.980000 ;
-      RECT 13.645000 1.300000 13.975000 2.140000 ;
-      RECT 13.770000 0.350000 14.100000 0.960000 ;
-      RECT 13.870000 2.480000 14.315000 2.910000 ;
-      RECT 14.145000 1.130000 14.315000 2.480000 ;
-      RECT 15.865000 0.450000 16.220000 1.300000 ;
-      RECT 15.865000 1.300000 16.885000 1.630000 ;
-      RECT 15.865000 1.630000 16.195000 2.860000 ;
+      RECT  0.000000 -0.085000 17.760000 0.085000 ;
+      RECT  0.000000  3.245000 17.760000 3.415000 ;
+      RECT  0.085000  0.350000  0.445000 0.900000 ;
+      RECT  0.085000  0.900000  1.145000 1.230000 ;
+      RECT  0.085000  1.230000  0.255000 1.970000 ;
+      RECT  0.085000  1.970000  2.105000 2.140000 ;
+      RECT  0.085000  2.140000  0.465000 2.980000 ;
+      RECT  0.615000  0.085000  1.020000 0.680000 ;
+      RECT  0.635000  2.310000  0.965000 3.245000 ;
+      RECT  1.505000  2.310000  3.885000 2.480000 ;
+      RECT  1.505000  2.480000  1.955000 2.980000 ;
+      RECT  1.775000  1.810000  2.105000 1.970000 ;
+      RECT  1.965000  0.400000  2.350000 0.560000 ;
+      RECT  1.965000  0.560000  2.635000 0.730000 ;
+      RECT  2.465000  0.730000  2.635000 2.310000 ;
+      RECT  2.495000  2.650000  2.845000 3.245000 ;
+      RECT  2.840000  0.085000  3.170000 0.780000 ;
+      RECT  3.075000  1.790000  4.720000 1.960000 ;
+      RECT  3.075000  1.960000  3.545000 2.140000 ;
+      RECT  3.375000  0.340000  3.650000 1.010000 ;
+      RECT  3.375000  1.010000  3.545000 1.790000 ;
+      RECT  3.525000  2.650000  4.220000 3.245000 ;
+      RECT  3.715000  2.130000  5.370000 2.300000 ;
+      RECT  3.715000  2.300000  3.885000 2.310000 ;
+      RECT  3.830000  0.085000  4.160000 1.010000 ;
+      RECT  4.330000  0.255000  5.560000 0.425000 ;
+      RECT  4.330000  0.425000  4.660000 1.010000 ;
+      RECT  4.390000  1.350000  4.720000 1.790000 ;
+      RECT  4.390000  2.470000  4.720000 2.905000 ;
+      RECT  4.390000  2.905000  6.240000 3.075000 ;
+      RECT  4.890000  0.595000  5.220000 0.845000 ;
+      RECT  4.890000  0.845000  5.060000 2.130000 ;
+      RECT  4.890000  2.300000  5.370000 2.735000 ;
+      RECT  5.230000  1.290000  5.560000 1.960000 ;
+      RECT  5.390000  0.425000  5.560000 1.290000 ;
+      RECT  5.540000  2.295000  5.900000 2.735000 ;
+      RECT  5.730000  0.470000  6.645000 0.800000 ;
+      RECT  5.730000  0.800000  5.900000 2.295000 ;
+      RECT  6.070000  0.970000  6.305000 2.165000 ;
+      RECT  6.070000  2.165000  7.325000 2.335000 ;
+      RECT  6.070000  2.335000  6.240000 2.905000 ;
+      RECT  6.410000  2.505000  6.985000 3.245000 ;
+      RECT  6.475000  0.800000  6.645000 1.395000 ;
+      RECT  6.475000  1.395000  7.665000 1.565000 ;
+      RECT  6.635000  1.735000  7.665000 1.995000 ;
+      RECT  6.815000  0.085000  7.150000 0.700000 ;
+      RECT  6.815000  0.870000  7.710000 1.040000 ;
+      RECT  6.815000  1.040000  7.145000 1.225000 ;
+      RECT  7.155000  2.335000  7.325000 2.905000 ;
+      RECT  7.155000  2.905000  8.165000 3.075000 ;
+      RECT  7.355000  1.210000  8.050000 1.380000 ;
+      RECT  7.355000  1.380000  7.665000 1.395000 ;
+      RECT  7.380000  0.350000  7.710000 0.870000 ;
+      RECT  7.495000  1.995000  7.665000 2.295000 ;
+      RECT  7.495000  2.295000  7.825000 2.735000 ;
+      RECT  7.835000  1.550000  8.225000 1.880000 ;
+      RECT  7.880000  0.900000  8.860000 1.175000 ;
+      RECT  7.880000  1.175000  8.050000 1.210000 ;
+      RECT  7.995000  2.050000  8.565000 2.220000 ;
+      RECT  7.995000  2.220000  8.165000 2.905000 ;
+      RECT  8.200000  0.085000  8.530000 0.680000 ;
+      RECT  8.335000  2.390000  8.665000 3.245000 ;
+      RECT  8.395000  1.345000 11.390000 1.515000 ;
+      RECT  8.395000  1.515000  8.565000 2.050000 ;
+      RECT  8.735000  1.685000  9.065000 1.700000 ;
+      RECT  8.735000  1.700000 12.050000 1.870000 ;
+      RECT  8.735000  1.870000  9.065000 1.960000 ;
+      RECT  8.925000  2.130000 10.125000 2.300000 ;
+      RECT  8.925000  2.300000  9.255000 2.980000 ;
+      RECT  9.030000  0.350000  9.280000 1.005000 ;
+      RECT  9.030000  1.005000 10.210000 1.175000 ;
+      RECT  9.425000  2.470000  9.675000 3.245000 ;
+      RECT  9.450000  0.085000  9.780000 0.835000 ;
+      RECT  9.875000  2.100000 10.125000 2.130000 ;
+      RECT  9.875000  2.300000 10.125000 2.905000 ;
+      RECT  9.875000  2.905000 11.105000 3.075000 ;
+      RECT  9.960000  0.255000 11.210000 0.425000 ;
+      RECT  9.960000  0.425000 10.210000 1.005000 ;
+      RECT 10.325000  2.040000 12.390000 2.140000 ;
+      RECT 10.325000  2.140000 13.975000 2.210000 ;
+      RECT 10.325000  2.210000 10.575000 2.700000 ;
+      RECT 10.380000  0.595000 10.710000 0.860000 ;
+      RECT 10.380000  0.860000 11.550000 1.030000 ;
+      RECT 10.380000  1.200000 11.390000 1.345000 ;
+      RECT 10.380000  1.515000 11.390000 1.530000 ;
+      RECT 10.775000  2.380000 11.105000 2.905000 ;
+      RECT 10.880000  0.425000 11.210000 0.690000 ;
+      RECT 11.365000  2.385000 11.620000 2.885000 ;
+      RECT 11.365000  2.885000 12.740000 3.055000 ;
+      RECT 11.380000  0.400000 12.390000 0.730000 ;
+      RECT 11.380000  0.730000 11.550000 0.860000 ;
+      RECT 11.720000  0.900000 12.050000 1.700000 ;
+      RECT 11.820000  2.210000 13.975000 2.310000 ;
+      RECT 11.820000  2.310000 12.220000 2.715000 ;
+      RECT 12.220000  0.730000 12.390000 2.040000 ;
+      RECT 12.410000  2.520000 12.740000 2.885000 ;
+      RECT 12.565000  0.960000 14.315000 1.130000 ;
+      RECT 12.565000  1.130000 12.895000 1.960000 ;
+      RECT 12.940000  2.520000 13.110000 3.245000 ;
+      RECT 13.085000  1.300000 13.435000 1.970000 ;
+      RECT 13.260000  0.085000 13.590000 0.790000 ;
+      RECT 13.310000  2.310000 13.640000 2.980000 ;
+      RECT 13.645000  1.300000 13.975000 2.140000 ;
+      RECT 13.770000  0.350000 14.100000 0.960000 ;
+      RECT 13.870000  2.480000 14.315000 2.910000 ;
+      RECT 14.145000  1.130000 14.315000 2.480000 ;
+      RECT 14.350000  0.085000 14.680000 0.790000 ;
+      RECT 14.485000  1.820000 14.655000 3.245000 ;
+      RECT 15.305000  1.820000 15.635000 3.245000 ;
+      RECT 15.405000  0.085000 15.655000 1.130000 ;
+      RECT 15.865000  0.450000 16.220000 1.300000 ;
+      RECT 15.865000  1.300000 16.885000 1.630000 ;
+      RECT 15.865000  1.630000 16.195000 2.860000 ;
+      RECT 16.415000  1.820000 16.665000 3.245000 ;
+      RECT 16.455000  0.085000 16.705000 1.130000 ;
+      RECT 17.395000  0.085000 17.645000 1.130000 ;
+      RECT 17.395000  1.820000 17.645000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  1.580000  8.005000 1.750000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  1.580000 13.285000 1.750000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
+      RECT 16.955000 -0.085000 17.125000 0.085000 ;
+      RECT 16.955000  3.245000 17.125000 3.415000 ;
+      RECT 17.435000 -0.085000 17.605000 0.085000 ;
+      RECT 17.435000  3.245000 17.605000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfsbp_2
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef
index 2ca5fe7..94ca587 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.magic.lef
@@ -75,12 +75,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.145000 1.540000  7.555000 1.800000 ;
-        RECT 10.685000 1.380000 11.030000 2.050000 ;
-      LAYER mcon ;
-        RECT  7.355000 1.580000  7.525000 1.750000 ;
-        RECT 10.715000 1.580000 10.885000 1.750000 ;
       LAYER met1 ;
         RECT  7.295000 1.550000  7.585000 1.595000 ;
         RECT  7.295000 1.595000 10.945000 1.735000 ;
@@ -102,45 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.695000  0.085000  1.025000 0.770000 ;
-        RECT  2.375000  0.085000  2.705000 0.750000 ;
-        RECT  3.475000  0.085000  3.805000 1.010000 ;
-        RECT  6.115000  0.085000  6.445000 0.690000 ;
-        RECT  7.455000  0.085000  8.305000 0.940000 ;
-        RECT 10.825000  0.085000 11.155000 0.810000 ;
-        RECT 12.880000  0.085000 13.210000 1.050000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.920000 0.245000 ;
     END
@@ -149,140 +104,180 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.560000 2.660000  0.890000 3.245000 ;
-        RECT  2.565000 2.830000  2.895000 3.245000 ;
-        RECT  3.575000 2.580000  3.905000 3.245000 ;
-        RECT  6.225000 2.685000  6.475000 3.245000 ;
-        RECT  7.665000 2.310000  7.915000 3.245000 ;
-        RECT 10.630000 2.560000 10.800000 3.245000 ;
-        RECT 12.070000 2.560000 12.320000 3.245000 ;
-        RECT 13.030000 1.995000 13.360000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.350000  0.525000 0.940000 ;
-      RECT  0.085000 0.940000  1.220000 1.110000 ;
-      RECT  0.085000 1.110000  0.255000 2.300000 ;
-      RECT  0.085000 2.300000  0.360000 2.320000 ;
-      RECT  0.085000 2.320000  2.045000 2.490000 ;
-      RECT  0.085000 2.490000  0.360000 2.980000 ;
-      RECT  0.890000 1.110000  1.220000 1.270000 ;
-      RECT  1.430000 2.660000  2.385000 2.910000 ;
-      RECT  1.555000 0.350000  1.885000 0.920000 ;
-      RECT  1.555000 0.920000  2.385000 1.090000 ;
-      RECT  1.790000 1.830000  2.045000 2.320000 ;
-      RECT  2.215000 1.090000  2.385000 2.490000 ;
-      RECT  2.215000 2.490000  3.405000 2.660000 ;
-      RECT  2.975000 0.350000  3.305000 1.010000 ;
-      RECT  2.975000 1.010000  3.145000 1.820000 ;
-      RECT  2.975000 1.820000  4.215000 2.070000 ;
-      RECT  3.235000 2.240000  5.005000 2.410000 ;
-      RECT  3.235000 2.410000  3.405000 2.490000 ;
-      RECT  3.885000 1.350000  4.215000 1.820000 ;
-      RECT  3.975000 0.255000  5.205000 0.425000 ;
-      RECT  3.975000 0.425000  4.225000 1.130000 ;
-      RECT  4.105000 2.580000  4.275000 2.895000 ;
-      RECT  4.105000 2.895000  5.845000 3.065000 ;
-      RECT  4.445000 0.595000  4.865000 0.765000 ;
-      RECT  4.445000 0.765000  4.615000 2.240000 ;
-      RECT  4.445000 2.410000  5.005000 2.725000 ;
-      RECT  4.785000 0.935000  5.205000 1.105000 ;
-      RECT  4.785000 1.105000  5.005000 2.070000 ;
-      RECT  5.035000 0.425000  5.205000 0.935000 ;
-      RECT  5.175000 1.275000  6.070000 1.435000 ;
-      RECT  5.175000 1.435000  6.935000 1.445000 ;
-      RECT  5.175000 1.445000  5.345000 2.265000 ;
-      RECT  5.175000 2.265000  5.505000 2.725000 ;
-      RECT  5.375000 0.385000  5.625000 1.275000 ;
-      RECT  5.515000 1.615000  5.730000 1.775000 ;
-      RECT  5.515000 1.775000  5.845000 1.945000 ;
-      RECT  5.675000 1.945000  5.845000 2.345000 ;
-      RECT  5.675000 2.345000  6.815000 2.515000 ;
-      RECT  5.675000 2.515000  5.845000 2.895000 ;
-      RECT  5.900000 1.445000  6.935000 1.605000 ;
-      RECT  6.015000 1.795000  6.345000 2.005000 ;
-      RECT  6.015000 2.005000  7.155000 2.175000 ;
-      RECT  6.240000 0.860000  7.005000 1.030000 ;
-      RECT  6.240000 1.030000  6.480000 1.265000 ;
-      RECT  6.645000 2.515000  6.815000 2.895000 ;
-      RECT  6.645000 2.895000  7.495000 3.065000 ;
-      RECT  6.650000 1.200000  8.430000 1.370000 ;
-      RECT  6.650000 1.370000  6.935000 1.435000 ;
-      RECT  6.650000 1.605000  6.935000 1.835000 ;
-      RECT  6.675000 0.570000  7.005000 0.860000 ;
-      RECT  6.985000 2.175000  7.155000 2.725000 ;
-      RECT  7.325000 1.970000  7.945000 2.140000 ;
-      RECT  7.325000 2.140000  7.495000 2.895000 ;
-      RECT  7.760000 1.120000  8.430000 1.200000 ;
-      RECT  7.760000 1.370000  8.430000 1.410000 ;
-      RECT  7.775000 1.580000  8.840000 1.750000 ;
-      RECT  7.775000 1.750000  7.945000 1.970000 ;
-      RECT  8.115000 1.920000  8.365000 2.350000 ;
-      RECT  8.115000 2.350000  9.895000 2.520000 ;
-      RECT  8.115000 2.520000  8.365000 2.725000 ;
-      RECT  8.585000 2.690000  8.915000 2.905000 ;
-      RECT  8.585000 2.905000 10.430000 3.075000 ;
-      RECT  8.670000 1.120000  9.000000 1.450000 ;
-      RECT  8.670000 1.450000  8.840000 1.580000 ;
-      RECT  8.795000 0.350000  9.365000 0.940000 ;
-      RECT  9.090000 1.620000 10.235000 1.790000 ;
-      RECT  9.090000 1.790000  9.365000 2.180000 ;
-      RECT  9.195000 0.940000  9.365000 1.620000 ;
-      RECT  9.565000 1.960000  9.895000 2.350000 ;
-      RECT  9.565000 2.520000  9.895000 2.735000 ;
-      RECT  9.790000 0.980000 11.770000 1.040000 ;
-      RECT  9.790000 1.040000 11.940000 1.210000 ;
-      RECT  9.790000 1.210000 10.460000 1.310000 ;
-      RECT 10.065000 1.790000 10.235000 2.220000 ;
-      RECT 10.065000 2.220000 11.370000 2.390000 ;
-      RECT 10.100000 2.560000 10.430000 2.905000 ;
-      RECT 11.000000 2.390000 11.370000 2.980000 ;
-      RECT 11.200000 1.380000 11.600000 2.050000 ;
-      RECT 11.200000 2.050000 11.370000 2.220000 ;
-      RECT 11.395000 0.350000 11.770000 0.980000 ;
-      RECT 11.540000 2.220000 11.940000 2.390000 ;
-      RECT 11.540000 2.390000 11.870000 2.980000 ;
-      RECT 11.770000 1.210000 11.940000 2.220000 ;
-      RECT 11.955000 0.540000 12.700000 0.870000 ;
-      RECT 12.370000 0.870000 12.700000 1.005000 ;
-      RECT 12.530000 1.005000 12.700000 1.220000 ;
-      RECT 12.530000 1.220000 13.395000 1.550000 ;
-      RECT 12.530000 1.550000 12.700000 1.995000 ;
-      RECT 12.530000 1.995000 12.860000 2.875000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.085000  0.350000  0.525000 0.940000 ;
+      RECT  0.085000  0.940000  1.220000 1.110000 ;
+      RECT  0.085000  1.110000  0.255000 2.300000 ;
+      RECT  0.085000  2.300000  0.360000 2.320000 ;
+      RECT  0.085000  2.320000  2.045000 2.490000 ;
+      RECT  0.085000  2.490000  0.360000 2.980000 ;
+      RECT  0.560000  2.660000  0.890000 3.245000 ;
+      RECT  0.695000  0.085000  1.025000 0.770000 ;
+      RECT  0.890000  1.110000  1.220000 1.270000 ;
+      RECT  1.430000  2.660000  2.385000 2.910000 ;
+      RECT  1.555000  0.350000  1.885000 0.920000 ;
+      RECT  1.555000  0.920000  2.385000 1.090000 ;
+      RECT  1.790000  1.830000  2.045000 2.320000 ;
+      RECT  2.215000  1.090000  2.385000 2.490000 ;
+      RECT  2.215000  2.490000  3.405000 2.660000 ;
+      RECT  2.375000  0.085000  2.705000 0.750000 ;
+      RECT  2.565000  2.830000  2.895000 3.245000 ;
+      RECT  2.975000  0.350000  3.305000 1.010000 ;
+      RECT  2.975000  1.010000  3.145000 1.820000 ;
+      RECT  2.975000  1.820000  4.215000 2.070000 ;
+      RECT  3.235000  2.240000  5.005000 2.410000 ;
+      RECT  3.235000  2.410000  3.405000 2.490000 ;
+      RECT  3.475000  0.085000  3.805000 1.010000 ;
+      RECT  3.575000  2.580000  3.905000 3.245000 ;
+      RECT  3.885000  1.350000  4.215000 1.820000 ;
+      RECT  3.975000  0.255000  5.205000 0.425000 ;
+      RECT  3.975000  0.425000  4.225000 1.130000 ;
+      RECT  4.105000  2.580000  4.275000 2.895000 ;
+      RECT  4.105000  2.895000  5.845000 3.065000 ;
+      RECT  4.445000  0.595000  4.865000 0.765000 ;
+      RECT  4.445000  0.765000  4.615000 2.240000 ;
+      RECT  4.445000  2.410000  5.005000 2.725000 ;
+      RECT  4.785000  0.935000  5.205000 1.105000 ;
+      RECT  4.785000  1.105000  5.005000 2.070000 ;
+      RECT  5.035000  0.425000  5.205000 0.935000 ;
+      RECT  5.175000  1.275000  6.070000 1.435000 ;
+      RECT  5.175000  1.435000  6.935000 1.445000 ;
+      RECT  5.175000  1.445000  5.345000 2.265000 ;
+      RECT  5.175000  2.265000  5.505000 2.725000 ;
+      RECT  5.375000  0.385000  5.625000 1.275000 ;
+      RECT  5.515000  1.615000  5.730000 1.775000 ;
+      RECT  5.515000  1.775000  5.845000 1.945000 ;
+      RECT  5.675000  1.945000  5.845000 2.345000 ;
+      RECT  5.675000  2.345000  6.815000 2.515000 ;
+      RECT  5.675000  2.515000  5.845000 2.895000 ;
+      RECT  5.900000  1.445000  6.935000 1.605000 ;
+      RECT  6.015000  1.795000  6.345000 2.005000 ;
+      RECT  6.015000  2.005000  7.155000 2.175000 ;
+      RECT  6.115000  0.085000  6.445000 0.690000 ;
+      RECT  6.225000  2.685000  6.475000 3.245000 ;
+      RECT  6.240000  0.860000  7.005000 1.030000 ;
+      RECT  6.240000  1.030000  6.480000 1.265000 ;
+      RECT  6.645000  2.515000  6.815000 2.895000 ;
+      RECT  6.645000  2.895000  7.495000 3.065000 ;
+      RECT  6.650000  1.200000  8.430000 1.370000 ;
+      RECT  6.650000  1.370000  6.935000 1.435000 ;
+      RECT  6.650000  1.605000  6.935000 1.835000 ;
+      RECT  6.675000  0.570000  7.005000 0.860000 ;
+      RECT  6.985000  2.175000  7.155000 2.725000 ;
+      RECT  7.145000  1.540000  7.555000 1.800000 ;
+      RECT  7.325000  1.970000  7.945000 2.140000 ;
+      RECT  7.325000  2.140000  7.495000 2.895000 ;
+      RECT  7.455000  0.085000  8.305000 0.940000 ;
+      RECT  7.665000  2.310000  7.915000 3.245000 ;
+      RECT  7.760000  1.120000  8.430000 1.200000 ;
+      RECT  7.760000  1.370000  8.430000 1.410000 ;
+      RECT  7.775000  1.580000  8.840000 1.750000 ;
+      RECT  7.775000  1.750000  7.945000 1.970000 ;
+      RECT  8.115000  1.920000  8.365000 2.350000 ;
+      RECT  8.115000  2.350000  9.895000 2.520000 ;
+      RECT  8.115000  2.520000  8.365000 2.725000 ;
+      RECT  8.585000  2.690000  8.915000 2.905000 ;
+      RECT  8.585000  2.905000 10.430000 3.075000 ;
+      RECT  8.670000  1.120000  9.000000 1.450000 ;
+      RECT  8.670000  1.450000  8.840000 1.580000 ;
+      RECT  8.795000  0.350000  9.365000 0.940000 ;
+      RECT  9.090000  1.620000 10.235000 1.790000 ;
+      RECT  9.090000  1.790000  9.365000 2.180000 ;
+      RECT  9.195000  0.940000  9.365000 1.620000 ;
+      RECT  9.565000  1.960000  9.895000 2.350000 ;
+      RECT  9.565000  2.520000  9.895000 2.735000 ;
+      RECT  9.790000  0.980000 11.770000 1.040000 ;
+      RECT  9.790000  1.040000 11.940000 1.210000 ;
+      RECT  9.790000  1.210000 10.460000 1.310000 ;
+      RECT 10.065000  1.790000 10.235000 2.220000 ;
+      RECT 10.065000  2.220000 11.370000 2.390000 ;
+      RECT 10.100000  2.560000 10.430000 2.905000 ;
+      RECT 10.630000  2.560000 10.800000 3.245000 ;
+      RECT 10.685000  1.380000 11.030000 2.050000 ;
+      RECT 10.825000  0.085000 11.155000 0.810000 ;
+      RECT 11.000000  2.390000 11.370000 2.980000 ;
+      RECT 11.200000  1.380000 11.600000 2.050000 ;
+      RECT 11.200000  2.050000 11.370000 2.220000 ;
+      RECT 11.395000  0.350000 11.770000 0.980000 ;
+      RECT 11.540000  2.220000 11.940000 2.390000 ;
+      RECT 11.540000  2.390000 11.870000 2.980000 ;
+      RECT 11.770000  1.210000 11.940000 2.220000 ;
+      RECT 11.955000  0.540000 12.700000 0.870000 ;
+      RECT 12.070000  2.560000 12.320000 3.245000 ;
+      RECT 12.370000  0.870000 12.700000 1.005000 ;
+      RECT 12.530000  1.005000 12.700000 1.220000 ;
+      RECT 12.530000  1.220000 13.395000 1.550000 ;
+      RECT 12.530000  1.550000 12.700000 1.995000 ;
+      RECT 12.530000  1.995000 12.860000 2.875000 ;
+      RECT 12.880000  0.085000 13.210000 1.050000 ;
+      RECT 13.030000  1.995000 13.360000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  1.580000  7.525000 1.750000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  1.580000 10.885000 1.750000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef
index fe01342..50c3411 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.magic.lef
@@ -78,12 +78,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.205000 1.210000  7.555000 1.555000 ;
-        RECT 11.445000 1.180000 11.875000 1.800000 ;
-      LAYER mcon ;
-        RECT  7.355000 1.210000  7.525000 1.380000 ;
-        RECT 11.675000 1.210000 11.845000 1.380000 ;
       LAYER met1 ;
         RECT  7.295000 1.180000  7.585000 1.225000 ;
         RECT  7.295000 1.225000 11.905000 1.365000 ;
@@ -105,49 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.880000 0.085000 ;
-        RECT  0.615000  0.085000  1.070000 0.680000 ;
-        RECT  2.460000  0.085000  2.790000 0.740000 ;
-        RECT  3.520000  0.085000  3.850000 1.010000 ;
-        RECT  6.130000  0.085000  6.460000 0.360000 ;
-        RECT  7.510000  0.085000  8.010000 0.680000 ;
-        RECT  8.690000  0.085000  9.020000 0.715000 ;
-        RECT 11.640000  0.085000 12.330000 0.600000 ;
-        RECT 13.555000  0.085000 13.805000 1.150000 ;
-        RECT 14.515000  0.085000 14.765000 1.150000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 14.880000 0.245000 ;
     END
@@ -156,142 +107,186 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.880000 3.415000 ;
-        RECT  0.565000 2.660000  0.895000 3.245000 ;
-        RECT  2.560000 2.830000  2.890000 3.245000 ;
-        RECT  3.545000 2.580000  3.875000 3.245000 ;
-        RECT  6.095000 2.425000  6.345000 3.245000 ;
-        RECT  7.535000 2.065000  7.705000 3.245000 ;
-        RECT  8.435000 2.405000  8.685000 3.245000 ;
-        RECT 11.080000 2.645000 11.330000 3.245000 ;
-        RECT 12.510000 2.650000 12.840000 3.245000 ;
-        RECT 13.540000 1.820000 13.825000 3.245000 ;
-        RECT 14.445000 2.320000 14.775000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.350000  0.445000 0.900000 ;
-      RECT  0.115000 0.900000  1.225000 1.230000 ;
-      RECT  0.115000 1.230000  0.285000 2.310000 ;
-      RECT  0.115000 2.310000  0.365000 2.320000 ;
-      RECT  0.115000 2.320000  2.045000 2.490000 ;
-      RECT  0.115000 2.490000  0.365000 2.980000 ;
-      RECT  1.435000 2.660000  2.385000 2.910000 ;
-      RECT  1.560000 0.350000  1.890000 0.910000 ;
-      RECT  1.560000 0.910000  2.385000 1.080000 ;
-      RECT  1.795000 1.830000  2.045000 2.320000 ;
-      RECT  2.215000 1.080000  2.385000 2.490000 ;
-      RECT  2.215000 2.490000  3.120000 2.660000 ;
-      RECT  2.950000 2.240000  4.915000 2.410000 ;
-      RECT  2.950000 2.410000  3.120000 2.490000 ;
-      RECT  2.960000 0.350000  3.350000 1.010000 ;
-      RECT  2.960000 1.010000  3.130000 1.820000 ;
-      RECT  2.960000 1.820000  4.215000 2.070000 ;
-      RECT  3.885000 1.350000  4.215000 1.820000 ;
-      RECT  4.030000 0.255000  5.170000 0.425000 ;
-      RECT  4.030000 0.425000  4.200000 1.130000 ;
-      RECT  4.075000 2.580000  4.325000 2.895000 ;
-      RECT  4.075000 2.895000  5.730000 3.065000 ;
-      RECT  4.420000 0.595000  4.830000 0.845000 ;
-      RECT  4.420000 0.845000  4.590000 1.900000 ;
-      RECT  4.420000 1.900000  4.915000 2.070000 ;
-      RECT  4.585000 2.070000  4.915000 2.240000 ;
-      RECT  4.585000 2.410000  4.915000 2.725000 ;
-      RECT  4.760000 1.015000  5.170000 1.185000 ;
-      RECT  4.760000 1.185000  4.965000 1.730000 ;
-      RECT  5.000000 0.425000  5.170000 1.015000 ;
-      RECT  5.115000 2.265000  5.365000 2.725000 ;
-      RECT  5.135000 1.375000  6.880000 1.545000 ;
-      RECT  5.135000 1.545000  5.305000 2.265000 ;
-      RECT  5.340000 0.385000  5.590000 1.375000 ;
-      RECT  5.475000 1.715000  5.730000 2.045000 ;
-      RECT  5.560000 2.045000  5.730000 2.085000 ;
-      RECT  5.560000 2.085000  6.685000 2.255000 ;
-      RECT  5.560000 2.255000  5.730000 2.895000 ;
-      RECT  5.940000 1.715000  6.270000 1.745000 ;
-      RECT  5.940000 1.745000  7.025000 1.915000 ;
-      RECT  5.980000 0.530000  7.020000 0.700000 ;
-      RECT  5.980000 0.700000  6.310000 1.205000 ;
-      RECT  6.515000 2.255000  6.685000 2.905000 ;
-      RECT  6.515000 2.905000  7.365000 3.075000 ;
-      RECT  6.550000 0.870000  7.925000 1.040000 ;
-      RECT  6.550000 1.040000  6.880000 1.375000 ;
-      RECT  6.550000 1.545000  6.880000 1.570000 ;
-      RECT  6.690000 0.350000  7.020000 0.530000 ;
-      RECT  6.855000 1.915000  7.025000 2.735000 ;
-      RECT  7.195000 1.725000 10.170000 1.805000 ;
-      RECT  7.195000 1.805000  8.425000 1.895000 ;
-      RECT  7.195000 1.895000  7.365000 2.905000 ;
-      RECT  7.755000 1.040000  7.925000 1.225000 ;
-      RECT  7.755000 1.225000  8.085000 1.555000 ;
-      RECT  7.905000 2.065000  9.830000 2.145000 ;
-      RECT  7.905000 2.145000  8.765000 2.235000 ;
-      RECT  7.905000 2.235000  8.235000 2.755000 ;
-      RECT  8.180000 0.350000  8.510000 0.885000 ;
-      RECT  8.180000 0.885000 10.080000 1.055000 ;
-      RECT  8.255000 1.475000 10.170000 1.725000 ;
-      RECT  8.595000 1.975000  9.830000 2.065000 ;
-      RECT  9.000000 2.315000  9.330000 2.905000 ;
-      RECT  9.000000 2.905000 10.435000 3.075000 ;
-      RECT  9.250000 0.255000 10.580000 0.425000 ;
-      RECT  9.250000 0.425000  9.580000 0.715000 ;
-      RECT  9.500000 2.145000  9.830000 2.735000 ;
-      RECT  9.750000 0.595000 10.080000 0.885000 ;
-      RECT 10.000000 1.805000 10.720000 2.135000 ;
-      RECT 10.105000 2.305000 11.860000 2.475000 ;
-      RECT 10.105000 2.475000 10.435000 2.905000 ;
-      RECT 10.250000 0.425000 10.580000 0.810000 ;
-      RECT 10.410000 0.810000 10.580000 1.400000 ;
-      RECT 10.410000 1.400000 11.060000 1.570000 ;
-      RECT 10.890000 1.570000 11.060000 1.970000 ;
-      RECT 10.890000 1.970000 12.465000 2.140000 ;
-      RECT 10.890000 2.140000 11.860000 2.305000 ;
-      RECT 10.945000 0.790000 12.805000 0.960000 ;
-      RECT 10.945000 0.960000 11.275000 1.230000 ;
-      RECT 11.530000 2.475000 11.860000 2.980000 ;
-      RECT 12.060000 2.310000 12.805000 2.480000 ;
-      RECT 12.060000 2.480000 12.310000 2.980000 ;
-      RECT 12.135000 1.130000 12.465000 1.970000 ;
-      RECT 12.500000 0.350000 12.805000 0.790000 ;
-      RECT 12.635000 0.960000 12.805000 2.310000 ;
-      RECT 13.035000 0.470000 13.365000 1.320000 ;
-      RECT 13.035000 1.320000 14.005000 1.650000 ;
-      RECT 13.035000 1.650000 13.370000 2.980000 ;
+      RECT  0.000000 -0.085000 14.880000 0.085000 ;
+      RECT  0.000000  3.245000 14.880000 3.415000 ;
+      RECT  0.115000  0.350000  0.445000 0.900000 ;
+      RECT  0.115000  0.900000  1.225000 1.230000 ;
+      RECT  0.115000  1.230000  0.285000 2.310000 ;
+      RECT  0.115000  2.310000  0.365000 2.320000 ;
+      RECT  0.115000  2.320000  2.045000 2.490000 ;
+      RECT  0.115000  2.490000  0.365000 2.980000 ;
+      RECT  0.565000  2.660000  0.895000 3.245000 ;
+      RECT  0.615000  0.085000  1.070000 0.680000 ;
+      RECT  1.435000  2.660000  2.385000 2.910000 ;
+      RECT  1.560000  0.350000  1.890000 0.910000 ;
+      RECT  1.560000  0.910000  2.385000 1.080000 ;
+      RECT  1.795000  1.830000  2.045000 2.320000 ;
+      RECT  2.215000  1.080000  2.385000 2.490000 ;
+      RECT  2.215000  2.490000  3.120000 2.660000 ;
+      RECT  2.460000  0.085000  2.790000 0.740000 ;
+      RECT  2.560000  2.830000  2.890000 3.245000 ;
+      RECT  2.950000  2.240000  4.915000 2.410000 ;
+      RECT  2.950000  2.410000  3.120000 2.490000 ;
+      RECT  2.960000  0.350000  3.350000 1.010000 ;
+      RECT  2.960000  1.010000  3.130000 1.820000 ;
+      RECT  2.960000  1.820000  4.215000 2.070000 ;
+      RECT  3.520000  0.085000  3.850000 1.010000 ;
+      RECT  3.545000  2.580000  3.875000 3.245000 ;
+      RECT  3.885000  1.350000  4.215000 1.820000 ;
+      RECT  4.030000  0.255000  5.170000 0.425000 ;
+      RECT  4.030000  0.425000  4.200000 1.130000 ;
+      RECT  4.075000  2.580000  4.325000 2.895000 ;
+      RECT  4.075000  2.895000  5.730000 3.065000 ;
+      RECT  4.420000  0.595000  4.830000 0.845000 ;
+      RECT  4.420000  0.845000  4.590000 1.900000 ;
+      RECT  4.420000  1.900000  4.915000 2.070000 ;
+      RECT  4.585000  2.070000  4.915000 2.240000 ;
+      RECT  4.585000  2.410000  4.915000 2.725000 ;
+      RECT  4.760000  1.015000  5.170000 1.185000 ;
+      RECT  4.760000  1.185000  4.965000 1.730000 ;
+      RECT  5.000000  0.425000  5.170000 1.015000 ;
+      RECT  5.115000  2.265000  5.365000 2.725000 ;
+      RECT  5.135000  1.375000  6.880000 1.545000 ;
+      RECT  5.135000  1.545000  5.305000 2.265000 ;
+      RECT  5.340000  0.385000  5.590000 1.375000 ;
+      RECT  5.475000  1.715000  5.730000 2.045000 ;
+      RECT  5.560000  2.045000  5.730000 2.085000 ;
+      RECT  5.560000  2.085000  6.685000 2.255000 ;
+      RECT  5.560000  2.255000  5.730000 2.895000 ;
+      RECT  5.940000  1.715000  6.270000 1.745000 ;
+      RECT  5.940000  1.745000  7.025000 1.915000 ;
+      RECT  5.980000  0.530000  7.020000 0.700000 ;
+      RECT  5.980000  0.700000  6.310000 1.205000 ;
+      RECT  6.095000  2.425000  6.345000 3.245000 ;
+      RECT  6.130000  0.085000  6.460000 0.360000 ;
+      RECT  6.515000  2.255000  6.685000 2.905000 ;
+      RECT  6.515000  2.905000  7.365000 3.075000 ;
+      RECT  6.550000  0.870000  7.925000 1.040000 ;
+      RECT  6.550000  1.040000  6.880000 1.375000 ;
+      RECT  6.550000  1.545000  6.880000 1.570000 ;
+      RECT  6.690000  0.350000  7.020000 0.530000 ;
+      RECT  6.855000  1.915000  7.025000 2.735000 ;
+      RECT  7.195000  1.725000 10.170000 1.805000 ;
+      RECT  7.195000  1.805000  8.425000 1.895000 ;
+      RECT  7.195000  1.895000  7.365000 2.905000 ;
+      RECT  7.205000  1.210000  7.555000 1.555000 ;
+      RECT  7.510000  0.085000  8.010000 0.680000 ;
+      RECT  7.535000  2.065000  7.705000 3.245000 ;
+      RECT  7.755000  1.040000  7.925000 1.225000 ;
+      RECT  7.755000  1.225000  8.085000 1.555000 ;
+      RECT  7.905000  2.065000  9.830000 2.145000 ;
+      RECT  7.905000  2.145000  8.765000 2.235000 ;
+      RECT  7.905000  2.235000  8.235000 2.755000 ;
+      RECT  8.180000  0.350000  8.510000 0.885000 ;
+      RECT  8.180000  0.885000 10.080000 1.055000 ;
+      RECT  8.255000  1.475000 10.170000 1.725000 ;
+      RECT  8.435000  2.405000  8.685000 3.245000 ;
+      RECT  8.595000  1.975000  9.830000 2.065000 ;
+      RECT  8.690000  0.085000  9.020000 0.715000 ;
+      RECT  9.000000  2.315000  9.330000 2.905000 ;
+      RECT  9.000000  2.905000 10.435000 3.075000 ;
+      RECT  9.250000  0.255000 10.580000 0.425000 ;
+      RECT  9.250000  0.425000  9.580000 0.715000 ;
+      RECT  9.500000  2.145000  9.830000 2.735000 ;
+      RECT  9.750000  0.595000 10.080000 0.885000 ;
+      RECT 10.000000  1.805000 10.720000 2.135000 ;
+      RECT 10.105000  2.305000 11.860000 2.475000 ;
+      RECT 10.105000  2.475000 10.435000 2.905000 ;
+      RECT 10.250000  0.425000 10.580000 0.810000 ;
+      RECT 10.410000  0.810000 10.580000 1.400000 ;
+      RECT 10.410000  1.400000 11.060000 1.570000 ;
+      RECT 10.890000  1.570000 11.060000 1.970000 ;
+      RECT 10.890000  1.970000 12.465000 2.140000 ;
+      RECT 10.890000  2.140000 11.860000 2.305000 ;
+      RECT 10.945000  0.790000 12.805000 0.960000 ;
+      RECT 10.945000  0.960000 11.275000 1.230000 ;
+      RECT 11.080000  2.645000 11.330000 3.245000 ;
+      RECT 11.445000  1.180000 11.875000 1.800000 ;
+      RECT 11.530000  2.475000 11.860000 2.980000 ;
+      RECT 11.640000  0.085000 12.330000 0.600000 ;
+      RECT 12.060000  2.310000 12.805000 2.480000 ;
+      RECT 12.060000  2.480000 12.310000 2.980000 ;
+      RECT 12.135000  1.130000 12.465000 1.970000 ;
+      RECT 12.500000  0.350000 12.805000 0.790000 ;
+      RECT 12.510000  2.650000 12.840000 3.245000 ;
+      RECT 12.635000  0.960000 12.805000 2.310000 ;
+      RECT 13.035000  0.470000 13.365000 1.320000 ;
+      RECT 13.035000  1.320000 14.005000 1.650000 ;
+      RECT 13.035000  1.650000 13.370000 2.980000 ;
+      RECT 13.540000  1.820000 13.825000 3.245000 ;
+      RECT 13.555000  0.085000 13.805000 1.150000 ;
+      RECT 14.445000  2.320000 14.775000 3.245000 ;
+      RECT 14.515000  0.085000 14.765000 1.150000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  1.210000  7.525000 1.380000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  1.210000 11.845000 1.380000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfstp_2
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef
index f1035de..1816627 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.magic.lef
@@ -83,12 +83,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.195000 1.450000  7.555000 1.780000 ;
-        RECT 11.470000 1.470000 11.870000 2.140000 ;
-      LAYER mcon ;
-        RECT  7.355000 1.580000  7.525000 1.750000 ;
-        RECT 11.675000 1.580000 11.845000 1.750000 ;
       LAYER met1 ;
         RECT  7.295000 1.550000  7.585000 1.595000 ;
         RECT  7.295000 1.595000 11.905000 1.735000 ;
@@ -110,52 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.840000 0.085000 ;
-        RECT  0.615000  0.085000  0.945000 0.740000 ;
-        RECT  2.450000  0.085000  2.780000 0.740000 ;
-        RECT  3.560000  0.085000  3.890000 1.010000 ;
-        RECT  6.210000  0.085000  6.540000 0.600000 ;
-        RECT  7.590000  0.085000  8.260000 0.930000 ;
-        RECT  8.790000  0.085000  9.120000 0.940000 ;
-        RECT 11.650000  0.085000 12.150000 0.680000 ;
-        RECT 13.380000  0.085000 13.710000 1.130000 ;
-        RECT 14.395000  0.085000 14.725000 0.810000 ;
-        RECT 15.395000  0.085000 15.725000 1.100000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
     END
@@ -164,145 +112,192 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.840000 3.415000 ;
-        RECT  0.555000 2.660000  0.885000 3.245000 ;
-        RECT  2.560000 2.830000  2.890000 3.245000 ;
-        RECT  3.570000 2.580000  3.900000 3.245000 ;
-        RECT  6.275000 2.630000  6.525000 3.245000 ;
-        RECT  7.715000 2.290000  7.885000 3.245000 ;
-        RECT  8.535000 2.460000  8.865000 3.245000 ;
-        RECT 11.125000 2.650000 11.375000 3.245000 ;
-        RECT 12.720000 2.520000 12.970000 3.245000 ;
-        RECT 13.540000 2.100000 13.870000 3.245000 ;
-        RECT 14.495000 2.320000 14.825000 3.245000 ;
-        RECT 15.395000 1.950000 15.725000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 15.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.105000 0.350000  0.445000 0.910000 ;
-      RECT  0.105000 0.910000  1.140000 1.240000 ;
-      RECT  0.105000 1.240000  0.355000 2.320000 ;
-      RECT  0.105000 2.320000  2.045000 2.490000 ;
-      RECT  0.105000 2.490000  0.355000 2.980000 ;
-      RECT  1.425000 2.660000  2.385000 2.910000 ;
-      RECT  1.475000 0.410000  1.960000 0.740000 ;
-      RECT  1.785000 1.830000  2.045000 2.320000 ;
-      RECT  1.790000 0.740000  1.960000 0.910000 ;
-      RECT  1.790000 0.910000  2.385000 1.080000 ;
-      RECT  2.215000 1.080000  2.385000 2.490000 ;
-      RECT  2.215000 2.490000  3.175000 2.660000 ;
-      RECT  3.005000 0.350000  3.390000 1.010000 ;
-      RECT  3.005000 1.010000  3.175000 1.820000 ;
-      RECT  3.005000 1.820000  4.215000 2.070000 ;
-      RECT  3.005000 2.240000  5.030000 2.410000 ;
-      RECT  3.005000 2.410000  3.175000 2.490000 ;
-      RECT  3.885000 1.350000  4.215000 1.820000 ;
-      RECT  4.070000 0.255000  5.140000 0.425000 ;
-      RECT  4.070000 0.425000  4.240000 1.130000 ;
-      RECT  4.070000 2.580000  4.400000 2.895000 ;
-      RECT  4.070000 2.895000  5.830000 3.065000 ;
-      RECT  4.410000 0.595000  4.800000 0.925000 ;
-      RECT  4.410000 0.925000  4.580000 1.900000 ;
-      RECT  4.410000 1.900000  5.030000 2.240000 ;
-      RECT  4.700000 2.410000  5.030000 2.725000 ;
-      RECT  4.750000 1.095000  5.140000 1.265000 ;
-      RECT  4.750000 1.265000  5.030000 1.730000 ;
-      RECT  4.970000 0.425000  5.140000 1.095000 ;
-      RECT  5.200000 1.435000  6.955000 1.605000 ;
-      RECT  5.200000 1.605000  5.370000 2.275000 ;
-      RECT  5.200000 2.275000  5.480000 2.725000 ;
-      RECT  5.310000 0.385000  5.640000 1.435000 ;
-      RECT  5.540000 1.775000  5.830000 2.105000 ;
-      RECT  5.660000 2.105000  5.830000 2.290000 ;
-      RECT  5.660000 2.290000  6.865000 2.460000 ;
-      RECT  5.660000 2.460000  5.830000 2.895000 ;
-      RECT  6.005000 0.770000  7.100000 0.940000 ;
-      RECT  6.005000 0.940000  6.335000 1.265000 ;
-      RECT  6.040000 1.780000  6.370000 1.950000 ;
-      RECT  6.040000 1.950000  7.205000 2.120000 ;
-      RECT  6.625000 1.110000  8.265000 1.280000 ;
-      RECT  6.625000 1.280000  6.955000 1.435000 ;
-      RECT  6.625000 1.605000  6.955000 1.780000 ;
-      RECT  6.695000 2.460000  6.865000 2.895000 ;
-      RECT  6.695000 2.895000  7.545000 3.065000 ;
-      RECT  6.770000 0.350000  7.100000 0.770000 ;
-      RECT  7.035000 2.120000  7.205000 2.725000 ;
-      RECT  7.375000 1.950000  7.895000 2.120000 ;
-      RECT  7.375000 2.120000  7.545000 2.895000 ;
-      RECT  7.725000 1.780000 10.765000 1.930000 ;
-      RECT  7.725000 1.930000  9.375000 1.950000 ;
-      RECT  7.935000 1.280000  8.265000 1.450000 ;
-      RECT  8.085000 2.120000  9.875000 2.290000 ;
-      RECT  8.085000 2.290000  8.365000 2.715000 ;
-      RECT  8.440000 0.350000  8.610000 1.110000 ;
-      RECT  8.440000 1.110000 10.030000 1.280000 ;
-      RECT  9.045000 1.450000  9.375000 1.760000 ;
-      RECT  9.045000 1.760000 10.765000 1.780000 ;
-      RECT  9.095000 2.600000  9.375000 2.860000 ;
-      RECT  9.095000 2.860000 10.375000 3.075000 ;
-      RECT  9.350000 0.255000 10.540000 0.425000 ;
-      RECT  9.350000 0.425000  9.680000 0.940000 ;
-      RECT  9.545000 2.100000  9.875000 2.120000 ;
-      RECT  9.545000 2.290000  9.875000 2.690000 ;
-      RECT  9.860000 0.595000 10.030000 1.110000 ;
-      RECT 10.045000 2.310000 12.210000 2.480000 ;
-      RECT 10.045000 2.480000 10.375000 2.860000 ;
-      RECT 10.210000 0.425000 10.540000 1.400000 ;
-      RECT 10.210000 1.400000 11.105000 1.570000 ;
-      RECT 10.435000 1.930000 10.765000 2.135000 ;
-      RECT 10.545000 2.650000 10.955000 2.980000 ;
-      RECT 10.935000 1.570000 11.105000 2.310000 ;
-      RECT 10.955000 0.900000 12.710000 1.070000 ;
-      RECT 10.955000 1.070000 11.285000 1.230000 ;
-      RECT 11.575000 2.480000 11.905000 2.980000 ;
-      RECT 12.040000 1.340000 12.370000 2.010000 ;
-      RECT 12.040000 2.010000 12.210000 2.310000 ;
-      RECT 12.135000 2.650000 12.550000 2.980000 ;
-      RECT 12.320000 0.350000 12.710000 0.900000 ;
-      RECT 12.380000 2.180000 12.710000 2.350000 ;
-      RECT 12.380000 2.350000 12.550000 2.650000 ;
-      RECT 12.540000 1.070000 12.710000 2.180000 ;
-      RECT 12.880000 0.350000 13.210000 1.320000 ;
-      RECT 12.880000 1.320000 14.695000 1.490000 ;
-      RECT 13.170000 1.490000 14.695000 1.650000 ;
-      RECT 13.170000 1.650000 13.340000 2.980000 ;
+      RECT  0.000000 -0.085000 15.840000 0.085000 ;
+      RECT  0.000000  3.245000 15.840000 3.415000 ;
+      RECT  0.105000  0.350000  0.445000 0.910000 ;
+      RECT  0.105000  0.910000  1.140000 1.240000 ;
+      RECT  0.105000  1.240000  0.355000 2.320000 ;
+      RECT  0.105000  2.320000  2.045000 2.490000 ;
+      RECT  0.105000  2.490000  0.355000 2.980000 ;
+      RECT  0.555000  2.660000  0.885000 3.245000 ;
+      RECT  0.615000  0.085000  0.945000 0.740000 ;
+      RECT  1.425000  2.660000  2.385000 2.910000 ;
+      RECT  1.475000  0.410000  1.960000 0.740000 ;
+      RECT  1.785000  1.830000  2.045000 2.320000 ;
+      RECT  1.790000  0.740000  1.960000 0.910000 ;
+      RECT  1.790000  0.910000  2.385000 1.080000 ;
+      RECT  2.215000  1.080000  2.385000 2.490000 ;
+      RECT  2.215000  2.490000  3.175000 2.660000 ;
+      RECT  2.450000  0.085000  2.780000 0.740000 ;
+      RECT  2.560000  2.830000  2.890000 3.245000 ;
+      RECT  3.005000  0.350000  3.390000 1.010000 ;
+      RECT  3.005000  1.010000  3.175000 1.820000 ;
+      RECT  3.005000  1.820000  4.215000 2.070000 ;
+      RECT  3.005000  2.240000  5.030000 2.410000 ;
+      RECT  3.005000  2.410000  3.175000 2.490000 ;
+      RECT  3.560000  0.085000  3.890000 1.010000 ;
+      RECT  3.570000  2.580000  3.900000 3.245000 ;
+      RECT  3.885000  1.350000  4.215000 1.820000 ;
+      RECT  4.070000  0.255000  5.140000 0.425000 ;
+      RECT  4.070000  0.425000  4.240000 1.130000 ;
+      RECT  4.070000  2.580000  4.400000 2.895000 ;
+      RECT  4.070000  2.895000  5.830000 3.065000 ;
+      RECT  4.410000  0.595000  4.800000 0.925000 ;
+      RECT  4.410000  0.925000  4.580000 1.900000 ;
+      RECT  4.410000  1.900000  5.030000 2.240000 ;
+      RECT  4.700000  2.410000  5.030000 2.725000 ;
+      RECT  4.750000  1.095000  5.140000 1.265000 ;
+      RECT  4.750000  1.265000  5.030000 1.730000 ;
+      RECT  4.970000  0.425000  5.140000 1.095000 ;
+      RECT  5.200000  1.435000  6.955000 1.605000 ;
+      RECT  5.200000  1.605000  5.370000 2.275000 ;
+      RECT  5.200000  2.275000  5.480000 2.725000 ;
+      RECT  5.310000  0.385000  5.640000 1.435000 ;
+      RECT  5.540000  1.775000  5.830000 2.105000 ;
+      RECT  5.660000  2.105000  5.830000 2.290000 ;
+      RECT  5.660000  2.290000  6.865000 2.460000 ;
+      RECT  5.660000  2.460000  5.830000 2.895000 ;
+      RECT  6.005000  0.770000  7.100000 0.940000 ;
+      RECT  6.005000  0.940000  6.335000 1.265000 ;
+      RECT  6.040000  1.780000  6.370000 1.950000 ;
+      RECT  6.040000  1.950000  7.205000 2.120000 ;
+      RECT  6.210000  0.085000  6.540000 0.600000 ;
+      RECT  6.275000  2.630000  6.525000 3.245000 ;
+      RECT  6.625000  1.110000  8.265000 1.280000 ;
+      RECT  6.625000  1.280000  6.955000 1.435000 ;
+      RECT  6.625000  1.605000  6.955000 1.780000 ;
+      RECT  6.695000  2.460000  6.865000 2.895000 ;
+      RECT  6.695000  2.895000  7.545000 3.065000 ;
+      RECT  6.770000  0.350000  7.100000 0.770000 ;
+      RECT  7.035000  2.120000  7.205000 2.725000 ;
+      RECT  7.195000  1.450000  7.555000 1.780000 ;
+      RECT  7.375000  1.950000  7.895000 2.120000 ;
+      RECT  7.375000  2.120000  7.545000 2.895000 ;
+      RECT  7.590000  0.085000  8.260000 0.930000 ;
+      RECT  7.715000  2.290000  7.885000 3.245000 ;
+      RECT  7.725000  1.780000 10.765000 1.930000 ;
+      RECT  7.725000  1.930000  9.375000 1.950000 ;
+      RECT  7.935000  1.280000  8.265000 1.450000 ;
+      RECT  8.085000  2.120000  9.875000 2.290000 ;
+      RECT  8.085000  2.290000  8.365000 2.715000 ;
+      RECT  8.440000  0.350000  8.610000 1.110000 ;
+      RECT  8.440000  1.110000 10.030000 1.280000 ;
+      RECT  8.535000  2.460000  8.865000 3.245000 ;
+      RECT  8.790000  0.085000  9.120000 0.940000 ;
+      RECT  9.045000  1.450000  9.375000 1.760000 ;
+      RECT  9.045000  1.760000 10.765000 1.780000 ;
+      RECT  9.095000  2.600000  9.375000 2.860000 ;
+      RECT  9.095000  2.860000 10.375000 3.075000 ;
+      RECT  9.350000  0.255000 10.540000 0.425000 ;
+      RECT  9.350000  0.425000  9.680000 0.940000 ;
+      RECT  9.545000  2.100000  9.875000 2.120000 ;
+      RECT  9.545000  2.290000  9.875000 2.690000 ;
+      RECT  9.860000  0.595000 10.030000 1.110000 ;
+      RECT 10.045000  2.310000 12.210000 2.480000 ;
+      RECT 10.045000  2.480000 10.375000 2.860000 ;
+      RECT 10.210000  0.425000 10.540000 1.400000 ;
+      RECT 10.210000  1.400000 11.105000 1.570000 ;
+      RECT 10.435000  1.930000 10.765000 2.135000 ;
+      RECT 10.545000  2.650000 10.955000 2.980000 ;
+      RECT 10.935000  1.570000 11.105000 2.310000 ;
+      RECT 10.955000  0.900000 12.710000 1.070000 ;
+      RECT 10.955000  1.070000 11.285000 1.230000 ;
+      RECT 11.125000  2.650000 11.375000 3.245000 ;
+      RECT 11.470000  1.470000 11.870000 2.140000 ;
+      RECT 11.575000  2.480000 11.905000 2.980000 ;
+      RECT 11.650000  0.085000 12.150000 0.680000 ;
+      RECT 12.040000  1.340000 12.370000 2.010000 ;
+      RECT 12.040000  2.010000 12.210000 2.310000 ;
+      RECT 12.135000  2.650000 12.550000 2.980000 ;
+      RECT 12.320000  0.350000 12.710000 0.900000 ;
+      RECT 12.380000  2.180000 12.710000 2.350000 ;
+      RECT 12.380000  2.350000 12.550000 2.650000 ;
+      RECT 12.540000  1.070000 12.710000 2.180000 ;
+      RECT 12.720000  2.520000 12.970000 3.245000 ;
+      RECT 12.880000  0.350000 13.210000 1.320000 ;
+      RECT 12.880000  1.320000 14.695000 1.490000 ;
+      RECT 13.170000  1.490000 14.695000 1.650000 ;
+      RECT 13.170000  1.650000 13.340000 2.980000 ;
+      RECT 13.380000  0.085000 13.710000 1.130000 ;
+      RECT 13.540000  2.100000 13.870000 3.245000 ;
+      RECT 14.395000  0.085000 14.725000 0.810000 ;
+      RECT 14.495000  2.320000 14.825000 3.245000 ;
+      RECT 15.395000  0.085000 15.725000 1.100000 ;
+      RECT 15.395000  1.950000 15.725000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  1.580000  7.525000 1.750000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  1.580000 11.845000 1.750000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfstp_4
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef
index 6c66102..8f43bda 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.magic.lef
@@ -93,42 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.480000 0.085000 ;
-        RECT  0.635000  0.085000  0.965000 0.730000 ;
-        RECT  2.615000  0.085000  2.865000 0.810000 ;
-        RECT  3.595000  0.085000  3.935000 0.670000 ;
-        RECT  6.430000  0.085000  6.680000 0.520000 ;
-        RECT  8.740000  0.085000  9.410000 0.810000 ;
-        RECT 10.150000  0.085000 10.320000 1.130000 ;
-        RECT 11.490000  0.085000 11.865000 1.020000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
@@ -137,122 +101,155 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.480000 3.415000 ;
-        RECT  0.700000 2.300000  1.030000 3.245000 ;
-        RECT  2.560000 2.730000  3.150000 3.245000 ;
-        RECT  3.830000 2.730000  4.335000 3.245000 ;
-        RECT  6.450000 2.860000  6.780000 3.245000 ;
-        RECT  8.860000 2.650000  9.430000 3.245000 ;
-        RECT 10.120000 1.820000 10.450000 3.245000 ;
-        RECT 11.540000 1.995000 11.870000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.480000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.350000  0.465000 0.785000 ;
-      RECT  0.085000 0.785000  0.255000 1.525000 ;
-      RECT  0.085000 1.525000  0.915000 1.855000 ;
-      RECT  0.085000 1.855000  0.530000 2.980000 ;
-      RECT  0.745000 1.855000  0.915000 1.955000 ;
-      RECT  0.745000 1.955000  2.170000 2.125000 ;
-      RECT  1.455000 0.390000  2.390000 0.640000 ;
-      RECT  1.570000 2.300000  1.900000 2.390000 ;
-      RECT  1.570000 2.390000  4.675000 2.460000 ;
-      RECT  1.570000 2.460000  5.235000 2.560000 ;
-      RECT  1.570000 2.560000  1.900000 2.980000 ;
-      RECT  1.840000 1.795000  2.170000 1.955000 ;
-      RECT  2.220000 0.640000  2.390000 1.180000 ;
-      RECT  2.220000 1.180000  3.065000 1.350000 ;
-      RECT  2.895000 1.350000  3.065000 2.390000 ;
-      RECT  3.035000 0.350000  3.365000 0.840000 ;
-      RECT  3.035000 0.840000  4.025000 1.010000 ;
-      RECT  3.270000 1.820000  4.025000 1.990000 ;
-      RECT  3.270000 1.990000  3.600000 2.220000 ;
-      RECT  3.855000 1.010000  4.025000 1.820000 ;
-      RECT  4.195000 0.255000  6.035000 0.425000 ;
-      RECT  4.195000 0.425000  4.445000 1.130000 ;
-      RECT  4.195000 1.480000  4.900000 1.650000 ;
-      RECT  4.195000 1.650000  4.365000 2.390000 ;
-      RECT  4.505000 2.560000  5.235000 2.630000 ;
-      RECT  4.535000 1.820000  5.240000 2.220000 ;
-      RECT  4.650000 0.595000  4.900000 1.480000 ;
-      RECT  4.910000 2.220000  5.240000 2.280000 ;
-      RECT  4.985000 2.630000  5.235000 2.920000 ;
-      RECT  5.070000 0.425000  5.240000 1.820000 ;
-      RECT  5.410000 0.595000  5.580000 1.530000 ;
-      RECT  5.410000 1.530000  7.020000 1.700000 ;
-      RECT  5.410000 1.700000  5.580000 2.460000 ;
-      RECT  5.410000 2.460000  5.765000 2.920000 ;
-      RECT  5.750000 0.425000  6.035000 0.690000 ;
-      RECT  5.750000 0.690000  7.020000 0.860000 ;
-      RECT  5.750000 0.860000  6.035000 1.360000 ;
-      RECT  5.750000 1.870000  6.105000 2.200000 ;
-      RECT  5.935000 2.200000  6.105000 2.520000 ;
-      RECT  5.935000 2.520000  7.735000 2.690000 ;
-      RECT  6.245000 1.030000  7.360000 1.360000 ;
-      RECT  6.690000 1.700000  7.020000 1.930000 ;
-      RECT  6.850000 0.255000  7.860000 0.425000 ;
-      RECT  6.850000 0.425000  7.020000 0.690000 ;
-      RECT  6.985000 2.100000  7.395000 2.350000 ;
-      RECT  7.190000 0.595000  7.520000 0.920000 ;
-      RECT  7.190000 0.920000  7.360000 1.030000 ;
-      RECT  7.190000 1.360000  7.360000 2.100000 ;
-      RECT  7.530000 1.090000  7.860000 1.250000 ;
-      RECT  7.530000 1.250000  8.220000 1.355000 ;
-      RECT  7.530000 1.355000  8.680000 1.420000 ;
-      RECT  7.565000 1.630000  7.880000 1.960000 ;
-      RECT  7.565000 1.960000  7.735000 2.520000 ;
-      RECT  7.690000 0.425000  7.860000 1.090000 ;
-      RECT  7.905000 2.130000  8.235000 2.980000 ;
-      RECT  8.030000 0.350000  8.560000 0.810000 ;
-      RECT  8.050000 1.420000  8.680000 1.610000 ;
-      RECT  8.065000 1.780000  9.020000 1.950000 ;
-      RECT  8.065000 1.950000  8.235000 2.130000 ;
-      RECT  8.390000 0.810000  8.560000 0.980000 ;
-      RECT  8.390000 0.980000  9.020000 1.100000 ;
-      RECT  8.390000 1.100000  9.610000 1.150000 ;
-      RECT  8.710000 2.120000  9.950000 2.350000 ;
-      RECT  8.850000 1.150000  9.610000 1.270000 ;
-      RECT  8.850000 1.270000  9.020000 1.780000 ;
-      RECT  9.280000 1.270000  9.610000 1.770000 ;
-      RECT  9.590000 0.350000  9.950000 0.930000 ;
-      RECT  9.600000 1.940000  9.950000 2.120000 ;
-      RECT  9.600000 2.350000  9.950000 2.980000 ;
-      RECT  9.780000 0.930000  9.950000 1.320000 ;
-      RECT  9.780000 1.320000 10.575000 1.650000 ;
-      RECT  9.780000 1.650000  9.950000 1.940000 ;
-      RECT 11.090000 0.540000 11.310000 1.220000 ;
-      RECT 11.090000 1.220000 11.985000 1.550000 ;
-      RECT 11.090000 1.550000 11.340000 2.875000 ;
+      RECT  0.000000 -0.085000 12.480000 0.085000 ;
+      RECT  0.000000  3.245000 12.480000 3.415000 ;
+      RECT  0.085000  0.350000  0.465000 0.785000 ;
+      RECT  0.085000  0.785000  0.255000 1.525000 ;
+      RECT  0.085000  1.525000  0.915000 1.855000 ;
+      RECT  0.085000  1.855000  0.530000 2.980000 ;
+      RECT  0.635000  0.085000  0.965000 0.730000 ;
+      RECT  0.700000  2.300000  1.030000 3.245000 ;
+      RECT  0.745000  1.855000  0.915000 1.955000 ;
+      RECT  0.745000  1.955000  2.170000 2.125000 ;
+      RECT  1.455000  0.390000  2.390000 0.640000 ;
+      RECT  1.570000  2.300000  1.900000 2.390000 ;
+      RECT  1.570000  2.390000  4.675000 2.460000 ;
+      RECT  1.570000  2.460000  5.235000 2.560000 ;
+      RECT  1.570000  2.560000  1.900000 2.980000 ;
+      RECT  1.840000  1.795000  2.170000 1.955000 ;
+      RECT  2.220000  0.640000  2.390000 1.180000 ;
+      RECT  2.220000  1.180000  3.065000 1.350000 ;
+      RECT  2.560000  2.730000  3.150000 3.245000 ;
+      RECT  2.615000  0.085000  2.865000 0.810000 ;
+      RECT  2.895000  1.350000  3.065000 2.390000 ;
+      RECT  3.035000  0.350000  3.365000 0.840000 ;
+      RECT  3.035000  0.840000  4.025000 1.010000 ;
+      RECT  3.270000  1.820000  4.025000 1.990000 ;
+      RECT  3.270000  1.990000  3.600000 2.220000 ;
+      RECT  3.595000  0.085000  3.935000 0.670000 ;
+      RECT  3.830000  2.730000  4.335000 3.245000 ;
+      RECT  3.855000  1.010000  4.025000 1.820000 ;
+      RECT  4.195000  0.255000  6.035000 0.425000 ;
+      RECT  4.195000  0.425000  4.445000 1.130000 ;
+      RECT  4.195000  1.480000  4.900000 1.650000 ;
+      RECT  4.195000  1.650000  4.365000 2.390000 ;
+      RECT  4.505000  2.560000  5.235000 2.630000 ;
+      RECT  4.535000  1.820000  5.240000 2.220000 ;
+      RECT  4.650000  0.595000  4.900000 1.480000 ;
+      RECT  4.910000  2.220000  5.240000 2.280000 ;
+      RECT  4.985000  2.630000  5.235000 2.920000 ;
+      RECT  5.070000  0.425000  5.240000 1.820000 ;
+      RECT  5.410000  0.595000  5.580000 1.530000 ;
+      RECT  5.410000  1.530000  7.020000 1.700000 ;
+      RECT  5.410000  1.700000  5.580000 2.460000 ;
+      RECT  5.410000  2.460000  5.765000 2.920000 ;
+      RECT  5.750000  0.425000  6.035000 0.690000 ;
+      RECT  5.750000  0.690000  7.020000 0.860000 ;
+      RECT  5.750000  0.860000  6.035000 1.360000 ;
+      RECT  5.750000  1.870000  6.105000 2.200000 ;
+      RECT  5.935000  2.200000  6.105000 2.520000 ;
+      RECT  5.935000  2.520000  7.735000 2.690000 ;
+      RECT  6.245000  1.030000  7.360000 1.360000 ;
+      RECT  6.430000  0.085000  6.680000 0.520000 ;
+      RECT  6.450000  2.860000  6.780000 3.245000 ;
+      RECT  6.690000  1.700000  7.020000 1.930000 ;
+      RECT  6.850000  0.255000  7.860000 0.425000 ;
+      RECT  6.850000  0.425000  7.020000 0.690000 ;
+      RECT  6.985000  2.100000  7.395000 2.350000 ;
+      RECT  7.190000  0.595000  7.520000 0.920000 ;
+      RECT  7.190000  0.920000  7.360000 1.030000 ;
+      RECT  7.190000  1.360000  7.360000 2.100000 ;
+      RECT  7.530000  1.090000  7.860000 1.250000 ;
+      RECT  7.530000  1.250000  8.220000 1.355000 ;
+      RECT  7.530000  1.355000  8.680000 1.420000 ;
+      RECT  7.565000  1.630000  7.880000 1.960000 ;
+      RECT  7.565000  1.960000  7.735000 2.520000 ;
+      RECT  7.690000  0.425000  7.860000 1.090000 ;
+      RECT  7.905000  2.130000  8.235000 2.980000 ;
+      RECT  8.030000  0.350000  8.560000 0.810000 ;
+      RECT  8.050000  1.420000  8.680000 1.610000 ;
+      RECT  8.065000  1.780000  9.020000 1.950000 ;
+      RECT  8.065000  1.950000  8.235000 2.130000 ;
+      RECT  8.390000  0.810000  8.560000 0.980000 ;
+      RECT  8.390000  0.980000  9.020000 1.100000 ;
+      RECT  8.390000  1.100000  9.610000 1.150000 ;
+      RECT  8.710000  2.120000  9.950000 2.350000 ;
+      RECT  8.740000  0.085000  9.410000 0.810000 ;
+      RECT  8.850000  1.150000  9.610000 1.270000 ;
+      RECT  8.850000  1.270000  9.020000 1.780000 ;
+      RECT  8.860000  2.650000  9.430000 3.245000 ;
+      RECT  9.280000  1.270000  9.610000 1.770000 ;
+      RECT  9.590000  0.350000  9.950000 0.930000 ;
+      RECT  9.600000  1.940000  9.950000 2.120000 ;
+      RECT  9.600000  2.350000  9.950000 2.980000 ;
+      RECT  9.780000  0.930000  9.950000 1.320000 ;
+      RECT  9.780000  1.320000 10.575000 1.650000 ;
+      RECT  9.780000  1.650000  9.950000 1.940000 ;
+      RECT 10.120000  1.820000 10.450000 3.245000 ;
+      RECT 10.150000  0.085000 10.320000 1.130000 ;
+      RECT 11.090000  0.540000 11.310000 1.220000 ;
+      RECT 11.090000  1.220000 11.985000 1.550000 ;
+      RECT 11.090000  1.550000 11.340000 2.875000 ;
+      RECT 11.490000  0.085000 11.865000 1.020000 ;
+      RECT 11.540000  1.995000 11.870000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef
index 71def98..2279536 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.magic.lef
@@ -95,47 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  0.660000  0.085000  0.990000 0.730000 ;
-        RECT  2.695000  0.085000  2.945000 1.130000 ;
-        RECT  3.685000  0.085000  4.015000 0.840000 ;
-        RECT  6.340000  0.085000  6.670000 0.600000 ;
-        RECT  8.680000  0.085000  9.390000 0.715000 ;
-        RECT 10.120000  0.085000 10.450000 1.130000 ;
-        RECT 11.130000  0.085000 11.380000 1.130000 ;
-        RECT 12.120000  0.085000 12.450000 0.730000 ;
-        RECT 12.120000  0.730000 12.380000 1.150000 ;
-        RECT 12.995000  0.085000 13.325000 0.730000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 13.440000 0.245000 ;
     END
@@ -144,127 +103,165 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  0.725000 2.310000  1.055000 3.245000 ;
-        RECT  2.670000 2.710000  3.090000 3.245000 ;
-        RECT  4.075000 2.710000  4.405000 3.245000 ;
-        RECT  6.575000 2.955000  6.905000 3.245000 ;
-        RECT  8.860000 2.650000  9.430000 3.245000 ;
-        RECT 10.140000 1.820000 10.390000 3.245000 ;
-        RECT 11.040000 2.140000 11.370000 3.245000 ;
-        RECT 11.120000 1.820000 11.370000 2.140000 ;
-        RECT 12.105000 1.820000 12.355000 3.245000 ;
-        RECT 13.005000 2.320000 13.335000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.350000  0.490000 0.730000 ;
-      RECT  0.085000 0.730000  0.255000 1.470000 ;
-      RECT  0.085000 1.470000  0.915000 1.800000 ;
-      RECT  0.085000 1.800000  0.520000 2.925000 ;
-      RECT  0.745000 1.800000  0.915000 1.970000 ;
-      RECT  0.745000 1.970000  2.195000 2.140000 ;
-      RECT  1.480000 0.390000  2.415000 0.640000 ;
-      RECT  1.650000 2.310000  1.980000 2.370000 ;
-      RECT  1.650000 2.370000  4.745000 2.495000 ;
-      RECT  1.650000 2.495000  5.335000 2.540000 ;
-      RECT  1.650000 2.540000  1.980000 2.925000 ;
-      RECT  1.865000 1.725000  2.195000 1.970000 ;
-      RECT  2.245000 0.640000  2.415000 1.350000 ;
-      RECT  2.245000 1.350000  3.095000 1.520000 ;
-      RECT  2.925000 1.520000  3.095000 2.370000 ;
-      RECT  3.125000 0.350000  3.455000 1.010000 ;
-      RECT  3.125000 1.010000  4.025000 1.180000 ;
-      RECT  3.295000 1.950000  4.095000 2.200000 ;
-      RECT  3.855000 1.180000  4.025000 1.350000 ;
-      RECT  3.855000 1.350000  4.095000 1.950000 ;
-      RECT  4.195000 0.255000  6.080000 0.425000 ;
-      RECT  4.195000 0.425000  4.445000 1.130000 ;
-      RECT  4.265000 1.480000  4.900000 1.650000 ;
-      RECT  4.265000 1.650000  4.435000 2.370000 ;
-      RECT  4.575000 2.540000  5.335000 2.665000 ;
-      RECT  4.605000 1.820000  4.855000 2.005000 ;
-      RECT  4.605000 2.005000  5.335000 2.200000 ;
-      RECT  4.650000 0.595000  4.900000 1.480000 ;
-      RECT  5.005000 2.200000  5.335000 2.325000 ;
-      RECT  5.070000 0.425000  5.240000 2.005000 ;
-      RECT  5.085000 2.665000  5.335000 2.935000 ;
-      RECT  5.410000 0.595000  5.740000 0.875000 ;
-      RECT  5.410000 0.875000  5.580000 1.575000 ;
-      RECT  5.410000 1.575000  7.010000 1.745000 ;
-      RECT  5.505000 1.745000  5.675000 2.475000 ;
-      RECT  5.505000 2.475000  5.865000 2.935000 ;
-      RECT  5.750000 1.045000  6.080000 1.375000 ;
-      RECT  5.845000 1.915000  6.205000 2.245000 ;
-      RECT  5.910000 0.425000  6.080000 0.770000 ;
-      RECT  5.910000 0.770000  7.010000 0.940000 ;
-      RECT  5.910000 0.940000  6.080000 1.045000 ;
-      RECT  6.035000 2.245000  6.205000 2.615000 ;
-      RECT  6.035000 2.615000  7.735000 2.785000 ;
-      RECT  6.250000 1.110000  7.350000 1.405000 ;
-      RECT  6.730000 1.745000  7.010000 1.945000 ;
-      RECT  6.840000 0.255000  7.690000 0.425000 ;
-      RECT  6.840000 0.425000  7.010000 0.770000 ;
-      RECT  7.110000 2.115000  7.395000 2.445000 ;
-      RECT  7.180000 0.595000  7.350000 1.110000 ;
-      RECT  7.180000 1.405000  7.350000 2.115000 ;
-      RECT  7.520000 0.425000  7.690000 1.030000 ;
-      RECT  7.520000 1.030000  7.780000 1.225000 ;
-      RECT  7.520000 1.225000  8.680000 1.395000 ;
-      RECT  7.565000 1.600000  7.895000 1.930000 ;
-      RECT  7.565000 1.930000  7.735000 2.615000 ;
-      RECT  7.860000 0.350000  8.190000 0.810000 ;
-      RECT  7.905000 2.100000  8.235000 2.980000 ;
-      RECT  8.020000 0.810000  8.190000 0.885000 ;
-      RECT  8.020000 0.885000  9.020000 1.055000 ;
-      RECT  8.065000 1.720000  9.020000 1.890000 ;
-      RECT  8.065000 1.890000  8.235000 2.100000 ;
-      RECT  8.350000 1.395000  8.680000 1.550000 ;
-      RECT  8.710000 2.060000  9.950000 2.380000 ;
-      RECT  8.850000 1.055000  9.610000 1.225000 ;
-      RECT  8.850000 1.225000  9.020000 1.720000 ;
-      RECT  9.280000 1.225000  9.610000 1.550000 ;
-      RECT  9.560000 0.350000  9.950000 0.885000 ;
-      RECT  9.600000 1.940000  9.950000 2.060000 ;
-      RECT  9.600000 2.380000  9.950000 2.980000 ;
-      RECT  9.780000 0.885000  9.950000 1.300000 ;
-      RECT  9.780000 1.300000 10.610000 1.630000 ;
-      RECT  9.780000 1.630000  9.950000 1.940000 ;
-      RECT 11.580000 0.560000 11.940000 1.320000 ;
-      RECT 11.580000 1.320000 12.735000 1.650000 ;
-      RECT 11.580000 1.650000 11.910000 2.860000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.085000  0.350000  0.490000 0.730000 ;
+      RECT  0.085000  0.730000  0.255000 1.470000 ;
+      RECT  0.085000  1.470000  0.915000 1.800000 ;
+      RECT  0.085000  1.800000  0.520000 2.925000 ;
+      RECT  0.660000  0.085000  0.990000 0.730000 ;
+      RECT  0.725000  2.310000  1.055000 3.245000 ;
+      RECT  0.745000  1.800000  0.915000 1.970000 ;
+      RECT  0.745000  1.970000  2.195000 2.140000 ;
+      RECT  1.480000  0.390000  2.415000 0.640000 ;
+      RECT  1.650000  2.310000  1.980000 2.370000 ;
+      RECT  1.650000  2.370000  4.745000 2.495000 ;
+      RECT  1.650000  2.495000  5.335000 2.540000 ;
+      RECT  1.650000  2.540000  1.980000 2.925000 ;
+      RECT  1.865000  1.725000  2.195000 1.970000 ;
+      RECT  2.245000  0.640000  2.415000 1.350000 ;
+      RECT  2.245000  1.350000  3.095000 1.520000 ;
+      RECT  2.670000  2.710000  3.090000 3.245000 ;
+      RECT  2.695000  0.085000  2.945000 1.130000 ;
+      RECT  2.925000  1.520000  3.095000 2.370000 ;
+      RECT  3.125000  0.350000  3.455000 1.010000 ;
+      RECT  3.125000  1.010000  4.025000 1.180000 ;
+      RECT  3.295000  1.950000  4.095000 2.200000 ;
+      RECT  3.685000  0.085000  4.015000 0.840000 ;
+      RECT  3.855000  1.180000  4.025000 1.350000 ;
+      RECT  3.855000  1.350000  4.095000 1.950000 ;
+      RECT  4.075000  2.710000  4.405000 3.245000 ;
+      RECT  4.195000  0.255000  6.080000 0.425000 ;
+      RECT  4.195000  0.425000  4.445000 1.130000 ;
+      RECT  4.265000  1.480000  4.900000 1.650000 ;
+      RECT  4.265000  1.650000  4.435000 2.370000 ;
+      RECT  4.575000  2.540000  5.335000 2.665000 ;
+      RECT  4.605000  1.820000  4.855000 2.005000 ;
+      RECT  4.605000  2.005000  5.335000 2.200000 ;
+      RECT  4.650000  0.595000  4.900000 1.480000 ;
+      RECT  5.005000  2.200000  5.335000 2.325000 ;
+      RECT  5.070000  0.425000  5.240000 2.005000 ;
+      RECT  5.085000  2.665000  5.335000 2.935000 ;
+      RECT  5.410000  0.595000  5.740000 0.875000 ;
+      RECT  5.410000  0.875000  5.580000 1.575000 ;
+      RECT  5.410000  1.575000  7.010000 1.745000 ;
+      RECT  5.505000  1.745000  5.675000 2.475000 ;
+      RECT  5.505000  2.475000  5.865000 2.935000 ;
+      RECT  5.750000  1.045000  6.080000 1.375000 ;
+      RECT  5.845000  1.915000  6.205000 2.245000 ;
+      RECT  5.910000  0.425000  6.080000 0.770000 ;
+      RECT  5.910000  0.770000  7.010000 0.940000 ;
+      RECT  5.910000  0.940000  6.080000 1.045000 ;
+      RECT  6.035000  2.245000  6.205000 2.615000 ;
+      RECT  6.035000  2.615000  7.735000 2.785000 ;
+      RECT  6.250000  1.110000  7.350000 1.405000 ;
+      RECT  6.340000  0.085000  6.670000 0.600000 ;
+      RECT  6.575000  2.955000  6.905000 3.245000 ;
+      RECT  6.730000  1.745000  7.010000 1.945000 ;
+      RECT  6.840000  0.255000  7.690000 0.425000 ;
+      RECT  6.840000  0.425000  7.010000 0.770000 ;
+      RECT  7.110000  2.115000  7.395000 2.445000 ;
+      RECT  7.180000  0.595000  7.350000 1.110000 ;
+      RECT  7.180000  1.405000  7.350000 2.115000 ;
+      RECT  7.520000  0.425000  7.690000 1.030000 ;
+      RECT  7.520000  1.030000  7.780000 1.225000 ;
+      RECT  7.520000  1.225000  8.680000 1.395000 ;
+      RECT  7.565000  1.600000  7.895000 1.930000 ;
+      RECT  7.565000  1.930000  7.735000 2.615000 ;
+      RECT  7.860000  0.350000  8.190000 0.810000 ;
+      RECT  7.905000  2.100000  8.235000 2.980000 ;
+      RECT  8.020000  0.810000  8.190000 0.885000 ;
+      RECT  8.020000  0.885000  9.020000 1.055000 ;
+      RECT  8.065000  1.720000  9.020000 1.890000 ;
+      RECT  8.065000  1.890000  8.235000 2.100000 ;
+      RECT  8.350000  1.395000  8.680000 1.550000 ;
+      RECT  8.680000  0.085000  9.390000 0.715000 ;
+      RECT  8.710000  2.060000  9.950000 2.380000 ;
+      RECT  8.850000  1.055000  9.610000 1.225000 ;
+      RECT  8.850000  1.225000  9.020000 1.720000 ;
+      RECT  8.860000  2.650000  9.430000 3.245000 ;
+      RECT  9.280000  1.225000  9.610000 1.550000 ;
+      RECT  9.560000  0.350000  9.950000 0.885000 ;
+      RECT  9.600000  1.940000  9.950000 2.060000 ;
+      RECT  9.600000  2.380000  9.950000 2.980000 ;
+      RECT  9.780000  0.885000  9.950000 1.300000 ;
+      RECT  9.780000  1.300000 10.610000 1.630000 ;
+      RECT  9.780000  1.630000  9.950000 1.940000 ;
+      RECT 10.120000  0.085000 10.450000 1.130000 ;
+      RECT 10.140000  1.820000 10.390000 3.245000 ;
+      RECT 11.040000  2.140000 11.370000 3.245000 ;
+      RECT 11.120000  1.820000 11.370000 2.140000 ;
+      RECT 11.130000  0.085000 11.380000 1.130000 ;
+      RECT 11.580000  0.560000 11.940000 1.320000 ;
+      RECT 11.580000  1.320000 12.735000 1.650000 ;
+      RECT 11.580000  1.650000 11.910000 2.860000 ;
+      RECT 12.105000  1.820000 12.355000 3.245000 ;
+      RECT 12.120000  0.085000 12.450000 0.730000 ;
+      RECT 12.120000  0.730000 12.380000 1.150000 ;
+      RECT 12.995000  0.085000 13.325000 0.730000 ;
+      RECT 13.005000  2.320000 13.335000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfxbp_2
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef
index c359f55..5c42317 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.magic.lef
@@ -81,38 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.585000  0.085000  0.915000 0.785000 ;
-        RECT  2.775000  0.085000  2.945000 0.790000 ;
-        RECT  3.685000  0.085000  4.015000 0.620000 ;
-        RECT  6.385000  0.085000  6.635000 0.520000 ;
-        RECT  8.805000  0.085000  9.480000 0.810000 ;
-        RECT 10.175000  0.085000 10.425000 1.150000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 11.040000 0.245000 ;
     END
@@ -121,118 +89,147 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.725000 2.300000  1.055000 3.245000 ;
-        RECT  2.670000 2.650000  3.175000 3.245000 ;
-        RECT  3.855000 2.730000  4.365000 3.245000 ;
-        RECT  6.480000 2.860000  6.810000 3.245000 ;
-        RECT  8.845000 2.650000  9.420000 3.245000 ;
-        RECT 10.150000 1.820000 10.400000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.350000  0.405000 0.785000 ;
-      RECT 0.085000 0.785000  0.255000 1.525000 ;
-      RECT 0.085000 1.525000  0.825000 1.955000 ;
-      RECT 0.085000 1.955000  2.195000 2.125000 ;
-      RECT 0.085000 2.125000  0.555000 2.980000 ;
-      RECT 1.485000 0.400000  2.590000 0.730000 ;
-      RECT 1.595000 2.310000  4.395000 2.390000 ;
-      RECT 1.595000 2.390000  4.705000 2.480000 ;
-      RECT 1.595000 2.480000  1.925000 2.980000 ;
-      RECT 1.865000 1.470000  2.195000 1.955000 ;
-      RECT 1.865000 2.125000  2.195000 2.140000 ;
-      RECT 2.420000 0.730000  2.590000 1.130000 ;
-      RECT 2.420000 1.130000  3.080000 1.300000 ;
-      RECT 2.910000 1.300000  3.080000 2.310000 ;
-      RECT 3.125000 0.350000  3.455000 0.790000 ;
-      RECT 3.125000 0.790000  4.025000 0.960000 ;
-      RECT 3.295000 1.820000  4.055000 2.140000 ;
-      RECT 3.345000 2.480000  4.705000 2.560000 ;
-      RECT 3.855000 0.960000  4.025000 1.300000 ;
-      RECT 3.855000 1.300000  4.055000 1.820000 ;
-      RECT 4.195000 0.255000  5.905000 0.425000 ;
-      RECT 4.195000 0.425000  4.445000 1.130000 ;
-      RECT 4.225000 1.480000  4.785000 1.650000 ;
-      RECT 4.225000 1.650000  4.395000 2.310000 ;
-      RECT 4.535000 2.560000  4.705000 2.710000 ;
-      RECT 4.535000 2.710000  5.375000 2.980000 ;
-      RECT 4.565000 1.820000  4.815000 2.050000 ;
-      RECT 4.565000 2.050000  5.225000 2.220000 ;
-      RECT 4.615000 0.595000  4.885000 0.940000 ;
-      RECT 4.615000 0.940000  4.785000 1.480000 ;
-      RECT 4.955000 2.220000  5.225000 2.380000 ;
-      RECT 5.055000 0.425000  5.225000 2.050000 ;
-      RECT 5.395000 0.595000  5.565000 1.530000 ;
-      RECT 5.395000 1.530000  6.975000 1.700000 ;
-      RECT 5.395000 1.700000  5.565000 2.370000 ;
-      RECT 5.395000 2.370000  5.875000 2.540000 ;
-      RECT 5.545000 2.540000  5.875000 2.980000 ;
-      RECT 5.735000 0.425000  5.905000 0.690000 ;
-      RECT 5.735000 0.690000  6.975000 0.860000 ;
-      RECT 5.735000 0.860000  5.985000 1.360000 ;
-      RECT 5.735000 1.870000  6.215000 2.200000 ;
-      RECT 6.045000 2.200000  6.215000 2.520000 ;
-      RECT 6.045000 2.520000  7.715000 2.690000 ;
-      RECT 6.195000 1.030000  7.315000 1.360000 ;
-      RECT 6.645000 1.700000  6.975000 1.930000 ;
-      RECT 6.805000 0.255000  7.815000 0.425000 ;
-      RECT 6.805000 0.425000  6.975000 0.690000 ;
-      RECT 7.015000 2.100000  7.375000 2.350000 ;
-      RECT 7.145000 0.595000  7.475000 0.860000 ;
-      RECT 7.145000 0.860000  7.315000 1.030000 ;
-      RECT 7.145000 1.360000  7.315000 2.100000 ;
-      RECT 7.485000 1.030000  7.815000 1.190000 ;
-      RECT 7.485000 1.190000  8.240000 1.320000 ;
-      RECT 7.485000 1.320000  8.555000 1.360000 ;
-      RECT 7.545000 1.600000  7.900000 1.930000 ;
-      RECT 7.545000 1.930000  7.715000 2.520000 ;
-      RECT 7.645000 0.425000  7.815000 1.030000 ;
-      RECT 7.885000 2.100000  8.135000 2.245000 ;
-      RECT 7.885000 2.245000  8.895000 2.415000 ;
-      RECT 7.885000 2.415000  8.135000 2.980000 ;
-      RECT 7.985000 0.480000  8.315000 0.770000 ;
-      RECT 7.985000 0.770000  8.580000 0.940000 ;
-      RECT 8.070000 1.360000  8.555000 1.490000 ;
-      RECT 8.305000 1.490000  8.555000 2.075000 ;
-      RECT 8.410000 0.940000  8.580000 0.980000 ;
-      RECT 8.410000 0.980000  8.895000 1.150000 ;
-      RECT 8.725000 1.150000  8.895000 1.600000 ;
-      RECT 8.725000 1.600000  9.595000 1.930000 ;
-      RECT 8.725000 1.930000  8.895000 2.245000 ;
-      RECT 9.065000 1.030000  9.980000 1.320000 ;
-      RECT 9.065000 1.320000 10.245000 1.360000 ;
-      RECT 9.590000 2.100000  9.935000 2.980000 ;
-      RECT 9.650000 0.350000  9.980000 1.030000 ;
-      RECT 9.765000 1.360000 10.245000 1.650000 ;
-      RECT 9.765000 1.650000  9.935000 2.100000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.085000  0.350000  0.405000 0.785000 ;
+      RECT  0.085000  0.785000  0.255000 1.525000 ;
+      RECT  0.085000  1.525000  0.825000 1.955000 ;
+      RECT  0.085000  1.955000  2.195000 2.125000 ;
+      RECT  0.085000  2.125000  0.555000 2.980000 ;
+      RECT  0.585000  0.085000  0.915000 0.785000 ;
+      RECT  0.725000  2.300000  1.055000 3.245000 ;
+      RECT  1.485000  0.400000  2.590000 0.730000 ;
+      RECT  1.595000  2.310000  4.395000 2.390000 ;
+      RECT  1.595000  2.390000  4.705000 2.480000 ;
+      RECT  1.595000  2.480000  1.925000 2.980000 ;
+      RECT  1.865000  1.470000  2.195000 1.955000 ;
+      RECT  1.865000  2.125000  2.195000 2.140000 ;
+      RECT  2.420000  0.730000  2.590000 1.130000 ;
+      RECT  2.420000  1.130000  3.080000 1.300000 ;
+      RECT  2.670000  2.650000  3.175000 3.245000 ;
+      RECT  2.775000  0.085000  2.945000 0.790000 ;
+      RECT  2.910000  1.300000  3.080000 2.310000 ;
+      RECT  3.125000  0.350000  3.455000 0.790000 ;
+      RECT  3.125000  0.790000  4.025000 0.960000 ;
+      RECT  3.295000  1.820000  4.055000 2.140000 ;
+      RECT  3.345000  2.480000  4.705000 2.560000 ;
+      RECT  3.685000  0.085000  4.015000 0.620000 ;
+      RECT  3.855000  0.960000  4.025000 1.300000 ;
+      RECT  3.855000  1.300000  4.055000 1.820000 ;
+      RECT  3.855000  2.730000  4.365000 3.245000 ;
+      RECT  4.195000  0.255000  5.905000 0.425000 ;
+      RECT  4.195000  0.425000  4.445000 1.130000 ;
+      RECT  4.225000  1.480000  4.785000 1.650000 ;
+      RECT  4.225000  1.650000  4.395000 2.310000 ;
+      RECT  4.535000  2.560000  4.705000 2.710000 ;
+      RECT  4.535000  2.710000  5.375000 2.980000 ;
+      RECT  4.565000  1.820000  4.815000 2.050000 ;
+      RECT  4.565000  2.050000  5.225000 2.220000 ;
+      RECT  4.615000  0.595000  4.885000 0.940000 ;
+      RECT  4.615000  0.940000  4.785000 1.480000 ;
+      RECT  4.955000  2.220000  5.225000 2.380000 ;
+      RECT  5.055000  0.425000  5.225000 2.050000 ;
+      RECT  5.395000  0.595000  5.565000 1.530000 ;
+      RECT  5.395000  1.530000  6.975000 1.700000 ;
+      RECT  5.395000  1.700000  5.565000 2.370000 ;
+      RECT  5.395000  2.370000  5.875000 2.540000 ;
+      RECT  5.545000  2.540000  5.875000 2.980000 ;
+      RECT  5.735000  0.425000  5.905000 0.690000 ;
+      RECT  5.735000  0.690000  6.975000 0.860000 ;
+      RECT  5.735000  0.860000  5.985000 1.360000 ;
+      RECT  5.735000  1.870000  6.215000 2.200000 ;
+      RECT  6.045000  2.200000  6.215000 2.520000 ;
+      RECT  6.045000  2.520000  7.715000 2.690000 ;
+      RECT  6.195000  1.030000  7.315000 1.360000 ;
+      RECT  6.385000  0.085000  6.635000 0.520000 ;
+      RECT  6.480000  2.860000  6.810000 3.245000 ;
+      RECT  6.645000  1.700000  6.975000 1.930000 ;
+      RECT  6.805000  0.255000  7.815000 0.425000 ;
+      RECT  6.805000  0.425000  6.975000 0.690000 ;
+      RECT  7.015000  2.100000  7.375000 2.350000 ;
+      RECT  7.145000  0.595000  7.475000 0.860000 ;
+      RECT  7.145000  0.860000  7.315000 1.030000 ;
+      RECT  7.145000  1.360000  7.315000 2.100000 ;
+      RECT  7.485000  1.030000  7.815000 1.190000 ;
+      RECT  7.485000  1.190000  8.240000 1.320000 ;
+      RECT  7.485000  1.320000  8.555000 1.360000 ;
+      RECT  7.545000  1.600000  7.900000 1.930000 ;
+      RECT  7.545000  1.930000  7.715000 2.520000 ;
+      RECT  7.645000  0.425000  7.815000 1.030000 ;
+      RECT  7.885000  2.100000  8.135000 2.245000 ;
+      RECT  7.885000  2.245000  8.895000 2.415000 ;
+      RECT  7.885000  2.415000  8.135000 2.980000 ;
+      RECT  7.985000  0.480000  8.315000 0.770000 ;
+      RECT  7.985000  0.770000  8.580000 0.940000 ;
+      RECT  8.070000  1.360000  8.555000 1.490000 ;
+      RECT  8.305000  1.490000  8.555000 2.075000 ;
+      RECT  8.410000  0.940000  8.580000 0.980000 ;
+      RECT  8.410000  0.980000  8.895000 1.150000 ;
+      RECT  8.725000  1.150000  8.895000 1.600000 ;
+      RECT  8.725000  1.600000  9.595000 1.930000 ;
+      RECT  8.725000  1.930000  8.895000 2.245000 ;
+      RECT  8.805000  0.085000  9.480000 0.810000 ;
+      RECT  8.845000  2.650000  9.420000 3.245000 ;
+      RECT  9.065000  1.030000  9.980000 1.320000 ;
+      RECT  9.065000  1.320000 10.245000 1.360000 ;
+      RECT  9.590000  2.100000  9.935000 2.980000 ;
+      RECT  9.650000  0.350000  9.980000 1.030000 ;
+      RECT  9.765000  1.360000 10.245000 1.650000 ;
+      RECT  9.765000  1.650000  9.935000 2.100000 ;
+      RECT 10.150000  1.820000 10.400000 3.245000 ;
+      RECT 10.175000  0.085000 10.425000 1.150000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfxtp_1
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef
index 17fe951..2346a6c 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.magic.lef
@@ -84,41 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.660000  0.085000  0.990000 0.640000 ;
-        RECT  2.715000  0.085000  2.975000 0.810000 ;
-        RECT  3.705000  0.085000  4.035000 0.840000 ;
-        RECT  6.720000  0.085000  7.050000 0.550000 ;
-        RECT  9.300000  0.085000  9.630000 0.810000 ;
-        RECT 10.615000  0.085000 10.885000 1.050000 ;
-        RECT 11.555000  0.085000 11.885000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.000000 0.245000 ;
     END
@@ -127,115 +92,147 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  0.615000 2.355000  0.945000 3.245000 ;
-        RECT  2.685000 2.790000  3.135000 3.245000 ;
-        RECT  3.900000 2.790000  4.370000 3.245000 ;
-        RECT  6.585000 2.520000  6.835000 3.245000 ;
-        RECT  9.295000 2.590000  9.925000 3.245000 ;
-        RECT 10.655000 1.820000 10.905000 3.245000 ;
-        RECT 11.635000 1.820000 11.885000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.000000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.390000  0.490000 0.640000 ;
-      RECT  0.085000 0.640000  0.255000 1.470000 ;
-      RECT  0.085000 1.470000  0.915000 2.015000 ;
-      RECT  0.085000 2.015000  2.210000 2.185000 ;
-      RECT  0.085000 2.185000  0.445000 2.925000 ;
-      RECT  1.480000 0.350000  2.545000 0.680000 ;
-      RECT  1.485000 2.355000  3.120000 2.450000 ;
-      RECT  1.485000 2.450000  5.385000 2.620000 ;
-      RECT  1.485000 2.620000  2.060000 2.945000 ;
-      RECT  1.880000 1.775000  2.210000 2.015000 ;
-      RECT  2.375000 0.680000  2.545000 1.095000 ;
-      RECT  2.375000 1.095000  3.120000 1.265000 ;
-      RECT  2.950000 1.265000  3.120000 2.355000 ;
-      RECT  3.145000 0.330000  3.475000 0.920000 ;
-      RECT  3.305000 0.920000  3.475000 1.010000 ;
-      RECT  3.305000 1.010000  4.025000 1.180000 ;
-      RECT  3.340000 1.950000  4.145000 2.280000 ;
-      RECT  3.855000 1.180000  4.025000 1.300000 ;
-      RECT  3.855000 1.300000  4.145000 1.950000 ;
-      RECT  4.205000 0.255000  6.115000 0.425000 ;
-      RECT  4.205000 0.425000  4.535000 1.130000 ;
-      RECT  4.315000 1.300000  4.875000 1.470000 ;
-      RECT  4.315000 1.470000  4.485000 2.450000 ;
-      RECT  4.655000 1.820000  5.375000 2.280000 ;
-      RECT  4.705000 0.595000  5.015000 0.940000 ;
-      RECT  4.705000 0.940000  4.875000 1.300000 ;
-      RECT  5.045000 1.610000  5.375000 1.820000 ;
-      RECT  5.135000 2.620000  5.385000 2.980000 ;
-      RECT  5.185000 0.425000  5.355000 1.610000 ;
-      RECT  5.525000 0.595000  5.775000 0.940000 ;
-      RECT  5.555000 0.940000  5.775000 1.630000 ;
-      RECT  5.555000 1.630000  7.175000 1.800000 ;
-      RECT  5.555000 1.800000  5.725000 2.520000 ;
-      RECT  5.555000 2.520000  5.915000 2.980000 ;
-      RECT  5.895000 1.970000  6.225000 2.130000 ;
-      RECT  5.895000 2.130000  7.175000 2.300000 ;
-      RECT  5.945000 0.425000  6.115000 0.720000 ;
-      RECT  5.945000 0.720000  7.390000 0.890000 ;
-      RECT  5.945000 0.890000  6.275000 1.360000 ;
-      RECT  6.485000 1.060000  7.890000 1.230000 ;
-      RECT  6.485000 1.230000  7.515000 1.390000 ;
-      RECT  6.845000 1.800000  7.175000 1.960000 ;
-      RECT  7.005000 2.300000  7.175000 2.905000 ;
-      RECT  7.005000 2.905000  7.855000 3.075000 ;
-      RECT  7.220000 0.255000  8.230000 0.425000 ;
-      RECT  7.220000 0.425000  7.390000 0.720000 ;
-      RECT  7.345000 1.390000  7.515000 2.610000 ;
-      RECT  7.560000 0.595000  7.890000 1.060000 ;
-      RECT  7.685000 1.600000  8.115000 1.930000 ;
-      RECT  7.685000 1.930000  7.855000 2.905000 ;
-      RECT  8.025000 2.490000  9.060000 2.660000 ;
-      RECT  8.025000 2.660000  8.275000 2.920000 ;
-      RECT  8.060000 0.425000  8.230000 1.030000 ;
-      RECT  8.060000 1.030000  8.455000 1.360000 ;
-      RECT  8.285000 1.360000  8.455000 1.990000 ;
-      RECT  8.285000 1.990000  8.720000 2.320000 ;
-      RECT  8.400000 0.350000  8.795000 0.640000 ;
-      RECT  8.400000 0.640000  9.060000 0.810000 ;
-      RECT  8.890000 0.810000  9.060000 2.075000 ;
-      RECT  8.890000 2.075000 10.105000 2.245000 ;
-      RECT  8.890000 2.245000  9.060000 2.490000 ;
-      RECT  9.230000 1.070000 10.445000 1.220000 ;
-      RECT  9.230000 1.220000 11.045000 1.240000 ;
-      RECT  9.230000 1.240000  9.535000 1.905000 ;
-      RECT  9.775000 1.410000 10.105000 2.075000 ;
-      RECT  9.800000 0.350000 10.130000 1.070000 ;
-      RECT 10.095000 2.415000 10.445000 2.920000 ;
-      RECT 10.275000 1.240000 11.045000 1.550000 ;
-      RECT 10.275000 1.550000 10.445000 2.415000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.085000  0.390000  0.490000 0.640000 ;
+      RECT  0.085000  0.640000  0.255000 1.470000 ;
+      RECT  0.085000  1.470000  0.915000 2.015000 ;
+      RECT  0.085000  2.015000  2.210000 2.185000 ;
+      RECT  0.085000  2.185000  0.445000 2.925000 ;
+      RECT  0.615000  2.355000  0.945000 3.245000 ;
+      RECT  0.660000  0.085000  0.990000 0.640000 ;
+      RECT  1.480000  0.350000  2.545000 0.680000 ;
+      RECT  1.485000  2.355000  3.120000 2.450000 ;
+      RECT  1.485000  2.450000  5.385000 2.620000 ;
+      RECT  1.485000  2.620000  2.060000 2.945000 ;
+      RECT  1.880000  1.775000  2.210000 2.015000 ;
+      RECT  2.375000  0.680000  2.545000 1.095000 ;
+      RECT  2.375000  1.095000  3.120000 1.265000 ;
+      RECT  2.685000  2.790000  3.135000 3.245000 ;
+      RECT  2.715000  0.085000  2.975000 0.810000 ;
+      RECT  2.950000  1.265000  3.120000 2.355000 ;
+      RECT  3.145000  0.330000  3.475000 0.920000 ;
+      RECT  3.305000  0.920000  3.475000 1.010000 ;
+      RECT  3.305000  1.010000  4.025000 1.180000 ;
+      RECT  3.340000  1.950000  4.145000 2.280000 ;
+      RECT  3.705000  0.085000  4.035000 0.840000 ;
+      RECT  3.855000  1.180000  4.025000 1.300000 ;
+      RECT  3.855000  1.300000  4.145000 1.950000 ;
+      RECT  3.900000  2.790000  4.370000 3.245000 ;
+      RECT  4.205000  0.255000  6.115000 0.425000 ;
+      RECT  4.205000  0.425000  4.535000 1.130000 ;
+      RECT  4.315000  1.300000  4.875000 1.470000 ;
+      RECT  4.315000  1.470000  4.485000 2.450000 ;
+      RECT  4.655000  1.820000  5.375000 2.280000 ;
+      RECT  4.705000  0.595000  5.015000 0.940000 ;
+      RECT  4.705000  0.940000  4.875000 1.300000 ;
+      RECT  5.045000  1.610000  5.375000 1.820000 ;
+      RECT  5.135000  2.620000  5.385000 2.980000 ;
+      RECT  5.185000  0.425000  5.355000 1.610000 ;
+      RECT  5.525000  0.595000  5.775000 0.940000 ;
+      RECT  5.555000  0.940000  5.775000 1.630000 ;
+      RECT  5.555000  1.630000  7.175000 1.800000 ;
+      RECT  5.555000  1.800000  5.725000 2.520000 ;
+      RECT  5.555000  2.520000  5.915000 2.980000 ;
+      RECT  5.895000  1.970000  6.225000 2.130000 ;
+      RECT  5.895000  2.130000  7.175000 2.300000 ;
+      RECT  5.945000  0.425000  6.115000 0.720000 ;
+      RECT  5.945000  0.720000  7.390000 0.890000 ;
+      RECT  5.945000  0.890000  6.275000 1.360000 ;
+      RECT  6.485000  1.060000  7.890000 1.230000 ;
+      RECT  6.485000  1.230000  7.515000 1.390000 ;
+      RECT  6.585000  2.520000  6.835000 3.245000 ;
+      RECT  6.720000  0.085000  7.050000 0.550000 ;
+      RECT  6.845000  1.800000  7.175000 1.960000 ;
+      RECT  7.005000  2.300000  7.175000 2.905000 ;
+      RECT  7.005000  2.905000  7.855000 3.075000 ;
+      RECT  7.220000  0.255000  8.230000 0.425000 ;
+      RECT  7.220000  0.425000  7.390000 0.720000 ;
+      RECT  7.345000  1.390000  7.515000 2.610000 ;
+      RECT  7.560000  0.595000  7.890000 1.060000 ;
+      RECT  7.685000  1.600000  8.115000 1.930000 ;
+      RECT  7.685000  1.930000  7.855000 2.905000 ;
+      RECT  8.025000  2.490000  9.060000 2.660000 ;
+      RECT  8.025000  2.660000  8.275000 2.920000 ;
+      RECT  8.060000  0.425000  8.230000 1.030000 ;
+      RECT  8.060000  1.030000  8.455000 1.360000 ;
+      RECT  8.285000  1.360000  8.455000 1.990000 ;
+      RECT  8.285000  1.990000  8.720000 2.320000 ;
+      RECT  8.400000  0.350000  8.795000 0.640000 ;
+      RECT  8.400000  0.640000  9.060000 0.810000 ;
+      RECT  8.890000  0.810000  9.060000 2.075000 ;
+      RECT  8.890000  2.075000 10.105000 2.245000 ;
+      RECT  8.890000  2.245000  9.060000 2.490000 ;
+      RECT  9.230000  1.070000 10.445000 1.220000 ;
+      RECT  9.230000  1.220000 11.045000 1.240000 ;
+      RECT  9.230000  1.240000  9.535000 1.905000 ;
+      RECT  9.295000  2.590000  9.925000 3.245000 ;
+      RECT  9.300000  0.085000  9.630000 0.810000 ;
+      RECT  9.775000  1.410000 10.105000 2.075000 ;
+      RECT  9.800000  0.350000 10.130000 1.070000 ;
+      RECT 10.095000  2.415000 10.445000 2.920000 ;
+      RECT 10.275000  1.240000 11.045000 1.550000 ;
+      RECT 10.275000  1.550000 10.445000 2.415000 ;
+      RECT 10.615000  0.085000 10.885000 1.050000 ;
+      RECT 10.655000  1.820000 10.905000 3.245000 ;
+      RECT 11.555000  0.085000 11.885000 1.130000 ;
+      RECT 11.635000  1.820000 11.885000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfxtp_2
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef
index 85a7bb2..a448986 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.magic.lef
@@ -87,43 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.480000 0.085000 ;
-        RECT  0.660000  0.085000  0.990000 0.785000 ;
-        RECT  2.705000  0.085000  2.955000 0.810000 ;
-        RECT  3.685000  0.085000  4.015000 0.670000 ;
-        RECT  6.490000  0.085000  6.820000 0.600000 ;
-        RECT  9.195000  0.085000  9.525000 0.730000 ;
-        RECT 10.185000  0.085000 10.515000 0.960000 ;
-        RECT 11.175000  0.085000 11.505000 0.710000 ;
-        RECT 12.035000  0.085000 12.365000 0.710000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 12.480000 0.245000 ;
     END
@@ -132,117 +95,151 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.480000 3.415000 ;
-        RECT  0.725000 2.300000  1.055000 3.245000 ;
-        RECT  2.585000 2.730000  3.205000 3.245000 ;
-        RECT  3.885000 2.730000  4.475000 3.245000 ;
-        RECT  6.680000 2.855000  7.010000 3.245000 ;
-        RECT  9.225000 2.360000  9.555000 3.245000 ;
-        RECT 10.305000 1.940000 10.475000 3.245000 ;
-        RECT 11.215000 2.140000 11.465000 3.245000 ;
-        RECT 12.035000 2.185000 12.365000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.480000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.350000  0.490000 0.785000 ;
-      RECT 0.085000 0.785000  0.255000 1.525000 ;
-      RECT 0.085000 1.525000  0.915000 1.955000 ;
-      RECT 0.085000 1.955000  2.195000 2.125000 ;
-      RECT 0.085000 2.125000  0.555000 2.980000 ;
-      RECT 1.480000 0.390000  2.535000 0.640000 ;
-      RECT 1.595000 2.310000  1.925000 2.390000 ;
-      RECT 1.595000 2.390000  4.815000 2.540000 ;
-      RECT 1.595000 2.540000  5.405000 2.560000 ;
-      RECT 1.595000 2.560000  1.925000 2.980000 ;
-      RECT 1.865000 1.470000  2.195000 1.955000 ;
-      RECT 1.865000 2.125000  2.195000 2.140000 ;
-      RECT 2.365000 0.640000  2.535000 1.180000 ;
-      RECT 2.365000 1.180000  3.105000 1.350000 ;
-      RECT 2.935000 1.350000  3.105000 2.390000 ;
-      RECT 3.125000 0.350000  3.455000 0.840000 ;
-      RECT 3.125000 0.840000  4.025000 1.010000 ;
-      RECT 3.325000 1.820000  4.165000 1.990000 ;
-      RECT 3.325000 1.990000  3.655000 2.220000 ;
-      RECT 3.855000 1.010000  4.025000 1.300000 ;
-      RECT 3.855000 1.300000  4.165000 1.820000 ;
-      RECT 4.195000 0.255000  5.945000 0.425000 ;
-      RECT 4.195000 0.425000  4.445000 1.130000 ;
-      RECT 4.335000 1.480000  4.925000 1.650000 ;
-      RECT 4.335000 1.650000  4.505000 2.390000 ;
-      RECT 4.645000 2.560000  5.405000 2.710000 ;
-      RECT 4.675000 0.595000  4.925000 1.480000 ;
-      RECT 4.675000 1.820000  4.925000 2.040000 ;
-      RECT 4.675000 2.040000  5.405000 2.220000 ;
-      RECT 5.075000 2.220000  5.405000 2.370000 ;
-      RECT 5.095000 0.425000  5.265000 2.040000 ;
-      RECT 5.155000 2.710000  5.405000 2.970000 ;
-      RECT 5.435000 0.595000  5.605000 1.610000 ;
-      RECT 5.435000 1.610000  7.160000 1.780000 ;
-      RECT 5.575000 1.780000  5.745000 2.510000 ;
-      RECT 5.575000 2.510000  5.935000 2.970000 ;
-      RECT 5.775000 0.425000  5.945000 0.770000 ;
-      RECT 5.775000 0.770000  7.160000 0.940000 ;
-      RECT 5.775000 0.940000  6.075000 1.360000 ;
-      RECT 5.915000 1.950000  6.275000 2.280000 ;
-      RECT 6.105000 2.280000  6.275000 2.515000 ;
-      RECT 6.105000 2.515000  8.100000 2.685000 ;
-      RECT 6.295000 1.110000  7.500000 1.440000 ;
-      RECT 6.835000 1.780000  7.160000 1.940000 ;
-      RECT 6.990000 0.295000  8.125000 0.465000 ;
-      RECT 6.990000 0.465000  7.160000 0.770000 ;
-      RECT 7.215000 2.175000  7.760000 2.345000 ;
-      RECT 7.330000 0.635000  7.785000 0.885000 ;
-      RECT 7.330000 0.885000  7.500000 1.110000 ;
-      RECT 7.330000 1.440000  7.500000 2.175000 ;
-      RECT 7.670000 1.055000  8.125000 1.240000 ;
-      RECT 7.670000 1.240000  8.845000 1.410000 ;
-      RECT 7.770000 1.625000  8.100000 1.955000 ;
-      RECT 7.930000 1.955000  8.100000 2.515000 ;
-      RECT 7.955000 0.465000  8.125000 1.055000 ;
-      RECT 8.270000 2.020000  9.185000 2.190000 ;
-      RECT 8.270000 2.190000  8.600000 2.820000 ;
-      RECT 8.295000 0.350000  8.625000 0.900000 ;
-      RECT 8.295000 0.900000  9.185000 1.070000 ;
-      RECT 8.535000 1.410000  8.845000 1.715000 ;
-      RECT 9.015000 1.070000  9.185000 1.470000 ;
-      RECT 9.015000 1.470000  9.795000 1.800000 ;
-      RECT 9.015000 1.800000  9.185000 2.020000 ;
-      RECT 9.355000 0.900000  9.665000 1.130000 ;
-      RECT 9.355000 1.130000 10.135000 1.300000 ;
-      RECT 9.730000 1.970000 10.135000 2.820000 ;
-      RECT 9.835000 0.350000 10.005000 1.130000 ;
-      RECT 9.965000 1.300000 11.545000 1.630000 ;
-      RECT 9.965000 1.630000 10.135000 1.970000 ;
+      RECT  0.000000 -0.085000 12.480000 0.085000 ;
+      RECT  0.000000  3.245000 12.480000 3.415000 ;
+      RECT  0.085000  0.350000  0.490000 0.785000 ;
+      RECT  0.085000  0.785000  0.255000 1.525000 ;
+      RECT  0.085000  1.525000  0.915000 1.955000 ;
+      RECT  0.085000  1.955000  2.195000 2.125000 ;
+      RECT  0.085000  2.125000  0.555000 2.980000 ;
+      RECT  0.660000  0.085000  0.990000 0.785000 ;
+      RECT  0.725000  2.300000  1.055000 3.245000 ;
+      RECT  1.480000  0.390000  2.535000 0.640000 ;
+      RECT  1.595000  2.310000  1.925000 2.390000 ;
+      RECT  1.595000  2.390000  4.815000 2.540000 ;
+      RECT  1.595000  2.540000  5.405000 2.560000 ;
+      RECT  1.595000  2.560000  1.925000 2.980000 ;
+      RECT  1.865000  1.470000  2.195000 1.955000 ;
+      RECT  1.865000  2.125000  2.195000 2.140000 ;
+      RECT  2.365000  0.640000  2.535000 1.180000 ;
+      RECT  2.365000  1.180000  3.105000 1.350000 ;
+      RECT  2.585000  2.730000  3.205000 3.245000 ;
+      RECT  2.705000  0.085000  2.955000 0.810000 ;
+      RECT  2.935000  1.350000  3.105000 2.390000 ;
+      RECT  3.125000  0.350000  3.455000 0.840000 ;
+      RECT  3.125000  0.840000  4.025000 1.010000 ;
+      RECT  3.325000  1.820000  4.165000 1.990000 ;
+      RECT  3.325000  1.990000  3.655000 2.220000 ;
+      RECT  3.685000  0.085000  4.015000 0.670000 ;
+      RECT  3.855000  1.010000  4.025000 1.300000 ;
+      RECT  3.855000  1.300000  4.165000 1.820000 ;
+      RECT  3.885000  2.730000  4.475000 3.245000 ;
+      RECT  4.195000  0.255000  5.945000 0.425000 ;
+      RECT  4.195000  0.425000  4.445000 1.130000 ;
+      RECT  4.335000  1.480000  4.925000 1.650000 ;
+      RECT  4.335000  1.650000  4.505000 2.390000 ;
+      RECT  4.645000  2.560000  5.405000 2.710000 ;
+      RECT  4.675000  0.595000  4.925000 1.480000 ;
+      RECT  4.675000  1.820000  4.925000 2.040000 ;
+      RECT  4.675000  2.040000  5.405000 2.220000 ;
+      RECT  5.075000  2.220000  5.405000 2.370000 ;
+      RECT  5.095000  0.425000  5.265000 2.040000 ;
+      RECT  5.155000  2.710000  5.405000 2.970000 ;
+      RECT  5.435000  0.595000  5.605000 1.610000 ;
+      RECT  5.435000  1.610000  7.160000 1.780000 ;
+      RECT  5.575000  1.780000  5.745000 2.510000 ;
+      RECT  5.575000  2.510000  5.935000 2.970000 ;
+      RECT  5.775000  0.425000  5.945000 0.770000 ;
+      RECT  5.775000  0.770000  7.160000 0.940000 ;
+      RECT  5.775000  0.940000  6.075000 1.360000 ;
+      RECT  5.915000  1.950000  6.275000 2.280000 ;
+      RECT  6.105000  2.280000  6.275000 2.515000 ;
+      RECT  6.105000  2.515000  8.100000 2.685000 ;
+      RECT  6.295000  1.110000  7.500000 1.440000 ;
+      RECT  6.490000  0.085000  6.820000 0.600000 ;
+      RECT  6.680000  2.855000  7.010000 3.245000 ;
+      RECT  6.835000  1.780000  7.160000 1.940000 ;
+      RECT  6.990000  0.295000  8.125000 0.465000 ;
+      RECT  6.990000  0.465000  7.160000 0.770000 ;
+      RECT  7.215000  2.175000  7.760000 2.345000 ;
+      RECT  7.330000  0.635000  7.785000 0.885000 ;
+      RECT  7.330000  0.885000  7.500000 1.110000 ;
+      RECT  7.330000  1.440000  7.500000 2.175000 ;
+      RECT  7.670000  1.055000  8.125000 1.240000 ;
+      RECT  7.670000  1.240000  8.845000 1.410000 ;
+      RECT  7.770000  1.625000  8.100000 1.955000 ;
+      RECT  7.930000  1.955000  8.100000 2.515000 ;
+      RECT  7.955000  0.465000  8.125000 1.055000 ;
+      RECT  8.270000  2.020000  9.185000 2.190000 ;
+      RECT  8.270000  2.190000  8.600000 2.820000 ;
+      RECT  8.295000  0.350000  8.625000 0.900000 ;
+      RECT  8.295000  0.900000  9.185000 1.070000 ;
+      RECT  8.535000  1.410000  8.845000 1.715000 ;
+      RECT  9.015000  1.070000  9.185000 1.470000 ;
+      RECT  9.015000  1.470000  9.795000 1.800000 ;
+      RECT  9.015000  1.800000  9.185000 2.020000 ;
+      RECT  9.195000  0.085000  9.525000 0.730000 ;
+      RECT  9.225000  2.360000  9.555000 3.245000 ;
+      RECT  9.355000  0.900000  9.665000 1.130000 ;
+      RECT  9.355000  1.130000 10.135000 1.300000 ;
+      RECT  9.730000  1.970000 10.135000 2.820000 ;
+      RECT  9.835000  0.350000 10.005000 1.130000 ;
+      RECT  9.965000  1.300000 11.545000 1.630000 ;
+      RECT  9.965000  1.630000 10.135000 1.970000 ;
+      RECT 10.185000  0.085000 10.515000 0.960000 ;
+      RECT 10.305000  1.940000 10.475000 3.245000 ;
+      RECT 11.175000  0.085000 11.505000 0.710000 ;
+      RECT 11.215000  2.140000 11.465000 3.245000 ;
+      RECT 12.035000  0.085000 12.365000 0.710000 ;
+      RECT 12.035000  2.185000 12.365000 3.245000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdfxtp_4
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef
index c180ac6..63dd1f5 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.magic.lef
@@ -72,30 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 1.120000 ;
-        RECT 1.055000  0.085000 1.385000 0.370000 ;
-        RECT 3.750000  0.085000 3.920000 0.710000 ;
-        RECT 5.410000  0.085000 5.660000 1.130000 ;
-        RECT 6.815000  0.085000 7.065000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -104,82 +80,103 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.115000 2.130000 0.445000 3.245000 ;
-        RECT 1.515000 2.660000 1.845000 3.245000 ;
-        RECT 3.985000 2.440000 4.315000 3.245000 ;
-        RECT 5.585000 2.835000 5.990000 3.245000 ;
-        RECT 6.695000 2.060000 7.025000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.540000 2.375000 0.710000 ;
-      RECT 0.545000 0.710000 0.885000 1.120000 ;
-      RECT 0.715000 1.120000 0.885000 1.290000 ;
-      RECT 0.715000 1.290000 1.625000 1.460000 ;
-      RECT 0.955000 2.320000 2.860000 2.490000 ;
-      RECT 0.955000 2.490000 1.285000 2.980000 ;
-      RECT 1.455000 1.460000 1.625000 2.320000 ;
-      RECT 1.565000 0.880000 1.895000 0.950000 ;
-      RECT 1.565000 0.950000 1.965000 1.120000 ;
-      RECT 1.795000 1.120000 1.965000 1.545000 ;
-      RECT 1.795000 1.545000 2.900000 1.715000 ;
-      RECT 1.795000 1.715000 2.380000 2.150000 ;
-      RECT 2.125000 0.350000 2.375000 0.540000 ;
-      RECT 2.125000 0.710000 2.375000 0.780000 ;
-      RECT 2.135000 1.030000 2.715000 1.200000 ;
-      RECT 2.135000 1.200000 2.415000 1.360000 ;
-      RECT 2.545000 0.255000 3.580000 0.425000 ;
-      RECT 2.545000 0.425000 2.715000 1.030000 ;
-      RECT 2.610000 1.885000 2.860000 2.320000 ;
-      RECT 2.610000 2.490000 2.860000 2.755000 ;
-      RECT 2.625000 1.385000 2.900000 1.545000 ;
-      RECT 2.885000 0.595000 3.240000 0.925000 ;
-      RECT 3.060000 2.425000 3.390000 2.755000 ;
-      RECT 3.070000 0.925000 3.240000 1.220000 ;
-      RECT 3.070000 1.220000 4.320000 1.550000 ;
-      RECT 3.070000 1.550000 3.390000 2.425000 ;
-      RECT 3.410000 0.425000 3.580000 0.880000 ;
-      RECT 3.410000 0.880000 4.260000 1.050000 ;
-      RECT 3.600000 1.740000 4.820000 2.120000 ;
-      RECT 4.090000 0.255000 5.230000 0.425000 ;
-      RECT 4.090000 0.425000 4.260000 0.880000 ;
-      RECT 4.430000 0.595000 4.680000 1.050000 ;
-      RECT 4.490000 1.050000 4.680000 1.740000 ;
-      RECT 4.490000 2.120000 4.820000 2.495000 ;
-      RECT 4.490000 2.495000 6.000000 2.665000 ;
-      RECT 4.490000 2.665000 4.820000 2.900000 ;
-      RECT 4.900000 0.425000 5.230000 1.130000 ;
-      RECT 4.990000 1.130000 5.160000 1.995000 ;
-      RECT 4.990000 1.995000 5.380000 2.325000 ;
-      RECT 5.830000 1.220000 6.305000 1.550000 ;
-      RECT 5.830000 1.550000 6.000000 2.495000 ;
-      RECT 6.165000 0.450000 6.645000 1.050000 ;
-      RECT 6.195000 1.720000 6.645000 1.890000 ;
-      RECT 6.195000 1.890000 6.525000 2.875000 ;
-      RECT 6.475000 1.050000 6.645000 1.300000 ;
-      RECT 6.475000 1.300000 7.245000 1.630000 ;
-      RECT 6.475000 1.630000 6.645000 1.720000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.115000  0.085000 0.365000 1.120000 ;
+      RECT 0.115000  2.130000 0.445000 3.245000 ;
+      RECT 0.545000  0.540000 2.375000 0.710000 ;
+      RECT 0.545000  0.710000 0.885000 1.120000 ;
+      RECT 0.715000  1.120000 0.885000 1.290000 ;
+      RECT 0.715000  1.290000 1.625000 1.460000 ;
+      RECT 0.955000  2.320000 2.860000 2.490000 ;
+      RECT 0.955000  2.490000 1.285000 2.980000 ;
+      RECT 1.055000  0.085000 1.385000 0.370000 ;
+      RECT 1.455000  1.460000 1.625000 2.320000 ;
+      RECT 1.515000  2.660000 1.845000 3.245000 ;
+      RECT 1.565000  0.880000 1.895000 0.950000 ;
+      RECT 1.565000  0.950000 1.965000 1.120000 ;
+      RECT 1.795000  1.120000 1.965000 1.545000 ;
+      RECT 1.795000  1.545000 2.900000 1.715000 ;
+      RECT 1.795000  1.715000 2.380000 2.150000 ;
+      RECT 2.125000  0.350000 2.375000 0.540000 ;
+      RECT 2.125000  0.710000 2.375000 0.780000 ;
+      RECT 2.135000  1.030000 2.715000 1.200000 ;
+      RECT 2.135000  1.200000 2.415000 1.360000 ;
+      RECT 2.545000  0.255000 3.580000 0.425000 ;
+      RECT 2.545000  0.425000 2.715000 1.030000 ;
+      RECT 2.610000  1.885000 2.860000 2.320000 ;
+      RECT 2.610000  2.490000 2.860000 2.755000 ;
+      RECT 2.625000  1.385000 2.900000 1.545000 ;
+      RECT 2.885000  0.595000 3.240000 0.925000 ;
+      RECT 3.060000  2.425000 3.390000 2.755000 ;
+      RECT 3.070000  0.925000 3.240000 1.220000 ;
+      RECT 3.070000  1.220000 4.320000 1.550000 ;
+      RECT 3.070000  1.550000 3.390000 2.425000 ;
+      RECT 3.410000  0.425000 3.580000 0.880000 ;
+      RECT 3.410000  0.880000 4.260000 1.050000 ;
+      RECT 3.600000  1.740000 4.820000 2.120000 ;
+      RECT 3.750000  0.085000 3.920000 0.710000 ;
+      RECT 3.985000  2.440000 4.315000 3.245000 ;
+      RECT 4.090000  0.255000 5.230000 0.425000 ;
+      RECT 4.090000  0.425000 4.260000 0.880000 ;
+      RECT 4.430000  0.595000 4.680000 1.050000 ;
+      RECT 4.490000  1.050000 4.680000 1.740000 ;
+      RECT 4.490000  2.120000 4.820000 2.495000 ;
+      RECT 4.490000  2.495000 6.000000 2.665000 ;
+      RECT 4.490000  2.665000 4.820000 2.900000 ;
+      RECT 4.900000  0.425000 5.230000 1.130000 ;
+      RECT 4.990000  1.130000 5.160000 1.995000 ;
+      RECT 4.990000  1.995000 5.380000 2.325000 ;
+      RECT 5.410000  0.085000 5.660000 1.130000 ;
+      RECT 5.585000  2.835000 5.990000 3.245000 ;
+      RECT 5.830000  1.220000 6.305000 1.550000 ;
+      RECT 5.830000  1.550000 6.000000 2.495000 ;
+      RECT 6.165000  0.450000 6.645000 1.050000 ;
+      RECT 6.195000  1.720000 6.645000 1.890000 ;
+      RECT 6.195000  1.890000 6.525000 2.875000 ;
+      RECT 6.475000  1.050000 6.645000 1.300000 ;
+      RECT 6.475000  1.300000 7.245000 1.630000 ;
+      RECT 6.475000  1.630000 6.645000 1.720000 ;
+      RECT 6.695000  2.060000 7.025000 3.245000 ;
+      RECT 6.815000  0.085000 7.065000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef
index 49b9986..bee0b93 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.magic.lef
@@ -72,32 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 1.120000 ;
-        RECT 1.055000  0.085000 1.385000 0.370000 ;
-        RECT 3.870000  0.085000 4.040000 0.735000 ;
-        RECT 5.530000  0.085000 5.860000 1.010000 ;
-        RECT 6.865000  0.085000 7.115000 0.790000 ;
-        RECT 7.805000  0.085000 8.055000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -106,85 +80,108 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.105000 2.130000 0.435000 3.245000 ;
-        RECT 1.485000 2.660000 1.815000 3.245000 ;
-        RECT 3.990000 2.095000 4.240000 3.245000 ;
-        RECT 5.510000 2.560000 5.840000 3.245000 ;
-        RECT 6.710000 2.140000 7.040000 3.245000 ;
-        RECT 7.740000 1.820000 7.990000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.540000 2.375000 0.710000 ;
-      RECT 0.545000 0.710000 0.890000 1.120000 ;
-      RECT 0.720000 1.120000 0.890000 1.220000 ;
-      RECT 0.720000 1.220000 1.640000 1.390000 ;
-      RECT 0.945000 2.320000 2.800000 2.490000 ;
-      RECT 0.945000 2.490000 1.275000 2.980000 ;
-      RECT 1.470000 1.390000 1.640000 2.320000 ;
-      RECT 1.565000 0.880000 1.980000 1.050000 ;
-      RECT 1.810000 1.050000 1.980000 1.545000 ;
-      RECT 1.810000 1.545000 3.020000 1.715000 ;
-      RECT 1.810000 1.715000 2.340000 2.150000 ;
-      RECT 2.125000 0.350000 2.375000 0.540000 ;
-      RECT 2.150000 1.030000 2.715000 1.200000 ;
-      RECT 2.150000 1.200000 2.480000 1.360000 ;
-      RECT 2.545000 0.255000 3.700000 0.425000 ;
-      RECT 2.545000 0.425000 2.715000 1.030000 ;
-      RECT 2.550000 1.885000 2.800000 2.320000 ;
-      RECT 2.550000 2.490000 2.800000 2.755000 ;
-      RECT 2.690000 1.385000 3.020000 1.545000 ;
-      RECT 2.885000 0.595000 3.360000 0.845000 ;
-      RECT 3.000000 2.235000 3.360000 2.695000 ;
-      RECT 3.190000 0.845000 3.360000 1.245000 ;
-      RECT 3.190000 1.245000 4.485000 1.415000 ;
-      RECT 3.190000 1.415000 3.360000 2.235000 ;
-      RECT 3.530000 0.425000 3.700000 0.905000 ;
-      RECT 3.530000 0.905000 4.380000 1.075000 ;
-      RECT 3.530000 1.585000 3.860000 1.755000 ;
-      RECT 3.530000 1.755000 4.825000 1.925000 ;
-      RECT 4.155000 1.415000 4.485000 1.585000 ;
-      RECT 4.210000 0.255000 5.360000 0.425000 ;
-      RECT 4.210000 0.425000 4.380000 0.905000 ;
-      RECT 4.440000 1.925000 4.825000 2.220000 ;
-      RECT 4.440000 2.220000 6.005000 2.390000 ;
-      RECT 4.440000 2.390000 4.825000 2.920000 ;
-      RECT 4.550000 0.595000 4.825000 1.075000 ;
-      RECT 4.655000 1.075000 4.825000 1.755000 ;
-      RECT 4.995000 0.425000 5.360000 1.010000 ;
-      RECT 4.995000 1.010000 5.165000 1.720000 ;
-      RECT 4.995000 1.720000 5.310000 2.050000 ;
-      RECT 5.835000 1.300000 6.530000 1.630000 ;
-      RECT 5.835000 1.630000 6.005000 2.220000 ;
-      RECT 6.175000 1.800000 7.040000 1.970000 ;
-      RECT 6.175000 1.970000 6.505000 2.890000 ;
-      RECT 6.325000 0.350000 6.655000 0.960000 ;
-      RECT 6.325000 0.960000 7.040000 1.130000 ;
-      RECT 6.870000 1.130000 7.040000 1.300000 ;
-      RECT 6.870000 1.300000 7.225000 1.630000 ;
-      RECT 6.870000 1.630000 7.040000 1.800000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.105000  2.130000 0.435000 3.245000 ;
+      RECT 0.115000  0.085000 0.365000 1.120000 ;
+      RECT 0.545000  0.540000 2.375000 0.710000 ;
+      RECT 0.545000  0.710000 0.890000 1.120000 ;
+      RECT 0.720000  1.120000 0.890000 1.220000 ;
+      RECT 0.720000  1.220000 1.640000 1.390000 ;
+      RECT 0.945000  2.320000 2.800000 2.490000 ;
+      RECT 0.945000  2.490000 1.275000 2.980000 ;
+      RECT 1.055000  0.085000 1.385000 0.370000 ;
+      RECT 1.470000  1.390000 1.640000 2.320000 ;
+      RECT 1.485000  2.660000 1.815000 3.245000 ;
+      RECT 1.565000  0.880000 1.980000 1.050000 ;
+      RECT 1.810000  1.050000 1.980000 1.545000 ;
+      RECT 1.810000  1.545000 3.020000 1.715000 ;
+      RECT 1.810000  1.715000 2.340000 2.150000 ;
+      RECT 2.125000  0.350000 2.375000 0.540000 ;
+      RECT 2.150000  1.030000 2.715000 1.200000 ;
+      RECT 2.150000  1.200000 2.480000 1.360000 ;
+      RECT 2.545000  0.255000 3.700000 0.425000 ;
+      RECT 2.545000  0.425000 2.715000 1.030000 ;
+      RECT 2.550000  1.885000 2.800000 2.320000 ;
+      RECT 2.550000  2.490000 2.800000 2.755000 ;
+      RECT 2.690000  1.385000 3.020000 1.545000 ;
+      RECT 2.885000  0.595000 3.360000 0.845000 ;
+      RECT 3.000000  2.235000 3.360000 2.695000 ;
+      RECT 3.190000  0.845000 3.360000 1.245000 ;
+      RECT 3.190000  1.245000 4.485000 1.415000 ;
+      RECT 3.190000  1.415000 3.360000 2.235000 ;
+      RECT 3.530000  0.425000 3.700000 0.905000 ;
+      RECT 3.530000  0.905000 4.380000 1.075000 ;
+      RECT 3.530000  1.585000 3.860000 1.755000 ;
+      RECT 3.530000  1.755000 4.825000 1.925000 ;
+      RECT 3.870000  0.085000 4.040000 0.735000 ;
+      RECT 3.990000  2.095000 4.240000 3.245000 ;
+      RECT 4.155000  1.415000 4.485000 1.585000 ;
+      RECT 4.210000  0.255000 5.360000 0.425000 ;
+      RECT 4.210000  0.425000 4.380000 0.905000 ;
+      RECT 4.440000  1.925000 4.825000 2.220000 ;
+      RECT 4.440000  2.220000 6.005000 2.390000 ;
+      RECT 4.440000  2.390000 4.825000 2.920000 ;
+      RECT 4.550000  0.595000 4.825000 1.075000 ;
+      RECT 4.655000  1.075000 4.825000 1.755000 ;
+      RECT 4.995000  0.425000 5.360000 1.010000 ;
+      RECT 4.995000  1.010000 5.165000 1.720000 ;
+      RECT 4.995000  1.720000 5.310000 2.050000 ;
+      RECT 5.510000  2.560000 5.840000 3.245000 ;
+      RECT 5.530000  0.085000 5.860000 1.010000 ;
+      RECT 5.835000  1.300000 6.530000 1.630000 ;
+      RECT 5.835000  1.630000 6.005000 2.220000 ;
+      RECT 6.175000  1.800000 7.040000 1.970000 ;
+      RECT 6.175000  1.970000 6.505000 2.890000 ;
+      RECT 6.325000  0.350000 6.655000 0.960000 ;
+      RECT 6.325000  0.960000 7.040000 1.130000 ;
+      RECT 6.710000  2.140000 7.040000 3.245000 ;
+      RECT 6.865000  0.085000 7.115000 0.790000 ;
+      RECT 6.870000  1.130000 7.040000 1.300000 ;
+      RECT 6.870000  1.300000 7.225000 1.630000 ;
+      RECT 6.870000  1.630000 7.040000 1.800000 ;
+      RECT 7.740000  1.820000 7.990000 3.245000 ;
+      RECT 7.805000  0.085000 8.055000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdlclkp_2
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef
index 000d568..70657b2 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.magic.lef
@@ -77,36 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 1.285000 ;
-        RECT 1.125000  0.085000 1.565000 0.445000 ;
-        RECT 4.105000  0.085000 4.435000 0.725000 ;
-        RECT 6.005000  0.085000 6.335000 1.010000 ;
-        RECT 7.385000  0.085000 7.635000 0.790000 ;
-        RECT 8.295000  0.085000 8.545000 0.790000 ;
-        RECT 9.235000  0.085000 9.485000 1.130000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -115,87 +85,114 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.115000 1.955000 0.445000 3.245000 ;
-        RECT 1.545000 2.650000 2.160000 3.245000 ;
-        RECT 4.430000 2.075000 4.680000 3.245000 ;
-        RECT 5.980000 2.580000 6.310000 3.245000 ;
-        RECT 7.125000 2.140000 7.455000 3.245000 ;
-        RECT 8.235000 2.140000 8.485000 3.245000 ;
-        RECT 9.155000 1.820000 9.485000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.615000 2.635000 0.785000 ;
-      RECT 0.615000 0.785000 0.945000 1.285000 ;
-      RECT 0.985000 1.955000 1.655000 2.310000 ;
-      RECT 0.985000 2.310000 3.255000 2.480000 ;
-      RECT 0.985000 2.480000 1.315000 2.835000 ;
-      RECT 1.485000 0.785000 1.655000 1.955000 ;
-      RECT 1.825000 0.955000 2.075000 1.565000 ;
-      RECT 1.825000 1.565000 3.255000 1.735000 ;
-      RECT 2.245000 1.065000 2.975000 1.235000 ;
-      RECT 2.245000 1.235000 2.575000 1.395000 ;
-      RECT 2.305000 0.350000 2.635000 0.615000 ;
-      RECT 2.305000 0.785000 2.635000 0.895000 ;
-      RECT 2.365000 1.735000 2.695000 2.140000 ;
-      RECT 2.805000 0.270000 3.935000 0.440000 ;
-      RECT 2.805000 0.440000 2.975000 1.065000 ;
-      RECT 2.925000 1.405000 3.255000 1.565000 ;
-      RECT 2.925000 1.905000 3.255000 2.310000 ;
-      RECT 2.925000 2.480000 3.255000 2.755000 ;
-      RECT 3.145000 0.610000 3.595000 0.940000 ;
-      RECT 3.425000 0.940000 3.595000 1.235000 ;
-      RECT 3.425000 1.235000 4.930000 1.405000 ;
-      RECT 3.425000 1.405000 3.705000 2.755000 ;
-      RECT 3.765000 0.440000 3.935000 0.895000 ;
-      RECT 3.765000 0.895000 4.775000 1.065000 ;
-      RECT 3.960000 1.575000 4.290000 1.735000 ;
-      RECT 3.960000 1.735000 5.270000 1.905000 ;
-      RECT 4.600000 1.405000 4.930000 1.565000 ;
-      RECT 4.605000 0.255000 5.835000 0.425000 ;
-      RECT 4.605000 0.425000 4.775000 0.895000 ;
-      RECT 4.880000 1.905000 5.270000 2.240000 ;
-      RECT 4.880000 2.240000 6.455000 2.410000 ;
-      RECT 4.880000 2.410000 5.270000 2.895000 ;
-      RECT 4.945000 0.595000 5.275000 1.065000 ;
-      RECT 5.100000 1.065000 5.270000 1.735000 ;
-      RECT 5.440000 1.820000 5.775000 2.070000 ;
-      RECT 5.445000 0.425000 5.835000 1.010000 ;
-      RECT 5.445000 1.010000 5.615000 1.820000 ;
-      RECT 6.285000 1.300000 7.030000 1.630000 ;
-      RECT 6.285000 1.630000 6.455000 2.240000 ;
-      RECT 6.625000 1.800000 7.535000 1.970000 ;
-      RECT 6.625000 1.970000 6.955000 2.980000 ;
-      RECT 6.825000 0.350000 7.155000 0.960000 ;
-      RECT 6.825000 0.960000 7.535000 1.130000 ;
-      RECT 7.365000 1.130000 7.535000 1.300000 ;
-      RECT 7.365000 1.300000 8.435000 1.630000 ;
-      RECT 7.365000 1.630000 7.535000 1.800000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.115000  0.085000 0.445000 1.285000 ;
+      RECT 0.115000  1.955000 0.445000 3.245000 ;
+      RECT 0.615000  0.615000 2.635000 0.785000 ;
+      RECT 0.615000  0.785000 0.945000 1.285000 ;
+      RECT 0.985000  1.955000 1.655000 2.310000 ;
+      RECT 0.985000  2.310000 3.255000 2.480000 ;
+      RECT 0.985000  2.480000 1.315000 2.835000 ;
+      RECT 1.125000  0.085000 1.565000 0.445000 ;
+      RECT 1.485000  0.785000 1.655000 1.955000 ;
+      RECT 1.545000  2.650000 2.160000 3.245000 ;
+      RECT 1.825000  0.955000 2.075000 1.565000 ;
+      RECT 1.825000  1.565000 3.255000 1.735000 ;
+      RECT 2.245000  1.065000 2.975000 1.235000 ;
+      RECT 2.245000  1.235000 2.575000 1.395000 ;
+      RECT 2.305000  0.350000 2.635000 0.615000 ;
+      RECT 2.305000  0.785000 2.635000 0.895000 ;
+      RECT 2.365000  1.735000 2.695000 2.140000 ;
+      RECT 2.805000  0.270000 3.935000 0.440000 ;
+      RECT 2.805000  0.440000 2.975000 1.065000 ;
+      RECT 2.925000  1.405000 3.255000 1.565000 ;
+      RECT 2.925000  1.905000 3.255000 2.310000 ;
+      RECT 2.925000  2.480000 3.255000 2.755000 ;
+      RECT 3.145000  0.610000 3.595000 0.940000 ;
+      RECT 3.425000  0.940000 3.595000 1.235000 ;
+      RECT 3.425000  1.235000 4.930000 1.405000 ;
+      RECT 3.425000  1.405000 3.705000 2.755000 ;
+      RECT 3.765000  0.440000 3.935000 0.895000 ;
+      RECT 3.765000  0.895000 4.775000 1.065000 ;
+      RECT 3.960000  1.575000 4.290000 1.735000 ;
+      RECT 3.960000  1.735000 5.270000 1.905000 ;
+      RECT 4.105000  0.085000 4.435000 0.725000 ;
+      RECT 4.430000  2.075000 4.680000 3.245000 ;
+      RECT 4.600000  1.405000 4.930000 1.565000 ;
+      RECT 4.605000  0.255000 5.835000 0.425000 ;
+      RECT 4.605000  0.425000 4.775000 0.895000 ;
+      RECT 4.880000  1.905000 5.270000 2.240000 ;
+      RECT 4.880000  2.240000 6.455000 2.410000 ;
+      RECT 4.880000  2.410000 5.270000 2.895000 ;
+      RECT 4.945000  0.595000 5.275000 1.065000 ;
+      RECT 5.100000  1.065000 5.270000 1.735000 ;
+      RECT 5.440000  1.820000 5.775000 2.070000 ;
+      RECT 5.445000  0.425000 5.835000 1.010000 ;
+      RECT 5.445000  1.010000 5.615000 1.820000 ;
+      RECT 5.980000  2.580000 6.310000 3.245000 ;
+      RECT 6.005000  0.085000 6.335000 1.010000 ;
+      RECT 6.285000  1.300000 7.030000 1.630000 ;
+      RECT 6.285000  1.630000 6.455000 2.240000 ;
+      RECT 6.625000  1.800000 7.535000 1.970000 ;
+      RECT 6.625000  1.970000 6.955000 2.980000 ;
+      RECT 6.825000  0.350000 7.155000 0.960000 ;
+      RECT 6.825000  0.960000 7.535000 1.130000 ;
+      RECT 7.125000  2.140000 7.455000 3.245000 ;
+      RECT 7.365000  1.130000 7.535000 1.300000 ;
+      RECT 7.365000  1.300000 8.435000 1.630000 ;
+      RECT 7.365000  1.630000 7.535000 1.800000 ;
+      RECT 7.385000  0.085000 7.635000 0.790000 ;
+      RECT 8.235000  2.140000 8.485000 3.245000 ;
+      RECT 8.295000  0.085000 8.545000 0.790000 ;
+      RECT 9.155000  1.820000 9.485000 3.245000 ;
+      RECT 9.235000  0.085000 9.485000 1.130000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
   END
 END sky130_fd_sc_hs__sdlclkp_4
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef
index da4ddf3..b856f84 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.magic.lef
@@ -100,52 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.320000 0.085000 ;
-        RECT  1.150000  0.085000  1.480000 0.890000 ;
-        RECT  2.210000  0.085000  2.540000 1.005000 ;
-        RECT  4.910000  0.085000  5.240000 1.010000 ;
-        RECT  6.380000  0.085000  6.550000 1.010000 ;
-        RECT  7.290000  0.085000  7.620000 0.670000 ;
-        RECT 10.065000  0.085000 10.390000 0.680000 ;
-        RECT 11.580000  0.085000 11.830000 0.680000 ;
-        RECT 13.190000  0.085000 14.035000 0.600000 ;
-        RECT 15.525000  0.085000 15.695000 1.150000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
@@ -154,160 +108,202 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 16.320000 3.415000 ;
-        RECT  0.955000 2.630000  1.205000 3.245000 ;
-        RECT  2.395000 2.650000  2.645000 3.245000 ;
-        RECT  4.955000 2.630000  5.205000 3.245000 ;
-        RECT  6.275000 2.650000  6.605000 3.245000 ;
-        RECT  7.665000 2.650000  7.995000 3.245000 ;
-        RECT 10.080000 2.730000 10.410000 3.245000 ;
-        RECT 11.175000 2.730000 11.505000 3.245000 ;
-        RECT 13.640000 2.650000 14.230000 3.245000 ;
-        RECT 15.440000 1.820000 15.690000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 16.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.480000  0.660000 0.810000 ;
-      RECT  0.115000 0.810000  0.285000 2.290000 ;
-      RECT  0.115000 2.290000  1.545000 2.460000 ;
-      RECT  0.115000 2.460000  0.445000 2.980000 ;
-      RECT  1.025000 1.110000  2.040000 1.280000 ;
-      RECT  1.025000 1.280000  1.355000 1.950000 ;
-      RECT  1.025000 1.950000  2.665000 2.120000 ;
-      RECT  1.375000 2.460000  1.545000 2.905000 ;
-      RECT  1.375000 2.905000  2.225000 3.075000 ;
-      RECT  1.710000 0.545000  2.040000 1.110000 ;
-      RECT  1.715000 2.120000  1.885000 2.735000 ;
-      RECT  2.055000 2.310000  3.545000 2.480000 ;
-      RECT  2.055000 2.480000  2.225000 2.905000 ;
-      RECT  2.335000 1.525000  2.665000 1.950000 ;
-      RECT  2.875000 1.525000  3.205000 2.140000 ;
-      RECT  3.030000 0.545000  3.360000 1.175000 ;
-      RECT  3.030000 1.175000  3.545000 1.345000 ;
-      RECT  3.185000 2.480000  3.545000 2.980000 ;
-      RECT  3.375000 1.345000  3.545000 2.310000 ;
-      RECT  3.530000 0.545000  3.885000 1.005000 ;
-      RECT  3.715000 1.005000  3.885000 2.300000 ;
-      RECT  3.715000 2.300000  3.965000 2.905000 ;
-      RECT  3.715000 2.905000  4.785000 3.075000 ;
-      RECT  4.055000 0.410000  4.305000 0.605000 ;
-      RECT  4.055000 0.605000  4.740000 1.065000 ;
-      RECT  4.055000 1.065000  4.305000 1.950000 ;
-      RECT  4.055000 1.950000  5.870000 2.120000 ;
-      RECT  4.135000 2.120000  4.305000 2.290000 ;
-      RECT  4.135000 2.290000  4.445000 2.735000 ;
-      RECT  4.615000 2.290000  6.210000 2.310000 ;
-      RECT  4.615000 2.310000  8.335000 2.460000 ;
-      RECT  4.615000 2.460000  4.785000 2.905000 ;
-      RECT  5.565000 1.790000  5.870000 1.950000 ;
-      RECT  5.715000 2.460000  8.335000 2.480000 ;
-      RECT  5.715000 2.480000  6.045000 2.970000 ;
-      RECT  5.740000 0.605000  6.210000 1.010000 ;
-      RECT  6.040000 1.010000  6.210000 2.290000 ;
-      RECT  6.725000 1.820000  7.525000 2.140000 ;
-      RECT  6.730000 0.350000  7.060000 0.840000 ;
-      RECT  6.730000 0.840000  7.525000 1.010000 ;
-      RECT  7.055000 1.810000  7.525000 1.820000 ;
-      RECT  7.355000 1.010000  7.525000 1.810000 ;
-      RECT  7.775000 1.480000  8.530000 1.650000 ;
-      RECT  7.775000 1.650000  7.945000 2.310000 ;
-      RECT  7.800000 0.255000  9.690000 0.425000 ;
-      RECT  7.800000 0.425000  8.050000 1.130000 ;
-      RECT  8.115000 1.820000  8.870000 2.140000 ;
-      RECT  8.165000 2.480000  8.335000 2.730000 ;
-      RECT  8.165000 2.730000  9.020000 2.980000 ;
-      RECT  8.280000 0.595000  8.530000 1.480000 ;
-      RECT  8.585000 2.140000  8.870000 2.380000 ;
-      RECT  8.700000 0.425000  8.870000 1.820000 ;
-      RECT  9.040000 0.620000  9.320000 0.950000 ;
-      RECT  9.040000 0.950000  9.210000 1.620000 ;
-      RECT  9.040000 1.620000 10.730000 1.790000 ;
-      RECT  9.040000 1.790000  9.210000 2.390000 ;
-      RECT  9.040000 2.390000  9.520000 2.560000 ;
-      RECT  9.190000 2.560000  9.520000 2.980000 ;
-      RECT  9.380000 1.120000  9.690000 1.450000 ;
-      RECT  9.380000 1.960000  9.860000 2.220000 ;
-      RECT  9.490000 0.425000  9.690000 0.850000 ;
-      RECT  9.490000 0.850000 10.730000 1.020000 ;
-      RECT  9.490000 1.020000  9.690000 1.120000 ;
-      RECT  9.690000 2.220000  9.860000 2.390000 ;
-      RECT  9.690000 2.390000 12.595000 2.560000 ;
-      RECT  9.860000 1.190000 11.740000 1.360000 ;
-      RECT  9.860000 1.360000 10.190000 1.450000 ;
-      RECT 10.400000 1.530000 10.730000 1.620000 ;
-      RECT 10.400000 1.790000 10.730000 1.830000 ;
-      RECT 10.560000 0.255000 11.410000 0.425000 ;
-      RECT 10.560000 0.425000 10.730000 0.850000 ;
-      RECT 10.615000 2.050000 11.070000 2.220000 ;
-      RECT 10.900000 0.595000 11.070000 1.190000 ;
-      RECT 10.900000 1.360000 11.740000 1.520000 ;
-      RECT 10.900000 1.520000 11.070000 2.050000 ;
-      RECT 11.240000 0.425000 11.410000 0.850000 ;
-      RECT 11.240000 0.850000 12.120000 1.020000 ;
-      RECT 11.950000 1.020000 12.120000 1.130000 ;
-      RECT 11.950000 1.130000 13.395000 1.300000 ;
-      RECT 11.950000 1.300000 12.255000 1.800000 ;
-      RECT 12.290000 0.350000 12.620000 0.770000 ;
-      RECT 12.290000 0.770000 13.875000 0.940000 ;
-      RECT 12.425000 1.470000 12.855000 1.800000 ;
-      RECT 12.425000 1.800000 12.595000 2.390000 ;
-      RECT 12.765000 2.520000 13.195000 2.980000 ;
-      RECT 13.025000 1.715000 13.875000 1.885000 ;
-      RECT 13.025000 1.885000 13.195000 2.520000 ;
-      RECT 13.065000 1.300000 13.395000 1.545000 ;
-      RECT 13.460000 2.055000 14.600000 2.380000 ;
-      RECT 13.705000 0.940000 13.875000 1.200000 ;
-      RECT 13.705000 1.200000 14.260000 1.530000 ;
-      RECT 13.705000 1.530000 13.875000 1.715000 ;
-      RECT 14.045000 1.920000 14.600000 2.055000 ;
-      RECT 14.205000 0.255000 15.355000 0.425000 ;
-      RECT 14.205000 0.425000 14.600000 1.030000 ;
-      RECT 14.430000 1.030000 14.600000 1.920000 ;
-      RECT 14.430000 2.380000 14.600000 2.980000 ;
-      RECT 15.185000 0.425000 15.355000 1.320000 ;
-      RECT 15.185000 1.320000 15.895000 1.650000 ;
+      RECT  0.000000 -0.085000 16.320000 0.085000 ;
+      RECT  0.000000  3.245000 16.320000 3.415000 ;
+      RECT  0.115000  0.480000  0.660000 0.810000 ;
+      RECT  0.115000  0.810000  0.285000 2.290000 ;
+      RECT  0.115000  2.290000  1.545000 2.460000 ;
+      RECT  0.115000  2.460000  0.445000 2.980000 ;
+      RECT  0.955000  2.630000  1.205000 3.245000 ;
+      RECT  1.025000  1.110000  2.040000 1.280000 ;
+      RECT  1.025000  1.280000  1.355000 1.950000 ;
+      RECT  1.025000  1.950000  2.665000 2.120000 ;
+      RECT  1.150000  0.085000  1.480000 0.890000 ;
+      RECT  1.375000  2.460000  1.545000 2.905000 ;
+      RECT  1.375000  2.905000  2.225000 3.075000 ;
+      RECT  1.710000  0.545000  2.040000 1.110000 ;
+      RECT  1.715000  2.120000  1.885000 2.735000 ;
+      RECT  2.055000  2.310000  3.545000 2.480000 ;
+      RECT  2.055000  2.480000  2.225000 2.905000 ;
+      RECT  2.210000  0.085000  2.540000 1.005000 ;
+      RECT  2.335000  1.525000  2.665000 1.950000 ;
+      RECT  2.395000  2.650000  2.645000 3.245000 ;
+      RECT  2.875000  1.525000  3.205000 2.140000 ;
+      RECT  3.030000  0.545000  3.360000 1.175000 ;
+      RECT  3.030000  1.175000  3.545000 1.345000 ;
+      RECT  3.185000  2.480000  3.545000 2.980000 ;
+      RECT  3.375000  1.345000  3.545000 2.310000 ;
+      RECT  3.530000  0.545000  3.885000 1.005000 ;
+      RECT  3.715000  1.005000  3.885000 2.300000 ;
+      RECT  3.715000  2.300000  3.965000 2.905000 ;
+      RECT  3.715000  2.905000  4.785000 3.075000 ;
+      RECT  4.055000  0.410000  4.305000 0.605000 ;
+      RECT  4.055000  0.605000  4.740000 1.065000 ;
+      RECT  4.055000  1.065000  4.305000 1.950000 ;
+      RECT  4.055000  1.950000  5.870000 2.120000 ;
+      RECT  4.135000  2.120000  4.305000 2.290000 ;
+      RECT  4.135000  2.290000  4.445000 2.735000 ;
+      RECT  4.615000  2.290000  6.210000 2.310000 ;
+      RECT  4.615000  2.310000  8.335000 2.460000 ;
+      RECT  4.615000  2.460000  4.785000 2.905000 ;
+      RECT  4.910000  0.085000  5.240000 1.010000 ;
+      RECT  4.955000  2.630000  5.205000 3.245000 ;
+      RECT  5.565000  1.790000  5.870000 1.950000 ;
+      RECT  5.715000  2.460000  8.335000 2.480000 ;
+      RECT  5.715000  2.480000  6.045000 2.970000 ;
+      RECT  5.740000  0.605000  6.210000 1.010000 ;
+      RECT  6.040000  1.010000  6.210000 2.290000 ;
+      RECT  6.275000  2.650000  6.605000 3.245000 ;
+      RECT  6.380000  0.085000  6.550000 1.010000 ;
+      RECT  6.725000  1.820000  7.525000 2.140000 ;
+      RECT  6.730000  0.350000  7.060000 0.840000 ;
+      RECT  6.730000  0.840000  7.525000 1.010000 ;
+      RECT  7.055000  1.810000  7.525000 1.820000 ;
+      RECT  7.290000  0.085000  7.620000 0.670000 ;
+      RECT  7.355000  1.010000  7.525000 1.810000 ;
+      RECT  7.665000  2.650000  7.995000 3.245000 ;
+      RECT  7.775000  1.480000  8.530000 1.650000 ;
+      RECT  7.775000  1.650000  7.945000 2.310000 ;
+      RECT  7.800000  0.255000  9.690000 0.425000 ;
+      RECT  7.800000  0.425000  8.050000 1.130000 ;
+      RECT  8.115000  1.820000  8.870000 2.140000 ;
+      RECT  8.165000  2.480000  8.335000 2.730000 ;
+      RECT  8.165000  2.730000  9.020000 2.980000 ;
+      RECT  8.280000  0.595000  8.530000 1.480000 ;
+      RECT  8.585000  2.140000  8.870000 2.380000 ;
+      RECT  8.700000  0.425000  8.870000 1.820000 ;
+      RECT  9.040000  0.620000  9.320000 0.950000 ;
+      RECT  9.040000  0.950000  9.210000 1.620000 ;
+      RECT  9.040000  1.620000 10.730000 1.790000 ;
+      RECT  9.040000  1.790000  9.210000 2.390000 ;
+      RECT  9.040000  2.390000  9.520000 2.560000 ;
+      RECT  9.190000  2.560000  9.520000 2.980000 ;
+      RECT  9.380000  1.120000  9.690000 1.450000 ;
+      RECT  9.380000  1.960000  9.860000 2.220000 ;
+      RECT  9.490000  0.425000  9.690000 0.850000 ;
+      RECT  9.490000  0.850000 10.730000 1.020000 ;
+      RECT  9.490000  1.020000  9.690000 1.120000 ;
+      RECT  9.690000  2.220000  9.860000 2.390000 ;
+      RECT  9.690000  2.390000 12.595000 2.560000 ;
+      RECT  9.860000  1.190000 11.740000 1.360000 ;
+      RECT  9.860000  1.360000 10.190000 1.450000 ;
+      RECT 10.065000  0.085000 10.390000 0.680000 ;
+      RECT 10.080000  2.730000 10.410000 3.245000 ;
+      RECT 10.400000  1.530000 10.730000 1.620000 ;
+      RECT 10.400000  1.790000 10.730000 1.830000 ;
+      RECT 10.560000  0.255000 11.410000 0.425000 ;
+      RECT 10.560000  0.425000 10.730000 0.850000 ;
+      RECT 10.615000  2.050000 11.070000 2.220000 ;
+      RECT 10.900000  0.595000 11.070000 1.190000 ;
+      RECT 10.900000  1.360000 11.740000 1.520000 ;
+      RECT 10.900000  1.520000 11.070000 2.050000 ;
+      RECT 11.175000  2.730000 11.505000 3.245000 ;
+      RECT 11.240000  0.425000 11.410000 0.850000 ;
+      RECT 11.240000  0.850000 12.120000 1.020000 ;
+      RECT 11.580000  0.085000 11.830000 0.680000 ;
+      RECT 11.950000  1.020000 12.120000 1.130000 ;
+      RECT 11.950000  1.130000 13.395000 1.300000 ;
+      RECT 11.950000  1.300000 12.255000 1.800000 ;
+      RECT 12.290000  0.350000 12.620000 0.770000 ;
+      RECT 12.290000  0.770000 13.875000 0.940000 ;
+      RECT 12.425000  1.470000 12.855000 1.800000 ;
+      RECT 12.425000  1.800000 12.595000 2.390000 ;
+      RECT 12.765000  2.520000 13.195000 2.980000 ;
+      RECT 13.025000  1.715000 13.875000 1.885000 ;
+      RECT 13.025000  1.885000 13.195000 2.520000 ;
+      RECT 13.065000  1.300000 13.395000 1.545000 ;
+      RECT 13.190000  0.085000 14.035000 0.600000 ;
+      RECT 13.460000  2.055000 14.600000 2.380000 ;
+      RECT 13.640000  2.650000 14.230000 3.245000 ;
+      RECT 13.705000  0.940000 13.875000 1.200000 ;
+      RECT 13.705000  1.200000 14.260000 1.530000 ;
+      RECT 13.705000  1.530000 13.875000 1.715000 ;
+      RECT 14.045000  1.920000 14.600000 2.055000 ;
+      RECT 14.205000  0.255000 15.355000 0.425000 ;
+      RECT 14.205000  0.425000 14.600000 1.030000 ;
+      RECT 14.430000  1.030000 14.600000 1.920000 ;
+      RECT 14.430000  2.380000 14.600000 2.980000 ;
+      RECT 15.185000  0.425000 15.355000 1.320000 ;
+      RECT 15.185000  1.320000 15.895000 1.650000 ;
+      RECT 15.440000  1.820000 15.690000 3.245000 ;
+      RECT 15.525000  0.085000 15.695000 1.150000 ;
     LAYER mcon ;
-      RECT  3.035000 1.950000  3.205000 2.120000 ;
-      RECT 14.075000 1.950000 14.245000 2.120000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.950000  3.205000 2.120000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  1.950000 14.245000 2.120000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
     LAYER met1 ;
       RECT  2.975000 1.920000  3.265000 1.965000 ;
       RECT  2.975000 1.965000 14.305000 2.105000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef
index 3c85840..2eb9cd7 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.magic.lef
@@ -101,57 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.280000 0.085000 ;
-        RECT  1.070000  0.085000  1.400000 0.810000 ;
-        RECT  2.180000  0.085000  2.510000 1.005000 ;
-        RECT  4.960000  0.085000  5.290000 1.010000 ;
-        RECT  6.415000  0.085000  6.745000 0.920000 ;
-        RECT  7.555000  0.085000  7.725000 1.130000 ;
-        RECT 10.270000  0.085000 10.520000 0.680000 ;
-        RECT 11.710000  0.085000 11.960000 0.680000 ;
-        RECT 13.320000  0.085000 14.335000 0.600000 ;
-        RECT 14.065000  0.600000 14.335000 1.120000 ;
-        RECT 15.065000  0.085000 15.315000 1.130000 ;
-        RECT 16.005000  0.085000 16.175000 1.130000 ;
-        RECT 16.855000  0.085000 17.115000 0.790000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
-        RECT 16.475000 -0.085000 16.645000 0.085000 ;
-        RECT 16.955000 -0.085000 17.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 17.280000 0.245000 ;
     END
@@ -160,164 +109,211 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 17.280000 3.415000 ;
-        RECT  1.065000 2.630000  1.315000 3.245000 ;
-        RECT  2.505000 2.630000  2.755000 3.245000 ;
-        RECT  5.035000 2.595000  5.305000 3.245000 ;
-        RECT  6.485000 2.650000  6.735000 3.245000 ;
-        RECT  7.795000 2.650000  8.125000 3.245000 ;
-        RECT 10.225000 2.730000 10.555000 3.245000 ;
-        RECT 11.320000 2.730000 11.650000 3.245000 ;
-        RECT 13.765000 2.650000 14.305000 3.245000 ;
-        RECT 15.035000 2.660000 15.365000 3.245000 ;
-        RECT 15.935000 2.660000 16.265000 3.245000 ;
-        RECT 16.835000 2.145000 17.165000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
-        RECT 16.475000 3.245000 16.645000 3.415000 ;
-        RECT 16.955000 3.245000 17.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 17.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.420000  0.580000 0.730000 ;
-      RECT  0.085000 0.730000  0.255000 2.290000 ;
-      RECT  0.085000 2.290000  1.655000 2.460000 ;
-      RECT  0.085000 2.460000  0.525000 2.980000 ;
-      RECT  1.005000 1.110000  2.010000 1.280000 ;
-      RECT  1.005000 1.280000  1.335000 1.950000 ;
-      RECT  1.005000 1.950000  2.635000 2.120000 ;
-      RECT  1.485000 2.460000  1.655000 2.905000 ;
-      RECT  1.485000 2.905000  2.335000 3.075000 ;
-      RECT  1.680000 0.545000  2.010000 1.110000 ;
-      RECT  1.825000 2.120000  1.995000 2.735000 ;
-      RECT  2.165000 2.290000  3.545000 2.460000 ;
-      RECT  2.165000 2.460000  2.335000 2.905000 ;
-      RECT  2.305000 1.515000  2.635000 1.950000 ;
-      RECT  2.875000 1.515000  3.205000 1.845000 ;
-      RECT  3.000000 0.545000  3.330000 1.175000 ;
-      RECT  3.000000 1.175000  3.545000 1.345000 ;
-      RECT  3.265000 2.460000  3.545000 2.970000 ;
-      RECT  3.375000 1.345000  3.545000 2.290000 ;
-      RECT  3.500000 0.545000  3.885000 1.005000 ;
-      RECT  3.715000 1.005000  3.885000 2.290000 ;
-      RECT  3.715000 2.290000  3.965000 2.905000 ;
-      RECT  3.715000 2.905000  4.865000 3.075000 ;
-      RECT  4.055000 0.365000  4.305000 0.605000 ;
-      RECT  4.055000 0.605000  4.790000 1.010000 ;
-      RECT  4.055000 1.010000  4.305000 1.680000 ;
-      RECT  4.055000 1.680000  6.135000 1.850000 ;
-      RECT  4.055000 1.850000  4.305000 2.055000 ;
-      RECT  4.135000 2.055000  4.305000 2.245000 ;
-      RECT  4.135000 2.245000  4.525000 2.735000 ;
-      RECT  4.695000 2.255000  6.475000 2.310000 ;
-      RECT  4.695000 2.310000  8.465000 2.425000 ;
-      RECT  4.695000 2.425000  4.865000 2.905000 ;
-      RECT  5.805000 1.430000  6.135000 1.680000 ;
-      RECT  5.805000 1.850000  6.135000 2.085000 ;
-      RECT  5.820000 0.605000  6.150000 1.090000 ;
-      RECT  5.820000 1.090000  6.475000 1.260000 ;
-      RECT  5.845000 2.425000  8.465000 2.480000 ;
-      RECT  5.845000 2.480000  6.305000 2.925000 ;
-      RECT  6.305000 1.260000  6.475000 2.255000 ;
-      RECT  6.855000 1.820000  7.655000 2.140000 ;
-      RECT  6.915000 0.350000  7.385000 1.010000 ;
-      RECT  7.215000 1.010000  7.385000 1.470000 ;
-      RECT  7.215000 1.470000  7.655000 1.820000 ;
-      RECT  7.905000 0.255000  9.735000 0.425000 ;
-      RECT  7.905000 0.425000  8.235000 1.130000 ;
-      RECT  7.905000 1.480000  8.715000 1.650000 ;
-      RECT  7.905000 1.650000  8.075000 2.310000 ;
-      RECT  8.245000 1.820000  9.055000 2.140000 ;
-      RECT  8.295000 2.480000  9.055000 2.650000 ;
-      RECT  8.465000 0.595000  8.715000 1.480000 ;
-      RECT  8.725000 2.140000  9.055000 2.305000 ;
-      RECT  8.805000 2.650000  9.055000 2.980000 ;
-      RECT  8.885000 0.425000  9.055000 1.820000 ;
-      RECT  9.225000 0.595000  9.395000 1.690000 ;
-      RECT  9.225000 1.690000 10.940000 1.860000 ;
-      RECT  9.225000 1.860000  9.395000 2.530000 ;
-      RECT  9.225000 2.530000  9.585000 2.980000 ;
-      RECT  9.565000 0.425000  9.735000 0.850000 ;
-      RECT  9.565000 0.850000 10.860000 1.020000 ;
-      RECT  9.565000 1.020000  9.855000 1.345000 ;
-      RECT  9.565000 2.030000  9.925000 2.360000 ;
-      RECT  9.755000 2.360000  9.925000 2.390000 ;
-      RECT  9.755000 2.390000 12.720000 2.560000 ;
-      RECT 10.065000 1.190000 11.885000 1.360000 ;
-      RECT 10.065000 1.360000 10.395000 1.520000 ;
-      RECT 10.610000 1.530000 10.940000 1.690000 ;
-      RECT 10.690000 0.255000 11.540000 0.425000 ;
-      RECT 10.690000 0.425000 10.860000 0.850000 ;
-      RECT 10.760000 2.050000 11.385000 2.220000 ;
-      RECT 11.030000 0.595000 11.200000 1.190000 ;
-      RECT 11.215000 1.360000 11.885000 1.520000 ;
-      RECT 11.215000 1.520000 11.385000 2.050000 ;
-      RECT 11.370000 0.425000 11.540000 0.850000 ;
-      RECT 11.370000 0.850000 12.250000 1.020000 ;
-      RECT 12.080000 1.020000 12.250000 1.130000 ;
-      RECT 12.080000 1.130000 13.525000 1.300000 ;
-      RECT 12.080000 1.300000 12.380000 1.800000 ;
-      RECT 12.420000 0.350000 12.750000 0.770000 ;
-      RECT 12.420000 0.770000 13.865000 0.940000 ;
-      RECT 12.550000 1.470000 12.985000 1.800000 ;
-      RECT 12.550000 1.800000 12.720000 2.390000 ;
-      RECT 12.890000 2.520000 13.325000 2.980000 ;
-      RECT 13.155000 1.715000 13.865000 1.885000 ;
-      RECT 13.155000 1.885000 13.325000 2.520000 ;
-      RECT 13.195000 1.300000 13.525000 1.545000 ;
-      RECT 13.585000 2.055000 15.235000 2.320000 ;
-      RECT 13.585000 2.320000 16.185000 2.380000 ;
-      RECT 13.695000 0.940000 13.865000 1.300000 ;
-      RECT 13.695000 1.300000 14.495000 1.630000 ;
-      RECT 13.695000 1.630000 13.865000 1.715000 ;
-      RECT 14.475000 1.800000 15.235000 2.055000 ;
-      RECT 14.475000 2.380000 16.185000 2.490000 ;
-      RECT 14.475000 2.490000 14.835000 2.980000 ;
-      RECT 14.505000 0.350000 14.835000 1.130000 ;
-      RECT 14.665000 1.130000 14.835000 1.550000 ;
-      RECT 14.665000 1.550000 15.235000 1.800000 ;
-      RECT 15.995000 1.300000 16.510000 1.635000 ;
-      RECT 15.995000 1.635000 16.185000 2.320000 ;
+      RECT  0.000000 -0.085000 17.280000 0.085000 ;
+      RECT  0.000000  3.245000 17.280000 3.415000 ;
+      RECT  0.085000  0.420000  0.580000 0.730000 ;
+      RECT  0.085000  0.730000  0.255000 2.290000 ;
+      RECT  0.085000  2.290000  1.655000 2.460000 ;
+      RECT  0.085000  2.460000  0.525000 2.980000 ;
+      RECT  1.005000  1.110000  2.010000 1.280000 ;
+      RECT  1.005000  1.280000  1.335000 1.950000 ;
+      RECT  1.005000  1.950000  2.635000 2.120000 ;
+      RECT  1.065000  2.630000  1.315000 3.245000 ;
+      RECT  1.070000  0.085000  1.400000 0.810000 ;
+      RECT  1.485000  2.460000  1.655000 2.905000 ;
+      RECT  1.485000  2.905000  2.335000 3.075000 ;
+      RECT  1.680000  0.545000  2.010000 1.110000 ;
+      RECT  1.825000  2.120000  1.995000 2.735000 ;
+      RECT  2.165000  2.290000  3.545000 2.460000 ;
+      RECT  2.165000  2.460000  2.335000 2.905000 ;
+      RECT  2.180000  0.085000  2.510000 1.005000 ;
+      RECT  2.305000  1.515000  2.635000 1.950000 ;
+      RECT  2.505000  2.630000  2.755000 3.245000 ;
+      RECT  2.875000  1.515000  3.205000 1.845000 ;
+      RECT  3.000000  0.545000  3.330000 1.175000 ;
+      RECT  3.000000  1.175000  3.545000 1.345000 ;
+      RECT  3.265000  2.460000  3.545000 2.970000 ;
+      RECT  3.375000  1.345000  3.545000 2.290000 ;
+      RECT  3.500000  0.545000  3.885000 1.005000 ;
+      RECT  3.715000  1.005000  3.885000 2.290000 ;
+      RECT  3.715000  2.290000  3.965000 2.905000 ;
+      RECT  3.715000  2.905000  4.865000 3.075000 ;
+      RECT  4.055000  0.365000  4.305000 0.605000 ;
+      RECT  4.055000  0.605000  4.790000 1.010000 ;
+      RECT  4.055000  1.010000  4.305000 1.680000 ;
+      RECT  4.055000  1.680000  6.135000 1.850000 ;
+      RECT  4.055000  1.850000  4.305000 2.055000 ;
+      RECT  4.135000  2.055000  4.305000 2.245000 ;
+      RECT  4.135000  2.245000  4.525000 2.735000 ;
+      RECT  4.695000  2.255000  6.475000 2.310000 ;
+      RECT  4.695000  2.310000  8.465000 2.425000 ;
+      RECT  4.695000  2.425000  4.865000 2.905000 ;
+      RECT  4.960000  0.085000  5.290000 1.010000 ;
+      RECT  5.035000  2.595000  5.305000 3.245000 ;
+      RECT  5.805000  1.430000  6.135000 1.680000 ;
+      RECT  5.805000  1.850000  6.135000 2.085000 ;
+      RECT  5.820000  0.605000  6.150000 1.090000 ;
+      RECT  5.820000  1.090000  6.475000 1.260000 ;
+      RECT  5.845000  2.425000  8.465000 2.480000 ;
+      RECT  5.845000  2.480000  6.305000 2.925000 ;
+      RECT  6.305000  1.260000  6.475000 2.255000 ;
+      RECT  6.415000  0.085000  6.745000 0.920000 ;
+      RECT  6.485000  2.650000  6.735000 3.245000 ;
+      RECT  6.855000  1.820000  7.655000 2.140000 ;
+      RECT  6.915000  0.350000  7.385000 1.010000 ;
+      RECT  7.215000  1.010000  7.385000 1.470000 ;
+      RECT  7.215000  1.470000  7.655000 1.820000 ;
+      RECT  7.555000  0.085000  7.725000 1.130000 ;
+      RECT  7.795000  2.650000  8.125000 3.245000 ;
+      RECT  7.905000  0.255000  9.735000 0.425000 ;
+      RECT  7.905000  0.425000  8.235000 1.130000 ;
+      RECT  7.905000  1.480000  8.715000 1.650000 ;
+      RECT  7.905000  1.650000  8.075000 2.310000 ;
+      RECT  8.245000  1.820000  9.055000 2.140000 ;
+      RECT  8.295000  2.480000  9.055000 2.650000 ;
+      RECT  8.465000  0.595000  8.715000 1.480000 ;
+      RECT  8.725000  2.140000  9.055000 2.305000 ;
+      RECT  8.805000  2.650000  9.055000 2.980000 ;
+      RECT  8.885000  0.425000  9.055000 1.820000 ;
+      RECT  9.225000  0.595000  9.395000 1.690000 ;
+      RECT  9.225000  1.690000 10.940000 1.860000 ;
+      RECT  9.225000  1.860000  9.395000 2.530000 ;
+      RECT  9.225000  2.530000  9.585000 2.980000 ;
+      RECT  9.565000  0.425000  9.735000 0.850000 ;
+      RECT  9.565000  0.850000 10.860000 1.020000 ;
+      RECT  9.565000  1.020000  9.855000 1.345000 ;
+      RECT  9.565000  2.030000  9.925000 2.360000 ;
+      RECT  9.755000  2.360000  9.925000 2.390000 ;
+      RECT  9.755000  2.390000 12.720000 2.560000 ;
+      RECT 10.065000  1.190000 11.885000 1.360000 ;
+      RECT 10.065000  1.360000 10.395000 1.520000 ;
+      RECT 10.225000  2.730000 10.555000 3.245000 ;
+      RECT 10.270000  0.085000 10.520000 0.680000 ;
+      RECT 10.610000  1.530000 10.940000 1.690000 ;
+      RECT 10.690000  0.255000 11.540000 0.425000 ;
+      RECT 10.690000  0.425000 10.860000 0.850000 ;
+      RECT 10.760000  2.050000 11.385000 2.220000 ;
+      RECT 11.030000  0.595000 11.200000 1.190000 ;
+      RECT 11.215000  1.360000 11.885000 1.520000 ;
+      RECT 11.215000  1.520000 11.385000 2.050000 ;
+      RECT 11.320000  2.730000 11.650000 3.245000 ;
+      RECT 11.370000  0.425000 11.540000 0.850000 ;
+      RECT 11.370000  0.850000 12.250000 1.020000 ;
+      RECT 11.710000  0.085000 11.960000 0.680000 ;
+      RECT 12.080000  1.020000 12.250000 1.130000 ;
+      RECT 12.080000  1.130000 13.525000 1.300000 ;
+      RECT 12.080000  1.300000 12.380000 1.800000 ;
+      RECT 12.420000  0.350000 12.750000 0.770000 ;
+      RECT 12.420000  0.770000 13.865000 0.940000 ;
+      RECT 12.550000  1.470000 12.985000 1.800000 ;
+      RECT 12.550000  1.800000 12.720000 2.390000 ;
+      RECT 12.890000  2.520000 13.325000 2.980000 ;
+      RECT 13.155000  1.715000 13.865000 1.885000 ;
+      RECT 13.155000  1.885000 13.325000 2.520000 ;
+      RECT 13.195000  1.300000 13.525000 1.545000 ;
+      RECT 13.320000  0.085000 14.335000 0.600000 ;
+      RECT 13.585000  2.055000 15.235000 2.320000 ;
+      RECT 13.585000  2.320000 16.185000 2.380000 ;
+      RECT 13.695000  0.940000 13.865000 1.300000 ;
+      RECT 13.695000  1.300000 14.495000 1.630000 ;
+      RECT 13.695000  1.630000 13.865000 1.715000 ;
+      RECT 13.765000  2.650000 14.305000 3.245000 ;
+      RECT 14.065000  0.600000 14.335000 1.120000 ;
+      RECT 14.475000  1.800000 15.235000 2.055000 ;
+      RECT 14.475000  2.380000 16.185000 2.490000 ;
+      RECT 14.475000  2.490000 14.835000 2.980000 ;
+      RECT 14.505000  0.350000 14.835000 1.130000 ;
+      RECT 14.665000  1.130000 14.835000 1.550000 ;
+      RECT 14.665000  1.550000 15.235000 1.800000 ;
+      RECT 15.035000  2.660000 15.365000 3.245000 ;
+      RECT 15.065000  0.085000 15.315000 1.130000 ;
+      RECT 15.935000  2.660000 16.265000 3.245000 ;
+      RECT 15.995000  1.300000 16.510000 1.635000 ;
+      RECT 15.995000  1.635000 16.185000 2.320000 ;
+      RECT 16.005000  0.085000 16.175000 1.130000 ;
+      RECT 16.835000  2.145000 17.165000 3.245000 ;
+      RECT 16.855000  0.085000 17.115000 0.790000 ;
     LAYER mcon ;
-      RECT  3.035000 1.580000  3.205000 1.750000 ;
-      RECT 15.035000 1.580000 15.205000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  1.580000  3.205000 1.750000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  1.580000 15.205000 1.750000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
+      RECT 16.955000 -0.085000 17.125000 0.085000 ;
+      RECT 16.955000  3.245000 17.125000 3.415000 ;
     LAYER met1 ;
       RECT  2.975000 1.550000  3.265000 1.595000 ;
       RECT  2.975000 1.595000 15.265000 1.735000 ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef
index 078402d..d067267 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.magic.lef
@@ -88,50 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.360000 0.085000 ;
-        RECT  1.080000  0.085000  1.410000 0.810000 ;
-        RECT  2.070000  0.085000  2.400000 0.995000 ;
-        RECT  4.755000  0.085000  5.005000 1.010000 ;
-        RECT  6.020000  0.085000  6.280000 0.905000 ;
-        RECT  7.005000  0.085000  7.335000 0.670000 ;
-        RECT  9.750000  0.085000 10.000000 0.680000 ;
-        RECT 11.190000  0.085000 11.440000 0.685000 ;
-        RECT 12.800000  0.085000 13.755000 0.600000 ;
-        RECT 14.995000  0.085000 15.245000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 15.360000 0.245000 ;
     END
@@ -140,157 +96,197 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.360000 3.415000 ;
-        RECT  0.945000 2.630000  1.195000 3.245000 ;
-        RECT  2.385000 2.630000  2.635000 3.245000 ;
-        RECT  4.880000 2.595000  5.130000 3.245000 ;
-        RECT  6.160000 2.670000  6.490000 3.245000 ;
-        RECT  7.510000 2.670000  7.840000 3.245000 ;
-        RECT  9.865000 2.730000 10.195000 3.245000 ;
-        RECT 10.905000 2.730000 11.235000 3.245000 ;
-        RECT 13.330000 2.650000 13.785000 3.245000 ;
-        RECT 15.005000 1.820000 15.255000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 15.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.480000  0.590000 0.810000 ;
-      RECT  0.085000 0.810000  0.255000 2.290000 ;
-      RECT  0.085000 2.290000  1.535000 2.460000 ;
-      RECT  0.085000 2.460000  0.435000 2.980000 ;
-      RECT  0.975000 0.980000  1.890000 0.995000 ;
-      RECT  0.975000 0.995000  1.810000 1.150000 ;
-      RECT  0.975000 1.150000  1.305000 1.950000 ;
-      RECT  0.975000 1.950000  2.385000 2.120000 ;
-      RECT  1.365000 2.460000  1.535000 2.905000 ;
-      RECT  1.365000 2.905000  2.215000 3.075000 ;
-      RECT  1.640000 0.535000  1.890000 0.980000 ;
-      RECT  1.705000 2.120000  1.875000 2.735000 ;
-      RECT  2.045000 2.290000  3.395000 2.460000 ;
-      RECT  2.045000 2.460000  2.215000 2.905000 ;
-      RECT  2.055000 1.520000  2.385000 1.950000 ;
-      RECT  2.555000 1.505000  3.055000 1.835000 ;
-      RECT  2.890000 0.535000  3.220000 1.165000 ;
-      RECT  2.890000 1.165000  3.395000 1.335000 ;
-      RECT  3.145000 2.460000  3.395000 2.975000 ;
-      RECT  3.225000 1.335000  3.395000 2.290000 ;
-      RECT  3.390000 0.535000  3.735000 0.995000 ;
-      RECT  3.565000 0.995000  3.735000 2.295000 ;
-      RECT  3.565000 2.295000  3.845000 2.905000 ;
-      RECT  3.565000 2.905000  4.710000 3.075000 ;
-      RECT  3.905000 0.255000  4.185000 0.605000 ;
-      RECT  3.905000 0.605000  4.575000 1.010000 ;
-      RECT  3.905000 1.010000  4.185000 1.915000 ;
-      RECT  3.905000 1.915000  5.820000 2.085000 ;
-      RECT  4.015000 2.085000  4.185000 2.255000 ;
-      RECT  4.015000 2.255000  4.370000 2.735000 ;
-      RECT  4.540000 2.255000  6.160000 2.330000 ;
-      RECT  4.540000 2.330000  8.180000 2.425000 ;
-      RECT  4.540000 2.425000  4.710000 2.905000 ;
-      RECT  5.465000 0.605000  5.795000 1.075000 ;
-      RECT  5.465000 1.075000  6.160000 1.245000 ;
-      RECT  5.490000 1.415000  5.820000 1.915000 ;
-      RECT  5.640000 2.425000  8.180000 2.500000 ;
-      RECT  5.640000 2.500000  5.990000 2.935000 ;
-      RECT  5.990000 1.245000  6.160000 2.255000 ;
-      RECT  6.450000 0.350000  6.780000 0.840000 ;
-      RECT  6.450000 0.840000  7.000000 1.010000 ;
-      RECT  6.610000 1.760000  7.000000 1.830000 ;
-      RECT  6.610000 1.830000  7.390000 2.160000 ;
-      RECT  6.830000 1.010000  7.000000 1.760000 ;
-      RECT  7.515000 0.255000  9.255000 0.425000 ;
-      RECT  7.515000 0.425000  7.765000 1.130000 ;
-      RECT  7.620000 1.480000  8.235000 1.650000 ;
-      RECT  7.620000 1.650000  7.790000 2.330000 ;
-      RECT  7.960000 1.820000  8.575000 1.990000 ;
-      RECT  7.960000 1.990000  8.665000 2.160000 ;
-      RECT  7.985000 0.595000  8.235000 1.480000 ;
-      RECT  8.010000 2.500000  8.180000 2.730000 ;
-      RECT  8.010000 2.730000  8.815000 2.980000 ;
-      RECT  8.405000 0.425000  8.575000 1.820000 ;
-      RECT  8.405000 2.160000  8.665000 2.335000 ;
-      RECT  8.745000 0.595000  8.915000 1.620000 ;
-      RECT  8.745000 1.620000 10.465000 1.790000 ;
-      RECT  8.835000 1.790000  9.005000 2.390000 ;
-      RECT  8.835000 2.390000  9.315000 2.560000 ;
-      RECT  8.985000 2.560000  9.315000 2.980000 ;
-      RECT  9.085000 0.425000  9.255000 0.850000 ;
-      RECT  9.085000 0.850000 10.340000 1.020000 ;
-      RECT  9.085000 1.020000  9.340000 1.345000 ;
-      RECT  9.175000 1.960000  9.655000 2.220000 ;
-      RECT  9.485000 2.220000  9.655000 2.390000 ;
-      RECT  9.485000 2.390000 12.200000 2.560000 ;
-      RECT  9.565000 1.190000  9.895000 1.195000 ;
-      RECT  9.565000 1.195000 11.385000 1.365000 ;
-      RECT  9.565000 1.365000  9.895000 1.450000 ;
-      RECT 10.135000 1.535000 10.465000 1.620000 ;
-      RECT 10.135000 1.790000 10.465000 1.795000 ;
-      RECT 10.170000 0.255000 11.020000 0.425000 ;
-      RECT 10.170000 0.425000 10.340000 0.850000 ;
-      RECT 10.385000 1.970000 10.805000 2.220000 ;
-      RECT 10.510000 0.595000 10.680000 1.195000 ;
-      RECT 10.635000 1.365000 11.385000 1.525000 ;
-      RECT 10.635000 1.525000 10.805000 1.970000 ;
-      RECT 10.850000 0.425000 11.020000 0.855000 ;
-      RECT 10.850000 0.855000 11.730000 1.025000 ;
-      RECT 11.560000 1.025000 11.730000 1.110000 ;
-      RECT 11.560000 1.110000 13.005000 1.280000 ;
-      RECT 11.560000 1.280000 11.860000 1.800000 ;
-      RECT 11.900000 0.350000 12.230000 0.770000 ;
-      RECT 11.900000 0.770000 13.345000 0.940000 ;
-      RECT 12.030000 1.450000 12.465000 1.735000 ;
-      RECT 12.030000 1.735000 12.200000 2.390000 ;
-      RECT 12.370000 1.940000 12.805000 2.980000 ;
-      RECT 12.635000 1.735000 13.785000 1.905000 ;
-      RECT 12.635000 1.905000 12.805000 1.940000 ;
-      RECT 12.675000 1.280000 13.005000 1.555000 ;
-      RECT 13.065000 2.075000 14.285000 2.380000 ;
-      RECT 13.175000 0.940000 13.345000 1.735000 ;
-      RECT 13.615000 1.050000 13.945000 1.380000 ;
-      RECT 13.615000 1.380000 13.785000 1.735000 ;
-      RECT 13.925000 0.350000 14.285000 0.810000 ;
-      RECT 13.955000 2.380000 14.285000 2.980000 ;
-      RECT 14.045000 1.550000 14.285000 2.075000 ;
-      RECT 14.115000 0.810000 14.285000 1.550000 ;
+      RECT  0.000000 -0.085000 15.360000 0.085000 ;
+      RECT  0.000000  3.245000 15.360000 3.415000 ;
+      RECT  0.085000  0.480000  0.590000 0.810000 ;
+      RECT  0.085000  0.810000  0.255000 2.290000 ;
+      RECT  0.085000  2.290000  1.535000 2.460000 ;
+      RECT  0.085000  2.460000  0.435000 2.980000 ;
+      RECT  0.945000  2.630000  1.195000 3.245000 ;
+      RECT  0.975000  0.980000  1.890000 0.995000 ;
+      RECT  0.975000  0.995000  1.810000 1.150000 ;
+      RECT  0.975000  1.150000  1.305000 1.950000 ;
+      RECT  0.975000  1.950000  2.385000 2.120000 ;
+      RECT  1.080000  0.085000  1.410000 0.810000 ;
+      RECT  1.365000  2.460000  1.535000 2.905000 ;
+      RECT  1.365000  2.905000  2.215000 3.075000 ;
+      RECT  1.640000  0.535000  1.890000 0.980000 ;
+      RECT  1.705000  2.120000  1.875000 2.735000 ;
+      RECT  2.045000  2.290000  3.395000 2.460000 ;
+      RECT  2.045000  2.460000  2.215000 2.905000 ;
+      RECT  2.055000  1.520000  2.385000 1.950000 ;
+      RECT  2.070000  0.085000  2.400000 0.995000 ;
+      RECT  2.385000  2.630000  2.635000 3.245000 ;
+      RECT  2.555000  1.505000  3.055000 1.835000 ;
+      RECT  2.890000  0.535000  3.220000 1.165000 ;
+      RECT  2.890000  1.165000  3.395000 1.335000 ;
+      RECT  3.145000  2.460000  3.395000 2.975000 ;
+      RECT  3.225000  1.335000  3.395000 2.290000 ;
+      RECT  3.390000  0.535000  3.735000 0.995000 ;
+      RECT  3.565000  0.995000  3.735000 2.295000 ;
+      RECT  3.565000  2.295000  3.845000 2.905000 ;
+      RECT  3.565000  2.905000  4.710000 3.075000 ;
+      RECT  3.905000  0.255000  4.185000 0.605000 ;
+      RECT  3.905000  0.605000  4.575000 1.010000 ;
+      RECT  3.905000  1.010000  4.185000 1.915000 ;
+      RECT  3.905000  1.915000  5.820000 2.085000 ;
+      RECT  4.015000  2.085000  4.185000 2.255000 ;
+      RECT  4.015000  2.255000  4.370000 2.735000 ;
+      RECT  4.540000  2.255000  6.160000 2.330000 ;
+      RECT  4.540000  2.330000  8.180000 2.425000 ;
+      RECT  4.540000  2.425000  4.710000 2.905000 ;
+      RECT  4.755000  0.085000  5.005000 1.010000 ;
+      RECT  4.880000  2.595000  5.130000 3.245000 ;
+      RECT  5.465000  0.605000  5.795000 1.075000 ;
+      RECT  5.465000  1.075000  6.160000 1.245000 ;
+      RECT  5.490000  1.415000  5.820000 1.915000 ;
+      RECT  5.640000  2.425000  8.180000 2.500000 ;
+      RECT  5.640000  2.500000  5.990000 2.935000 ;
+      RECT  5.990000  1.245000  6.160000 2.255000 ;
+      RECT  6.020000  0.085000  6.280000 0.905000 ;
+      RECT  6.160000  2.670000  6.490000 3.245000 ;
+      RECT  6.450000  0.350000  6.780000 0.840000 ;
+      RECT  6.450000  0.840000  7.000000 1.010000 ;
+      RECT  6.610000  1.760000  7.000000 1.830000 ;
+      RECT  6.610000  1.830000  7.390000 2.160000 ;
+      RECT  6.830000  1.010000  7.000000 1.760000 ;
+      RECT  7.005000  0.085000  7.335000 0.670000 ;
+      RECT  7.510000  2.670000  7.840000 3.245000 ;
+      RECT  7.515000  0.255000  9.255000 0.425000 ;
+      RECT  7.515000  0.425000  7.765000 1.130000 ;
+      RECT  7.620000  1.480000  8.235000 1.650000 ;
+      RECT  7.620000  1.650000  7.790000 2.330000 ;
+      RECT  7.960000  1.820000  8.575000 1.990000 ;
+      RECT  7.960000  1.990000  8.665000 2.160000 ;
+      RECT  7.985000  0.595000  8.235000 1.480000 ;
+      RECT  8.010000  2.500000  8.180000 2.730000 ;
+      RECT  8.010000  2.730000  8.815000 2.980000 ;
+      RECT  8.405000  0.425000  8.575000 1.820000 ;
+      RECT  8.405000  2.160000  8.665000 2.335000 ;
+      RECT  8.745000  0.595000  8.915000 1.620000 ;
+      RECT  8.745000  1.620000 10.465000 1.790000 ;
+      RECT  8.835000  1.790000  9.005000 2.390000 ;
+      RECT  8.835000  2.390000  9.315000 2.560000 ;
+      RECT  8.985000  2.560000  9.315000 2.980000 ;
+      RECT  9.085000  0.425000  9.255000 0.850000 ;
+      RECT  9.085000  0.850000 10.340000 1.020000 ;
+      RECT  9.085000  1.020000  9.340000 1.345000 ;
+      RECT  9.175000  1.960000  9.655000 2.220000 ;
+      RECT  9.485000  2.220000  9.655000 2.390000 ;
+      RECT  9.485000  2.390000 12.200000 2.560000 ;
+      RECT  9.565000  1.190000  9.895000 1.195000 ;
+      RECT  9.565000  1.195000 11.385000 1.365000 ;
+      RECT  9.565000  1.365000  9.895000 1.450000 ;
+      RECT  9.750000  0.085000 10.000000 0.680000 ;
+      RECT  9.865000  2.730000 10.195000 3.245000 ;
+      RECT 10.135000  1.535000 10.465000 1.620000 ;
+      RECT 10.135000  1.790000 10.465000 1.795000 ;
+      RECT 10.170000  0.255000 11.020000 0.425000 ;
+      RECT 10.170000  0.425000 10.340000 0.850000 ;
+      RECT 10.385000  1.970000 10.805000 2.220000 ;
+      RECT 10.510000  0.595000 10.680000 1.195000 ;
+      RECT 10.635000  1.365000 11.385000 1.525000 ;
+      RECT 10.635000  1.525000 10.805000 1.970000 ;
+      RECT 10.850000  0.425000 11.020000 0.855000 ;
+      RECT 10.850000  0.855000 11.730000 1.025000 ;
+      RECT 10.905000  2.730000 11.235000 3.245000 ;
+      RECT 11.190000  0.085000 11.440000 0.685000 ;
+      RECT 11.560000  1.025000 11.730000 1.110000 ;
+      RECT 11.560000  1.110000 13.005000 1.280000 ;
+      RECT 11.560000  1.280000 11.860000 1.800000 ;
+      RECT 11.900000  0.350000 12.230000 0.770000 ;
+      RECT 11.900000  0.770000 13.345000 0.940000 ;
+      RECT 12.030000  1.450000 12.465000 1.735000 ;
+      RECT 12.030000  1.735000 12.200000 2.390000 ;
+      RECT 12.370000  1.940000 12.805000 2.980000 ;
+      RECT 12.635000  1.735000 13.785000 1.905000 ;
+      RECT 12.635000  1.905000 12.805000 1.940000 ;
+      RECT 12.675000  1.280000 13.005000 1.555000 ;
+      RECT 12.800000  0.085000 13.755000 0.600000 ;
+      RECT 13.065000  2.075000 14.285000 2.380000 ;
+      RECT 13.175000  0.940000 13.345000 1.735000 ;
+      RECT 13.330000  2.650000 13.785000 3.245000 ;
+      RECT 13.615000  1.050000 13.945000 1.380000 ;
+      RECT 13.615000  1.380000 13.785000 1.735000 ;
+      RECT 13.925000  0.350000 14.285000 0.810000 ;
+      RECT 13.955000  2.380000 14.285000 2.980000 ;
+      RECT 14.045000  1.550000 14.285000 2.075000 ;
+      RECT 14.115000  0.810000 14.285000 1.550000 ;
+      RECT 14.995000  0.085000 15.245000 1.130000 ;
+      RECT 15.005000  1.820000 15.255000 3.245000 ;
     LAYER mcon ;
-      RECT  2.555000 1.580000  2.725000 1.750000 ;
-      RECT 14.075000 1.580000 14.245000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  1.580000  2.725000 1.750000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  1.580000 14.245000 1.750000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
     LAYER met1 ;
       RECT  2.495000 1.550000  2.785000 1.595000 ;
       RECT  2.495000 1.595000 14.305000 1.735000 ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef
index 73c7a9a..996fcbf 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.magic.lef
@@ -91,53 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.320000 0.085000 ;
-        RECT  1.055000  0.085000  1.385000 0.810000 ;
-        RECT  2.045000  0.085000  2.375000 1.005000 ;
-        RECT  4.885000  0.085000  5.215000 1.010000 ;
-        RECT  6.235000  0.085000  6.495000 0.680000 ;
-        RECT  7.235000  0.085000  7.485000 1.130000 ;
-        RECT 10.100000  0.085000 10.365000 0.680000 ;
-        RECT 11.635000  0.085000 11.885000 0.680000 ;
-        RECT 13.210000  0.085000 14.145000 0.680000 ;
-        RECT 14.875000  0.085000 15.205000 0.950000 ;
-        RECT 15.875000  0.085000 16.205000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 16.320000 0.245000 ;
     END
@@ -146,158 +99,201 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 16.320000 3.415000 ;
-        RECT  1.050000 2.630000  1.300000 3.245000 ;
-        RECT  2.490000 2.630000  2.740000 3.245000 ;
-        RECT  5.010000 2.595000  5.260000 3.245000 ;
-        RECT  6.360000 2.710000  6.695000 3.245000 ;
-        RECT  7.755000 2.710000  8.085000 3.245000 ;
-        RECT 10.215000 2.730000 10.545000 3.245000 ;
-        RECT 11.310000 2.730000 11.650000 3.245000 ;
-        RECT 13.690000 2.650000 14.230000 3.245000 ;
-        RECT 14.960000 1.950000 15.290000 3.245000 ;
-        RECT 15.875000 2.320000 16.205000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 16.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.350000  0.565000 0.810000 ;
-      RECT  0.085000 0.810000  0.255000 2.290000 ;
-      RECT  0.085000 2.290000  1.640000 2.460000 ;
-      RECT  0.085000 2.460000  0.510000 2.980000 ;
-      RECT  0.975000 0.980000  1.865000 1.150000 ;
-      RECT  0.975000 1.150000  1.305000 1.950000 ;
-      RECT  0.975000 1.950000  2.385000 2.120000 ;
-      RECT  1.470000 2.460000  1.640000 2.905000 ;
-      RECT  1.470000 2.905000  2.320000 3.075000 ;
-      RECT  1.615000 0.545000  1.865000 0.980000 ;
-      RECT  1.810000 2.120000  1.980000 2.735000 ;
-      RECT  2.055000 1.520000  2.385000 1.950000 ;
-      RECT  2.150000 2.290000  3.500000 2.460000 ;
-      RECT  2.150000 2.460000  2.320000 2.905000 ;
-      RECT  2.555000 1.515000  3.070000 1.845000 ;
-      RECT  2.865000 0.675000  3.340000 1.005000 ;
-      RECT  3.170000 1.005000  3.340000 1.175000 ;
-      RECT  3.170000 1.175000  3.500000 1.345000 ;
-      RECT  3.250000 2.460000  3.500000 2.975000 ;
-      RECT  3.330000 1.345000  3.500000 2.290000 ;
-      RECT  3.510000 0.545000  3.840000 1.005000 ;
-      RECT  3.670000 1.005000  3.840000 2.295000 ;
-      RECT  3.670000 2.295000  3.950000 2.905000 ;
-      RECT  3.670000 2.905000  4.840000 3.075000 ;
-      RECT  4.010000 0.255000  4.295000 0.605000 ;
-      RECT  4.010000 0.605000  4.715000 1.010000 ;
-      RECT  4.010000 1.010000  4.295000 1.915000 ;
-      RECT  4.010000 1.915000  5.885000 2.085000 ;
-      RECT  4.125000 2.085000  4.295000 2.255000 ;
-      RECT  4.125000 2.255000  4.500000 2.735000 ;
-      RECT  4.670000 2.255000  6.225000 2.370000 ;
-      RECT  4.670000 2.370000  8.425000 2.425000 ;
-      RECT  4.670000 2.425000  4.840000 2.905000 ;
-      RECT  5.620000 1.415000  5.885000 1.915000 ;
-      RECT  5.675000 0.605000  6.005000 0.895000 ;
-      RECT  5.675000 0.895000  6.225000 1.065000 ;
-      RECT  5.800000 2.425000  8.425000 2.520000 ;
-      RECT  5.800000 2.520000  9.015000 2.540000 ;
-      RECT  5.800000 2.540000  6.130000 2.935000 ;
-      RECT  6.055000 1.065000  6.225000 2.255000 ;
-      RECT  6.675000 0.350000  7.065000 1.010000 ;
-      RECT  6.895000 1.010000  7.065000 1.530000 ;
-      RECT  6.895000 1.530000  7.615000 2.200000 ;
-      RECT  7.665000 0.255000  9.495000 0.425000 ;
-      RECT  7.665000 0.425000  7.995000 1.130000 ;
-      RECT  7.865000 1.480000  8.475000 1.650000 ;
-      RECT  7.865000 1.650000  8.035000 2.370000 ;
-      RECT  8.205000 1.820000  8.815000 2.020000 ;
-      RECT  8.205000 2.020000  9.005000 2.200000 ;
-      RECT  8.225000 0.595000  8.475000 1.480000 ;
-      RECT  8.255000 2.540000  9.015000 2.690000 ;
-      RECT  8.645000 0.425000  8.815000 1.820000 ;
-      RECT  8.645000 2.200000  9.005000 2.350000 ;
-      RECT  8.765000 2.690000  9.015000 2.980000 ;
-      RECT  8.985000 0.595000  9.155000 1.660000 ;
-      RECT  8.985000 1.660000 10.785000 1.830000 ;
-      RECT  9.185000 1.830000  9.355000 2.520000 ;
-      RECT  9.185000 2.520000  9.545000 2.980000 ;
-      RECT  9.325000 0.425000  9.495000 0.850000 ;
-      RECT  9.325000 0.850000 10.705000 1.020000 ;
-      RECT  9.325000 1.020000  9.655000 1.345000 ;
-      RECT  9.525000 2.020000  9.885000 2.350000 ;
-      RECT  9.715000 2.350000  9.885000 2.390000 ;
-      RECT  9.715000 2.390000 12.730000 2.560000 ;
-      RECT  9.915000 1.190000 11.800000 1.360000 ;
-      RECT  9.915000 1.360000 10.245000 1.490000 ;
-      RECT 10.455000 1.530000 10.785000 1.660000 ;
-      RECT 10.535000 0.255000 11.465000 0.425000 ;
-      RECT 10.535000 0.425000 10.705000 0.850000 ;
-      RECT 10.750000 2.050000 11.125000 2.220000 ;
-      RECT 10.875000 0.595000 11.125000 1.190000 ;
-      RECT 10.955000 1.360000 11.800000 1.520000 ;
-      RECT 10.955000 1.520000 11.125000 2.050000 ;
-      RECT 11.295000 0.425000 11.465000 0.850000 ;
-      RECT 11.295000 0.850000 12.210000 1.020000 ;
-      RECT 12.040000 1.020000 12.210000 1.190000 ;
-      RECT 12.040000 1.190000 13.450000 1.360000 ;
-      RECT 12.040000 1.360000 12.370000 1.800000 ;
-      RECT 12.390000 0.350000 12.720000 0.850000 ;
-      RECT 12.390000 0.850000 13.790000 1.020000 ;
-      RECT 12.560000 1.530000 12.910000 1.755000 ;
-      RECT 12.560000 1.755000 12.730000 2.390000 ;
-      RECT 12.900000 1.925000 13.250000 2.980000 ;
-      RECT 13.080000 1.755000 14.410000 1.925000 ;
-      RECT 13.120000 1.360000 13.450000 1.585000 ;
-      RECT 13.510000 2.095000 13.840000 2.300000 ;
-      RECT 13.510000 2.300000 14.750000 2.470000 ;
-      RECT 13.620000 1.020000 13.790000 1.755000 ;
-      RECT 14.080000 1.460000 14.410000 1.755000 ;
-      RECT 14.080000 1.925000 14.410000 2.130000 ;
-      RECT 14.315000 0.350000 14.645000 1.120000 ;
-      RECT 14.315000 1.120000 14.750000 1.290000 ;
-      RECT 14.400000 2.470000 14.750000 2.980000 ;
-      RECT 14.580000 1.290000 14.750000 1.550000 ;
-      RECT 14.580000 1.550000 15.235000 1.780000 ;
-      RECT 14.580000 1.780000 14.750000 2.300000 ;
+      RECT  0.000000 -0.085000 16.320000 0.085000 ;
+      RECT  0.000000  3.245000 16.320000 3.415000 ;
+      RECT  0.085000  0.350000  0.565000 0.810000 ;
+      RECT  0.085000  0.810000  0.255000 2.290000 ;
+      RECT  0.085000  2.290000  1.640000 2.460000 ;
+      RECT  0.085000  2.460000  0.510000 2.980000 ;
+      RECT  0.975000  0.980000  1.865000 1.150000 ;
+      RECT  0.975000  1.150000  1.305000 1.950000 ;
+      RECT  0.975000  1.950000  2.385000 2.120000 ;
+      RECT  1.050000  2.630000  1.300000 3.245000 ;
+      RECT  1.055000  0.085000  1.385000 0.810000 ;
+      RECT  1.470000  2.460000  1.640000 2.905000 ;
+      RECT  1.470000  2.905000  2.320000 3.075000 ;
+      RECT  1.615000  0.545000  1.865000 0.980000 ;
+      RECT  1.810000  2.120000  1.980000 2.735000 ;
+      RECT  2.045000  0.085000  2.375000 1.005000 ;
+      RECT  2.055000  1.520000  2.385000 1.950000 ;
+      RECT  2.150000  2.290000  3.500000 2.460000 ;
+      RECT  2.150000  2.460000  2.320000 2.905000 ;
+      RECT  2.490000  2.630000  2.740000 3.245000 ;
+      RECT  2.555000  1.515000  3.070000 1.845000 ;
+      RECT  2.865000  0.675000  3.340000 1.005000 ;
+      RECT  3.170000  1.005000  3.340000 1.175000 ;
+      RECT  3.170000  1.175000  3.500000 1.345000 ;
+      RECT  3.250000  2.460000  3.500000 2.975000 ;
+      RECT  3.330000  1.345000  3.500000 2.290000 ;
+      RECT  3.510000  0.545000  3.840000 1.005000 ;
+      RECT  3.670000  1.005000  3.840000 2.295000 ;
+      RECT  3.670000  2.295000  3.950000 2.905000 ;
+      RECT  3.670000  2.905000  4.840000 3.075000 ;
+      RECT  4.010000  0.255000  4.295000 0.605000 ;
+      RECT  4.010000  0.605000  4.715000 1.010000 ;
+      RECT  4.010000  1.010000  4.295000 1.915000 ;
+      RECT  4.010000  1.915000  5.885000 2.085000 ;
+      RECT  4.125000  2.085000  4.295000 2.255000 ;
+      RECT  4.125000  2.255000  4.500000 2.735000 ;
+      RECT  4.670000  2.255000  6.225000 2.370000 ;
+      RECT  4.670000  2.370000  8.425000 2.425000 ;
+      RECT  4.670000  2.425000  4.840000 2.905000 ;
+      RECT  4.885000  0.085000  5.215000 1.010000 ;
+      RECT  5.010000  2.595000  5.260000 3.245000 ;
+      RECT  5.620000  1.415000  5.885000 1.915000 ;
+      RECT  5.675000  0.605000  6.005000 0.895000 ;
+      RECT  5.675000  0.895000  6.225000 1.065000 ;
+      RECT  5.800000  2.425000  8.425000 2.520000 ;
+      RECT  5.800000  2.520000  9.015000 2.540000 ;
+      RECT  5.800000  2.540000  6.130000 2.935000 ;
+      RECT  6.055000  1.065000  6.225000 2.255000 ;
+      RECT  6.235000  0.085000  6.495000 0.680000 ;
+      RECT  6.360000  2.710000  6.695000 3.245000 ;
+      RECT  6.675000  0.350000  7.065000 1.010000 ;
+      RECT  6.895000  1.010000  7.065000 1.530000 ;
+      RECT  6.895000  1.530000  7.615000 2.200000 ;
+      RECT  7.235000  0.085000  7.485000 1.130000 ;
+      RECT  7.665000  0.255000  9.495000 0.425000 ;
+      RECT  7.665000  0.425000  7.995000 1.130000 ;
+      RECT  7.755000  2.710000  8.085000 3.245000 ;
+      RECT  7.865000  1.480000  8.475000 1.650000 ;
+      RECT  7.865000  1.650000  8.035000 2.370000 ;
+      RECT  8.205000  1.820000  8.815000 2.020000 ;
+      RECT  8.205000  2.020000  9.005000 2.200000 ;
+      RECT  8.225000  0.595000  8.475000 1.480000 ;
+      RECT  8.255000  2.540000  9.015000 2.690000 ;
+      RECT  8.645000  0.425000  8.815000 1.820000 ;
+      RECT  8.645000  2.200000  9.005000 2.350000 ;
+      RECT  8.765000  2.690000  9.015000 2.980000 ;
+      RECT  8.985000  0.595000  9.155000 1.660000 ;
+      RECT  8.985000  1.660000 10.785000 1.830000 ;
+      RECT  9.185000  1.830000  9.355000 2.520000 ;
+      RECT  9.185000  2.520000  9.545000 2.980000 ;
+      RECT  9.325000  0.425000  9.495000 0.850000 ;
+      RECT  9.325000  0.850000 10.705000 1.020000 ;
+      RECT  9.325000  1.020000  9.655000 1.345000 ;
+      RECT  9.525000  2.020000  9.885000 2.350000 ;
+      RECT  9.715000  2.350000  9.885000 2.390000 ;
+      RECT  9.715000  2.390000 12.730000 2.560000 ;
+      RECT  9.915000  1.190000 11.800000 1.360000 ;
+      RECT  9.915000  1.360000 10.245000 1.490000 ;
+      RECT 10.100000  0.085000 10.365000 0.680000 ;
+      RECT 10.215000  2.730000 10.545000 3.245000 ;
+      RECT 10.455000  1.530000 10.785000 1.660000 ;
+      RECT 10.535000  0.255000 11.465000 0.425000 ;
+      RECT 10.535000  0.425000 10.705000 0.850000 ;
+      RECT 10.750000  2.050000 11.125000 2.220000 ;
+      RECT 10.875000  0.595000 11.125000 1.190000 ;
+      RECT 10.955000  1.360000 11.800000 1.520000 ;
+      RECT 10.955000  1.520000 11.125000 2.050000 ;
+      RECT 11.295000  0.425000 11.465000 0.850000 ;
+      RECT 11.295000  0.850000 12.210000 1.020000 ;
+      RECT 11.310000  2.730000 11.650000 3.245000 ;
+      RECT 11.635000  0.085000 11.885000 0.680000 ;
+      RECT 12.040000  1.020000 12.210000 1.190000 ;
+      RECT 12.040000  1.190000 13.450000 1.360000 ;
+      RECT 12.040000  1.360000 12.370000 1.800000 ;
+      RECT 12.390000  0.350000 12.720000 0.850000 ;
+      RECT 12.390000  0.850000 13.790000 1.020000 ;
+      RECT 12.560000  1.530000 12.910000 1.755000 ;
+      RECT 12.560000  1.755000 12.730000 2.390000 ;
+      RECT 12.900000  1.925000 13.250000 2.980000 ;
+      RECT 13.080000  1.755000 14.410000 1.925000 ;
+      RECT 13.120000  1.360000 13.450000 1.585000 ;
+      RECT 13.210000  0.085000 14.145000 0.680000 ;
+      RECT 13.510000  2.095000 13.840000 2.300000 ;
+      RECT 13.510000  2.300000 14.750000 2.470000 ;
+      RECT 13.620000  1.020000 13.790000 1.755000 ;
+      RECT 13.690000  2.650000 14.230000 3.245000 ;
+      RECT 14.080000  1.460000 14.410000 1.755000 ;
+      RECT 14.080000  1.925000 14.410000 2.130000 ;
+      RECT 14.315000  0.350000 14.645000 1.120000 ;
+      RECT 14.315000  1.120000 14.750000 1.290000 ;
+      RECT 14.400000  2.470000 14.750000 2.980000 ;
+      RECT 14.580000  1.290000 14.750000 1.550000 ;
+      RECT 14.580000  1.550000 15.235000 1.780000 ;
+      RECT 14.580000  1.780000 14.750000 2.300000 ;
+      RECT 14.875000  0.085000 15.205000 0.950000 ;
+      RECT 14.960000  1.950000 15.290000 3.245000 ;
+      RECT 15.875000  0.085000 16.205000 1.130000 ;
+      RECT 15.875000  2.320000 16.205000 3.245000 ;
     LAYER mcon ;
-      RECT  2.555000 1.580000  2.725000 1.750000 ;
-      RECT 15.035000 1.580000 15.205000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  1.580000  2.725000 1.750000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  1.580000 15.205000 1.750000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
     LAYER met1 ;
       RECT  2.495000 1.550000  2.785000 1.595000 ;
       RECT  2.495000 1.595000 15.265000 1.735000 ;
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef
index 6fc4e8f..ca99743 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.magic.lef
@@ -94,55 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.800000 0.085000 ;
-        RECT  1.040000  0.085000  1.370000 0.810000 ;
-        RECT  2.030000  0.085000  2.360000 1.005000 ;
-        RECT  4.765000  0.085000  5.095000 1.010000 ;
-        RECT  6.110000  0.085000  6.360000 0.905000 ;
-        RECT  7.095000  0.085000  7.425000 0.670000 ;
-        RECT  9.840000  0.085000 10.090000 0.690000 ;
-        RECT 11.280000  0.085000 11.530000 0.690000 ;
-        RECT 12.855000  0.085000 13.835000 0.680000 ;
-        RECT 14.565000  0.085000 14.895000 1.340000 ;
-        RECT 15.495000  0.085000 15.825000 0.920000 ;
-        RECT 16.370000  0.085000 16.700000 0.920000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
-        RECT 10.715000 -0.085000 10.885000 0.085000 ;
-        RECT 11.195000 -0.085000 11.365000 0.085000 ;
-        RECT 11.675000 -0.085000 11.845000 0.085000 ;
-        RECT 12.155000 -0.085000 12.325000 0.085000 ;
-        RECT 12.635000 -0.085000 12.805000 0.085000 ;
-        RECT 13.115000 -0.085000 13.285000 0.085000 ;
-        RECT 13.595000 -0.085000 13.765000 0.085000 ;
-        RECT 14.075000 -0.085000 14.245000 0.085000 ;
-        RECT 14.555000 -0.085000 14.725000 0.085000 ;
-        RECT 15.035000 -0.085000 15.205000 0.085000 ;
-        RECT 15.515000 -0.085000 15.685000 0.085000 ;
-        RECT 15.995000 -0.085000 16.165000 0.085000 ;
-        RECT 16.475000 -0.085000 16.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 16.800000 0.245000 ;
     END
@@ -151,158 +102,203 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 16.800000 3.415000 ;
-        RECT  1.035000 2.630000  1.285000 3.245000 ;
-        RECT  2.475000 2.630000  2.725000 3.245000 ;
-        RECT  4.970000 2.595000  5.220000 3.245000 ;
-        RECT  6.260000 2.675000  6.590000 3.245000 ;
-        RECT  7.610000 2.675000  7.940000 3.245000 ;
-        RECT  9.960000 2.730000 10.290000 3.245000 ;
-        RECT 10.995000 2.730000 11.325000 3.245000 ;
-        RECT 13.335000 2.650000 13.875000 3.245000 ;
-        RECT 14.565000 1.950000 14.895000 3.245000 ;
-        RECT 15.465000 2.320000 15.795000 3.245000 ;
-        RECT 16.365000 2.320000 16.695000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
-        RECT 10.715000 3.245000 10.885000 3.415000 ;
-        RECT 11.195000 3.245000 11.365000 3.415000 ;
-        RECT 11.675000 3.245000 11.845000 3.415000 ;
-        RECT 12.155000 3.245000 12.325000 3.415000 ;
-        RECT 12.635000 3.245000 12.805000 3.415000 ;
-        RECT 13.115000 3.245000 13.285000 3.415000 ;
-        RECT 13.595000 3.245000 13.765000 3.415000 ;
-        RECT 14.075000 3.245000 14.245000 3.415000 ;
-        RECT 14.555000 3.245000 14.725000 3.415000 ;
-        RECT 15.035000 3.245000 15.205000 3.415000 ;
-        RECT 15.515000 3.245000 15.685000 3.415000 ;
-        RECT 15.995000 3.245000 16.165000 3.415000 ;
-        RECT 16.475000 3.245000 16.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 16.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.340000  0.550000 0.810000 ;
-      RECT  0.085000 0.810000  0.255000 2.290000 ;
-      RECT  0.085000 2.290000  1.625000 2.460000 ;
-      RECT  0.085000 2.460000  0.495000 2.980000 ;
-      RECT  0.995000 0.980000  1.850000 1.150000 ;
-      RECT  0.995000 1.150000  1.325000 1.950000 ;
-      RECT  0.995000 1.950000  2.365000 2.120000 ;
-      RECT  1.455000 2.460000  1.625000 2.905000 ;
-      RECT  1.455000 2.905000  2.305000 3.075000 ;
-      RECT  1.600000 0.545000  1.850000 0.980000 ;
-      RECT  1.795000 2.120000  1.965000 2.735000 ;
-      RECT  2.115000 1.520000  2.365000 1.950000 ;
-      RECT  2.135000 2.290000  3.485000 2.460000 ;
-      RECT  2.135000 2.460000  2.305000 2.905000 ;
-      RECT  2.535000 1.520000  3.055000 1.850000 ;
-      RECT  2.850000 0.545000  3.180000 1.175000 ;
-      RECT  2.850000 1.175000  3.485000 1.345000 ;
-      RECT  3.235000 2.460000  3.485000 2.975000 ;
-      RECT  3.315000 1.345000  3.485000 2.290000 ;
-      RECT  3.350000 0.675000  3.825000 1.005000 ;
-      RECT  3.655000 1.005000  3.825000 2.295000 ;
-      RECT  3.655000 2.295000  3.935000 2.905000 ;
-      RECT  3.655000 2.905000  4.800000 3.075000 ;
-      RECT  3.995000 0.255000  4.275000 0.605000 ;
-      RECT  3.995000 0.605000  4.585000 1.010000 ;
-      RECT  3.995000 1.010000  4.275000 1.915000 ;
-      RECT  3.995000 1.915000  5.860000 2.085000 ;
-      RECT  4.105000 2.085000  4.275000 2.255000 ;
-      RECT  4.105000 2.255000  4.460000 2.735000 ;
-      RECT  4.630000 2.255000  6.200000 2.335000 ;
-      RECT  4.630000 2.335000  8.325000 2.425000 ;
-      RECT  4.630000 2.425000  4.800000 2.905000 ;
-      RECT  5.555000 0.605000  5.885000 1.075000 ;
-      RECT  5.555000 1.075000  6.200000 1.245000 ;
-      RECT  5.580000 1.415000  5.860000 1.915000 ;
-      RECT  5.730000 2.425000  8.325000 2.505000 ;
-      RECT  5.730000 2.505000  6.060000 2.935000 ;
-      RECT  6.030000 1.245000  6.200000 2.255000 ;
-      RECT  6.540000 0.350000  6.870000 0.840000 ;
-      RECT  6.540000 0.840000  7.415000 1.010000 ;
-      RECT  6.710000 1.785000  7.490000 2.165000 ;
-      RECT  7.245000 1.010000  7.415000 1.785000 ;
-      RECT  7.605000 0.255000  9.505000 0.425000 ;
-      RECT  7.605000 0.425000  7.855000 1.130000 ;
-      RECT  7.720000 1.480000  8.325000 1.650000 ;
-      RECT  7.720000 1.650000  7.890000 2.335000 ;
-      RECT  8.060000 1.820000  8.665000 1.995000 ;
-      RECT  8.060000 1.995000  8.830000 2.165000 ;
-      RECT  8.075000 0.595000  8.325000 1.480000 ;
-      RECT  8.155000 2.505000  8.830000 2.980000 ;
-      RECT  8.495000 0.425000  8.665000 1.820000 ;
-      RECT  8.495000 2.165000  8.830000 2.335000 ;
-      RECT  8.835000 0.595000  9.005000 1.630000 ;
-      RECT  8.835000 1.630000 10.585000 1.800000 ;
-      RECT  9.000000 1.800000  9.170000 2.520000 ;
-      RECT  9.000000 2.520000  9.360000 2.980000 ;
-      RECT  9.175000 0.425000  9.505000 0.860000 ;
-      RECT  9.175000 0.860000 10.430000 1.030000 ;
-      RECT  9.175000 1.030000  9.505000 1.255000 ;
-      RECT  9.340000 2.000000  9.700000 2.330000 ;
-      RECT  9.530000 2.330000  9.700000 2.390000 ;
-      RECT  9.530000 2.390000 12.295000 2.560000 ;
-      RECT  9.715000 1.200000 11.475000 1.370000 ;
-      RECT  9.715000 1.370000 10.045000 1.405000 ;
-      RECT 10.255000 1.540000 10.585000 1.630000 ;
-      RECT 10.260000 0.255000 11.110000 0.425000 ;
-      RECT 10.260000 0.425000 10.430000 0.860000 ;
-      RECT 10.475000 1.970000 10.925000 2.220000 ;
-      RECT 10.600000 0.595000 10.770000 1.200000 ;
-      RECT 10.755000 1.370000 11.475000 1.530000 ;
-      RECT 10.755000 1.530000 10.925000 1.970000 ;
-      RECT 10.940000 0.425000 11.110000 0.860000 ;
-      RECT 10.940000 0.860000 11.855000 1.030000 ;
-      RECT 11.685000 1.030000 11.855000 1.190000 ;
-      RECT 11.685000 1.190000 13.095000 1.360000 ;
-      RECT 11.685000 1.360000 11.955000 1.800000 ;
-      RECT 12.035000 0.350000 12.365000 0.850000 ;
-      RECT 12.035000 0.850000 13.435000 0.990000 ;
-      RECT 12.035000 0.990000 14.055000 1.020000 ;
-      RECT 12.125000 1.530000 12.555000 1.755000 ;
-      RECT 12.125000 1.755000 12.295000 2.390000 ;
-      RECT 12.465000 1.925000 12.895000 2.980000 ;
-      RECT 12.725000 1.755000 14.055000 1.925000 ;
-      RECT 12.765000 1.360000 13.095000 1.585000 ;
-      RECT 13.155000 2.095000 13.485000 2.180000 ;
-      RECT 13.155000 2.180000 14.395000 2.350000 ;
-      RECT 13.265000 1.020000 14.055000 1.755000 ;
-      RECT 13.725000 0.980000 14.055000 0.990000 ;
-      RECT 13.725000 1.925000 14.055000 1.990000 ;
-      RECT 14.005000 0.350000 14.395000 0.810000 ;
-      RECT 14.045000 2.350000 14.395000 2.980000 ;
-      RECT 14.225000 0.810000 14.395000 1.550000 ;
-      RECT 14.225000 1.550000 14.755000 1.780000 ;
-      RECT 14.225000 1.780000 14.395000 2.180000 ;
+      RECT  0.000000 -0.085000 16.800000 0.085000 ;
+      RECT  0.000000  3.245000 16.800000 3.415000 ;
+      RECT  0.085000  0.340000  0.550000 0.810000 ;
+      RECT  0.085000  0.810000  0.255000 2.290000 ;
+      RECT  0.085000  2.290000  1.625000 2.460000 ;
+      RECT  0.085000  2.460000  0.495000 2.980000 ;
+      RECT  0.995000  0.980000  1.850000 1.150000 ;
+      RECT  0.995000  1.150000  1.325000 1.950000 ;
+      RECT  0.995000  1.950000  2.365000 2.120000 ;
+      RECT  1.035000  2.630000  1.285000 3.245000 ;
+      RECT  1.040000  0.085000  1.370000 0.810000 ;
+      RECT  1.455000  2.460000  1.625000 2.905000 ;
+      RECT  1.455000  2.905000  2.305000 3.075000 ;
+      RECT  1.600000  0.545000  1.850000 0.980000 ;
+      RECT  1.795000  2.120000  1.965000 2.735000 ;
+      RECT  2.030000  0.085000  2.360000 1.005000 ;
+      RECT  2.115000  1.520000  2.365000 1.950000 ;
+      RECT  2.135000  2.290000  3.485000 2.460000 ;
+      RECT  2.135000  2.460000  2.305000 2.905000 ;
+      RECT  2.475000  2.630000  2.725000 3.245000 ;
+      RECT  2.535000  1.520000  3.055000 1.850000 ;
+      RECT  2.850000  0.545000  3.180000 1.175000 ;
+      RECT  2.850000  1.175000  3.485000 1.345000 ;
+      RECT  3.235000  2.460000  3.485000 2.975000 ;
+      RECT  3.315000  1.345000  3.485000 2.290000 ;
+      RECT  3.350000  0.675000  3.825000 1.005000 ;
+      RECT  3.655000  1.005000  3.825000 2.295000 ;
+      RECT  3.655000  2.295000  3.935000 2.905000 ;
+      RECT  3.655000  2.905000  4.800000 3.075000 ;
+      RECT  3.995000  0.255000  4.275000 0.605000 ;
+      RECT  3.995000  0.605000  4.585000 1.010000 ;
+      RECT  3.995000  1.010000  4.275000 1.915000 ;
+      RECT  3.995000  1.915000  5.860000 2.085000 ;
+      RECT  4.105000  2.085000  4.275000 2.255000 ;
+      RECT  4.105000  2.255000  4.460000 2.735000 ;
+      RECT  4.630000  2.255000  6.200000 2.335000 ;
+      RECT  4.630000  2.335000  8.325000 2.425000 ;
+      RECT  4.630000  2.425000  4.800000 2.905000 ;
+      RECT  4.765000  0.085000  5.095000 1.010000 ;
+      RECT  4.970000  2.595000  5.220000 3.245000 ;
+      RECT  5.555000  0.605000  5.885000 1.075000 ;
+      RECT  5.555000  1.075000  6.200000 1.245000 ;
+      RECT  5.580000  1.415000  5.860000 1.915000 ;
+      RECT  5.730000  2.425000  8.325000 2.505000 ;
+      RECT  5.730000  2.505000  6.060000 2.935000 ;
+      RECT  6.030000  1.245000  6.200000 2.255000 ;
+      RECT  6.110000  0.085000  6.360000 0.905000 ;
+      RECT  6.260000  2.675000  6.590000 3.245000 ;
+      RECT  6.540000  0.350000  6.870000 0.840000 ;
+      RECT  6.540000  0.840000  7.415000 1.010000 ;
+      RECT  6.710000  1.785000  7.490000 2.165000 ;
+      RECT  7.095000  0.085000  7.425000 0.670000 ;
+      RECT  7.245000  1.010000  7.415000 1.785000 ;
+      RECT  7.605000  0.255000  9.505000 0.425000 ;
+      RECT  7.605000  0.425000  7.855000 1.130000 ;
+      RECT  7.610000  2.675000  7.940000 3.245000 ;
+      RECT  7.720000  1.480000  8.325000 1.650000 ;
+      RECT  7.720000  1.650000  7.890000 2.335000 ;
+      RECT  8.060000  1.820000  8.665000 1.995000 ;
+      RECT  8.060000  1.995000  8.830000 2.165000 ;
+      RECT  8.075000  0.595000  8.325000 1.480000 ;
+      RECT  8.155000  2.505000  8.830000 2.980000 ;
+      RECT  8.495000  0.425000  8.665000 1.820000 ;
+      RECT  8.495000  2.165000  8.830000 2.335000 ;
+      RECT  8.835000  0.595000  9.005000 1.630000 ;
+      RECT  8.835000  1.630000 10.585000 1.800000 ;
+      RECT  9.000000  1.800000  9.170000 2.520000 ;
+      RECT  9.000000  2.520000  9.360000 2.980000 ;
+      RECT  9.175000  0.425000  9.505000 0.860000 ;
+      RECT  9.175000  0.860000 10.430000 1.030000 ;
+      RECT  9.175000  1.030000  9.505000 1.255000 ;
+      RECT  9.340000  2.000000  9.700000 2.330000 ;
+      RECT  9.530000  2.330000  9.700000 2.390000 ;
+      RECT  9.530000  2.390000 12.295000 2.560000 ;
+      RECT  9.715000  1.200000 11.475000 1.370000 ;
+      RECT  9.715000  1.370000 10.045000 1.405000 ;
+      RECT  9.840000  0.085000 10.090000 0.690000 ;
+      RECT  9.960000  2.730000 10.290000 3.245000 ;
+      RECT 10.255000  1.540000 10.585000 1.630000 ;
+      RECT 10.260000  0.255000 11.110000 0.425000 ;
+      RECT 10.260000  0.425000 10.430000 0.860000 ;
+      RECT 10.475000  1.970000 10.925000 2.220000 ;
+      RECT 10.600000  0.595000 10.770000 1.200000 ;
+      RECT 10.755000  1.370000 11.475000 1.530000 ;
+      RECT 10.755000  1.530000 10.925000 1.970000 ;
+      RECT 10.940000  0.425000 11.110000 0.860000 ;
+      RECT 10.940000  0.860000 11.855000 1.030000 ;
+      RECT 10.995000  2.730000 11.325000 3.245000 ;
+      RECT 11.280000  0.085000 11.530000 0.690000 ;
+      RECT 11.685000  1.030000 11.855000 1.190000 ;
+      RECT 11.685000  1.190000 13.095000 1.360000 ;
+      RECT 11.685000  1.360000 11.955000 1.800000 ;
+      RECT 12.035000  0.350000 12.365000 0.850000 ;
+      RECT 12.035000  0.850000 13.435000 0.990000 ;
+      RECT 12.035000  0.990000 14.055000 1.020000 ;
+      RECT 12.125000  1.530000 12.555000 1.755000 ;
+      RECT 12.125000  1.755000 12.295000 2.390000 ;
+      RECT 12.465000  1.925000 12.895000 2.980000 ;
+      RECT 12.725000  1.755000 14.055000 1.925000 ;
+      RECT 12.765000  1.360000 13.095000 1.585000 ;
+      RECT 12.855000  0.085000 13.835000 0.680000 ;
+      RECT 13.155000  2.095000 13.485000 2.180000 ;
+      RECT 13.155000  2.180000 14.395000 2.350000 ;
+      RECT 13.265000  1.020000 14.055000 1.755000 ;
+      RECT 13.335000  2.650000 13.875000 3.245000 ;
+      RECT 13.725000  0.980000 14.055000 0.990000 ;
+      RECT 13.725000  1.925000 14.055000 1.990000 ;
+      RECT 14.005000  0.350000 14.395000 0.810000 ;
+      RECT 14.045000  2.350000 14.395000 2.980000 ;
+      RECT 14.225000  0.810000 14.395000 1.550000 ;
+      RECT 14.225000  1.550000 14.755000 1.780000 ;
+      RECT 14.225000  1.780000 14.395000 2.180000 ;
+      RECT 14.565000  0.085000 14.895000 1.340000 ;
+      RECT 14.565000  1.950000 14.895000 3.245000 ;
+      RECT 15.465000  2.320000 15.795000 3.245000 ;
+      RECT 15.495000  0.085000 15.825000 0.920000 ;
+      RECT 16.365000  2.320000 16.695000 3.245000 ;
+      RECT 16.370000  0.085000 16.700000 0.920000 ;
     LAYER mcon ;
-      RECT  2.555000 1.580000  2.725000 1.750000 ;
-      RECT 14.555000 1.580000 14.725000 1.750000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  1.580000  2.725000 1.750000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  1.580000 14.725000 1.750000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
     LAYER met1 ;
       RECT  2.495000 1.550000  2.785000 1.595000 ;
       RECT  2.495000 1.595000 14.785000 1.735000 ;
diff --git a/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
index 4720dfe..3fb9382 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_1.magic.lef
@@ -34,10 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.480000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
@@ -62,12 +58,16 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.480000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.480000 0.085000 ;
+      RECT 0.000000  3.245000 0.480000 3.415000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+  END
 END sky130_fd_sc_hs__tap_1
diff --git a/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef b/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
index 6afcf89..20fff8e 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_hs__tap_2.magic.lef
@@ -34,11 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
@@ -63,13 +58,18 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.960000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.960000 0.085000 ;
+      RECT 0.000000  3.245000 0.960000 3.415000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+  END
 END sky130_fd_sc_hs__tap_2
diff --git a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
index 61cef8f..76076ef 100644
--- a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
+++ b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.magic.lef
@@ -34,11 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.960000 0.245000 ;
     END
@@ -47,10 +42,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.090000 0.265000 0.870000 1.105000 ;
-      LAYER mcon ;
-        RECT 0.155000 0.470000 0.325000 0.640000 ;
       LAYER met1 ;
         RECT 0.080000 0.425000 0.400000 0.685000 ;
     END
@@ -63,6 +54,8 @@
         RECT 0.090000 2.210000 0.870000 3.065000 ;
       LAYER mcon ;
         RECT 0.635000 2.690000 0.805000 2.860000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.560000 2.645000 0.880000 2.905000 ;
     END
@@ -71,13 +64,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.960000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.960000 0.085000 ;
+      RECT 0.000000  3.245000 0.960000 3.415000 ;
+      RECT 0.090000  0.265000 0.870000 1.105000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  0.470000 0.325000 0.640000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+  END
 END sky130_fd_sc_hs__tapmet1_2
diff --git a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
index a0d900b..f9e0b19 100644
--- a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.magic.lef
@@ -34,11 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.480000 0.085000 ;
-        RECT 0.090000  0.085000 0.390000 1.440000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
@@ -47,10 +42,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.090000 1.890000 0.390000 3.065000 ;
-      LAYER mcon ;
-        RECT 0.155000 2.690000 0.325000 2.860000 ;
       LAYER met1 ;
         RECT 0.080000 2.645000 0.400000 2.905000 ;
     END
@@ -59,12 +50,19 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.480000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.480000 0.085000 ;
+      RECT 0.000000  3.245000 0.480000 3.415000 ;
+      RECT 0.090000  0.085000 0.390000 1.440000 ;
+      RECT 0.090000  1.890000 0.390000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  2.690000 0.325000 2.860000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+  END
 END sky130_fd_sc_hs__tapvgnd_1
diff --git a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
index 68ec5e5..4b22346 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.magic.lef
@@ -34,11 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.480000 0.085000 ;
-        RECT 0.090000  0.085000 0.390000 1.440000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
@@ -47,10 +42,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.090000 1.890000 0.390000 3.065000 ;
-      LAYER mcon ;
-        RECT 0.155000 2.320000 0.325000 2.490000 ;
       LAYER met1 ;
         RECT 0.080000 2.275000 0.400000 2.535000 ;
     END
@@ -59,12 +50,19 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.480000 3.415000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.480000 0.085000 ;
+      RECT 0.000000  3.245000 0.480000 3.415000 ;
+      RECT 0.090000  0.085000 0.390000 1.440000 ;
+      RECT 0.090000  1.890000 0.390000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  2.320000 0.325000 2.490000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+  END
 END sky130_fd_sc_hs__tapvgnd2_1
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
index f1e064b..3124177 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.magic.lef
@@ -34,11 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.480000 0.085000 ;
-        RECT 0.090000  0.085000 0.390000 1.105000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 0.480000 0.245000 ;
     END
@@ -47,13 +42,18 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.480000 3.415000 ;
-        RECT 0.090000 2.205000 0.390000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 0.480000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.480000 0.085000 ;
+      RECT 0.000000  3.245000 0.480000 3.415000 ;
+      RECT 0.090000  0.085000 0.390000 1.105000 ;
+      RECT 0.090000  2.205000 0.390000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+  END
 END sky130_fd_sc_hs__tapvpwrvgnd_1
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef
index 4b9693a..182c9f9 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.magic.lef
@@ -69,18 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.105000  0.085000 0.435000 1.255000 ;
-        RECT 1.935000  0.085000 2.265000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -89,37 +77,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.175000 1.905000 0.425000 2.290000 ;
-        RECT 0.175000 2.290000 0.505000 3.245000 ;
-        RECT 1.415000 2.290000 1.745000 3.245000 ;
-        RECT 2.855000 2.190000 3.185000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.605000 1.085000 2.805000 1.180000 ;
-      RECT 0.605000 1.180000 1.225000 1.255000 ;
-      RECT 0.605000 1.255000 0.775000 1.950000 ;
-      RECT 0.605000 1.950000 1.005000 2.120000 ;
-      RECT 0.675000 2.120000 1.005000 2.785000 ;
-      RECT 0.895000 0.575000 1.225000 1.010000 ;
-      RECT 0.895000 1.010000 2.805000 1.085000 ;
-      RECT 1.435000 0.510000 1.765000 0.670000 ;
-      RECT 1.435000 0.670000 2.770000 0.840000 ;
-      RECT 2.440000 0.510000 2.770000 0.670000 ;
-      RECT 2.635000 1.180000 2.805000 1.300000 ;
-      RECT 2.635000 1.300000 2.935000 1.630000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.105000  0.085000 0.435000 1.255000 ;
+      RECT 0.175000  1.905000 0.425000 2.290000 ;
+      RECT 0.175000  2.290000 0.505000 3.245000 ;
+      RECT 0.605000  1.085000 2.805000 1.180000 ;
+      RECT 0.605000  1.180000 1.225000 1.255000 ;
+      RECT 0.605000  1.255000 0.775000 1.950000 ;
+      RECT 0.605000  1.950000 1.005000 2.120000 ;
+      RECT 0.675000  2.120000 1.005000 2.785000 ;
+      RECT 0.895000  0.575000 1.225000 1.010000 ;
+      RECT 0.895000  1.010000 2.805000 1.085000 ;
+      RECT 1.415000  2.290000 1.745000 3.245000 ;
+      RECT 1.435000  0.510000 1.765000 0.670000 ;
+      RECT 1.435000  0.670000 2.770000 0.840000 ;
+      RECT 1.935000  0.085000 2.265000 0.500000 ;
+      RECT 2.440000  0.510000 2.770000 0.670000 ;
+      RECT 2.635000  1.180000 2.805000 1.300000 ;
+      RECT 2.635000  1.300000 2.935000 1.630000 ;
+      RECT 2.855000  2.190000 3.185000 3.245000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
   END
 END sky130_fd_sc_hs__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef
index a13de22..8623d04 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.magic.lef
@@ -35,16 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.425000 1.180000 0.835000 1.550000 ;
-        RECT 3.005000 1.180000 3.355000 1.550000 ;
-        RECT 3.025000 1.550000 3.355000 1.720000 ;
-        RECT 3.025000 1.720000 4.675000 1.890000 ;
-        RECT 4.445000 1.350000 4.855000 1.680000 ;
-        RECT 4.445000 1.680000 4.675000 1.720000 ;
-      LAYER mcon ;
-        RECT 0.635000 1.210000 0.805000 1.380000 ;
-        RECT 3.035000 1.210000 3.205000 1.380000 ;
       LAYER met1 ;
         RECT 0.575000 1.180000 0.865000 1.225000 ;
         RECT 0.575000 1.225000 3.265000 1.365000 ;
@@ -91,23 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.115000  0.085000 0.495000 0.670000 ;
-        RECT 3.265000  0.085000 3.600000 0.500000 ;
-        RECT 4.310000  0.085000 4.655000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -116,43 +89,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.115000 2.660000 0.445000 3.245000 ;
-        RECT 1.230000 2.660000 1.875000 3.245000 ;
-        RECT 2.640000 2.740000 2.970000 3.245000 ;
-        RECT 4.805000 2.400000 5.135000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.650000 1.820000 1.175000 2.150000 ;
-      RECT 1.005000 0.635000 1.450000 1.010000 ;
-      RECT 1.005000 1.010000 2.585000 1.180000 ;
-      RECT 1.005000 1.180000 1.175000 1.820000 ;
-      RECT 1.680000 0.595000 2.010000 0.670000 ;
-      RECT 1.680000 0.670000 5.165000 0.840000 ;
-      RECT 1.915000 1.180000 2.585000 1.550000 ;
-      RECT 2.755000 0.350000 3.085000 0.670000 ;
-      RECT 2.755000 0.840000 3.085000 1.010000 ;
-      RECT 3.260000 2.740000 3.600000 2.905000 ;
-      RECT 3.260000 2.905000 4.635000 3.075000 ;
-      RECT 3.780000 0.490000 4.110000 0.670000 ;
-      RECT 4.305000 2.400000 4.635000 2.905000 ;
-      RECT 4.835000 0.490000 5.165000 0.670000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  0.085000 0.495000 0.670000 ;
+      RECT 0.115000  2.660000 0.445000 3.245000 ;
+      RECT 0.425000  1.180000 0.835000 1.550000 ;
+      RECT 0.650000  1.820000 1.175000 2.150000 ;
+      RECT 1.005000  0.635000 1.450000 1.010000 ;
+      RECT 1.005000  1.010000 2.585000 1.180000 ;
+      RECT 1.005000  1.180000 1.175000 1.820000 ;
+      RECT 1.230000  2.660000 1.875000 3.245000 ;
+      RECT 1.680000  0.595000 2.010000 0.670000 ;
+      RECT 1.680000  0.670000 5.165000 0.840000 ;
+      RECT 1.915000  1.180000 2.585000 1.550000 ;
+      RECT 2.640000  2.740000 2.970000 3.245000 ;
+      RECT 2.755000  0.350000 3.085000 0.670000 ;
+      RECT 2.755000  0.840000 3.085000 1.010000 ;
+      RECT 3.005000  1.180000 3.355000 1.550000 ;
+      RECT 3.025000  1.550000 3.355000 1.720000 ;
+      RECT 3.025000  1.720000 4.675000 1.890000 ;
+      RECT 3.260000  2.740000 3.600000 2.905000 ;
+      RECT 3.260000  2.905000 4.635000 3.075000 ;
+      RECT 3.265000  0.085000 3.600000 0.500000 ;
+      RECT 3.780000  0.490000 4.110000 0.670000 ;
+      RECT 4.305000  2.400000 4.635000 2.905000 ;
+      RECT 4.310000  0.085000 4.655000 0.500000 ;
+      RECT 4.445000  1.350000 4.855000 1.680000 ;
+      RECT 4.445000  1.680000 4.675000 1.720000 ;
+      RECT 4.805000  2.400000 5.135000 3.245000 ;
+      RECT 4.835000  0.490000 5.165000 0.670000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  1.210000 0.805000 1.380000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  1.210000 3.205000 1.380000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_hs__xnor2_2
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef
index fc786c4..5919086 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.magic.lef
@@ -35,13 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.545000 1.320000 1.315000 1.650000 ;
-        RECT 1.085000 1.650000 1.315000 1.780000 ;
-        RECT 4.445000 1.350000 5.835000 1.775000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.580000 1.285000 1.750000 ;
-        RECT 4.475000 1.580000 4.645000 1.750000 ;
       LAYER met1 ;
         RECT 1.055000 1.550000 1.345000 1.595000 ;
         RECT 1.055000 1.595000 4.705000 1.735000 ;
@@ -84,33 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.810000 ;
-        RECT 5.070000  0.085000 5.400000 0.500000 ;
-        RECT 6.090000  0.085000 6.420000 0.500000 ;
-        RECT 7.110000  0.085000 7.475000 0.500000 ;
-        RECT 8.165000  0.085000 8.495000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -119,70 +85,99 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.115000 1.820000 0.365000 3.245000 ;
-        RECT 1.095000 2.290000 1.265000 3.245000 ;
-        RECT 2.000000 2.965000 2.340000 3.245000 ;
-        RECT 3.080000 2.965000 3.410000 3.245000 ;
-        RECT 5.265000 2.965000 5.600000 3.245000 ;
-        RECT 6.340000 2.965000 6.670000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.350000 0.365000 0.980000 ;
-      RECT 0.115000 0.980000 1.375000 1.150000 ;
-      RECT 0.565000 1.820000 0.895000 1.950000 ;
-      RECT 0.565000 1.950000 1.795000 2.120000 ;
-      RECT 0.565000 2.120000 0.895000 2.700000 ;
-      RECT 1.045000 0.350000 2.305000 0.600000 ;
-      RECT 1.045000 0.600000 1.375000 0.980000 ;
-      RECT 1.465000 2.120000 1.795000 2.625000 ;
-      RECT 1.465000 2.625000 4.590000 2.795000 ;
-      RECT 1.545000 0.770000 1.875000 1.010000 ;
-      RECT 1.545000 1.010000 2.565000 1.180000 ;
-      RECT 2.395000 1.180000 2.565000 1.350000 ;
-      RECT 2.395000 1.350000 4.085000 1.680000 ;
-      RECT 2.535000 0.255000 4.890000 0.425000 ;
-      RECT 2.535000 0.425000 2.865000 0.840000 ;
-      RECT 3.535000 0.425000 3.865000 0.840000 ;
-      RECT 3.580000 2.795000 4.590000 2.955000 ;
-      RECT 4.560000 0.425000 4.890000 0.670000 ;
-      RECT 4.560000 0.670000 9.005000 0.840000 ;
-      RECT 4.810000 2.625000 7.125000 2.795000 ;
-      RECT 4.810000 2.795000 5.060000 2.980000 ;
-      RECT 5.580000 0.350000 5.910000 0.670000 ;
-      RECT 5.805000 2.795000 6.135000 2.980000 ;
-      RECT 6.600000 0.350000 6.930000 0.670000 ;
-      RECT 6.875000 2.795000 7.125000 2.905000 ;
-      RECT 6.875000 2.905000 9.005000 3.075000 ;
-      RECT 7.655000 0.350000 7.985000 0.670000 ;
-      RECT 7.855000 2.275000 8.025000 2.905000 ;
-      RECT 8.675000 0.350000 9.005000 0.670000 ;
-      RECT 8.675000 0.840000 9.005000 1.130000 ;
-      RECT 8.755000 1.935000 9.005000 2.905000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.115000  0.350000 0.365000 0.980000 ;
+      RECT 0.115000  0.980000 1.375000 1.150000 ;
+      RECT 0.115000  1.820000 0.365000 3.245000 ;
+      RECT 0.545000  0.085000 0.875000 0.810000 ;
+      RECT 0.545000  1.320000 1.315000 1.650000 ;
+      RECT 0.565000  1.820000 0.895000 1.950000 ;
+      RECT 0.565000  1.950000 1.795000 2.120000 ;
+      RECT 0.565000  2.120000 0.895000 2.700000 ;
+      RECT 1.045000  0.350000 2.305000 0.600000 ;
+      RECT 1.045000  0.600000 1.375000 0.980000 ;
+      RECT 1.085000  1.650000 1.315000 1.780000 ;
+      RECT 1.095000  2.290000 1.265000 3.245000 ;
+      RECT 1.465000  2.120000 1.795000 2.625000 ;
+      RECT 1.465000  2.625000 4.590000 2.795000 ;
+      RECT 1.545000  0.770000 1.875000 1.010000 ;
+      RECT 1.545000  1.010000 2.565000 1.180000 ;
+      RECT 2.000000  2.965000 2.340000 3.245000 ;
+      RECT 2.395000  1.180000 2.565000 1.350000 ;
+      RECT 2.395000  1.350000 4.085000 1.680000 ;
+      RECT 2.535000  0.255000 4.890000 0.425000 ;
+      RECT 2.535000  0.425000 2.865000 0.840000 ;
+      RECT 3.080000  2.965000 3.410000 3.245000 ;
+      RECT 3.535000  0.425000 3.865000 0.840000 ;
+      RECT 3.580000  2.795000 4.590000 2.955000 ;
+      RECT 4.445000  1.350000 5.835000 1.775000 ;
+      RECT 4.560000  0.425000 4.890000 0.670000 ;
+      RECT 4.560000  0.670000 9.005000 0.840000 ;
+      RECT 4.810000  2.625000 7.125000 2.795000 ;
+      RECT 4.810000  2.795000 5.060000 2.980000 ;
+      RECT 5.070000  0.085000 5.400000 0.500000 ;
+      RECT 5.265000  2.965000 5.600000 3.245000 ;
+      RECT 5.580000  0.350000 5.910000 0.670000 ;
+      RECT 5.805000  2.795000 6.135000 2.980000 ;
+      RECT 6.090000  0.085000 6.420000 0.500000 ;
+      RECT 6.340000  2.965000 6.670000 3.245000 ;
+      RECT 6.600000  0.350000 6.930000 0.670000 ;
+      RECT 6.875000  2.795000 7.125000 2.905000 ;
+      RECT 6.875000  2.905000 9.005000 3.075000 ;
+      RECT 7.110000  0.085000 7.475000 0.500000 ;
+      RECT 7.655000  0.350000 7.985000 0.670000 ;
+      RECT 7.855000  2.275000 8.025000 2.905000 ;
+      RECT 8.165000  0.085000 8.495000 0.500000 ;
+      RECT 8.675000  0.350000 9.005000 0.670000 ;
+      RECT 8.675000  0.840000 9.005000 1.130000 ;
+      RECT 8.755000  1.935000 9.005000 2.905000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  1.580000 1.285000 1.750000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  1.580000 4.645000 1.750000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_hs__xnor2_4
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef
index 5061712..cc46567 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.magic.lef
@@ -72,29 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.490000 ;
-        RECT 3.395000  0.085000 3.725000 0.500000 ;
-        RECT 7.205000  0.085000 7.615000 0.915000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.160000 0.245000 ;
     END
@@ -103,105 +80,124 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.555000 2.290000 0.805000 3.245000 ;
-        RECT 3.395000 2.710000 3.725000 3.245000 ;
-        RECT 7.260000 2.290000 7.590000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.340000 0.785000 1.670000 ;
-      RECT 0.615000 0.660000 1.665000 0.830000 ;
-      RECT 0.615000 0.830000 0.785000 1.340000 ;
-      RECT 0.615000 1.670000 0.785000 1.950000 ;
-      RECT 0.615000 1.950000 1.145000 2.120000 ;
-      RECT 0.975000 2.120000 1.145000 2.905000 ;
-      RECT 0.975000 2.905000 2.655000 3.075000 ;
-      RECT 1.135000 1.000000 1.665000 1.170000 ;
-      RECT 1.315000 1.950000 1.665000 2.500000 ;
-      RECT 1.495000 0.255000 2.665000 0.425000 ;
-      RECT 1.495000 0.425000 1.665000 0.660000 ;
-      RECT 1.495000 1.170000 1.665000 1.580000 ;
-      RECT 1.495000 1.580000 2.845000 1.750000 ;
-      RECT 1.495000 1.750000 1.665000 1.950000 ;
-      RECT 1.835000 0.595000 2.165000 1.140000 ;
-      RECT 1.835000 1.140000 3.185000 1.310000 ;
-      RECT 1.835000 1.310000 2.275000 1.410000 ;
-      RECT 1.875000 1.950000 2.125000 2.370000 ;
-      RECT 1.875000 2.370000 5.265000 2.540000 ;
-      RECT 1.875000 2.540000 2.125000 2.735000 ;
-      RECT 2.325000 2.710000 2.655000 2.905000 ;
-      RECT 2.335000 0.425000 2.665000 0.970000 ;
-      RECT 2.515000 1.480000 2.845000 1.580000 ;
-      RECT 2.515000 1.750000 2.845000 1.810000 ;
-      RECT 2.835000 0.350000 3.165000 0.670000 ;
-      RECT 2.835000 0.670000 6.535000 0.765000 ;
-      RECT 2.835000 0.765000 5.180000 0.840000 ;
-      RECT 2.835000 0.840000 3.525000 0.970000 ;
-      RECT 2.850000 2.030000 3.185000 2.200000 ;
-      RECT 3.015000 1.310000 3.185000 2.030000 ;
-      RECT 3.355000 0.970000 3.525000 2.370000 ;
-      RECT 3.905000 1.010000 4.715000 1.180000 ;
-      RECT 3.920000 1.950000 4.715000 2.200000 ;
-      RECT 4.465000 0.255000 7.035000 0.425000 ;
-      RECT 4.465000 0.425000 4.840000 0.500000 ;
-      RECT 4.490000 2.710000 4.820000 2.905000 ;
-      RECT 4.490000 2.905000 7.090000 3.075000 ;
-      RECT 4.545000 1.180000 4.715000 1.355000 ;
-      RECT 4.545000 1.355000 5.045000 1.685000 ;
-      RECT 4.545000 1.685000 4.715000 1.950000 ;
-      RECT 5.010000 0.595000 6.535000 0.670000 ;
-      RECT 5.015000 1.855000 5.265000 2.370000 ;
-      RECT 5.015000 2.540000 5.265000 2.575000 ;
-      RECT 5.020000 1.015000 5.485000 1.180000 ;
-      RECT 5.020000 1.180000 5.605000 1.185000 ;
-      RECT 5.315000 1.185000 5.605000 1.410000 ;
-      RECT 5.435000 1.410000 5.605000 1.765000 ;
-      RECT 5.435000 1.765000 6.250000 1.935000 ;
-      RECT 5.550000 2.105000 5.880000 2.565000 ;
-      RECT 5.550000 2.565000 6.590000 2.735000 ;
-      RECT 5.775000 0.935000 6.085000 1.425000 ;
-      RECT 5.775000 1.425000 6.590000 1.595000 ;
-      RECT 6.080000 1.935000 6.250000 2.395000 ;
-      RECT 6.255000 0.765000 6.535000 1.210000 ;
-      RECT 6.420000 1.595000 6.590000 2.565000 ;
-      RECT 6.705000 0.425000 7.035000 1.085000 ;
-      RECT 6.705000 1.085000 7.620000 1.255000 ;
-      RECT 6.760000 1.950000 7.620000 2.120000 ;
-      RECT 6.760000 2.120000 7.090000 2.905000 ;
-      RECT 7.415000 1.255000 7.620000 1.425000 ;
-      RECT 7.415000 1.425000 7.665000 1.755000 ;
-      RECT 7.415000 1.755000 7.620000 1.950000 ;
-      RECT 7.790000 2.190000 8.075000 2.930000 ;
-      RECT 7.795000 0.585000 8.075000 1.255000 ;
-      RECT 7.835000 1.255000 8.075000 2.190000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.425000  1.340000 0.785000 1.670000 ;
+      RECT 0.555000  2.290000 0.805000 3.245000 ;
+      RECT 0.615000  0.660000 1.665000 0.830000 ;
+      RECT 0.615000  0.830000 0.785000 1.340000 ;
+      RECT 0.615000  1.670000 0.785000 1.950000 ;
+      RECT 0.615000  1.950000 1.145000 2.120000 ;
+      RECT 0.625000  0.085000 0.955000 0.490000 ;
+      RECT 0.975000  2.120000 1.145000 2.905000 ;
+      RECT 0.975000  2.905000 2.655000 3.075000 ;
+      RECT 1.135000  1.000000 1.665000 1.170000 ;
+      RECT 1.315000  1.950000 1.665000 2.500000 ;
+      RECT 1.495000  0.255000 2.665000 0.425000 ;
+      RECT 1.495000  0.425000 1.665000 0.660000 ;
+      RECT 1.495000  1.170000 1.665000 1.580000 ;
+      RECT 1.495000  1.580000 2.845000 1.750000 ;
+      RECT 1.495000  1.750000 1.665000 1.950000 ;
+      RECT 1.835000  0.595000 2.165000 1.140000 ;
+      RECT 1.835000  1.140000 3.185000 1.310000 ;
+      RECT 1.835000  1.310000 2.275000 1.410000 ;
+      RECT 1.875000  1.950000 2.125000 2.370000 ;
+      RECT 1.875000  2.370000 5.265000 2.540000 ;
+      RECT 1.875000  2.540000 2.125000 2.735000 ;
+      RECT 2.325000  2.710000 2.655000 2.905000 ;
+      RECT 2.335000  0.425000 2.665000 0.970000 ;
+      RECT 2.515000  1.480000 2.845000 1.580000 ;
+      RECT 2.515000  1.750000 2.845000 1.810000 ;
+      RECT 2.835000  0.350000 3.165000 0.670000 ;
+      RECT 2.835000  0.670000 6.535000 0.765000 ;
+      RECT 2.835000  0.765000 5.180000 0.840000 ;
+      RECT 2.835000  0.840000 3.525000 0.970000 ;
+      RECT 2.850000  2.030000 3.185000 2.200000 ;
+      RECT 3.015000  1.310000 3.185000 2.030000 ;
+      RECT 3.355000  0.970000 3.525000 2.370000 ;
+      RECT 3.395000  0.085000 3.725000 0.500000 ;
+      RECT 3.395000  2.710000 3.725000 3.245000 ;
+      RECT 3.905000  1.010000 4.715000 1.180000 ;
+      RECT 3.920000  1.950000 4.715000 2.200000 ;
+      RECT 4.465000  0.255000 7.035000 0.425000 ;
+      RECT 4.465000  0.425000 4.840000 0.500000 ;
+      RECT 4.490000  2.710000 4.820000 2.905000 ;
+      RECT 4.490000  2.905000 7.090000 3.075000 ;
+      RECT 4.545000  1.180000 4.715000 1.355000 ;
+      RECT 4.545000  1.355000 5.045000 1.685000 ;
+      RECT 4.545000  1.685000 4.715000 1.950000 ;
+      RECT 5.010000  0.595000 6.535000 0.670000 ;
+      RECT 5.015000  1.855000 5.265000 2.370000 ;
+      RECT 5.015000  2.540000 5.265000 2.575000 ;
+      RECT 5.020000  1.015000 5.485000 1.180000 ;
+      RECT 5.020000  1.180000 5.605000 1.185000 ;
+      RECT 5.315000  1.185000 5.605000 1.410000 ;
+      RECT 5.435000  1.410000 5.605000 1.765000 ;
+      RECT 5.435000  1.765000 6.250000 1.935000 ;
+      RECT 5.550000  2.105000 5.880000 2.565000 ;
+      RECT 5.550000  2.565000 6.590000 2.735000 ;
+      RECT 5.775000  0.935000 6.085000 1.425000 ;
+      RECT 5.775000  1.425000 6.590000 1.595000 ;
+      RECT 6.080000  1.935000 6.250000 2.395000 ;
+      RECT 6.255000  0.765000 6.535000 1.210000 ;
+      RECT 6.420000  1.595000 6.590000 2.565000 ;
+      RECT 6.705000  0.425000 7.035000 1.085000 ;
+      RECT 6.705000  1.085000 7.620000 1.255000 ;
+      RECT 6.760000  1.950000 7.620000 2.120000 ;
+      RECT 6.760000  2.120000 7.090000 2.905000 ;
+      RECT 7.205000  0.085000 7.615000 0.915000 ;
+      RECT 7.260000  2.290000 7.590000 3.245000 ;
+      RECT 7.415000  1.255000 7.620000 1.425000 ;
+      RECT 7.415000  1.425000 7.665000 1.755000 ;
+      RECT 7.415000  1.755000 7.620000 1.950000 ;
+      RECT 7.790000  2.190000 8.075000 2.930000 ;
+      RECT 7.795000  0.585000 8.075000 1.255000 ;
+      RECT 7.835000  1.255000 8.075000 2.190000 ;
     LAYER mcon ;
-      RECT 2.075000 1.210000 2.245000 1.380000 ;
-      RECT 5.435000 1.210000 5.605000 1.380000 ;
-      RECT 5.915000 1.210000 6.085000 1.380000 ;
-      RECT 7.835000 1.210000 8.005000 1.380000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  1.210000 2.245000 1.380000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  1.210000 5.605000 1.380000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  1.210000 6.085000 1.380000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  1.210000 8.005000 1.380000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
     LAYER met1 ;
       RECT 2.015000 1.180000 2.305000 1.225000 ;
       RECT 2.015000 1.225000 5.665000 1.365000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef
index a200b35..bade8fc 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.magic.lef
@@ -72,32 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.865000 ;
-        RECT 4.270000  0.085000 4.600000 0.445000 ;
-        RECT 6.900000  0.085000 7.585000 0.490000 ;
-        RECT 7.230000  0.490000 7.585000 0.840000 ;
-        RECT 8.275000  0.085000 8.525000 1.250000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -106,105 +80,127 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.645000 2.305000 0.925000 3.245000 ;
-        RECT 4.455000 2.735000 4.785000 3.245000 ;
-        RECT 7.380000 2.290000 7.550000 3.245000 ;
-        RECT 8.280000 1.820000 8.530000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.385000 0.405000 1.065000 ;
-      RECT 0.085000 1.065000 0.325000 2.290000 ;
-      RECT 0.085000 2.290000 0.445000 2.885000 ;
-      RECT 0.495000 1.235000 0.745000 1.950000 ;
-      RECT 0.495000 1.950000 1.375000 2.120000 ;
-      RECT 0.575000 1.035000 1.345000 1.205000 ;
-      RECT 0.575000 1.205000 0.745000 1.235000 ;
-      RECT 1.095000 0.255000 3.530000 0.425000 ;
-      RECT 1.095000 0.425000 1.345000 1.035000 ;
-      RECT 1.095000 2.120000 1.375000 2.905000 ;
-      RECT 1.095000 2.905000 3.675000 3.075000 ;
-      RECT 1.545000 1.165000 2.385000 1.380000 ;
-      RECT 1.545000 1.380000 1.715000 2.565000 ;
-      RECT 1.545000 2.565000 2.605000 2.735000 ;
-      RECT 1.625000 0.595000 2.725000 0.615000 ;
-      RECT 1.625000 0.615000 5.160000 0.765000 ;
-      RECT 1.625000 0.765000 1.955000 0.995000 ;
-      RECT 1.885000 1.550000 2.755000 1.720000 ;
-      RECT 1.885000 1.720000 2.105000 2.395000 ;
-      RECT 2.135000 0.935000 2.385000 1.165000 ;
-      RECT 2.275000 1.890000 2.605000 2.565000 ;
-      RECT 2.555000 0.765000 5.160000 0.785000 ;
-      RECT 2.555000 0.955000 2.985000 1.285000 ;
-      RECT 2.555000 1.285000 2.755000 1.550000 ;
-      RECT 2.835000 1.875000 3.145000 2.370000 ;
-      RECT 2.835000 2.370000 4.755000 2.395000 ;
-      RECT 2.835000 2.395000 6.320000 2.540000 ;
-      RECT 2.835000 2.540000 3.065000 2.620000 ;
-      RECT 3.155000 1.375000 3.565000 1.705000 ;
-      RECT 3.200000 0.425000 3.530000 0.445000 ;
-      RECT 3.345000 2.710000 3.675000 2.905000 ;
-      RECT 3.395000 0.955000 4.090000 1.125000 ;
-      RECT 3.395000 1.125000 3.565000 1.375000 ;
-      RECT 3.395000 1.705000 3.565000 1.950000 ;
-      RECT 3.395000 1.950000 4.255000 2.200000 ;
-      RECT 4.585000 0.785000 5.160000 0.965000 ;
-      RECT 4.585000 0.965000 4.755000 2.370000 ;
-      RECT 4.585000 2.540000 6.320000 2.565000 ;
-      RECT 4.830000 0.350000 5.160000 0.615000 ;
-      RECT 4.925000 1.135000 6.160000 1.305000 ;
-      RECT 4.925000 1.305000 5.155000 1.975000 ;
-      RECT 4.925000 1.975000 5.335000 2.225000 ;
-      RECT 5.325000 1.475000 6.675000 1.805000 ;
-      RECT 5.330000 0.255000 6.500000 0.425000 ;
-      RECT 5.330000 0.425000 5.660000 0.965000 ;
-      RECT 5.535000 2.735000 5.865000 2.905000 ;
-      RECT 5.535000 2.905000 7.210000 3.075000 ;
-      RECT 5.830000 0.595000 6.160000 1.135000 ;
-      RECT 6.070000 1.975000 6.320000 2.395000 ;
-      RECT 6.070000 2.565000 6.320000 2.735000 ;
-      RECT 6.330000 0.425000 6.500000 0.660000 ;
-      RECT 6.330000 0.660000 7.060000 0.830000 ;
-      RECT 6.390000 1.000000 6.720000 1.170000 ;
-      RECT 6.390000 1.170000 6.675000 1.475000 ;
-      RECT 6.505000 1.805000 6.675000 1.950000 ;
-      RECT 6.505000 1.950000 6.870000 2.500000 ;
-      RECT 6.890000 0.830000 7.060000 1.010000 ;
-      RECT 6.890000 1.010000 7.580000 1.180000 ;
-      RECT 7.040000 1.950000 7.580000 2.120000 ;
-      RECT 7.040000 2.120000 7.210000 2.905000 ;
-      RECT 7.410000 1.180000 7.580000 1.340000 ;
-      RECT 7.410000 1.340000 7.755000 1.670000 ;
-      RECT 7.410000 1.670000 7.580000 1.950000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.085000  0.385000 0.405000 1.065000 ;
+      RECT 0.085000  1.065000 0.325000 2.290000 ;
+      RECT 0.085000  2.290000 0.445000 2.885000 ;
+      RECT 0.495000  1.235000 0.745000 1.950000 ;
+      RECT 0.495000  1.950000 1.375000 2.120000 ;
+      RECT 0.575000  1.035000 1.345000 1.205000 ;
+      RECT 0.575000  1.205000 0.745000 1.235000 ;
+      RECT 0.585000  0.085000 0.915000 0.865000 ;
+      RECT 0.645000  2.305000 0.925000 3.245000 ;
+      RECT 1.095000  0.255000 3.530000 0.425000 ;
+      RECT 1.095000  0.425000 1.345000 1.035000 ;
+      RECT 1.095000  2.120000 1.375000 2.905000 ;
+      RECT 1.095000  2.905000 3.675000 3.075000 ;
+      RECT 1.545000  1.165000 2.385000 1.380000 ;
+      RECT 1.545000  1.380000 1.715000 2.565000 ;
+      RECT 1.545000  2.565000 2.605000 2.735000 ;
+      RECT 1.625000  0.595000 2.725000 0.615000 ;
+      RECT 1.625000  0.615000 5.160000 0.765000 ;
+      RECT 1.625000  0.765000 1.955000 0.995000 ;
+      RECT 1.885000  1.550000 2.755000 1.720000 ;
+      RECT 1.885000  1.720000 2.105000 2.395000 ;
+      RECT 2.135000  0.935000 2.385000 1.165000 ;
+      RECT 2.275000  1.890000 2.605000 2.565000 ;
+      RECT 2.555000  0.765000 5.160000 0.785000 ;
+      RECT 2.555000  0.955000 2.985000 1.285000 ;
+      RECT 2.555000  1.285000 2.755000 1.550000 ;
+      RECT 2.835000  1.875000 3.145000 2.370000 ;
+      RECT 2.835000  2.370000 4.755000 2.395000 ;
+      RECT 2.835000  2.395000 6.320000 2.540000 ;
+      RECT 2.835000  2.540000 3.065000 2.620000 ;
+      RECT 3.155000  1.375000 3.565000 1.705000 ;
+      RECT 3.200000  0.425000 3.530000 0.445000 ;
+      RECT 3.345000  2.710000 3.675000 2.905000 ;
+      RECT 3.395000  0.955000 4.090000 1.125000 ;
+      RECT 3.395000  1.125000 3.565000 1.375000 ;
+      RECT 3.395000  1.705000 3.565000 1.950000 ;
+      RECT 3.395000  1.950000 4.255000 2.200000 ;
+      RECT 4.270000  0.085000 4.600000 0.445000 ;
+      RECT 4.455000  2.735000 4.785000 3.245000 ;
+      RECT 4.585000  0.785000 5.160000 0.965000 ;
+      RECT 4.585000  0.965000 4.755000 2.370000 ;
+      RECT 4.585000  2.540000 6.320000 2.565000 ;
+      RECT 4.830000  0.350000 5.160000 0.615000 ;
+      RECT 4.925000  1.135000 6.160000 1.305000 ;
+      RECT 4.925000  1.305000 5.155000 1.975000 ;
+      RECT 4.925000  1.975000 5.335000 2.225000 ;
+      RECT 5.325000  1.475000 6.675000 1.805000 ;
+      RECT 5.330000  0.255000 6.500000 0.425000 ;
+      RECT 5.330000  0.425000 5.660000 0.965000 ;
+      RECT 5.535000  2.735000 5.865000 2.905000 ;
+      RECT 5.535000  2.905000 7.210000 3.075000 ;
+      RECT 5.830000  0.595000 6.160000 1.135000 ;
+      RECT 6.070000  1.975000 6.320000 2.395000 ;
+      RECT 6.070000  2.565000 6.320000 2.735000 ;
+      RECT 6.330000  0.425000 6.500000 0.660000 ;
+      RECT 6.330000  0.660000 7.060000 0.830000 ;
+      RECT 6.390000  1.000000 6.720000 1.170000 ;
+      RECT 6.390000  1.170000 6.675000 1.475000 ;
+      RECT 6.505000  1.805000 6.675000 1.950000 ;
+      RECT 6.505000  1.950000 6.870000 2.500000 ;
+      RECT 6.890000  0.830000 7.060000 1.010000 ;
+      RECT 6.890000  1.010000 7.580000 1.180000 ;
+      RECT 6.900000  0.085000 7.585000 0.490000 ;
+      RECT 7.040000  1.950000 7.580000 2.120000 ;
+      RECT 7.040000  2.120000 7.210000 2.905000 ;
+      RECT 7.230000  0.490000 7.585000 0.840000 ;
+      RECT 7.380000  2.290000 7.550000 3.245000 ;
+      RECT 7.410000  1.180000 7.580000 1.340000 ;
+      RECT 7.410000  1.340000 7.755000 1.670000 ;
+      RECT 7.410000  1.670000 7.580000 1.950000 ;
+      RECT 8.275000  0.085000 8.525000 1.250000 ;
+      RECT 8.280000  1.820000 8.530000 3.245000 ;
     LAYER mcon ;
-      RECT 0.155000 1.210000 0.325000 1.380000 ;
-      RECT 1.595000 1.210000 1.765000 1.380000 ;
-      RECT 2.555000 1.210000 2.725000 1.380000 ;
-      RECT 4.955000 1.210000 5.125000 1.380000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  1.210000 0.325000 1.380000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  1.210000 1.765000 1.380000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  1.210000 2.725000 1.380000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  1.210000 5.125000 1.380000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
     LAYER met1 ;
       RECT 0.095000 1.180000 0.385000 1.225000 ;
       RECT 0.095000 1.225000 1.825000 1.365000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef
index 9384eb4..fb7fb49 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.magic.lef
@@ -76,37 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.665000  0.085000  0.995000 0.865000 ;
-        RECT 4.270000  0.085000  4.600000 0.445000 ;
-        RECT 6.900000  0.085000  8.165000 0.490000 ;
-        RECT 7.230000  0.490000  8.165000 0.840000 ;
-        RECT 7.915000  0.840000  8.165000 1.170000 ;
-        RECT 8.855000  0.085000  9.025000 1.250000 ;
-        RECT 9.715000  0.085000  9.965000 1.250000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
-        RECT 9.755000 -0.085000 9.925000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -115,114 +84,141 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.565000 2.290000  0.895000 3.245000 ;
-        RECT 4.390000 2.730000  4.720000 3.245000 ;
-        RECT 7.485000 2.290000  8.110000 3.245000 ;
-        RECT 7.685000 1.840000  8.110000 2.290000 ;
-        RECT 8.810000 1.820000  8.980000 3.245000 ;
-        RECT 9.710000 1.820000  9.960000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
-        RECT 9.755000 3.245000 9.925000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.365000 0.495000 0.865000 ;
-      RECT 0.085000 0.865000 0.285000 1.845000 ;
-      RECT 0.085000 1.845000 0.365000 2.885000 ;
-      RECT 0.455000 1.035000 1.425000 1.205000 ;
-      RECT 0.455000 1.205000 0.705000 1.465000 ;
-      RECT 0.535000 1.465000 0.705000 1.950000 ;
-      RECT 0.535000 1.950000 1.395000 2.120000 ;
-      RECT 1.065000 2.120000 1.395000 2.905000 ;
-      RECT 1.065000 2.905000 3.680000 3.075000 ;
-      RECT 1.175000 0.255000 3.530000 0.425000 ;
-      RECT 1.175000 0.425000 1.425000 1.035000 ;
-      RECT 1.565000 1.375000 1.765000 2.565000 ;
-      RECT 1.565000 2.565000 2.725000 2.735000 ;
-      RECT 1.595000 1.165000 2.385000 1.335000 ;
-      RECT 1.595000 1.335000 1.765000 1.375000 ;
-      RECT 1.625000 0.595000 2.725000 0.615000 ;
-      RECT 1.625000 0.615000 5.160000 0.765000 ;
-      RECT 1.625000 0.765000 1.955000 0.995000 ;
-      RECT 1.935000 1.505000 2.755000 1.675000 ;
-      RECT 1.935000 1.675000 2.245000 2.120000 ;
-      RECT 1.935000 2.120000 2.135000 2.155000 ;
-      RECT 2.135000 0.935000 2.385000 1.165000 ;
-      RECT 2.305000 2.290000 2.725000 2.565000 ;
-      RECT 2.555000 0.765000 5.160000 0.785000 ;
-      RECT 2.555000 0.955000 3.020000 1.205000 ;
-      RECT 2.555000 1.205000 2.755000 1.505000 ;
-      RECT 2.895000 1.875000 3.145000 2.370000 ;
-      RECT 2.895000 2.370000 4.610000 2.390000 ;
-      RECT 2.895000 2.390000 6.270000 2.540000 ;
-      RECT 2.895000 2.540000 3.145000 2.545000 ;
-      RECT 2.995000 1.375000 3.770000 1.705000 ;
-      RECT 3.200000 0.425000 3.530000 0.445000 ;
-      RECT 3.350000 2.710000 3.680000 2.905000 ;
-      RECT 3.600000 0.955000 4.090000 1.125000 ;
-      RECT 3.600000 1.125000 3.770000 1.375000 ;
-      RECT 3.600000 1.705000 3.770000 1.950000 ;
-      RECT 3.600000 1.950000 4.270000 2.200000 ;
-      RECT 4.440000 0.785000 5.160000 1.030000 ;
-      RECT 4.440000 1.030000 4.610000 2.370000 ;
-      RECT 4.440000 2.540000 6.270000 2.560000 ;
-      RECT 4.780000 1.210000 6.160000 1.380000 ;
-      RECT 4.780000 1.380000 4.950000 1.950000 ;
-      RECT 4.780000 1.950000 5.280000 2.220000 ;
-      RECT 4.830000 0.350000 5.160000 0.615000 ;
-      RECT 5.120000 1.550000 6.610000 1.720000 ;
-      RECT 5.120000 1.720000 5.450000 1.780000 ;
-      RECT 5.330000 0.255000 6.500000 0.425000 ;
-      RECT 5.330000 0.425000 5.660000 1.010000 ;
-      RECT 5.405000 1.180000 6.160000 1.210000 ;
-      RECT 5.485000 2.730000 5.815000 2.905000 ;
-      RECT 5.485000 2.905000 7.315000 3.075000 ;
-      RECT 5.830000 0.595000 6.160000 1.180000 ;
-      RECT 6.020000 1.970000 6.270000 2.390000 ;
-      RECT 6.020000 2.560000 6.270000 2.735000 ;
-      RECT 6.330000 0.425000 6.500000 0.660000 ;
-      RECT 6.330000 0.660000 7.060000 0.830000 ;
-      RECT 6.390000 1.000000 6.720000 1.170000 ;
-      RECT 6.390000 1.170000 6.610000 1.550000 ;
-      RECT 6.440000 1.720000 6.610000 1.990000 ;
-      RECT 6.440000 1.990000 6.960000 2.500000 ;
-      RECT 6.890000 0.830000 7.060000 1.010000 ;
-      RECT 6.890000 1.010000 7.490000 1.180000 ;
-      RECT 7.130000 1.950000 7.490000 2.120000 ;
-      RECT 7.130000 2.120000 7.315000 2.905000 ;
-      RECT 7.320000 1.180000 7.490000 1.340000 ;
-      RECT 7.320000 1.340000 8.300000 1.670000 ;
-      RECT 7.320000 1.670000 7.490000 1.950000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.085000  0.365000  0.495000 0.865000 ;
+      RECT 0.085000  0.865000  0.285000 1.845000 ;
+      RECT 0.085000  1.845000  0.365000 2.885000 ;
+      RECT 0.455000  1.035000  1.425000 1.205000 ;
+      RECT 0.455000  1.205000  0.705000 1.465000 ;
+      RECT 0.535000  1.465000  0.705000 1.950000 ;
+      RECT 0.535000  1.950000  1.395000 2.120000 ;
+      RECT 0.565000  2.290000  0.895000 3.245000 ;
+      RECT 0.665000  0.085000  0.995000 0.865000 ;
+      RECT 1.065000  2.120000  1.395000 2.905000 ;
+      RECT 1.065000  2.905000  3.680000 3.075000 ;
+      RECT 1.175000  0.255000  3.530000 0.425000 ;
+      RECT 1.175000  0.425000  1.425000 1.035000 ;
+      RECT 1.565000  1.375000  1.765000 2.565000 ;
+      RECT 1.565000  2.565000  2.725000 2.735000 ;
+      RECT 1.595000  1.165000  2.385000 1.335000 ;
+      RECT 1.595000  1.335000  1.765000 1.375000 ;
+      RECT 1.625000  0.595000  2.725000 0.615000 ;
+      RECT 1.625000  0.615000  5.160000 0.765000 ;
+      RECT 1.625000  0.765000  1.955000 0.995000 ;
+      RECT 1.935000  1.505000  2.755000 1.675000 ;
+      RECT 1.935000  1.675000  2.245000 2.120000 ;
+      RECT 1.935000  2.120000  2.135000 2.155000 ;
+      RECT 2.135000  0.935000  2.385000 1.165000 ;
+      RECT 2.305000  2.290000  2.725000 2.565000 ;
+      RECT 2.555000  0.765000  5.160000 0.785000 ;
+      RECT 2.555000  0.955000  3.020000 1.205000 ;
+      RECT 2.555000  1.205000  2.755000 1.505000 ;
+      RECT 2.895000  1.875000  3.145000 2.370000 ;
+      RECT 2.895000  2.370000  4.610000 2.390000 ;
+      RECT 2.895000  2.390000  6.270000 2.540000 ;
+      RECT 2.895000  2.540000  3.145000 2.545000 ;
+      RECT 2.995000  1.375000  3.770000 1.705000 ;
+      RECT 3.200000  0.425000  3.530000 0.445000 ;
+      RECT 3.350000  2.710000  3.680000 2.905000 ;
+      RECT 3.600000  0.955000  4.090000 1.125000 ;
+      RECT 3.600000  1.125000  3.770000 1.375000 ;
+      RECT 3.600000  1.705000  3.770000 1.950000 ;
+      RECT 3.600000  1.950000  4.270000 2.200000 ;
+      RECT 4.270000  0.085000  4.600000 0.445000 ;
+      RECT 4.390000  2.730000  4.720000 3.245000 ;
+      RECT 4.440000  0.785000  5.160000 1.030000 ;
+      RECT 4.440000  1.030000  4.610000 2.370000 ;
+      RECT 4.440000  2.540000  6.270000 2.560000 ;
+      RECT 4.780000  1.210000  6.160000 1.380000 ;
+      RECT 4.780000  1.380000  4.950000 1.950000 ;
+      RECT 4.780000  1.950000  5.280000 2.220000 ;
+      RECT 4.830000  0.350000  5.160000 0.615000 ;
+      RECT 5.120000  1.550000  6.610000 1.720000 ;
+      RECT 5.120000  1.720000  5.450000 1.780000 ;
+      RECT 5.330000  0.255000  6.500000 0.425000 ;
+      RECT 5.330000  0.425000  5.660000 1.010000 ;
+      RECT 5.405000  1.180000  6.160000 1.210000 ;
+      RECT 5.485000  2.730000  5.815000 2.905000 ;
+      RECT 5.485000  2.905000  7.315000 3.075000 ;
+      RECT 5.830000  0.595000  6.160000 1.180000 ;
+      RECT 6.020000  1.970000  6.270000 2.390000 ;
+      RECT 6.020000  2.560000  6.270000 2.735000 ;
+      RECT 6.330000  0.425000  6.500000 0.660000 ;
+      RECT 6.330000  0.660000  7.060000 0.830000 ;
+      RECT 6.390000  1.000000  6.720000 1.170000 ;
+      RECT 6.390000  1.170000  6.610000 1.550000 ;
+      RECT 6.440000  1.720000  6.610000 1.990000 ;
+      RECT 6.440000  1.990000  6.960000 2.500000 ;
+      RECT 6.890000  0.830000  7.060000 1.010000 ;
+      RECT 6.890000  1.010000  7.490000 1.180000 ;
+      RECT 6.900000  0.085000  8.165000 0.490000 ;
+      RECT 7.130000  1.950000  7.490000 2.120000 ;
+      RECT 7.130000  2.120000  7.315000 2.905000 ;
+      RECT 7.230000  0.490000  8.165000 0.840000 ;
+      RECT 7.320000  1.180000  7.490000 1.340000 ;
+      RECT 7.320000  1.340000  8.300000 1.670000 ;
+      RECT 7.320000  1.670000  7.490000 1.950000 ;
+      RECT 7.485000  2.290000  8.110000 3.245000 ;
+      RECT 7.685000  1.840000  8.110000 2.290000 ;
+      RECT 7.915000  0.840000  8.165000 1.170000 ;
+      RECT 8.810000  1.820000  8.980000 3.245000 ;
+      RECT 8.855000  0.085000  9.025000 1.250000 ;
+      RECT 9.710000  1.820000  9.960000 3.245000 ;
+      RECT 9.715000  0.085000  9.965000 1.250000 ;
     LAYER mcon ;
-      RECT 0.155000 1.950000 0.325000 2.120000 ;
-      RECT 1.595000 1.950000 1.765000 2.120000 ;
-      RECT 2.075000 1.950000 2.245000 2.120000 ;
-      RECT 4.955000 1.950000 5.125000 2.120000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  1.950000 0.325000 2.120000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  1.950000 1.765000 2.120000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  1.950000 2.245000 2.120000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  1.950000 5.125000 2.120000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
     LAYER met1 ;
       RECT 0.095000 1.920000 0.385000 1.965000 ;
       RECT 0.095000 1.965000 1.825000 2.105000 ;
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef
index 52ee8a2..95822f5 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_1.magic.lef
@@ -66,20 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.175000  0.085000 0.775000 0.990000 ;
-        RECT 1.820000  0.085000 2.150000 1.195000 ;
-        RECT 3.210000  0.085000 3.540000 0.745000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -88,33 +74,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.325000 1.940000 0.655000 3.245000 ;
-        RECT 2.255000 2.650000 2.695000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.945000 0.710000 1.640000 1.040000 ;
-      RECT 0.945000 1.040000 1.115000 1.950000 ;
-      RECT 0.945000 1.950000 3.195000 2.120000 ;
-      RECT 0.945000 2.120000 1.525000 2.980000 ;
-      RECT 1.755000 2.290000 3.195000 2.460000 ;
-      RECT 1.755000 2.460000 2.085000 2.980000 ;
-      RECT 2.865000 2.460000 3.195000 2.980000 ;
-      RECT 3.025000 1.320000 3.415000 1.650000 ;
-      RECT 3.025000 1.650000 3.195000 1.950000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.175000  0.085000 0.775000 0.990000 ;
+      RECT 0.325000  1.940000 0.655000 3.245000 ;
+      RECT 0.945000  0.710000 1.640000 1.040000 ;
+      RECT 0.945000  1.040000 1.115000 1.950000 ;
+      RECT 0.945000  1.950000 3.195000 2.120000 ;
+      RECT 0.945000  2.120000 1.525000 2.980000 ;
+      RECT 1.755000  2.290000 3.195000 2.460000 ;
+      RECT 1.755000  2.460000 2.085000 2.980000 ;
+      RECT 1.820000  0.085000 2.150000 1.195000 ;
+      RECT 2.255000  2.650000 2.695000 3.245000 ;
+      RECT 2.865000  2.460000 3.195000 2.980000 ;
+      RECT 3.025000  1.320000 3.415000 1.650000 ;
+      RECT 3.025000  1.650000 3.195000 1.950000 ;
+      RECT 3.210000  0.085000 3.540000 0.745000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
   END
 END sky130_fd_sc_hs__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef
index 050e599..d7934ed 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_2.magic.lef
@@ -70,22 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.115000  0.085000 0.710000 0.500000 ;
-        RECT 1.390000  0.085000 1.720000 0.840000 ;
-        RECT 2.480000  0.085000 2.820000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -94,46 +78,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.115000 2.300000 0.445000 3.245000 ;
-        RECT 1.995000 2.640000 2.325000 3.245000 ;
-        RECT 3.845000 2.530000 4.175000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.245000 0.670000 1.220000 0.840000 ;
-      RECT 0.245000 0.840000 0.415000 1.960000 ;
-      RECT 0.245000 1.960000 2.855000 2.130000 ;
-      RECT 0.890000 0.350000 1.220000 0.670000 ;
-      RECT 1.065000 2.130000 1.315000 2.980000 ;
-      RECT 1.545000 2.300000 2.825000 2.470000 ;
-      RECT 1.545000 2.470000 1.795000 2.980000 ;
-      RECT 1.970000 0.350000 2.300000 0.670000 ;
-      RECT 1.970000 0.670000 3.160000 0.840000 ;
-      RECT 2.495000 2.470000 2.825000 2.905000 ;
-      RECT 2.495000 2.905000 3.675000 3.075000 ;
-      RECT 2.685000 1.350000 3.125000 1.680000 ;
-      RECT 2.685000 1.680000 2.855000 1.960000 ;
-      RECT 2.990000 0.255000 4.175000 0.425000 ;
-      RECT 2.990000 0.425000 3.160000 0.670000 ;
-      RECT 3.395000 2.190000 4.685000 2.360000 ;
-      RECT 3.395000 2.360000 3.675000 2.905000 ;
-      RECT 3.840000 0.425000 4.175000 0.500000 ;
-      RECT 4.345000 2.360000 4.685000 2.980000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  0.085000 0.710000 0.500000 ;
+      RECT 0.115000  2.300000 0.445000 3.245000 ;
+      RECT 0.245000  0.670000 1.220000 0.840000 ;
+      RECT 0.245000  0.840000 0.415000 1.960000 ;
+      RECT 0.245000  1.960000 2.855000 2.130000 ;
+      RECT 0.890000  0.350000 1.220000 0.670000 ;
+      RECT 1.065000  2.130000 1.315000 2.980000 ;
+      RECT 1.390000  0.085000 1.720000 0.840000 ;
+      RECT 1.545000  2.300000 2.825000 2.470000 ;
+      RECT 1.545000  2.470000 1.795000 2.980000 ;
+      RECT 1.970000  0.350000 2.300000 0.670000 ;
+      RECT 1.970000  0.670000 3.160000 0.840000 ;
+      RECT 1.995000  2.640000 2.325000 3.245000 ;
+      RECT 2.480000  0.085000 2.820000 0.500000 ;
+      RECT 2.495000  2.470000 2.825000 2.905000 ;
+      RECT 2.495000  2.905000 3.675000 3.075000 ;
+      RECT 2.685000  1.350000 3.125000 1.680000 ;
+      RECT 2.685000  1.680000 2.855000 1.960000 ;
+      RECT 2.990000  0.255000 4.175000 0.425000 ;
+      RECT 2.990000  0.425000 3.160000 0.670000 ;
+      RECT 3.395000  2.190000 4.685000 2.360000 ;
+      RECT 3.395000  2.360000 3.675000 2.905000 ;
+      RECT 3.840000  0.425000 4.175000 0.500000 ;
+      RECT 3.845000  2.530000 4.175000 3.245000 ;
+      RECT 4.345000  2.360000 4.685000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
   END
 END sky130_fd_sc_hs__xor2_2
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef
index 124edf5..cfa159c 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_4.magic.lef
@@ -88,33 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.095000  0.085000 0.345000 1.250000 ;
-        RECT 1.285000  0.085000 1.615000 0.410000 ;
-        RECT 2.415000  0.085000 2.745000 0.430000 ;
-        RECT 3.720000  0.085000 4.135000 0.510000 ;
-        RECT 4.875000  0.085000 5.205000 0.500000 ;
-        RECT 5.895000  0.085000 6.225000 0.500000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -123,66 +96,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.690000 2.260000 0.940000 3.245000 ;
-        RECT 4.855000 2.965000 5.185000 3.245000 ;
-        RECT 5.890000 2.965000 6.220000 3.245000 ;
-        RECT 6.855000 2.630000 7.105000 3.245000 ;
-        RECT 7.835000 2.630000 8.005000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 1.920000 1.360000 2.090000 ;
-      RECT 0.160000 2.090000 0.490000 2.980000 ;
-      RECT 0.855000 0.920000 1.105000 0.940000 ;
-      RECT 0.855000 0.940000 2.700000 1.190000 ;
-      RECT 0.855000 1.190000 1.105000 1.250000 ;
-      RECT 1.110000 2.090000 1.360000 2.905000 ;
-      RECT 1.110000 2.905000 2.340000 3.075000 ;
-      RECT 1.560000 1.190000 1.810000 2.735000 ;
-      RECT 2.010000 2.190000 2.340000 2.905000 ;
-      RECT 2.530000 1.190000 2.700000 1.360000 ;
-      RECT 2.530000 1.360000 3.595000 1.680000 ;
-      RECT 2.535000 2.190000 2.785000 2.905000 ;
-      RECT 2.535000 2.905000 4.665000 3.075000 ;
-      RECT 3.515000 2.625000 3.685000 2.905000 ;
-      RECT 4.415000 2.625000 6.655000 2.795000 ;
-      RECT 4.415000 2.795000 4.665000 2.905000 ;
-      RECT 4.445000 0.350000 4.695000 0.670000 ;
-      RECT 4.445000 0.670000 6.655000 0.840000 ;
-      RECT 5.375000 2.795000 5.705000 2.980000 ;
-      RECT 5.385000 0.350000 5.715000 0.670000 ;
-      RECT 6.405000 0.255000 8.525000 0.425000 ;
-      RECT 6.405000 0.425000 6.655000 0.670000 ;
-      RECT 6.485000 2.290000 8.535000 2.460000 ;
-      RECT 6.485000 2.460000 6.655000 2.625000 ;
-      RECT 6.485000 2.795000 6.655000 2.980000 ;
-      RECT 7.305000 2.460000 7.635000 2.980000 ;
-      RECT 7.335000 0.425000 7.665000 0.840000 ;
-      RECT 8.195000 0.425000 8.525000 0.840000 ;
-      RECT 8.205000 2.460000 8.535000 2.980000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.095000  0.085000 0.345000 1.250000 ;
+      RECT 0.160000  1.920000 1.360000 2.090000 ;
+      RECT 0.160000  2.090000 0.490000 2.980000 ;
+      RECT 0.690000  2.260000 0.940000 3.245000 ;
+      RECT 0.855000  0.920000 1.105000 0.940000 ;
+      RECT 0.855000  0.940000 2.700000 1.190000 ;
+      RECT 0.855000  1.190000 1.105000 1.250000 ;
+      RECT 1.110000  2.090000 1.360000 2.905000 ;
+      RECT 1.110000  2.905000 2.340000 3.075000 ;
+      RECT 1.285000  0.085000 1.615000 0.410000 ;
+      RECT 1.560000  1.190000 1.810000 2.735000 ;
+      RECT 2.010000  2.190000 2.340000 2.905000 ;
+      RECT 2.415000  0.085000 2.745000 0.430000 ;
+      RECT 2.530000  1.190000 2.700000 1.360000 ;
+      RECT 2.530000  1.360000 3.595000 1.680000 ;
+      RECT 2.535000  2.190000 2.785000 2.905000 ;
+      RECT 2.535000  2.905000 4.665000 3.075000 ;
+      RECT 3.515000  2.625000 3.685000 2.905000 ;
+      RECT 3.720000  0.085000 4.135000 0.510000 ;
+      RECT 4.415000  2.625000 6.655000 2.795000 ;
+      RECT 4.415000  2.795000 4.665000 2.905000 ;
+      RECT 4.445000  0.350000 4.695000 0.670000 ;
+      RECT 4.445000  0.670000 6.655000 0.840000 ;
+      RECT 4.855000  2.965000 5.185000 3.245000 ;
+      RECT 4.875000  0.085000 5.205000 0.500000 ;
+      RECT 5.375000  2.795000 5.705000 2.980000 ;
+      RECT 5.385000  0.350000 5.715000 0.670000 ;
+      RECT 5.890000  2.965000 6.220000 3.245000 ;
+      RECT 5.895000  0.085000 6.225000 0.500000 ;
+      RECT 6.405000  0.255000 8.525000 0.425000 ;
+      RECT 6.405000  0.425000 6.655000 0.670000 ;
+      RECT 6.485000  2.290000 8.535000 2.460000 ;
+      RECT 6.485000  2.460000 6.655000 2.625000 ;
+      RECT 6.485000  2.795000 6.655000 2.980000 ;
+      RECT 6.855000  2.630000 7.105000 3.245000 ;
+      RECT 7.305000  2.460000 7.635000 2.980000 ;
+      RECT 7.335000  0.425000 7.665000 0.840000 ;
+      RECT 7.835000  2.630000 8.005000 3.245000 ;
+      RECT 8.195000  0.425000 8.525000 0.840000 ;
+      RECT 8.205000  2.460000 8.535000 2.980000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
   END
 END sky130_fd_sc_hs__xor2_4
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef
index d487d55..70391eb 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_1.magic.lef
@@ -70,31 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.625000  0.085000 1.195000 0.490000 ;
-        RECT 5.315000  0.085000 5.565000 0.680000 ;
-        RECT 8.245000  0.085000 8.575000 1.180000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -103,99 +78,120 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.770000 2.260000 1.100000 3.245000 ;
-        RECT 4.950000 1.950000 5.200000 3.245000 ;
-        RECT 8.225000 1.950000 8.555000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.650000 0.445000 0.660000 ;
-      RECT 0.085000 0.660000 1.965000 0.830000 ;
-      RECT 0.085000 0.830000 0.445000 1.300000 ;
-      RECT 0.085000 1.300000 0.255000 2.260000 ;
-      RECT 0.085000 2.260000 0.600000 2.980000 ;
-      RECT 0.425000 1.470000 0.750000 1.920000 ;
-      RECT 0.425000 1.920000 1.625000 1.940000 ;
-      RECT 0.425000 1.940000 1.700000 2.090000 ;
-      RECT 1.370000 2.090000 1.700000 2.905000 ;
-      RECT 1.370000 2.905000 3.895000 3.075000 ;
-      RECT 1.455000 1.000000 1.625000 1.920000 ;
-      RECT 1.795000 0.830000 1.965000 1.260000 ;
-      RECT 1.795000 1.260000 2.760000 1.430000 ;
-      RECT 1.930000 1.940000 2.260000 2.565000 ;
-      RECT 1.930000 2.565000 3.555000 2.735000 ;
-      RECT 2.135000 0.290000 3.215000 0.460000 ;
-      RECT 2.135000 0.460000 2.385000 1.090000 ;
-      RECT 2.430000 1.430000 2.760000 2.395000 ;
-      RECT 2.590000 0.630000 2.850000 1.090000 ;
-      RECT 2.590000 1.090000 2.760000 1.260000 ;
-      RECT 2.965000 1.875000 3.215000 2.395000 ;
-      RECT 3.020000 0.460000 3.215000 1.875000 ;
-      RECT 3.385000 0.255000 5.145000 0.425000 ;
-      RECT 3.385000 0.425000 3.555000 2.565000 ;
-      RECT 3.725000 0.595000 4.805000 0.765000 ;
-      RECT 3.725000 0.765000 3.895000 1.435000 ;
-      RECT 3.725000 1.435000 4.055000 1.735000 ;
-      RECT 3.725000 1.905000 4.395000 2.755000 ;
-      RECT 3.725000 2.755000 3.895000 2.905000 ;
-      RECT 4.065000 0.935000 4.395000 1.265000 ;
-      RECT 4.225000 1.265000 4.395000 1.905000 ;
-      RECT 4.580000 0.765000 4.805000 1.130000 ;
-      RECT 4.580000 1.130000 4.750000 2.980000 ;
-      RECT 4.975000 0.425000 5.145000 0.850000 ;
-      RECT 4.975000 0.850000 6.025000 1.020000 ;
-      RECT 5.405000 1.950000 5.625000 1.990000 ;
-      RECT 5.405000 1.990000 5.855000 2.840000 ;
-      RECT 5.420000 1.190000 6.365000 1.360000 ;
-      RECT 5.420000 1.360000 5.625000 1.950000 ;
-      RECT 5.775000 0.255000 7.645000 0.425000 ;
-      RECT 5.775000 0.425000 6.025000 0.850000 ;
-      RECT 5.805000 1.530000 6.195000 1.820000 ;
-      RECT 6.025000 1.820000 6.195000 2.905000 ;
-      RECT 6.025000 2.905000 7.605000 3.075000 ;
-      RECT 6.195000 0.595000 7.305000 0.765000 ;
-      RECT 6.195000 0.765000 6.365000 1.190000 ;
-      RECT 6.365000 1.550000 6.705000 2.735000 ;
-      RECT 6.535000 0.935000 6.705000 1.550000 ;
-      RECT 6.875000 1.855000 7.645000 2.025000 ;
-      RECT 6.875000 2.025000 7.205000 2.735000 ;
-      RECT 6.885000 0.765000 7.305000 0.925000 ;
-      RECT 7.435000 2.195000 7.985000 2.525000 ;
-      RECT 7.435000 2.525000 7.605000 2.905000 ;
-      RECT 7.475000 0.425000 7.645000 1.855000 ;
-      RECT 7.815000 0.400000 8.065000 0.860000 ;
-      RECT 7.815000 0.860000 7.985000 2.195000 ;
-      RECT 8.255000 1.350000 8.585000 1.780000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.085000  0.650000 0.445000 0.660000 ;
+      RECT 0.085000  0.660000 1.965000 0.830000 ;
+      RECT 0.085000  0.830000 0.445000 1.300000 ;
+      RECT 0.085000  1.300000 0.255000 2.260000 ;
+      RECT 0.085000  2.260000 0.600000 2.980000 ;
+      RECT 0.425000  1.470000 0.750000 1.920000 ;
+      RECT 0.425000  1.920000 1.625000 1.940000 ;
+      RECT 0.425000  1.940000 1.700000 2.090000 ;
+      RECT 0.625000  0.085000 1.195000 0.490000 ;
+      RECT 0.770000  2.260000 1.100000 3.245000 ;
+      RECT 1.370000  2.090000 1.700000 2.905000 ;
+      RECT 1.370000  2.905000 3.895000 3.075000 ;
+      RECT 1.455000  1.000000 1.625000 1.920000 ;
+      RECT 1.795000  0.830000 1.965000 1.260000 ;
+      RECT 1.795000  1.260000 2.760000 1.430000 ;
+      RECT 1.930000  1.940000 2.260000 2.565000 ;
+      RECT 1.930000  2.565000 3.555000 2.735000 ;
+      RECT 2.135000  0.290000 3.215000 0.460000 ;
+      RECT 2.135000  0.460000 2.385000 1.090000 ;
+      RECT 2.430000  1.430000 2.760000 2.395000 ;
+      RECT 2.590000  0.630000 2.850000 1.090000 ;
+      RECT 2.590000  1.090000 2.760000 1.260000 ;
+      RECT 2.965000  1.875000 3.215000 2.395000 ;
+      RECT 3.020000  0.460000 3.215000 1.875000 ;
+      RECT 3.385000  0.255000 5.145000 0.425000 ;
+      RECT 3.385000  0.425000 3.555000 2.565000 ;
+      RECT 3.725000  0.595000 4.805000 0.765000 ;
+      RECT 3.725000  0.765000 3.895000 1.435000 ;
+      RECT 3.725000  1.435000 4.055000 1.735000 ;
+      RECT 3.725000  1.905000 4.395000 2.755000 ;
+      RECT 3.725000  2.755000 3.895000 2.905000 ;
+      RECT 4.065000  0.935000 4.395000 1.265000 ;
+      RECT 4.225000  1.265000 4.395000 1.905000 ;
+      RECT 4.580000  0.765000 4.805000 1.130000 ;
+      RECT 4.580000  1.130000 4.750000 2.980000 ;
+      RECT 4.950000  1.950000 5.200000 3.245000 ;
+      RECT 4.975000  0.425000 5.145000 0.850000 ;
+      RECT 4.975000  0.850000 6.025000 1.020000 ;
+      RECT 5.315000  0.085000 5.565000 0.680000 ;
+      RECT 5.405000  1.950000 5.625000 1.990000 ;
+      RECT 5.405000  1.990000 5.855000 2.840000 ;
+      RECT 5.420000  1.190000 6.365000 1.360000 ;
+      RECT 5.420000  1.360000 5.625000 1.950000 ;
+      RECT 5.775000  0.255000 7.645000 0.425000 ;
+      RECT 5.775000  0.425000 6.025000 0.850000 ;
+      RECT 5.805000  1.530000 6.195000 1.820000 ;
+      RECT 6.025000  1.820000 6.195000 2.905000 ;
+      RECT 6.025000  2.905000 7.605000 3.075000 ;
+      RECT 6.195000  0.595000 7.305000 0.765000 ;
+      RECT 6.195000  0.765000 6.365000 1.190000 ;
+      RECT 6.365000  1.550000 6.705000 2.735000 ;
+      RECT 6.535000  0.935000 6.705000 1.550000 ;
+      RECT 6.875000  1.855000 7.645000 2.025000 ;
+      RECT 6.875000  2.025000 7.205000 2.735000 ;
+      RECT 6.885000  0.765000 7.305000 0.925000 ;
+      RECT 7.435000  2.195000 7.985000 2.525000 ;
+      RECT 7.435000  2.525000 7.605000 2.905000 ;
+      RECT 7.475000  0.425000 7.645000 1.855000 ;
+      RECT 7.815000  0.400000 8.065000 0.860000 ;
+      RECT 7.815000  0.860000 7.985000 2.195000 ;
+      RECT 8.225000  1.950000 8.555000 3.245000 ;
+      RECT 8.245000  0.085000 8.575000 1.180000 ;
+      RECT 8.255000  1.350000 8.585000 1.780000 ;
     LAYER mcon ;
-      RECT 3.035000 1.580000 3.205000 1.750000 ;
-      RECT 5.435000 1.580000 5.605000 1.750000 ;
-      RECT 6.395000 1.580000 6.565000 1.750000 ;
-      RECT 8.315000 1.580000 8.485000 1.750000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  1.580000 3.205000 1.750000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  1.580000 5.605000 1.750000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  1.580000 6.565000 1.750000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  1.580000 8.485000 1.750000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
     LAYER met1 ;
       RECT 2.975000 1.550000 3.265000 1.595000 ;
       RECT 2.975000 1.595000 5.665000 1.735000 ;
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef
index 36996c8..e46a999 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_2.magic.lef
@@ -70,33 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.625000  0.085000 1.195000 0.490000 ;
-        RECT 5.315000  0.085000 5.565000 0.505000 ;
-        RECT 8.205000  0.085000 8.535000 1.150000 ;
-        RECT 9.215000  0.085000 9.465000 1.150000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -0.085000 3.205000 0.085000 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
-        RECT 4.475000 -0.085000 4.645000 0.085000 ;
-        RECT 4.955000 -0.085000 5.125000 0.085000 ;
-        RECT 5.435000 -0.085000 5.605000 0.085000 ;
-        RECT 5.915000 -0.085000 6.085000 0.085000 ;
-        RECT 6.395000 -0.085000 6.565000 0.085000 ;
-        RECT 6.875000 -0.085000 7.045000 0.085000 ;
-        RECT 7.355000 -0.085000 7.525000 0.085000 ;
-        RECT 7.835000 -0.085000 8.005000 0.085000 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
-        RECT 8.795000 -0.085000 8.965000 0.085000 ;
-        RECT 9.275000 -0.085000 9.445000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -105,106 +78,129 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.765000 2.260000 1.095000 3.245000 ;
-        RECT 4.950000 1.820000 5.200000 3.245000 ;
-        RECT 7.975000 1.820000 8.145000 2.320000 ;
-        RECT 7.975000 2.320000 8.530000 3.245000 ;
-        RECT 9.235000 1.820000 9.485000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.995000 3.245000 4.165000 3.415000 ;
-        RECT 4.475000 3.245000 4.645000 3.415000 ;
-        RECT 4.955000 3.245000 5.125000 3.415000 ;
-        RECT 5.435000 3.245000 5.605000 3.415000 ;
-        RECT 5.915000 3.245000 6.085000 3.415000 ;
-        RECT 6.395000 3.245000 6.565000 3.415000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 7.355000 3.245000 7.525000 3.415000 ;
-        RECT 7.835000 3.245000 8.005000 3.415000 ;
-        RECT 8.315000 3.245000 8.485000 3.415000 ;
-        RECT 8.795000 3.245000 8.965000 3.415000 ;
-        RECT 9.275000 3.245000 9.445000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.650000 0.445000 0.660000 ;
-      RECT 0.085000 0.660000 1.965000 0.830000 ;
-      RECT 0.085000 0.830000 0.445000 1.275000 ;
-      RECT 0.085000 1.275000 0.255000 2.260000 ;
-      RECT 0.085000 2.260000 0.595000 2.955000 ;
-      RECT 0.425000 1.445000 0.745000 1.920000 ;
-      RECT 0.425000 1.920000 1.625000 2.075000 ;
-      RECT 0.425000 2.075000 1.640000 2.090000 ;
-      RECT 1.310000 2.090000 1.640000 2.905000 ;
-      RECT 1.310000 2.905000 3.895000 3.075000 ;
-      RECT 1.455000 1.000000 1.625000 1.920000 ;
-      RECT 1.795000 0.830000 1.965000 1.395000 ;
-      RECT 1.795000 1.395000 2.680000 1.565000 ;
-      RECT 1.850000 2.075000 2.180000 2.565000 ;
-      RECT 1.850000 2.565000 3.555000 2.735000 ;
-      RECT 2.135000 0.425000 3.215000 0.595000 ;
-      RECT 2.135000 0.595000 2.305000 1.225000 ;
-      RECT 2.350000 1.565000 2.680000 2.395000 ;
-      RECT 2.510000 0.765000 2.875000 1.225000 ;
-      RECT 2.510000 1.225000 2.680000 1.395000 ;
-      RECT 2.885000 1.875000 3.215000 2.395000 ;
-      RECT 3.045000 0.595000 3.215000 1.875000 ;
-      RECT 3.385000 0.255000 5.145000 0.425000 ;
-      RECT 3.385000 0.425000 3.555000 2.565000 ;
-      RECT 3.725000 0.595000 4.805000 0.765000 ;
-      RECT 3.725000 0.765000 3.895000 1.435000 ;
-      RECT 3.725000 1.435000 4.055000 1.735000 ;
-      RECT 3.725000 1.905000 4.395000 2.755000 ;
-      RECT 3.725000 2.755000 3.895000 2.905000 ;
-      RECT 4.065000 0.935000 4.395000 1.265000 ;
-      RECT 4.225000 1.265000 4.395000 1.905000 ;
-      RECT 4.580000 0.765000 4.805000 1.010000 ;
-      RECT 4.580000 1.010000 4.750000 2.980000 ;
-      RECT 4.975000 0.425000 5.145000 0.675000 ;
-      RECT 4.975000 0.675000 6.025000 0.845000 ;
-      RECT 5.405000 1.920000 5.840000 2.980000 ;
-      RECT 5.510000 1.015000 6.365000 1.185000 ;
-      RECT 5.510000 1.185000 5.680000 1.920000 ;
-      RECT 5.775000 0.255000 7.605000 0.425000 ;
-      RECT 5.775000 0.425000 6.025000 0.675000 ;
-      RECT 5.850000 1.355000 6.180000 1.685000 ;
-      RECT 6.010000 1.685000 6.180000 2.905000 ;
-      RECT 6.010000 2.905000 7.450000 3.075000 ;
-      RECT 6.195000 0.595000 7.265000 0.765000 ;
-      RECT 6.195000 0.765000 6.365000 1.015000 ;
-      RECT 6.350000 1.355000 6.705000 1.525000 ;
-      RECT 6.350000 1.525000 6.600000 2.700000 ;
-      RECT 6.535000 0.935000 6.705000 1.355000 ;
-      RECT 6.785000 1.855000 7.465000 2.025000 ;
-      RECT 6.785000 2.025000 7.050000 2.690000 ;
-      RECT 6.885000 0.765000 7.265000 0.925000 ;
-      RECT 7.280000 2.195000 7.805000 2.500000 ;
-      RECT 7.280000 2.500000 7.450000 2.905000 ;
-      RECT 7.295000 1.095000 7.605000 1.265000 ;
-      RECT 7.295000 1.265000 7.465000 1.855000 ;
-      RECT 7.435000 0.425000 7.605000 1.095000 ;
-      RECT 7.635000 1.435000 8.025000 1.605000 ;
-      RECT 7.635000 1.605000 7.805000 2.195000 ;
-      RECT 7.775000 0.370000 8.025000 1.435000 ;
-      RECT 8.195000 1.320000 8.525000 1.650000 ;
-      RECT 8.315000 1.650000 8.525000 2.150000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.085000  0.650000 0.445000 0.660000 ;
+      RECT 0.085000  0.660000 1.965000 0.830000 ;
+      RECT 0.085000  0.830000 0.445000 1.275000 ;
+      RECT 0.085000  1.275000 0.255000 2.260000 ;
+      RECT 0.085000  2.260000 0.595000 2.955000 ;
+      RECT 0.425000  1.445000 0.745000 1.920000 ;
+      RECT 0.425000  1.920000 1.625000 2.075000 ;
+      RECT 0.425000  2.075000 1.640000 2.090000 ;
+      RECT 0.625000  0.085000 1.195000 0.490000 ;
+      RECT 0.765000  2.260000 1.095000 3.245000 ;
+      RECT 1.310000  2.090000 1.640000 2.905000 ;
+      RECT 1.310000  2.905000 3.895000 3.075000 ;
+      RECT 1.455000  1.000000 1.625000 1.920000 ;
+      RECT 1.795000  0.830000 1.965000 1.395000 ;
+      RECT 1.795000  1.395000 2.680000 1.565000 ;
+      RECT 1.850000  2.075000 2.180000 2.565000 ;
+      RECT 1.850000  2.565000 3.555000 2.735000 ;
+      RECT 2.135000  0.425000 3.215000 0.595000 ;
+      RECT 2.135000  0.595000 2.305000 1.225000 ;
+      RECT 2.350000  1.565000 2.680000 2.395000 ;
+      RECT 2.510000  0.765000 2.875000 1.225000 ;
+      RECT 2.510000  1.225000 2.680000 1.395000 ;
+      RECT 2.885000  1.875000 3.215000 2.395000 ;
+      RECT 3.045000  0.595000 3.215000 1.875000 ;
+      RECT 3.385000  0.255000 5.145000 0.425000 ;
+      RECT 3.385000  0.425000 3.555000 2.565000 ;
+      RECT 3.725000  0.595000 4.805000 0.765000 ;
+      RECT 3.725000  0.765000 3.895000 1.435000 ;
+      RECT 3.725000  1.435000 4.055000 1.735000 ;
+      RECT 3.725000  1.905000 4.395000 2.755000 ;
+      RECT 3.725000  2.755000 3.895000 2.905000 ;
+      RECT 4.065000  0.935000 4.395000 1.265000 ;
+      RECT 4.225000  1.265000 4.395000 1.905000 ;
+      RECT 4.580000  0.765000 4.805000 1.010000 ;
+      RECT 4.580000  1.010000 4.750000 2.980000 ;
+      RECT 4.950000  1.820000 5.200000 3.245000 ;
+      RECT 4.975000  0.425000 5.145000 0.675000 ;
+      RECT 4.975000  0.675000 6.025000 0.845000 ;
+      RECT 5.315000  0.085000 5.565000 0.505000 ;
+      RECT 5.405000  1.920000 5.840000 2.980000 ;
+      RECT 5.510000  1.015000 6.365000 1.185000 ;
+      RECT 5.510000  1.185000 5.680000 1.920000 ;
+      RECT 5.775000  0.255000 7.605000 0.425000 ;
+      RECT 5.775000  0.425000 6.025000 0.675000 ;
+      RECT 5.850000  1.355000 6.180000 1.685000 ;
+      RECT 6.010000  1.685000 6.180000 2.905000 ;
+      RECT 6.010000  2.905000 7.450000 3.075000 ;
+      RECT 6.195000  0.595000 7.265000 0.765000 ;
+      RECT 6.195000  0.765000 6.365000 1.015000 ;
+      RECT 6.350000  1.355000 6.705000 1.525000 ;
+      RECT 6.350000  1.525000 6.600000 2.700000 ;
+      RECT 6.535000  0.935000 6.705000 1.355000 ;
+      RECT 6.785000  1.855000 7.465000 2.025000 ;
+      RECT 6.785000  2.025000 7.050000 2.690000 ;
+      RECT 6.885000  0.765000 7.265000 0.925000 ;
+      RECT 7.280000  2.195000 7.805000 2.500000 ;
+      RECT 7.280000  2.500000 7.450000 2.905000 ;
+      RECT 7.295000  1.095000 7.605000 1.265000 ;
+      RECT 7.295000  1.265000 7.465000 1.855000 ;
+      RECT 7.435000  0.425000 7.605000 1.095000 ;
+      RECT 7.635000  1.435000 8.025000 1.605000 ;
+      RECT 7.635000  1.605000 7.805000 2.195000 ;
+      RECT 7.775000  0.370000 8.025000 1.435000 ;
+      RECT 7.975000  1.820000 8.145000 2.320000 ;
+      RECT 7.975000  2.320000 8.530000 3.245000 ;
+      RECT 8.195000  1.320000 8.525000 1.650000 ;
+      RECT 8.205000  0.085000 8.535000 1.150000 ;
+      RECT 8.315000  1.650000 8.525000 2.150000 ;
+      RECT 9.215000  0.085000 9.465000 1.150000 ;
+      RECT 9.235000  1.820000 9.485000 3.245000 ;
     LAYER mcon ;
-      RECT 3.035000 1.950000 3.205000 2.120000 ;
-      RECT 5.435000 1.950000 5.605000 2.120000 ;
-      RECT 6.395000 1.950000 6.565000 2.120000 ;
-      RECT 8.315000 1.950000 8.485000 2.120000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  1.950000 3.205000 2.120000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  1.950000 5.605000 2.120000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  1.950000 6.565000 2.120000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  1.950000 8.485000 2.120000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
     LAYER met1 ;
       RECT 2.975000 1.920000 3.265000 1.965000 ;
       RECT 2.975000 1.965000 5.665000 2.105000 ;
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef
index b8d7c81..61cf475 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_4.magic.lef
@@ -77,36 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.560000 0.085000 ;
-        RECT  0.625000  0.085000  1.035000 0.410000 ;
-        RECT  5.250000  0.085000  5.500000 0.610000 ;
-        RECT  8.330000  0.085000  8.660000 1.085000 ;
-        RECT  9.340000  0.085000  9.510000 1.130000 ;
-        RECT 10.120000  0.085000 10.450000 1.130000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -0.085000  3.205000 0.085000 ;
-        RECT  3.515000 -0.085000  3.685000 0.085000 ;
-        RECT  3.995000 -0.085000  4.165000 0.085000 ;
-        RECT  4.475000 -0.085000  4.645000 0.085000 ;
-        RECT  4.955000 -0.085000  5.125000 0.085000 ;
-        RECT  5.435000 -0.085000  5.605000 0.085000 ;
-        RECT  5.915000 -0.085000  6.085000 0.085000 ;
-        RECT  6.395000 -0.085000  6.565000 0.085000 ;
-        RECT  6.875000 -0.085000  7.045000 0.085000 ;
-        RECT  7.355000 -0.085000  7.525000 0.085000 ;
-        RECT  7.835000 -0.085000  8.005000 0.085000 ;
-        RECT  8.315000 -0.085000  8.485000 0.085000 ;
-        RECT  8.795000 -0.085000  8.965000 0.085000 ;
-        RECT  9.275000 -0.085000  9.445000 0.085000 ;
-        RECT  9.755000 -0.085000  9.925000 0.085000 ;
-        RECT 10.235000 -0.085000 10.405000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.560000 0.245000 ;
     END
@@ -115,103 +85,129 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 10.560000 3.415000 ;
-        RECT  0.565000 2.180000  0.895000 3.245000 ;
-        RECT  4.905000 1.820000  5.235000 3.245000 ;
-        RECT  7.945000 1.820000  8.115000 2.330000 ;
-        RECT  7.945000 2.330000  8.500000 3.245000 ;
-        RECT  9.295000 1.820000  9.465000 3.245000 ;
-        RECT 10.195000 1.820000 10.445000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 3.245000  3.205000 3.415000 ;
-        RECT  3.515000 3.245000  3.685000 3.415000 ;
-        RECT  3.995000 3.245000  4.165000 3.415000 ;
-        RECT  4.475000 3.245000  4.645000 3.415000 ;
-        RECT  4.955000 3.245000  5.125000 3.415000 ;
-        RECT  5.435000 3.245000  5.605000 3.415000 ;
-        RECT  5.915000 3.245000  6.085000 3.415000 ;
-        RECT  6.395000 3.245000  6.565000 3.415000 ;
-        RECT  6.875000 3.245000  7.045000 3.415000 ;
-        RECT  7.355000 3.245000  7.525000 3.415000 ;
-        RECT  7.835000 3.245000  8.005000 3.415000 ;
-        RECT  8.315000 3.245000  8.485000 3.415000 ;
-        RECT  8.795000 3.245000  8.965000 3.415000 ;
-        RECT  9.275000 3.245000  9.445000 3.415000 ;
-        RECT  9.755000 3.245000  9.925000 3.415000 ;
-        RECT 10.235000 3.245000 10.405000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.560000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.570000 0.445000 0.580000 ;
-      RECT 0.085000 0.580000 1.965000 0.750000 ;
-      RECT 0.085000 0.750000 0.445000 1.250000 ;
-      RECT 0.085000 1.250000 0.255000 2.180000 ;
-      RECT 0.085000 2.180000 0.365000 2.980000 ;
-      RECT 0.425000 1.470000 0.700000 1.840000 ;
-      RECT 0.425000 1.840000 1.625000 2.010000 ;
-      RECT 1.065000 2.010000 1.395000 2.905000 ;
-      RECT 1.065000 2.905000 3.825000 3.075000 ;
-      RECT 1.455000 0.920000 1.625000 1.840000 ;
-      RECT 1.600000 2.180000 1.930000 2.565000 ;
-      RECT 1.600000 2.565000 3.485000 2.735000 ;
-      RECT 1.795000 0.750000 1.965000 1.420000 ;
-      RECT 1.795000 1.420000 2.805000 1.590000 ;
-      RECT 2.135000 0.450000 3.145000 0.620000 ;
-      RECT 2.135000 0.620000 2.385000 1.250000 ;
-      RECT 2.135000 1.590000 2.385000 2.395000 ;
-      RECT 2.555000 0.790000 2.805000 1.420000 ;
-      RECT 2.555000 1.875000 3.145000 2.395000 ;
-      RECT 2.975000 0.620000 3.145000 1.875000 ;
-      RECT 3.315000 0.255000 5.080000 0.425000 ;
-      RECT 3.315000 0.425000 3.485000 2.565000 ;
-      RECT 3.655000 0.595000 4.740000 0.765000 ;
-      RECT 3.655000 0.765000 3.825000 1.435000 ;
-      RECT 3.655000 1.435000 3.985000 1.735000 ;
-      RECT 3.655000 1.905000 4.325000 2.755000 ;
-      RECT 3.655000 2.755000 3.825000 2.905000 ;
-      RECT 3.995000 0.935000 4.325000 1.265000 ;
-      RECT 4.155000 1.265000 4.325000 1.905000 ;
-      RECT 4.535000 0.765000 4.740000 1.130000 ;
-      RECT 4.535000 1.130000 4.705000 2.980000 ;
-      RECT 4.910000 0.425000 5.080000 0.780000 ;
-      RECT 4.910000 0.780000 5.960000 0.950000 ;
-      RECT 5.405000 1.920000 5.795000 2.800000 ;
-      RECT 5.435000 1.120000 6.300000 1.290000 ;
-      RECT 5.435000 1.290000 5.605000 1.920000 ;
-      RECT 5.710000 0.255000 7.410000 0.425000 ;
-      RECT 5.710000 0.425000 5.960000 0.780000 ;
-      RECT 5.775000 1.460000 6.135000 1.750000 ;
-      RECT 5.965000 1.750000 6.135000 2.905000 ;
-      RECT 5.965000 2.905000 7.500000 3.075000 ;
-      RECT 6.130000 0.595000 7.070000 0.765000 ;
-      RECT 6.130000 0.765000 6.300000 1.120000 ;
-      RECT 6.305000 1.920000 6.640000 2.735000 ;
-      RECT 6.470000 0.935000 6.640000 1.920000 ;
-      RECT 6.820000 0.765000 7.070000 1.275000 ;
-      RECT 6.835000 1.950000 7.410000 2.120000 ;
-      RECT 6.835000 2.120000 7.085000 2.735000 ;
-      RECT 7.240000 0.425000 7.410000 1.950000 ;
-      RECT 7.330000 2.290000 7.750000 2.710000 ;
-      RECT 7.330000 2.710000 7.500000 2.905000 ;
-      RECT 7.580000 0.415000 8.150000 0.745000 ;
-      RECT 7.580000 0.745000 7.750000 2.290000 ;
-      RECT 7.920000 1.255000 8.785000 1.585000 ;
-      RECT 8.285000 1.585000 8.515000 2.150000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.085000  0.570000  0.445000 0.580000 ;
+      RECT  0.085000  0.580000  1.965000 0.750000 ;
+      RECT  0.085000  0.750000  0.445000 1.250000 ;
+      RECT  0.085000  1.250000  0.255000 2.180000 ;
+      RECT  0.085000  2.180000  0.365000 2.980000 ;
+      RECT  0.425000  1.470000  0.700000 1.840000 ;
+      RECT  0.425000  1.840000  1.625000 2.010000 ;
+      RECT  0.565000  2.180000  0.895000 3.245000 ;
+      RECT  0.625000  0.085000  1.035000 0.410000 ;
+      RECT  1.065000  2.010000  1.395000 2.905000 ;
+      RECT  1.065000  2.905000  3.825000 3.075000 ;
+      RECT  1.455000  0.920000  1.625000 1.840000 ;
+      RECT  1.600000  2.180000  1.930000 2.565000 ;
+      RECT  1.600000  2.565000  3.485000 2.735000 ;
+      RECT  1.795000  0.750000  1.965000 1.420000 ;
+      RECT  1.795000  1.420000  2.805000 1.590000 ;
+      RECT  2.135000  0.450000  3.145000 0.620000 ;
+      RECT  2.135000  0.620000  2.385000 1.250000 ;
+      RECT  2.135000  1.590000  2.385000 2.395000 ;
+      RECT  2.555000  0.790000  2.805000 1.420000 ;
+      RECT  2.555000  1.875000  3.145000 2.395000 ;
+      RECT  2.975000  0.620000  3.145000 1.875000 ;
+      RECT  3.315000  0.255000  5.080000 0.425000 ;
+      RECT  3.315000  0.425000  3.485000 2.565000 ;
+      RECT  3.655000  0.595000  4.740000 0.765000 ;
+      RECT  3.655000  0.765000  3.825000 1.435000 ;
+      RECT  3.655000  1.435000  3.985000 1.735000 ;
+      RECT  3.655000  1.905000  4.325000 2.755000 ;
+      RECT  3.655000  2.755000  3.825000 2.905000 ;
+      RECT  3.995000  0.935000  4.325000 1.265000 ;
+      RECT  4.155000  1.265000  4.325000 1.905000 ;
+      RECT  4.535000  0.765000  4.740000 1.130000 ;
+      RECT  4.535000  1.130000  4.705000 2.980000 ;
+      RECT  4.905000  1.820000  5.235000 3.245000 ;
+      RECT  4.910000  0.425000  5.080000 0.780000 ;
+      RECT  4.910000  0.780000  5.960000 0.950000 ;
+      RECT  5.250000  0.085000  5.500000 0.610000 ;
+      RECT  5.405000  1.920000  5.795000 2.800000 ;
+      RECT  5.435000  1.120000  6.300000 1.290000 ;
+      RECT  5.435000  1.290000  5.605000 1.920000 ;
+      RECT  5.710000  0.255000  7.410000 0.425000 ;
+      RECT  5.710000  0.425000  5.960000 0.780000 ;
+      RECT  5.775000  1.460000  6.135000 1.750000 ;
+      RECT  5.965000  1.750000  6.135000 2.905000 ;
+      RECT  5.965000  2.905000  7.500000 3.075000 ;
+      RECT  6.130000  0.595000  7.070000 0.765000 ;
+      RECT  6.130000  0.765000  6.300000 1.120000 ;
+      RECT  6.305000  1.920000  6.640000 2.735000 ;
+      RECT  6.470000  0.935000  6.640000 1.920000 ;
+      RECT  6.820000  0.765000  7.070000 1.275000 ;
+      RECT  6.835000  1.950000  7.410000 2.120000 ;
+      RECT  6.835000  2.120000  7.085000 2.735000 ;
+      RECT  7.240000  0.425000  7.410000 1.950000 ;
+      RECT  7.330000  2.290000  7.750000 2.710000 ;
+      RECT  7.330000  2.710000  7.500000 2.905000 ;
+      RECT  7.580000  0.415000  8.150000 0.745000 ;
+      RECT  7.580000  0.745000  7.750000 2.290000 ;
+      RECT  7.920000  1.255000  8.785000 1.585000 ;
+      RECT  7.945000  1.820000  8.115000 2.330000 ;
+      RECT  7.945000  2.330000  8.500000 3.245000 ;
+      RECT  8.285000  1.585000  8.515000 2.150000 ;
+      RECT  8.330000  0.085000  8.660000 1.085000 ;
+      RECT  9.295000  1.820000  9.465000 3.245000 ;
+      RECT  9.340000  0.085000  9.510000 1.130000 ;
+      RECT 10.120000  0.085000 10.450000 1.130000 ;
+      RECT 10.195000  1.820000 10.445000 3.245000 ;
     LAYER mcon ;
-      RECT 2.555000 1.950000 2.725000 2.120000 ;
-      RECT 5.435000 1.950000 5.605000 2.120000 ;
-      RECT 6.395000 1.950000 6.565000 2.120000 ;
-      RECT 8.315000 1.950000 8.485000 2.120000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  1.950000  2.725000 2.120000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  1.950000  5.605000 2.120000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  1.950000  6.565000 2.120000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  1.950000  8.485000 2.120000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
     LAYER met1 ;
       RECT 2.495000 1.920000 2.785000 1.965000 ;
       RECT 2.495000 1.965000 5.665000 2.105000 ;