diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef
index 832f046..1a2c294 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.815000  0.085000 1.075000 0.610000 ;
-        RECT 1.680000  0.085000 2.320000 0.610000 ;
-        RECT 3.215000  0.085000 3.595000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -112,34 +98,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.535000 2.405000 0.855000 3.245000 ;
-        RECT 2.990000 2.370000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 0.795000 2.745000 0.965000 ;
-      RECT 0.535000 0.965000 0.810000 2.055000 ;
-      RECT 0.535000 2.055000 1.375000 2.225000 ;
-      RECT 1.105000 2.225000 1.375000 3.040000 ;
-      RECT 1.245000 0.280000 1.510000 0.795000 ;
-      RECT 2.315000 2.710000 2.820000 3.040000 ;
-      RECT 2.490000 0.280000 2.745000 0.795000 ;
-      RECT 2.580000 2.020000 3.720000 2.190000 ;
-      RECT 2.580000 2.190000 2.820000 2.710000 ;
-      RECT 3.425000 2.190000 3.720000 3.040000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.535000  0.795000 2.745000 0.965000 ;
+      RECT 0.535000  0.965000 0.810000 2.055000 ;
+      RECT 0.535000  2.055000 1.375000 2.225000 ;
+      RECT 0.535000  2.405000 0.855000 3.245000 ;
+      RECT 0.815000  0.085000 1.075000 0.610000 ;
+      RECT 1.105000  2.225000 1.375000 3.040000 ;
+      RECT 1.245000  0.280000 1.510000 0.795000 ;
+      RECT 1.680000  0.085000 2.320000 0.610000 ;
+      RECT 2.315000  2.710000 2.820000 3.040000 ;
+      RECT 2.490000  0.280000 2.745000 0.795000 ;
+      RECT 2.580000  2.020000 3.720000 2.190000 ;
+      RECT 2.580000  2.190000 2.820000 2.710000 ;
+      RECT 2.990000  2.370000 3.255000 3.245000 ;
+      RECT 3.215000  0.085000 3.595000 0.610000 ;
+      RECT 3.425000  2.190000 3.720000 3.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2111o_0
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef
index d4ff6b3..c14897a 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.magic.lef
@@ -89,21 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.690000  0.085000 1.460000 0.825000 ;
-        RECT 2.030000  0.085000 2.360000 0.825000 ;
-        RECT 3.700000  0.085000 4.030000 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
@@ -112,35 +97,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.650000 2.260000 0.980000 3.245000 ;
-        RECT 3.300000 2.270000 3.630000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.690000 0.995000 3.240000 1.040000 ;
-      RECT 0.690000 1.040000 2.820000 1.165000 ;
-      RECT 0.690000 1.165000 0.905000 1.920000 ;
-      RECT 0.690000 1.920000 1.500000 2.090000 ;
-      RECT 1.170000 2.090000 1.500000 3.075000 ;
-      RECT 1.630000 0.255000 1.860000 0.995000 ;
-      RECT 2.530000 0.255000 3.240000 0.995000 ;
-      RECT 2.530000 1.930000 4.060000 2.100000 ;
-      RECT 2.530000 2.100000 3.130000 3.075000 ;
-      RECT 3.800000 2.100000 4.060000 3.075000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.650000  2.260000 0.980000 3.245000 ;
+      RECT 0.690000  0.085000 1.460000 0.825000 ;
+      RECT 0.690000  0.995000 3.240000 1.040000 ;
+      RECT 0.690000  1.040000 2.820000 1.165000 ;
+      RECT 0.690000  1.165000 0.905000 1.920000 ;
+      RECT 0.690000  1.920000 1.500000 2.090000 ;
+      RECT 1.170000  2.090000 1.500000 3.075000 ;
+      RECT 1.630000  0.255000 1.860000 0.995000 ;
+      RECT 2.030000  0.085000 2.360000 0.825000 ;
+      RECT 2.530000  0.255000 3.240000 0.995000 ;
+      RECT 2.530000  1.930000 4.060000 2.100000 ;
+      RECT 2.530000  2.100000 3.130000 3.075000 ;
+      RECT 3.300000  2.270000 3.630000 3.245000 ;
+      RECT 3.700000  0.085000 4.030000 1.040000 ;
+      RECT 3.800000  2.100000 4.060000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2111o_1
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.magic.lef
index 89304a9..aba7e85 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__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.205000  0.085000 0.455000 1.105000 ;
-        RECT 1.065000  0.085000 2.010000 0.835000 ;
-        RECT 2.590000  0.085000 2.920000 0.815000 ;
-        RECT 4.090000  0.085000 4.420000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -114,36 +97,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.125000 1.815000 0.455000 3.245000 ;
-        RECT 0.985000 2.270000 1.315000 3.245000 ;
-        RECT 3.605000 2.270000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.065000 1.005000 3.335000 1.175000 ;
-      RECT 1.065000 1.175000 1.415000 1.920000 ;
-      RECT 1.065000 1.920000 2.010000 2.100000 ;
-      RECT 1.680000 2.100000 2.010000 3.075000 ;
-      RECT 2.180000 0.255000 2.420000 1.005000 ;
-      RECT 3.070000 1.930000 4.420000 2.100000 ;
-      RECT 3.070000 2.100000 3.400000 3.075000 ;
-      RECT 3.090000 0.255000 3.335000 1.005000 ;
-      RECT 4.105000 2.100000 4.420000 3.075000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.125000  1.815000 0.455000 3.245000 ;
+      RECT 0.205000  0.085000 0.455000 1.105000 ;
+      RECT 0.985000  2.270000 1.315000 3.245000 ;
+      RECT 1.065000  0.085000 2.010000 0.835000 ;
+      RECT 1.065000  1.005000 3.335000 1.175000 ;
+      RECT 1.065000  1.175000 1.415000 1.920000 ;
+      RECT 1.065000  1.920000 2.010000 2.100000 ;
+      RECT 1.680000  2.100000 2.010000 3.075000 ;
+      RECT 2.180000  0.255000 2.420000 1.005000 ;
+      RECT 2.590000  0.085000 2.920000 0.815000 ;
+      RECT 3.070000  1.930000 4.420000 2.100000 ;
+      RECT 3.070000  2.100000 3.400000 3.075000 ;
+      RECT 3.090000  0.255000 3.335000 1.005000 ;
+      RECT 3.605000  2.270000 3.935000 3.245000 ;
+      RECT 4.090000  0.085000 4.420000 1.040000 ;
+      RECT 4.105000  2.100000 4.420000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2111o_2
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef
index f1f1de3..54ef84b 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.magic.lef
@@ -95,33 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.775000  0.085000 1.105000 0.885000 ;
-        RECT 1.675000  0.085000 2.005000 0.815000 ;
-        RECT 2.575000  0.085000 3.510000 0.815000 ;
-        RECT 5.030000  0.085000 5.360000 0.590000 ;
-        RECT 5.890000  0.085000 6.220000 1.040000 ;
-        RECT 6.750000  0.085000 7.080000 0.895000 ;
-        RECT 7.610000  0.085000 7.940000 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 ;
-        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
@@ -130,68 +103,92 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 4.040000 2.295000 4.370000 3.245000 ;
-        RECT 5.030000 2.295000 5.360000 3.245000 ;
-        RECT 5.890000 1.955000 6.220000 3.245000 ;
-        RECT 6.750000 2.095000 7.080000 3.245000 ;
-        RECT 7.610000 2.105000 7.940000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.275000 1.920000 0.535000 2.905000 ;
-      RECT 0.275000 2.905000 2.325000 3.075000 ;
-      RECT 0.345000 0.255000 0.605000 1.065000 ;
-      RECT 0.345000 1.065000 4.515000 1.155000 ;
-      RECT 0.345000 1.155000 1.455000 1.235000 ;
-      RECT 0.705000 1.235000 0.935000 1.930000 ;
-      RECT 0.705000 1.930000 1.035000 2.735000 ;
-      RECT 1.205000 1.940000 1.395000 2.905000 ;
-      RECT 1.275000 0.255000 1.505000 0.985000 ;
-      RECT 1.275000 0.985000 4.515000 1.065000 ;
-      RECT 1.565000 1.940000 3.205000 2.110000 ;
-      RECT 1.565000 2.110000 1.895000 2.735000 ;
-      RECT 2.065000 2.280000 2.325000 2.905000 ;
-      RECT 2.175000 0.255000 2.405000 0.985000 ;
-      RECT 2.515000 2.280000 2.845000 2.905000 ;
-      RECT 2.515000 2.905000 3.825000 3.075000 ;
-      RECT 2.965000 1.705000 3.205000 1.940000 ;
-      RECT 3.015000 2.110000 3.205000 2.735000 ;
-      RECT 3.495000 1.955000 5.720000 2.125000 ;
-      RECT 3.495000 2.125000 3.825000 2.905000 ;
-      RECT 3.680000 0.255000 4.800000 0.465000 ;
-      RECT 3.680000 0.465000 3.870000 0.985000 ;
-      RECT 4.040000 0.635000 4.860000 0.760000 ;
-      RECT 4.040000 0.760000 5.720000 0.815000 ;
-      RECT 4.345000 1.155000 4.515000 1.615000 ;
-      RECT 4.345000 1.615000 6.200000 1.785000 ;
-      RECT 4.540000 2.125000 4.800000 3.025000 ;
-      RECT 4.685000 0.815000 5.720000 1.040000 ;
-      RECT 5.530000 0.255000 5.720000 0.760000 ;
-      RECT 5.530000 2.125000 5.720000 3.075000 ;
-      RECT 6.020000 1.405000 7.545000 1.575000 ;
-      RECT 6.020000 1.575000 6.200000 1.615000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.275000  1.920000 0.535000 2.905000 ;
+      RECT 0.275000  2.905000 2.325000 3.075000 ;
+      RECT 0.345000  0.255000 0.605000 1.065000 ;
+      RECT 0.345000  1.065000 4.515000 1.155000 ;
+      RECT 0.345000  1.155000 1.455000 1.235000 ;
+      RECT 0.705000  1.235000 0.935000 1.930000 ;
+      RECT 0.705000  1.930000 1.035000 2.735000 ;
+      RECT 0.775000  0.085000 1.105000 0.885000 ;
+      RECT 1.205000  1.940000 1.395000 2.905000 ;
+      RECT 1.275000  0.255000 1.505000 0.985000 ;
+      RECT 1.275000  0.985000 4.515000 1.065000 ;
+      RECT 1.565000  1.940000 3.205000 2.110000 ;
+      RECT 1.565000  2.110000 1.895000 2.735000 ;
+      RECT 1.675000  0.085000 2.005000 0.815000 ;
+      RECT 2.065000  2.280000 2.325000 2.905000 ;
+      RECT 2.175000  0.255000 2.405000 0.985000 ;
+      RECT 2.515000  2.280000 2.845000 2.905000 ;
+      RECT 2.515000  2.905000 3.825000 3.075000 ;
+      RECT 2.575000  0.085000 3.510000 0.815000 ;
+      RECT 2.965000  1.705000 3.205000 1.940000 ;
+      RECT 3.015000  2.110000 3.205000 2.735000 ;
+      RECT 3.495000  1.955000 5.720000 2.125000 ;
+      RECT 3.495000  2.125000 3.825000 2.905000 ;
+      RECT 3.680000  0.255000 4.800000 0.465000 ;
+      RECT 3.680000  0.465000 3.870000 0.985000 ;
+      RECT 4.040000  0.635000 4.860000 0.760000 ;
+      RECT 4.040000  0.760000 5.720000 0.815000 ;
+      RECT 4.040000  2.295000 4.370000 3.245000 ;
+      RECT 4.345000  1.155000 4.515000 1.615000 ;
+      RECT 4.345000  1.615000 6.200000 1.785000 ;
+      RECT 4.540000  2.125000 4.800000 3.025000 ;
+      RECT 4.685000  0.815000 5.720000 1.040000 ;
+      RECT 5.030000  0.085000 5.360000 0.590000 ;
+      RECT 5.030000  2.295000 5.360000 3.245000 ;
+      RECT 5.530000  0.255000 5.720000 0.760000 ;
+      RECT 5.530000  2.125000 5.720000 3.075000 ;
+      RECT 5.890000  0.085000 6.220000 1.040000 ;
+      RECT 5.890000  1.955000 6.220000 3.245000 ;
+      RECT 6.020000  1.405000 7.545000 1.575000 ;
+      RECT 6.020000  1.575000 6.200000 1.615000 ;
+      RECT 6.750000  0.085000 7.080000 0.895000 ;
+      RECT 6.750000  2.095000 7.080000 3.245000 ;
+      RECT 7.610000  0.085000 7.940000 0.895000 ;
+      RECT 7.610000  2.105000 7.940000 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_lp__a2111o_4
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef
index 0c80a44..4956e02 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.magic.lef
@@ -90,23 +90,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.675000 ;
-        RECT 1.725000  0.085000 2.055000 0.645000 ;
-        RECT 3.885000  0.085000 4.215000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -115,45 +98,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 1.835000 2.710000 2.165000 3.245000 ;
-        RECT 4.200000 2.375000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 2.025000 0.880000 2.195000 ;
-      RECT 0.115000 2.195000 0.445000 3.065000 ;
-      RECT 0.710000 0.265000 1.265000 0.825000 ;
-      RECT 0.710000 0.825000 2.055000 0.995000 ;
-      RECT 0.710000 0.995000 0.880000 2.025000 ;
-      RECT 1.135000 2.025000 1.465000 2.360000 ;
-      RECT 1.135000 2.360000 3.470000 2.530000 ;
-      RECT 1.135000 2.530000 1.465000 3.065000 ;
-      RECT 1.725000 0.995000 2.055000 1.790000 ;
-      RECT 2.585000 0.825000 5.035000 0.995000 ;
-      RECT 2.585000 0.995000 2.915000 1.495000 ;
-      RECT 3.095000 0.265000 3.425000 0.825000 ;
-      RECT 3.140000 2.025000 3.470000 2.360000 ;
-      RECT 3.140000 2.530000 3.470000 3.065000 ;
-      RECT 3.670000 2.025000 5.135000 2.195000 ;
-      RECT 3.670000 2.195000 4.000000 3.065000 ;
-      RECT 4.705000 0.265000 5.035000 0.825000 ;
-      RECT 4.805000 2.195000 5.135000 3.065000 ;
+      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.675000 ;
+      RECT 0.115000  2.025000 0.880000 2.195000 ;
+      RECT 0.115000  2.195000 0.445000 3.065000 ;
+      RECT 0.710000  0.265000 1.265000 0.825000 ;
+      RECT 0.710000  0.825000 2.055000 0.995000 ;
+      RECT 0.710000  0.995000 0.880000 2.025000 ;
+      RECT 1.135000  2.025000 1.465000 2.360000 ;
+      RECT 1.135000  2.360000 3.470000 2.530000 ;
+      RECT 1.135000  2.530000 1.465000 3.065000 ;
+      RECT 1.725000  0.085000 2.055000 0.645000 ;
+      RECT 1.725000  0.995000 2.055000 1.790000 ;
+      RECT 1.835000  2.710000 2.165000 3.245000 ;
+      RECT 2.585000  0.825000 5.035000 0.995000 ;
+      RECT 2.585000  0.995000 2.915000 1.495000 ;
+      RECT 3.095000  0.265000 3.425000 0.825000 ;
+      RECT 3.140000  2.025000 3.470000 2.360000 ;
+      RECT 3.140000  2.530000 3.470000 3.065000 ;
+      RECT 3.670000  2.025000 5.135000 2.195000 ;
+      RECT 3.670000  2.195000 4.000000 3.065000 ;
+      RECT 3.885000  0.085000 4.215000 0.645000 ;
+      RECT 4.200000  2.375000 4.530000 3.245000 ;
+      RECT 4.705000  0.265000 5.035000 0.825000 ;
+      RECT 4.805000  2.195000 5.135000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2111o_lp
diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef
index 381df7d..ec27cbf 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.magic.lef
@@ -92,19 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.570000  0.085000 0.900000 0.485000 ;
-        RECT 1.690000  0.085000 1.900000 0.545000 ;
-        RECT 2.850000  0.085000 3.180000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,34 +100,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.610000 2.645000 0.820000 3.245000 ;
-        RECT 2.340000 2.305000 2.710000 2.495000 ;
-        RECT 2.340000 2.495000 2.530000 3.245000 ;
-        RECT 2.520000 1.955000 2.710000 2.305000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.505000 1.470000 0.675000 1.930000 ;
-      RECT 0.505000 1.930000 1.645000 2.140000 ;
-      RECT 1.260000 0.345000 1.470000 0.725000 ;
-      RECT 1.260000 0.725000 2.330000 0.895000 ;
-      RECT 1.475000 0.895000 1.645000 1.930000 ;
-      RECT 2.090000 1.605000 3.260000 1.775000 ;
-      RECT 2.090000 1.775000 2.300000 2.135000 ;
-      RECT 2.120000 0.345000 2.330000 0.725000 ;
-      RECT 2.930000 1.775000 3.260000 2.095000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.505000  1.470000 0.675000 1.930000 ;
+      RECT 0.505000  1.930000 1.645000 2.140000 ;
+      RECT 0.570000  0.085000 0.900000 0.485000 ;
+      RECT 0.610000  2.645000 0.820000 3.245000 ;
+      RECT 1.260000  0.345000 1.470000 0.725000 ;
+      RECT 1.260000  0.725000 2.330000 0.895000 ;
+      RECT 1.475000  0.895000 1.645000 1.930000 ;
+      RECT 1.690000  0.085000 1.900000 0.545000 ;
+      RECT 2.090000  1.605000 3.260000 1.775000 ;
+      RECT 2.090000  1.775000 2.300000 2.135000 ;
+      RECT 2.120000  0.345000 2.330000 0.725000 ;
+      RECT 2.340000  2.305000 2.710000 2.495000 ;
+      RECT 2.340000  2.495000 2.530000 3.245000 ;
+      RECT 2.520000  1.955000 2.710000 2.305000 ;
+      RECT 2.850000  0.085000 3.180000 0.485000 ;
+      RECT 2.930000  1.775000 3.260000 2.095000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a2111o_m
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef
index a982824..dadfb8b 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.magic.lef
@@ -92,19 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.345000  0.085000 0.640000 0.610000 ;
-        RECT 1.235000  0.085000 1.560000 0.610000 ;
-        RECT 2.495000  0.085000 2.825000 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 ;
       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.040000 2.405000 2.370000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.565000 2.045000 2.765000 2.225000 ;
-      RECT 1.565000 2.225000 1.860000 3.065000 ;
-      RECT 2.540000 2.225000 2.765000 2.395000 ;
-      RECT 2.540000 2.395000 2.855000 3.065000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.345000  0.085000 0.640000 0.610000 ;
+      RECT 1.235000  0.085000 1.560000 0.610000 ;
+      RECT 1.565000  2.045000 2.765000 2.225000 ;
+      RECT 1.565000  2.225000 1.860000 3.065000 ;
+      RECT 2.040000  2.405000 2.370000 3.245000 ;
+      RECT 2.495000  0.085000 2.825000 0.610000 ;
+      RECT 2.540000  2.225000 2.765000 2.395000 ;
+      RECT 2.540000  2.395000 2.855000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a2111oi_0
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef
index 5e3e96f..7974dbd 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.magic.lef
@@ -93,19 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.135000  0.085000 0.465000 0.815000 ;
-        RECT 1.135000  0.085000 1.800000 0.670000 ;
-        RECT 2.895000  0.085000 3.160000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -114,25 +101,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 2.325000 2.105000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.765000 1.755000 3.160000 1.925000 ;
-      RECT 1.765000 1.925000 2.095000 3.075000 ;
-      RECT 2.890000 1.925000 3.160000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.135000  0.085000 0.465000 0.815000 ;
+      RECT 1.135000  0.085000 1.800000 0.670000 ;
+      RECT 1.765000  1.755000 3.160000 1.925000 ;
+      RECT 1.765000  1.925000 2.095000 3.075000 ;
+      RECT 2.325000  2.105000 2.655000 3.245000 ;
+      RECT 2.890000  1.925000 3.160000 3.075000 ;
+      RECT 2.895000  0.085000 3.160000 1.015000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a2111oi_1
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef
index 5fee9ba..058947c 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.magic.lef
@@ -104,25 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.550000  0.085000 0.880000 0.700000 ;
-        RECT 1.465000  0.085000 1.795000 0.700000 ;
-        RECT 2.465000  0.085000 2.795000 0.915000 ;
-        RECT 4.125000  0.085000 4.455000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -131,43 +112,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 3.690000 2.635000 4.020000 3.245000 ;
-        RECT 4.570000 2.635000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 1.955000 0.400000 2.865000 ;
-      RECT 0.120000 2.865000 3.070000 3.075000 ;
-      RECT 0.570000 1.955000 0.830000 2.525000 ;
-      RECT 0.570000 2.525000 1.700000 2.695000 ;
-      RECT 1.450000 2.295000 1.700000 2.525000 ;
-      RECT 1.870000 2.295000 2.165000 2.815000 ;
-      RECT 1.870000 2.815000 3.070000 2.865000 ;
-      RECT 2.335000 2.295000 5.350000 2.465000 ;
-      RECT 2.335000 2.465000 3.520000 2.645000 ;
-      RECT 3.260000 2.645000 3.520000 3.075000 ;
-      RECT 3.530000 0.255000 3.860000 0.870000 ;
-      RECT 3.530000 0.870000 4.850000 1.040000 ;
-      RECT 4.190000 2.465000 4.400000 3.075000 ;
-      RECT 4.625000 0.255000 4.850000 0.870000 ;
-      RECT 5.070000 2.465000 5.350000 3.075000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.120000  1.955000 0.400000 2.865000 ;
+      RECT 0.120000  2.865000 3.070000 3.075000 ;
+      RECT 0.550000  0.085000 0.880000 0.700000 ;
+      RECT 0.570000  1.955000 0.830000 2.525000 ;
+      RECT 0.570000  2.525000 1.700000 2.695000 ;
+      RECT 1.450000  2.295000 1.700000 2.525000 ;
+      RECT 1.465000  0.085000 1.795000 0.700000 ;
+      RECT 1.870000  2.295000 2.165000 2.815000 ;
+      RECT 1.870000  2.815000 3.070000 2.865000 ;
+      RECT 2.335000  2.295000 5.350000 2.465000 ;
+      RECT 2.335000  2.465000 3.520000 2.645000 ;
+      RECT 2.465000  0.085000 2.795000 0.915000 ;
+      RECT 3.260000  2.645000 3.520000 3.075000 ;
+      RECT 3.530000  0.255000 3.860000 0.870000 ;
+      RECT 3.530000  0.870000 4.850000 1.040000 ;
+      RECT 3.690000  2.635000 4.020000 3.245000 ;
+      RECT 4.125000  0.085000 4.455000 0.700000 ;
+      RECT 4.190000  2.465000 4.400000 3.075000 ;
+      RECT 4.570000  2.635000 4.900000 3.245000 ;
+      RECT 4.625000  0.255000 4.850000 0.870000 ;
+      RECT 5.070000  2.465000 5.350000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2111oi_2
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef
index 1605264..5a38c17 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.magic.lef
@@ -105,39 +105,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.095000  0.085000  0.425000 0.700000 ;
-        RECT 0.955000  0.085000  1.285000 0.700000 ;
-        RECT 1.815000  0.085000  2.145000 0.700000 ;
-        RECT 2.675000  0.085000  3.005000 0.915000 ;
-        RECT 3.595000  0.085000  3.925000 0.915000 ;
-        RECT 4.505000  0.085000  4.775000 0.915000 ;
-        RECT 5.365000  0.085000  5.695000 0.690000 ;
-        RECT 8.230000  0.085000  8.560000 0.865000 ;
-        RECT 9.090000  0.085000  9.420000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -146,71 +113,101 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 6.205000 1.945000  6.535000 3.245000 ;
-        RECT 7.065000 1.945000  7.395000 3.245000 ;
-        RECT 8.065000 2.270000  8.395000 3.245000 ;
-        RECT 9.015000 2.055000  9.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 ;
-        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.095000 2.045000 0.425000 2.905000 ;
-      RECT 0.095000 2.905000 3.865000 3.075000 ;
-      RECT 0.955000 2.045000 1.285000 2.905000 ;
-      RECT 1.815000 1.930000 2.145000 2.905000 ;
-      RECT 2.315000 1.930000 5.675000 2.100000 ;
-      RECT 2.315000 2.100000 2.505000 2.735000 ;
-      RECT 2.675000 2.270000 3.005000 2.905000 ;
-      RECT 3.175000 2.100000 3.365000 2.735000 ;
-      RECT 3.535000 2.270000 3.865000 2.905000 ;
-      RECT 4.055000 2.270000 4.385000 2.905000 ;
-      RECT 4.055000 2.905000 6.035000 3.075000 ;
-      RECT 4.555000 2.100000 5.675000 2.120000 ;
-      RECT 4.555000 2.120000 4.785000 2.735000 ;
-      RECT 4.955000 2.305000 5.175000 2.905000 ;
-      RECT 5.345000 2.120000 5.675000 2.735000 ;
-      RECT 5.845000 1.605000 7.775000 1.775000 ;
-      RECT 5.845000 1.775000 6.035000 2.905000 ;
-      RECT 5.965000 0.255000 8.060000 0.425000 ;
-      RECT 5.965000 0.425000 6.290000 0.700000 ;
-      RECT 6.705000 1.775000 6.895000 3.075000 ;
-      RECT 6.875000 0.425000 7.140000 0.700000 ;
-      RECT 7.565000 1.775000 7.775000 1.930000 ;
-      RECT 7.565000 1.930000 8.845000 2.100000 ;
-      RECT 7.565000 2.100000 7.895000 3.075000 ;
-      RECT 7.870000 0.425000 8.060000 1.035000 ;
-      RECT 7.870000 1.035000 9.850000 1.205000 ;
-      RECT 8.565000 2.100000 8.845000 3.075000 ;
-      RECT 8.655000 1.715000 9.775000 1.885000 ;
-      RECT 8.655000 1.885000 8.845000 1.930000 ;
-      RECT 8.730000 0.255000 8.920000 1.035000 ;
-      RECT 9.515000 1.885000 9.775000 3.075000 ;
-      RECT 9.590000 0.255000 9.850000 1.035000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.095000  0.085000  0.425000 0.700000 ;
+      RECT 0.095000  2.045000  0.425000 2.905000 ;
+      RECT 0.095000  2.905000  3.865000 3.075000 ;
+      RECT 0.955000  0.085000  1.285000 0.700000 ;
+      RECT 0.955000  2.045000  1.285000 2.905000 ;
+      RECT 1.815000  0.085000  2.145000 0.700000 ;
+      RECT 1.815000  1.930000  2.145000 2.905000 ;
+      RECT 2.315000  1.930000  5.675000 2.100000 ;
+      RECT 2.315000  2.100000  2.505000 2.735000 ;
+      RECT 2.675000  0.085000  3.005000 0.915000 ;
+      RECT 2.675000  2.270000  3.005000 2.905000 ;
+      RECT 3.175000  2.100000  3.365000 2.735000 ;
+      RECT 3.535000  2.270000  3.865000 2.905000 ;
+      RECT 3.595000  0.085000  3.925000 0.915000 ;
+      RECT 4.055000  2.270000  4.385000 2.905000 ;
+      RECT 4.055000  2.905000  6.035000 3.075000 ;
+      RECT 4.505000  0.085000  4.775000 0.915000 ;
+      RECT 4.555000  2.100000  5.675000 2.120000 ;
+      RECT 4.555000  2.120000  4.785000 2.735000 ;
+      RECT 4.955000  2.305000  5.175000 2.905000 ;
+      RECT 5.345000  2.120000  5.675000 2.735000 ;
+      RECT 5.365000  0.085000  5.695000 0.690000 ;
+      RECT 5.845000  1.605000  7.775000 1.775000 ;
+      RECT 5.845000  1.775000  6.035000 2.905000 ;
+      RECT 5.965000  0.255000  8.060000 0.425000 ;
+      RECT 5.965000  0.425000  6.290000 0.700000 ;
+      RECT 6.205000  1.945000  6.535000 3.245000 ;
+      RECT 6.705000  1.775000  6.895000 3.075000 ;
+      RECT 6.875000  0.425000  7.140000 0.700000 ;
+      RECT 7.065000  1.945000  7.395000 3.245000 ;
+      RECT 7.565000  1.775000  7.775000 1.930000 ;
+      RECT 7.565000  1.930000  8.845000 2.100000 ;
+      RECT 7.565000  2.100000  7.895000 3.075000 ;
+      RECT 7.870000  0.425000  8.060000 1.035000 ;
+      RECT 7.870000  1.035000  9.850000 1.205000 ;
+      RECT 8.065000  2.270000  8.395000 3.245000 ;
+      RECT 8.230000  0.085000  8.560000 0.865000 ;
+      RECT 8.565000  2.100000  8.845000 3.075000 ;
+      RECT 8.655000  1.715000  9.775000 1.885000 ;
+      RECT 8.655000  1.885000  8.845000 1.930000 ;
+      RECT 8.730000  0.255000  8.920000 1.035000 ;
+      RECT 9.015000  2.055000  9.345000 3.245000 ;
+      RECT 9.090000  0.085000  9.420000 0.865000 ;
+      RECT 9.515000  1.885000  9.775000 3.075000 ;
+      RECT 9.590000  0.255000  9.850000 1.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2111oi_4
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef
index b6da550..27fcf9b 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.magic.lef
@@ -93,21 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.990000  0.085000 1.320000 0.645000 ;
-        RECT 2.310000  0.085000 2.640000 0.645000 ;
-        RECT 3.890000  0.085000 4.220000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,28 +101,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.100000 2.025000 0.430000 3.245000 ;
-        RECT 1.160000 2.375000 1.490000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.630000 2.025000 2.470000 2.195000 ;
-      RECT 0.630000 2.195000 0.960000 3.065000 ;
-      RECT 2.140000 2.195000 2.470000 3.065000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.100000  2.025000 0.430000 3.245000 ;
+      RECT 0.630000  2.025000 2.470000 2.195000 ;
+      RECT 0.630000  2.195000 0.960000 3.065000 ;
+      RECT 0.990000  0.085000 1.320000 0.645000 ;
+      RECT 1.160000  2.375000 1.490000 3.245000 ;
+      RECT 2.140000  2.195000 2.470000 3.065000 ;
+      RECT 2.310000  0.085000 2.640000 0.645000 ;
+      RECT 3.890000  0.085000 4.220000 0.645000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2111oi_lp
diff --git a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef
index ce1baa7..ce5f35b 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.magic.lef
@@ -93,19 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.265000  0.085000 0.455000 0.545000 ;
-        RECT 1.200000  0.085000 1.530000 0.445000 ;
-        RECT 2.610000  0.085000 2.820000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -114,25 +101,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.920000 2.835000 2.250000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.530000 2.485000 2.880000 2.655000 ;
-      RECT 1.530000 2.655000 1.740000 2.975000 ;
-      RECT 2.550000 2.655000 2.880000 2.915000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.265000  0.085000 0.455000 0.545000 ;
+      RECT 1.200000  0.085000 1.530000 0.445000 ;
+      RECT 1.530000  2.485000 2.880000 2.655000 ;
+      RECT 1.530000  2.655000 1.740000 2.975000 ;
+      RECT 1.920000  2.835000 2.250000 3.245000 ;
+      RECT 2.550000  2.655000 2.880000 2.915000 ;
+      RECT 2.610000  0.085000 2.820000 0.545000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a2111oi_m
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef
index 0b089b8..5b48c6b 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_0.magic.lef
@@ -81,18 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.560000  0.085000 1.200000 0.675000 ;
-        RECT 2.130000  0.085000 2.720000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -101,33 +89,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.555000 2.180000 0.855000 3.245000 ;
-        RECT 1.550000 2.400000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 0.860000 3.190000 1.030000 ;
-      RECT 0.505000 1.030000 0.755000 1.530000 ;
-      RECT 1.080000 2.060000 2.275000 2.230000 ;
-      RECT 1.080000 2.230000 1.380000 3.070000 ;
-      RECT 1.660000 0.345000 1.960000 0.860000 ;
-      RECT 2.010000 2.230000 2.275000 3.075000 ;
-      RECT 2.535000 1.030000 2.705000 2.390000 ;
-      RECT 2.535000 2.390000 3.100000 2.560000 ;
-      RECT 2.615000 2.560000 3.100000 3.060000 ;
-      RECT 2.890000 0.345000 3.190000 0.860000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.505000  0.860000 3.190000 1.030000 ;
+      RECT 0.505000  1.030000 0.755000 1.530000 ;
+      RECT 0.555000  2.180000 0.855000 3.245000 ;
+      RECT 0.560000  0.085000 1.200000 0.675000 ;
+      RECT 1.080000  2.060000 2.275000 2.230000 ;
+      RECT 1.080000  2.230000 1.380000 3.070000 ;
+      RECT 1.550000  2.400000 1.840000 3.245000 ;
+      RECT 1.660000  0.345000 1.960000 0.860000 ;
+      RECT 2.010000  2.230000 2.275000 3.075000 ;
+      RECT 2.130000  0.085000 2.720000 0.675000 ;
+      RECT 2.535000  1.030000 2.705000 2.390000 ;
+      RECT 2.535000  2.390000 3.100000 2.560000 ;
+      RECT 2.615000  2.560000 3.100000 3.060000 ;
+      RECT 2.890000  0.345000 3.190000 0.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 ;
   END
 END sky130_fd_sc_lp__a211o_0
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef
index b83d425..cb88e5c 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_1.magic.lef
@@ -79,18 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.575000  0.085000 1.345000 0.685000 ;
-        RECT 2.445000  0.085000 2.775000 0.685000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -99,32 +87,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.575000 2.045000 0.855000 3.245000 ;
-        RECT 1.515000 2.375000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.585000 0.855000 3.245000 1.025000 ;
-      RECT 0.585000 1.025000 0.915000 1.695000 ;
-      RECT 0.585000 1.695000 3.245000 1.865000 ;
-      RECT 1.045000 2.035000 2.360000 2.205000 ;
-      RECT 1.045000 2.205000 1.345000 3.075000 ;
-      RECT 1.905000 0.255000 2.235000 0.855000 ;
-      RECT 2.030000 2.205000 2.360000 3.075000 ;
-      RECT 2.915000 1.865000 3.245000 3.075000 ;
-      RECT 2.945000 0.255000 3.245000 0.855000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.575000  0.085000 1.345000 0.685000 ;
+      RECT 0.575000  2.045000 0.855000 3.245000 ;
+      RECT 0.585000  0.855000 3.245000 1.025000 ;
+      RECT 0.585000  1.025000 0.915000 1.695000 ;
+      RECT 0.585000  1.695000 3.245000 1.865000 ;
+      RECT 1.045000  2.035000 2.360000 2.205000 ;
+      RECT 1.045000  2.205000 1.345000 3.075000 ;
+      RECT 1.515000  2.375000 1.845000 3.245000 ;
+      RECT 1.905000  0.255000 2.235000 0.855000 ;
+      RECT 2.030000  2.205000 2.360000 3.075000 ;
+      RECT 2.445000  0.085000 2.775000 0.685000 ;
+      RECT 2.915000  1.865000 3.245000 3.075000 ;
+      RECT 2.945000  0.255000 3.245000 0.855000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a211o_1
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef
index 7f5d17e..951f691 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_2.magic.lef
@@ -79,20 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.095000  0.085000 0.385000 1.095000 ;
-        RECT 0.995000  0.085000 1.805000 0.685000 ;
-        RECT 2.915000  0.085000 3.245000 0.685000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -101,36 +87,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.095000 1.815000 0.385000 3.245000 ;
-        RECT 1.000000 2.045000 1.285000 3.245000 ;
-        RECT 1.960000 2.395000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.000000 1.345000 1.415000 1.675000 ;
-      RECT 1.245000 0.855000 3.675000 1.025000 ;
-      RECT 1.245000 1.025000 1.415000 1.345000 ;
-      RECT 1.245000 1.675000 1.415000 1.695000 ;
-      RECT 1.245000 1.695000 3.675000 1.875000 ;
-      RECT 1.475000 2.045000 2.790000 2.225000 ;
-      RECT 1.475000 2.225000 1.790000 3.075000 ;
-      RECT 2.365000 0.255000 2.695000 0.855000 ;
-      RECT 2.460000 2.225000 2.790000 3.065000 ;
-      RECT 3.345000 1.875000 3.675000 3.075000 ;
-      RECT 3.415000 0.255000 3.675000 0.855000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.085000 0.385000 1.095000 ;
+      RECT 0.095000  1.815000 0.385000 3.245000 ;
+      RECT 0.995000  0.085000 1.805000 0.685000 ;
+      RECT 1.000000  1.345000 1.415000 1.675000 ;
+      RECT 1.000000  2.045000 1.285000 3.245000 ;
+      RECT 1.245000  0.855000 3.675000 1.025000 ;
+      RECT 1.245000  1.025000 1.415000 1.345000 ;
+      RECT 1.245000  1.675000 1.415000 1.695000 ;
+      RECT 1.245000  1.695000 3.675000 1.875000 ;
+      RECT 1.475000  2.045000 2.790000 2.225000 ;
+      RECT 1.475000  2.225000 1.790000 3.075000 ;
+      RECT 1.960000  2.395000 2.290000 3.245000 ;
+      RECT 2.365000  0.255000 2.695000 0.855000 ;
+      RECT 2.460000  2.225000 2.790000 3.065000 ;
+      RECT 2.915000  0.085000 3.245000 0.685000 ;
+      RECT 3.345000  1.875000 3.675000 3.075000 ;
+      RECT 3.415000  0.255000 3.675000 0.855000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a211o_2
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef
index 81c00a9..e8d6e62 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_4.magic.lef
@@ -93,29 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.765000  0.085000 1.095000 0.885000 ;
-        RECT 1.625000  0.085000 1.955000 0.875000 ;
-        RECT 2.500000  0.085000 2.830000 0.805000 ;
-        RECT 3.375000  0.085000 3.705000 0.675000 ;
-        RECT 4.280000  0.085000 4.835000 0.885000 ;
-        RECT 6.365000  0.085000 6.625000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -124,60 +101,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.210000 2.095000 0.540000 3.245000 ;
-        RECT 1.070000 2.105000 1.400000 3.245000 ;
-        RECT 1.930000 1.815000 2.260000 3.245000 ;
-        RECT 4.895000 2.630000 5.225000 3.245000 ;
-        RECT 5.865000 2.630000 6.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 ;
-        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.515000 1.395000 2.645000 1.585000 ;
-      RECT 2.475000 0.985000 4.110000 1.015000 ;
-      RECT 2.475000 1.015000 3.205000 1.155000 ;
-      RECT 2.475000 1.155000 2.645000 1.395000 ;
-      RECT 2.475000 1.585000 2.645000 2.035000 ;
-      RECT 2.475000 2.035000 3.785000 2.205000 ;
-      RECT 2.595000 2.375000 2.925000 2.425000 ;
-      RECT 2.595000 2.425000 6.625000 2.460000 ;
-      RECT 2.595000 2.460000 4.725000 2.595000 ;
-      RECT 2.595000 2.595000 2.855000 3.075000 ;
-      RECT 3.000000 0.255000 3.205000 0.845000 ;
-      RECT 3.000000 0.845000 4.110000 0.985000 ;
-      RECT 3.025000 2.765000 4.215000 3.055000 ;
-      RECT 3.455000 2.205000 3.785000 2.255000 ;
-      RECT 3.875000 0.255000 4.110000 0.845000 ;
-      RECT 3.885000 1.015000 4.110000 1.065000 ;
-      RECT 3.885000 1.065000 5.695000 1.235000 ;
-      RECT 4.355000 2.035000 4.730000 2.290000 ;
-      RECT 4.355000 2.290000 6.625000 2.425000 ;
-      RECT 4.385000 2.595000 4.725000 3.075000 ;
-      RECT 5.005000 0.255000 6.195000 0.425000 ;
-      RECT 5.005000 0.425000 5.335000 0.895000 ;
-      RECT 5.435000 2.460000 5.695000 3.075000 ;
-      RECT 5.505000 0.595000 5.695000 1.065000 ;
-      RECT 5.865000 0.425000 6.195000 1.095000 ;
-      RECT 6.295000 1.815000 6.625000 2.290000 ;
-      RECT 6.365000 2.460000 6.625000 3.075000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.210000  2.095000 0.540000 3.245000 ;
+      RECT 0.515000  1.395000 2.645000 1.585000 ;
+      RECT 0.765000  0.085000 1.095000 0.885000 ;
+      RECT 1.070000  2.105000 1.400000 3.245000 ;
+      RECT 1.625000  0.085000 1.955000 0.875000 ;
+      RECT 1.930000  1.815000 2.260000 3.245000 ;
+      RECT 2.475000  0.985000 4.110000 1.015000 ;
+      RECT 2.475000  1.015000 3.205000 1.155000 ;
+      RECT 2.475000  1.155000 2.645000 1.395000 ;
+      RECT 2.475000  1.585000 2.645000 2.035000 ;
+      RECT 2.475000  2.035000 3.785000 2.205000 ;
+      RECT 2.500000  0.085000 2.830000 0.805000 ;
+      RECT 2.595000  2.375000 2.925000 2.425000 ;
+      RECT 2.595000  2.425000 6.625000 2.460000 ;
+      RECT 2.595000  2.460000 4.725000 2.595000 ;
+      RECT 2.595000  2.595000 2.855000 3.075000 ;
+      RECT 3.000000  0.255000 3.205000 0.845000 ;
+      RECT 3.000000  0.845000 4.110000 0.985000 ;
+      RECT 3.025000  2.765000 4.215000 3.055000 ;
+      RECT 3.375000  0.085000 3.705000 0.675000 ;
+      RECT 3.455000  2.205000 3.785000 2.255000 ;
+      RECT 3.875000  0.255000 4.110000 0.845000 ;
+      RECT 3.885000  1.015000 4.110000 1.065000 ;
+      RECT 3.885000  1.065000 5.695000 1.235000 ;
+      RECT 4.280000  0.085000 4.835000 0.885000 ;
+      RECT 4.355000  2.035000 4.730000 2.290000 ;
+      RECT 4.355000  2.290000 6.625000 2.425000 ;
+      RECT 4.385000  2.595000 4.725000 3.075000 ;
+      RECT 4.895000  2.630000 5.225000 3.245000 ;
+      RECT 5.005000  0.255000 6.195000 0.425000 ;
+      RECT 5.005000  0.425000 5.335000 0.895000 ;
+      RECT 5.435000  2.460000 5.695000 3.075000 ;
+      RECT 5.505000  0.595000 5.695000 1.065000 ;
+      RECT 5.865000  0.425000 6.195000 1.095000 ;
+      RECT 5.865000  2.630000 6.195000 3.245000 ;
+      RECT 6.295000  1.815000 6.625000 2.290000 ;
+      RECT 6.365000  0.085000 6.625000 1.095000 ;
+      RECT 6.365000  2.460000 6.625000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a211o_4
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef
index abee4a3..1c4b221 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_lp.magic.lef
@@ -79,19 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.015000  0.085000 1.345000 0.640000 ;
-        RECT 2.595000  0.085000 2.925000 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
@@ -100,36 +87,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.655000 2.370000 0.985000 3.245000 ;
-        RECT 2.855000 2.370000 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 ;
-        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.125000 2.020000 1.565000 2.190000 ;
-      RECT 0.125000 2.190000 0.455000 3.065000 ;
-      RECT 0.195000 0.265000 0.525000 0.555000 ;
-      RECT 0.195000 0.555000 0.835000 0.725000 ;
-      RECT 0.665000 0.725000 0.835000 0.820000 ;
-      RECT 0.665000 0.820000 3.205000 0.990000 ;
-      RECT 1.235000 2.190000 1.565000 3.065000 ;
-      RECT 1.805000 0.265000 2.135000 0.820000 ;
-      RECT 2.295000 2.020000 3.045000 2.190000 ;
-      RECT 2.295000 2.190000 2.625000 3.065000 ;
-      RECT 2.875000 0.990000 3.205000 1.490000 ;
-      RECT 2.875000 1.490000 3.045000 2.020000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.125000  2.020000 1.565000 2.190000 ;
+      RECT 0.125000  2.190000 0.455000 3.065000 ;
+      RECT 0.195000  0.265000 0.525000 0.555000 ;
+      RECT 0.195000  0.555000 0.835000 0.725000 ;
+      RECT 0.655000  2.370000 0.985000 3.245000 ;
+      RECT 0.665000  0.725000 0.835000 0.820000 ;
+      RECT 0.665000  0.820000 3.205000 0.990000 ;
+      RECT 1.015000  0.085000 1.345000 0.640000 ;
+      RECT 1.235000  2.190000 1.565000 3.065000 ;
+      RECT 1.805000  0.265000 2.135000 0.820000 ;
+      RECT 2.295000  2.020000 3.045000 2.190000 ;
+      RECT 2.295000  2.190000 2.625000 3.065000 ;
+      RECT 2.595000  0.085000 2.925000 0.640000 ;
+      RECT 2.855000  2.370000 3.185000 3.245000 ;
+      RECT 2.875000  0.990000 3.205000 1.490000 ;
+      RECT 2.875000  1.490000 3.045000 2.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 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a211o_lp
diff --git a/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef b/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef
index 7d94925..66ff9df 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_m.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.570000  0.085000 0.740000 0.765000 ;
-        RECT 0.570000  0.765000 0.900000 0.975000 ;
-        RECT 2.455000  0.775000 2.785000 0.985000 ;
-        RECT 2.615000  0.085000 2.785000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -103,33 +89,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.595000 2.785000 0.805000 3.245000 ;
-        RECT 1.515000 2.115000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.145000 1.765000 2.215000 1.935000 ;
-      RECT 1.145000 1.935000 1.335000 2.255000 ;
-      RECT 1.945000 0.915000 2.275000 1.165000 ;
-      RECT 1.945000 1.165000 3.155000 1.335000 ;
-      RECT 2.025000 1.935000 2.215000 2.255000 ;
-      RECT 2.025000 2.735000 2.565000 3.065000 ;
-      RECT 2.395000 1.335000 2.565000 1.930000 ;
-      RECT 2.395000 1.930000 3.005000 2.260000 ;
-      RECT 2.395000 2.260000 2.565000 2.735000 ;
-      RECT 2.965000 0.835000 3.155000 1.165000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.570000  0.085000 0.740000 0.765000 ;
+      RECT 0.570000  0.765000 0.900000 0.975000 ;
+      RECT 0.595000  2.785000 0.805000 3.245000 ;
+      RECT 1.145000  1.765000 2.215000 1.935000 ;
+      RECT 1.145000  1.935000 1.335000 2.255000 ;
+      RECT 1.515000  2.115000 1.845000 3.245000 ;
+      RECT 1.945000  0.915000 2.275000 1.165000 ;
+      RECT 1.945000  1.165000 3.155000 1.335000 ;
+      RECT 2.025000  1.935000 2.215000 2.255000 ;
+      RECT 2.025000  2.735000 2.565000 3.065000 ;
+      RECT 2.395000  1.335000 2.565000 1.930000 ;
+      RECT 2.395000  1.930000 3.005000 2.260000 ;
+      RECT 2.395000  2.260000 2.565000 2.735000 ;
+      RECT 2.455000  0.775000 2.785000 0.985000 ;
+      RECT 2.615000  0.085000 2.785000 0.775000 ;
+      RECT 2.965000  0.835000 3.155000 1.165000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a211o_m
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef
index 93be0e4..9ab01e4 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.magic.lef
@@ -84,17 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.285000  0.085000 0.615000 0.610000 ;
-        RECT 1.570000  0.085000 1.830000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -103,24 +92,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.710000 2.395000 0.970000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.245000 2.045000 1.435000 2.225000 ;
-      RECT 0.245000 2.225000 0.540000 3.075000 ;
-      RECT 1.140000 2.225000 1.435000 3.075000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.245000  2.045000 1.435000 2.225000 ;
+      RECT 0.245000  2.225000 0.540000 3.075000 ;
+      RECT 0.285000  0.085000 0.615000 0.610000 ;
+      RECT 0.710000  2.395000 0.970000 3.245000 ;
+      RECT 1.140000  2.225000 1.435000 3.075000 ;
+      RECT 1.570000  0.085000 1.830000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a211oi_0
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef
index 049b903..6784a89 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.magic.lef
@@ -87,17 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 1.040000 ;
-        RECT 1.520000  0.085000 1.850000 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 ;
-        RECT 1.595000 -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
@@ -106,24 +95,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.580000 2.270000 0.910000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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 1.930000 1.455000 2.100000 ;
-      RECT 0.095000 2.100000 0.410000 3.075000 ;
-      RECT 1.125000 2.100000 1.455000 3.075000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 1.040000 ;
+      RECT 0.095000  1.930000 1.455000 2.100000 ;
+      RECT 0.095000  2.100000 0.410000 3.075000 ;
+      RECT 0.580000  2.270000 0.910000 3.245000 ;
+      RECT 1.125000  2.100000 1.455000 3.075000 ;
+      RECT 1.520000  0.085000 1.850000 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 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a211oi_1
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.magic.lef
index f09d536..eaf2e69 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__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 0.165000  0.085000 0.425000 1.040000 ;
-        RECT 1.025000  0.085000 1.355000 0.905000 ;
-        RECT 1.935000  0.085000 2.215000 0.905000 ;
-        RECT 2.915000  0.085000 3.245000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,42 +94,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 2.565000 2.260000 2.895000 3.245000 ;
-        RECT 3.425000 2.105000 3.755000 3.245000 ;
-        RECT 4.285000 1.920000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.165000 1.920000 0.425000 2.905000 ;
-      RECT 0.165000 2.905000 2.215000 3.075000 ;
-      RECT 1.095000 1.920000 1.285000 2.905000 ;
-      RECT 1.455000 1.920000 4.115000 1.935000 ;
-      RECT 1.455000 1.935000 3.255000 2.090000 ;
-      RECT 1.455000 2.090000 1.785000 2.735000 ;
-      RECT 1.955000 2.260000 2.215000 2.905000 ;
-      RECT 2.405000 0.305000 2.735000 0.735000 ;
-      RECT 2.405000 0.735000 3.755000 0.905000 ;
-      RECT 3.065000 1.765000 4.115000 1.920000 ;
-      RECT 3.065000 2.090000 3.255000 3.075000 ;
-      RECT 3.425000 0.255000 4.695000 0.425000 ;
-      RECT 3.425000 0.425000 3.755000 0.735000 ;
-      RECT 3.925000 1.935000 4.115000 3.075000 ;
-      RECT 4.435000 0.425000 4.695000 1.040000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.165000  0.085000 0.425000 1.040000 ;
+      RECT 0.165000  1.920000 0.425000 2.905000 ;
+      RECT 0.165000  2.905000 2.215000 3.075000 ;
+      RECT 1.025000  0.085000 1.355000 0.905000 ;
+      RECT 1.095000  1.920000 1.285000 2.905000 ;
+      RECT 1.455000  1.920000 4.115000 1.935000 ;
+      RECT 1.455000  1.935000 3.255000 2.090000 ;
+      RECT 1.455000  2.090000 1.785000 2.735000 ;
+      RECT 1.935000  0.085000 2.215000 0.905000 ;
+      RECT 1.955000  2.260000 2.215000 2.905000 ;
+      RECT 2.405000  0.305000 2.735000 0.735000 ;
+      RECT 2.405000  0.735000 3.755000 0.905000 ;
+      RECT 2.565000  2.260000 2.895000 3.245000 ;
+      RECT 2.915000  0.085000 3.245000 0.565000 ;
+      RECT 3.065000  1.765000 4.115000 1.920000 ;
+      RECT 3.065000  2.090000 3.255000 3.075000 ;
+      RECT 3.425000  0.255000 4.695000 0.425000 ;
+      RECT 3.425000  0.425000 3.755000 0.735000 ;
+      RECT 3.425000  2.105000 3.755000 3.245000 ;
+      RECT 3.925000  1.935000 4.115000 3.075000 ;
+      RECT 4.285000  1.920000 4.615000 3.245000 ;
+      RECT 4.435000  0.425000 4.695000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a211oi_2
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef
index a99c993..b732a45 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.magic.lef
@@ -97,32 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.115000  0.085000 0.415000 1.095000 ;
-        RECT 0.975000  0.085000 1.305000 0.835000 ;
-        RECT 3.555000  0.085000 3.885000 0.585000 ;
-        RECT 4.525000  0.085000 4.785000 0.555000 ;
-        RECT 5.455000  0.085000 5.645000 0.575000 ;
-        RECT 6.315000  0.085000 6.505000 0.575000 ;
-        RECT 7.175000  0.085000 7.435000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -131,52 +105,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.615000 2.295000 0.945000 3.245000 ;
-        RECT 1.475000 2.295000 1.805000 3.245000 ;
-        RECT 2.335000 2.295000 2.665000 3.245000 ;
-        RECT 3.195000 2.295000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.185000 1.955000 3.945000 2.125000 ;
-      RECT 0.185000 2.125000 0.445000 3.075000 ;
-      RECT 0.585000 0.255000 0.805000 1.005000 ;
-      RECT 0.585000 1.005000 1.665000 1.175000 ;
-      RECT 1.115000 2.125000 1.305000 3.075000 ;
-      RECT 1.475000 0.255000 3.385000 0.585000 ;
-      RECT 1.475000 0.585000 1.665000 1.005000 ;
-      RECT 1.975000 2.125000 2.165000 3.075000 ;
-      RECT 2.835000 2.125000 3.025000 3.075000 ;
-      RECT 3.695000 2.125000 3.945000 3.075000 ;
-      RECT 3.735000 1.705000 4.805000 1.875000 ;
-      RECT 3.735000 1.875000 3.945000 1.955000 ;
-      RECT 4.165000 2.045000 4.375000 2.745000 ;
-      RECT 4.165000 2.745000 6.965000 3.075000 ;
-      RECT 4.595000 1.875000 4.805000 2.325000 ;
-      RECT 4.595000 2.325000 7.465000 2.575000 ;
-      RECT 7.135000 2.165000 7.465000 2.325000 ;
-      RECT 7.135000 2.575000 7.465000 3.055000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.115000  0.085000 0.415000 1.095000 ;
+      RECT 0.185000  1.955000 3.945000 2.125000 ;
+      RECT 0.185000  2.125000 0.445000 3.075000 ;
+      RECT 0.585000  0.255000 0.805000 1.005000 ;
+      RECT 0.585000  1.005000 1.665000 1.175000 ;
+      RECT 0.615000  2.295000 0.945000 3.245000 ;
+      RECT 0.975000  0.085000 1.305000 0.835000 ;
+      RECT 1.115000  2.125000 1.305000 3.075000 ;
+      RECT 1.475000  0.255000 3.385000 0.585000 ;
+      RECT 1.475000  0.585000 1.665000 1.005000 ;
+      RECT 1.475000  2.295000 1.805000 3.245000 ;
+      RECT 1.975000  2.125000 2.165000 3.075000 ;
+      RECT 2.335000  2.295000 2.665000 3.245000 ;
+      RECT 2.835000  2.125000 3.025000 3.075000 ;
+      RECT 3.195000  2.295000 3.525000 3.245000 ;
+      RECT 3.555000  0.085000 3.885000 0.585000 ;
+      RECT 3.695000  2.125000 3.945000 3.075000 ;
+      RECT 3.735000  1.705000 4.805000 1.875000 ;
+      RECT 3.735000  1.875000 3.945000 1.955000 ;
+      RECT 4.165000  2.045000 4.375000 2.745000 ;
+      RECT 4.165000  2.745000 6.965000 3.075000 ;
+      RECT 4.525000  0.085000 4.785000 0.555000 ;
+      RECT 4.595000  1.875000 4.805000 2.325000 ;
+      RECT 4.595000  2.325000 7.465000 2.575000 ;
+      RECT 5.455000  0.085000 5.645000 0.575000 ;
+      RECT 6.315000  0.085000 6.505000 0.575000 ;
+      RECT 7.135000  2.165000 7.465000 2.325000 ;
+      RECT 7.135000  2.575000 7.465000 3.055000 ;
+      RECT 7.175000  0.085000 7.435000 0.575000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a211oi_4
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef
index 8adfdc7..111f11b 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.magic.lef
@@ -82,18 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.020000  0.085000 1.350000 0.640000 ;
-        RECT 2.670000  0.085000 3.000000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,25 +90,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.940000 2.370000 2.270000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.410000 2.020000 3.100000 2.190000 ;
-      RECT 1.410000 2.190000 1.740000 3.065000 ;
-      RECT 2.770000 2.190000 3.100000 3.065000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 1.020000  0.085000 1.350000 0.640000 ;
+      RECT 1.410000  2.020000 3.100000 2.190000 ;
+      RECT 1.410000  2.190000 1.740000 3.065000 ;
+      RECT 1.940000  2.370000 2.270000 3.245000 ;
+      RECT 2.670000  0.085000 3.000000 0.725000 ;
+      RECT 2.770000  2.190000 3.100000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a211oi_lp
diff --git a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef
index 64df750..df3d39d 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.magic.lef
@@ -83,16 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.485000 ;
-        RECT 1.445000  0.085000 1.775000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -101,23 +91,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.545000 2.035000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 1.685000 1.335000 1.855000 ;
-      RECT 0.155000 1.855000 0.365000 2.155000 ;
-      RECT 1.125000 1.855000 1.335000 2.135000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.485000 ;
+      RECT 0.155000  1.685000 1.335000 1.855000 ;
+      RECT 0.155000  1.855000 0.365000 2.155000 ;
+      RECT 0.545000  2.035000 0.875000 3.245000 ;
+      RECT 1.125000  1.855000 1.335000 2.135000 ;
+      RECT 1.445000  0.085000 1.775000 0.465000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__a211oi_m
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef
index 2426867..5054d9a 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.magic.lef
@@ -72,20 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.705000  0.085000 0.955000 0.635000 ;
-        RECT 1.840000  0.085000 2.035000 0.635000 ;
-        RECT 3.170000  0.085000 3.500000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,37 +80,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.590000 2.400000 0.885000 3.245000 ;
-        RECT 2.770000 2.280000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 1.060000 0.695000 1.560000 ;
-      RECT 0.430000 1.560000 2.375000 1.730000 ;
-      RECT 1.055000 1.900000 1.650000 2.160000 ;
-      RECT 1.055000 2.160000 1.385000 3.005000 ;
-      RECT 1.125000 0.305000 1.670000 0.635000 ;
-      RECT 1.500000 0.635000 1.670000 0.870000 ;
-      RECT 1.500000 0.870000 1.830000 1.380000 ;
-      RECT 1.880000 1.730000 2.170000 2.940000 ;
-      RECT 2.205000 0.305000 2.540000 0.635000 ;
-      RECT 2.205000 0.635000 2.375000 1.560000 ;
-      RECT 2.340000 1.930000 3.500000 2.100000 ;
-      RECT 2.340000 2.100000 2.600000 2.940000 ;
-      RECT 3.205000 2.100000 3.500000 2.940000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.430000  1.060000 0.695000 1.560000 ;
+      RECT 0.430000  1.560000 2.375000 1.730000 ;
+      RECT 0.590000  2.400000 0.885000 3.245000 ;
+      RECT 0.705000  0.085000 0.955000 0.635000 ;
+      RECT 1.055000  1.900000 1.650000 2.160000 ;
+      RECT 1.055000  2.160000 1.385000 3.005000 ;
+      RECT 1.125000  0.305000 1.670000 0.635000 ;
+      RECT 1.500000  0.635000 1.670000 0.870000 ;
+      RECT 1.500000  0.870000 1.830000 1.380000 ;
+      RECT 1.840000  0.085000 2.035000 0.635000 ;
+      RECT 1.880000  1.730000 2.170000 2.940000 ;
+      RECT 2.205000  0.305000 2.540000 0.635000 ;
+      RECT 2.205000  0.635000 2.375000 1.560000 ;
+      RECT 2.340000  1.930000 3.500000 2.100000 ;
+      RECT 2.340000  2.100000 2.600000 2.940000 ;
+      RECT 2.770000  2.280000 3.035000 3.245000 ;
+      RECT 3.170000  0.085000 3.500000 0.635000 ;
+      RECT 3.205000  2.100000 3.500000 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_lp__a21bo_0
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef
index da507ea..6c1bb30 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.magic.lef
@@ -71,20 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.640000  0.085000 0.970000 0.465000 ;
-        RECT 1.725000  0.085000 2.055000 0.465000 ;
-        RECT 3.115000  0.085000 3.445000 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
@@ -93,41 +79,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.635000 2.660000 0.965000 3.245000 ;
-        RECT 2.635000 1.970000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 1.295000 0.825000 1.625000 ;
-      RECT 0.655000 0.635000 2.575000 0.805000 ;
-      RECT 0.655000 0.805000 0.825000 1.295000 ;
-      RECT 0.655000 1.625000 0.825000 2.320000 ;
-      RECT 0.655000 2.320000 2.025000 2.490000 ;
-      RECT 1.160000 1.930000 1.635000 2.140000 ;
-      RECT 1.185000 0.975000 1.635000 1.175000 ;
-      RECT 1.465000 1.175000 1.635000 1.345000 ;
-      RECT 1.465000 1.345000 1.895000 1.675000 ;
-      RECT 1.465000 1.675000 1.635000 1.930000 ;
-      RECT 1.725000 2.490000 2.025000 3.075000 ;
-      RECT 1.805000 1.845000 2.025000 2.320000 ;
-      RECT 2.195000 1.630000 3.415000 1.800000 ;
-      RECT 2.195000 1.800000 2.455000 3.075000 ;
-      RECT 2.245000 0.255000 2.575000 0.635000 ;
-      RECT 2.245000 0.805000 2.575000 1.040000 ;
-      RECT 3.175000 1.800000 3.415000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.535000  1.295000 0.825000 1.625000 ;
+      RECT 0.635000  2.660000 0.965000 3.245000 ;
+      RECT 0.640000  0.085000 0.970000 0.465000 ;
+      RECT 0.655000  0.635000 2.575000 0.805000 ;
+      RECT 0.655000  0.805000 0.825000 1.295000 ;
+      RECT 0.655000  1.625000 0.825000 2.320000 ;
+      RECT 0.655000  2.320000 2.025000 2.490000 ;
+      RECT 1.160000  1.930000 1.635000 2.140000 ;
+      RECT 1.185000  0.975000 1.635000 1.175000 ;
+      RECT 1.465000  1.175000 1.635000 1.345000 ;
+      RECT 1.465000  1.345000 1.895000 1.675000 ;
+      RECT 1.465000  1.675000 1.635000 1.930000 ;
+      RECT 1.725000  0.085000 2.055000 0.465000 ;
+      RECT 1.725000  2.490000 2.025000 3.075000 ;
+      RECT 1.805000  1.845000 2.025000 2.320000 ;
+      RECT 2.195000  1.630000 3.415000 1.800000 ;
+      RECT 2.195000  1.800000 2.455000 3.075000 ;
+      RECT 2.245000  0.255000 2.575000 0.635000 ;
+      RECT 2.245000  0.805000 2.575000 1.040000 ;
+      RECT 2.635000  1.970000 2.965000 3.245000 ;
+      RECT 3.115000  0.085000 3.445000 1.040000 ;
+      RECT 3.175000  1.800000 3.415000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a21bo_1
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef
index 69251a3..ff4dd57 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.magic.lef
@@ -70,21 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 1.205000 ;
-        RECT 0.995000  0.085000 1.300000 1.040000 ;
-        RECT 2.085000  0.085000 2.415000 0.690000 ;
-        RECT 3.415000  0.085000 3.745000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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 +78,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.110000 2.665000 0.440000 3.245000 ;
-        RECT 0.970000 2.665000 1.300000 3.245000 ;
-        RECT 2.965000 2.025000 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.110000 1.375000 0.440000 2.325000 ;
-      RECT 0.110000 2.325000 2.360000 2.495000 ;
-      RECT 1.495000 0.795000 1.915000 1.040000 ;
-      RECT 1.625000 1.040000 1.915000 1.055000 ;
-      RECT 1.625000 1.055000 2.015000 1.625000 ;
-      RECT 1.625000 1.625000 1.885000 2.155000 ;
-      RECT 2.085000 1.815000 2.360000 2.325000 ;
-      RECT 2.085000 2.495000 2.360000 3.075000 ;
-      RECT 2.185000 0.860000 2.845000 1.030000 ;
-      RECT 2.185000 1.030000 2.360000 1.815000 ;
-      RECT 2.530000 1.685000 3.745000 1.855000 ;
-      RECT 2.530000 1.855000 2.795000 3.075000 ;
-      RECT 2.585000 0.255000 2.845000 0.860000 ;
-      RECT 3.465000 1.855000 3.745000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.110000  0.085000 0.440000 1.205000 ;
+      RECT 0.110000  1.375000 0.440000 2.325000 ;
+      RECT 0.110000  2.325000 2.360000 2.495000 ;
+      RECT 0.110000  2.665000 0.440000 3.245000 ;
+      RECT 0.970000  2.665000 1.300000 3.245000 ;
+      RECT 0.995000  0.085000 1.300000 1.040000 ;
+      RECT 1.495000  0.795000 1.915000 1.040000 ;
+      RECT 1.625000  1.040000 1.915000 1.055000 ;
+      RECT 1.625000  1.055000 2.015000 1.625000 ;
+      RECT 1.625000  1.625000 1.885000 2.155000 ;
+      RECT 2.085000  0.085000 2.415000 0.690000 ;
+      RECT 2.085000  1.815000 2.360000 2.325000 ;
+      RECT 2.085000  2.495000 2.360000 3.075000 ;
+      RECT 2.185000  0.860000 2.845000 1.030000 ;
+      RECT 2.185000  1.030000 2.360000 1.815000 ;
+      RECT 2.530000  1.685000 3.745000 1.855000 ;
+      RECT 2.530000  1.855000 2.795000 3.075000 ;
+      RECT 2.585000  0.255000 2.845000 0.860000 ;
+      RECT 2.965000  2.025000 3.295000 3.245000 ;
+      RECT 3.415000  0.085000 3.745000 1.015000 ;
+      RECT 3.465000  1.855000 3.745000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a21bo_2
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef
index 8e55a38..bfbbd71 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.magic.lef
@@ -79,27 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.600000  0.085000 1.270000 0.835000 ;
-        RECT 1.800000  0.085000 2.130000 0.825000 ;
-        RECT 2.670000  0.085000 3.475000 0.825000 ;
-        RECT 4.005000  0.085000 4.335000 0.825000 ;
-        RECT 5.855000  0.085000 6.135000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,57 +87,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.635000 2.710000 0.965000 3.245000 ;
-        RECT 1.495000 2.710000 1.825000 3.245000 ;
-        RECT 2.355000 2.710000 2.685000 3.245000 ;
-        RECT 4.475000 2.630000 4.805000 3.245000 ;
-        RECT 5.375000 2.630000 5.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.090000 0.255000 0.430000 1.030000 ;
-      RECT 0.090000 1.030000 0.270000 1.930000 ;
-      RECT 0.090000 1.930000 0.455000 2.370000 ;
-      RECT 0.090000 2.370000 3.075000 2.540000 ;
-      RECT 0.090000 2.540000 0.455000 3.075000 ;
-      RECT 1.345000 1.355000 2.820000 1.535000 ;
-      RECT 2.650000 0.995000 5.215000 1.165000 ;
-      RECT 2.650000 1.165000 2.820000 1.355000 ;
-      RECT 2.905000 1.705000 3.320000 1.875000 ;
-      RECT 2.905000 1.875000 3.075000 2.370000 ;
-      RECT 2.990000 1.345000 3.320000 1.705000 ;
-      RECT 3.245000 2.045000 3.445000 2.905000 ;
-      RECT 3.245000 2.905000 4.305000 3.075000 ;
-      RECT 3.615000 1.165000 3.945000 2.735000 ;
-      RECT 3.645000 0.255000 3.835000 0.995000 ;
-      RECT 4.115000 1.795000 4.305000 2.290000 ;
-      RECT 4.115000 2.290000 6.135000 2.460000 ;
-      RECT 4.115000 2.460000 4.305000 2.905000 ;
-      RECT 4.515000 0.255000 5.685000 0.425000 ;
-      RECT 4.515000 0.425000 4.845000 0.825000 ;
-      RECT 4.975000 2.460000 5.205000 3.075000 ;
-      RECT 5.015000 0.595000 5.215000 0.995000 ;
-      RECT 5.435000 0.425000 5.685000 1.095000 ;
-      RECT 5.835000 1.815000 6.135000 2.290000 ;
-      RECT 5.875000 2.460000 6.135000 3.075000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.090000  0.255000 0.430000 1.030000 ;
+      RECT 0.090000  1.030000 0.270000 1.930000 ;
+      RECT 0.090000  1.930000 0.455000 2.370000 ;
+      RECT 0.090000  2.370000 3.075000 2.540000 ;
+      RECT 0.090000  2.540000 0.455000 3.075000 ;
+      RECT 0.600000  0.085000 1.270000 0.835000 ;
+      RECT 0.635000  2.710000 0.965000 3.245000 ;
+      RECT 1.345000  1.355000 2.820000 1.535000 ;
+      RECT 1.495000  2.710000 1.825000 3.245000 ;
+      RECT 1.800000  0.085000 2.130000 0.825000 ;
+      RECT 2.355000  2.710000 2.685000 3.245000 ;
+      RECT 2.650000  0.995000 5.215000 1.165000 ;
+      RECT 2.650000  1.165000 2.820000 1.355000 ;
+      RECT 2.670000  0.085000 3.475000 0.825000 ;
+      RECT 2.905000  1.705000 3.320000 1.875000 ;
+      RECT 2.905000  1.875000 3.075000 2.370000 ;
+      RECT 2.990000  1.345000 3.320000 1.705000 ;
+      RECT 3.245000  2.045000 3.445000 2.905000 ;
+      RECT 3.245000  2.905000 4.305000 3.075000 ;
+      RECT 3.615000  1.165000 3.945000 2.735000 ;
+      RECT 3.645000  0.255000 3.835000 0.995000 ;
+      RECT 4.005000  0.085000 4.335000 0.825000 ;
+      RECT 4.115000  1.795000 4.305000 2.290000 ;
+      RECT 4.115000  2.290000 6.135000 2.460000 ;
+      RECT 4.115000  2.460000 4.305000 2.905000 ;
+      RECT 4.475000  2.630000 4.805000 3.245000 ;
+      RECT 4.515000  0.255000 5.685000 0.425000 ;
+      RECT 4.515000  0.425000 4.845000 0.825000 ;
+      RECT 4.975000  2.460000 5.205000 3.075000 ;
+      RECT 5.015000  0.595000 5.215000 0.995000 ;
+      RECT 5.375000  2.630000 5.705000 3.245000 ;
+      RECT 5.435000  0.425000 5.685000 1.095000 ;
+      RECT 5.835000  1.815000 6.135000 2.290000 ;
+      RECT 5.855000  0.085000 6.135000 1.095000 ;
+      RECT 5.875000  2.460000 6.135000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a21bo_4
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef
index f05e4e2..4cb5cb8 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.magic.lef
@@ -74,19 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.715000 ;
-        RECT 2.515000  0.085000 2.845000 0.505000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,38 +82,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.695000 2.310000 1.025000 3.245000 ;
-        RECT 2.855000 2.115000 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 ;
-        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.440000 0.895000 2.055000 1.065000 ;
-      RECT 0.440000 1.065000 0.845000 1.565000 ;
-      RECT 0.675000 1.565000 0.845000 1.960000 ;
-      RECT 0.675000 1.960000 2.095000 2.130000 ;
-      RECT 1.235000 2.310000 1.565000 2.895000 ;
-      RECT 1.235000 2.895000 2.655000 3.065000 ;
-      RECT 1.725000 0.265000 2.055000 0.895000 ;
-      RECT 1.765000 2.130000 2.095000 2.715000 ;
-      RECT 2.250000 0.685000 3.715000 0.855000 ;
-      RECT 2.250000 0.855000 2.580000 1.135000 ;
-      RECT 2.325000 2.115000 2.655000 2.895000 ;
-      RECT 3.305000 0.265000 3.635000 0.685000 ;
-      RECT 3.385000 2.075000 3.715000 3.065000 ;
-      RECT 3.545000 0.855000 3.715000 2.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.440000  0.895000 2.055000 1.065000 ;
+      RECT 0.440000  1.065000 0.845000 1.565000 ;
+      RECT 0.675000  1.565000 0.845000 1.960000 ;
+      RECT 0.675000  1.960000 2.095000 2.130000 ;
+      RECT 0.695000  2.310000 1.025000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.715000 ;
+      RECT 1.235000  2.310000 1.565000 2.895000 ;
+      RECT 1.235000  2.895000 2.655000 3.065000 ;
+      RECT 1.725000  0.265000 2.055000 0.895000 ;
+      RECT 1.765000  2.130000 2.095000 2.715000 ;
+      RECT 2.250000  0.685000 3.715000 0.855000 ;
+      RECT 2.250000  0.855000 2.580000 1.135000 ;
+      RECT 2.325000  2.115000 2.655000 2.895000 ;
+      RECT 2.515000  0.085000 2.845000 0.505000 ;
+      RECT 2.855000  2.115000 3.185000 3.245000 ;
+      RECT 3.305000  0.265000 3.635000 0.685000 ;
+      RECT 3.385000  2.075000 3.715000 3.065000 ;
+      RECT 3.545000  0.855000 3.715000 2.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a21bo_lp
diff --git a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef
index 0b54d2e..7555dbc 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.585000  0.085000 0.795000 0.800000 ;
-        RECT 1.530000  0.085000 1.860000 0.485000 ;
-        RECT 2.975000  0.085000 3.165000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -93,36 +80,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.585000 2.755000 0.795000 3.245000 ;
-        RECT 2.560000 2.325000 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 0.505000 1.475000 0.675000 2.335000 ;
-      RECT 0.505000 2.335000 1.910000 2.505000 ;
-      RECT 1.015000 0.515000 1.225000 0.675000 ;
-      RECT 1.015000 0.675000 1.875000 0.845000 ;
-      RECT 1.015000 2.695000 1.735000 3.025000 ;
-      RECT 1.700000 1.625000 2.795000 1.795000 ;
-      RECT 1.700000 1.795000 1.910000 2.335000 ;
-      RECT 1.705000 0.845000 1.875000 1.435000 ;
-      RECT 2.040000 0.285000 2.795000 0.495000 ;
-      RECT 2.130000 1.975000 3.200000 2.145000 ;
-      RECT 2.130000 2.145000 2.340000 2.505000 ;
-      RECT 2.625000 0.495000 2.795000 1.625000 ;
-      RECT 2.990000 2.145000 3.200000 2.505000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.505000  1.475000 0.675000 2.335000 ;
+      RECT 0.505000  2.335000 1.910000 2.505000 ;
+      RECT 0.585000  0.085000 0.795000 0.800000 ;
+      RECT 0.585000  2.755000 0.795000 3.245000 ;
+      RECT 1.015000  0.515000 1.225000 0.675000 ;
+      RECT 1.015000  0.675000 1.875000 0.845000 ;
+      RECT 1.015000  2.695000 1.735000 3.025000 ;
+      RECT 1.530000  0.085000 1.860000 0.485000 ;
+      RECT 1.700000  1.625000 2.795000 1.795000 ;
+      RECT 1.700000  1.795000 1.910000 2.335000 ;
+      RECT 1.705000  0.845000 1.875000 1.435000 ;
+      RECT 2.040000  0.285000 2.795000 0.495000 ;
+      RECT 2.130000  1.975000 3.200000 2.145000 ;
+      RECT 2.130000  2.145000 2.340000 2.505000 ;
+      RECT 2.560000  2.325000 2.770000 3.245000 ;
+      RECT 2.625000  0.495000 2.795000 1.625000 ;
+      RECT 2.975000  0.085000 3.165000 0.545000 ;
+      RECT 2.990000  2.145000 3.200000 2.505000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a21bo_m
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef
index 5679235..0a69096 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.magic.lef
@@ -72,17 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.550000  0.085000 1.145000 0.610000 ;
-        RECT 2.085000  0.085000 2.415000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -91,28 +80,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.525000 2.670000 0.855000 3.245000 ;
-        RECT 2.055000 2.405000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.280000 0.380000 0.780000 ;
-      RECT 0.095000 0.780000 1.090000 1.395000 ;
-      RECT 0.095000 1.395000 0.355000 3.000000 ;
-      RECT 1.655000 2.055000 2.785000 2.225000 ;
-      RECT 1.655000 2.225000 1.885000 3.065000 ;
-      RECT 2.490000 2.225000 2.785000 3.065000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.280000 0.380000 0.780000 ;
+      RECT 0.095000  0.780000 1.090000 1.395000 ;
+      RECT 0.095000  1.395000 0.355000 3.000000 ;
+      RECT 0.525000  2.670000 0.855000 3.245000 ;
+      RECT 0.550000  0.085000 1.145000 0.610000 ;
+      RECT 1.655000  2.055000 2.785000 2.225000 ;
+      RECT 1.655000  2.225000 1.885000 3.065000 ;
+      RECT 2.055000  2.405000 2.320000 3.245000 ;
+      RECT 2.085000  0.085000 2.415000 0.610000 ;
+      RECT 2.490000  2.225000 2.785000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a21boi_0
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef
index e341952..e02ede5 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.magic.lef
@@ -73,17 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.000000  0.085000 1.245000 1.040000 ;
-        RECT 2.445000  0.085000 2.775000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,30 +81,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.525000 2.640000 0.855000 3.245000 ;
-        RECT 1.970000 2.025000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 2.300000 0.925000 2.470000 ;
-      RECT 0.095000 2.470000 0.355000 2.915000 ;
-      RECT 0.425000 0.280000 0.830000 0.610000 ;
-      RECT 0.660000 0.610000 0.830000 1.345000 ;
-      RECT 0.660000 1.345000 0.925000 2.300000 ;
-      RECT 1.525000 1.685000 2.775000 1.855000 ;
-      RECT 1.525000 1.855000 1.800000 3.075000 ;
-      RECT 2.470000 1.855000 2.775000 3.075000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  2.300000 0.925000 2.470000 ;
+      RECT 0.095000  2.470000 0.355000 2.915000 ;
+      RECT 0.425000  0.280000 0.830000 0.610000 ;
+      RECT 0.525000  2.640000 0.855000 3.245000 ;
+      RECT 0.660000  0.610000 0.830000 1.345000 ;
+      RECT 0.660000  1.345000 0.925000 2.300000 ;
+      RECT 1.000000  0.085000 1.245000 1.040000 ;
+      RECT 1.525000  1.685000 2.775000 1.855000 ;
+      RECT 1.525000  1.855000 1.800000 3.075000 ;
+      RECT 1.970000  2.025000 2.300000 3.245000 ;
+      RECT 2.445000  0.085000 2.775000 1.015000 ;
+      RECT 2.470000  1.855000 2.775000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a21boi_1
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef
index 721cec9..2f2dc42 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.magic.lef
@@ -78,21 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.115000  0.085000 1.375000 1.170000 ;
-        RECT 1.975000  0.085000 2.305000 0.905000 ;
-        RECT 3.890000  0.085000 4.185000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -101,40 +86,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.140000 2.660000 0.470000 3.245000 ;
-        RECT 2.485000 2.640000 2.815000 3.245000 ;
-        RECT 3.425000 2.630000 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.640000 0.370000 0.920000 1.340000 ;
-      RECT 0.640000 1.340000 1.165000 1.605000 ;
-      RECT 0.640000 1.605000 0.900000 2.875000 ;
-      RECT 1.115000 1.830000 1.375000 2.905000 ;
-      RECT 1.115000 2.905000 2.315000 3.075000 ;
-      RECT 2.045000 1.830000 2.245000 2.290000 ;
-      RECT 2.045000 2.290000 4.185000 2.460000 ;
-      RECT 2.045000 2.460000 2.315000 2.905000 ;
-      RECT 2.485000 0.265000 3.720000 0.435000 ;
-      RECT 2.485000 0.435000 2.815000 0.905000 ;
-      RECT 2.985000 2.460000 3.255000 2.970000 ;
-      RECT 3.495000 0.435000 3.720000 1.185000 ;
-      RECT 3.915000 1.815000 4.185000 2.290000 ;
-      RECT 3.925000 2.460000 4.185000 3.075000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.140000  2.660000 0.470000 3.245000 ;
+      RECT 0.640000  0.370000 0.920000 1.340000 ;
+      RECT 0.640000  1.340000 1.165000 1.605000 ;
+      RECT 0.640000  1.605000 0.900000 2.875000 ;
+      RECT 1.115000  0.085000 1.375000 1.170000 ;
+      RECT 1.115000  1.830000 1.375000 2.905000 ;
+      RECT 1.115000  2.905000 2.315000 3.075000 ;
+      RECT 1.975000  0.085000 2.305000 0.905000 ;
+      RECT 2.045000  1.830000 2.245000 2.290000 ;
+      RECT 2.045000  2.290000 4.185000 2.460000 ;
+      RECT 2.045000  2.460000 2.315000 2.905000 ;
+      RECT 2.485000  0.265000 3.720000 0.435000 ;
+      RECT 2.485000  0.435000 2.815000 0.905000 ;
+      RECT 2.485000  2.640000 2.815000 3.245000 ;
+      RECT 2.985000  2.460000 3.255000 2.970000 ;
+      RECT 3.425000  2.630000 3.755000 3.245000 ;
+      RECT 3.495000  0.435000 3.720000 1.185000 ;
+      RECT 3.890000  0.085000 4.185000 1.185000 ;
+      RECT 3.915000  1.815000 4.185000 2.290000 ;
+      RECT 3.925000  2.460000 4.185000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a21boi_2
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef
index bd82a8a..6960206 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.magic.lef
@@ -83,28 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.775000  0.085000 1.105000 0.690000 ;
-        RECT 1.655000  0.085000 1.965000 0.865000 ;
-        RECT 2.535000  0.085000 3.095000 0.525000 ;
-        RECT 5.485000  0.085000 5.715000 0.565000 ;
-        RECT 6.305000  0.085000 6.605000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -113,57 +91,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.555000 2.260000 0.885000 3.245000 ;
-        RECT 3.265000 2.260000 4.455000 2.495000 ;
-        RECT 3.265000 2.495000 3.595000 3.245000 ;
-        RECT 4.985000 2.260000 5.315000 3.245000 ;
-        RECT 5.845000 2.105000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 1.920000 1.195000 2.090000 ;
-      RECT 0.125000 2.090000 0.385000 3.075000 ;
-      RECT 0.325000 0.255000 0.605000 0.870000 ;
-      RECT 0.325000 0.870000 1.145000 1.040000 ;
-      RECT 0.975000 1.040000 1.145000 1.375000 ;
-      RECT 0.975000 1.375000 2.375000 1.545000 ;
-      RECT 0.975000 1.545000 1.195000 1.920000 ;
-      RECT 1.075000 2.260000 1.335000 2.665000 ;
-      RECT 1.075000 2.665000 2.265000 2.835000 ;
-      RECT 1.075000 2.835000 3.095000 3.075000 ;
-      RECT 1.935000 2.205000 2.265000 2.665000 ;
-      RECT 2.895000 1.920000 6.605000 1.925000 ;
-      RECT 2.895000 1.925000 5.665000 2.090000 ;
-      RECT 2.895000 2.090000 3.095000 2.835000 ;
-      RECT 3.265000 0.255000 5.315000 0.525000 ;
-      RECT 3.765000 2.665000 4.815000 3.065000 ;
-      RECT 4.625000 2.090000 4.815000 2.665000 ;
-      RECT 5.055000 0.525000 5.315000 0.735000 ;
-      RECT 5.055000 0.735000 6.135000 0.905000 ;
-      RECT 5.335000 1.685000 6.605000 1.920000 ;
-      RECT 5.485000 2.090000 5.665000 3.075000 ;
-      RECT 5.885000 0.255000 6.135000 0.735000 ;
-      RECT 5.905000 0.905000 6.135000 1.040000 ;
-      RECT 6.345000 1.925000 6.605000 3.075000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.125000  1.920000 1.195000 2.090000 ;
+      RECT 0.125000  2.090000 0.385000 3.075000 ;
+      RECT 0.325000  0.255000 0.605000 0.870000 ;
+      RECT 0.325000  0.870000 1.145000 1.040000 ;
+      RECT 0.555000  2.260000 0.885000 3.245000 ;
+      RECT 0.775000  0.085000 1.105000 0.690000 ;
+      RECT 0.975000  1.040000 1.145000 1.375000 ;
+      RECT 0.975000  1.375000 2.375000 1.545000 ;
+      RECT 0.975000  1.545000 1.195000 1.920000 ;
+      RECT 1.075000  2.260000 1.335000 2.665000 ;
+      RECT 1.075000  2.665000 2.265000 2.835000 ;
+      RECT 1.075000  2.835000 3.095000 3.075000 ;
+      RECT 1.655000  0.085000 1.965000 0.865000 ;
+      RECT 1.935000  2.205000 2.265000 2.665000 ;
+      RECT 2.535000  0.085000 3.095000 0.525000 ;
+      RECT 2.895000  1.920000 6.605000 1.925000 ;
+      RECT 2.895000  1.925000 5.665000 2.090000 ;
+      RECT 2.895000  2.090000 3.095000 2.835000 ;
+      RECT 3.265000  0.255000 5.315000 0.525000 ;
+      RECT 3.265000  2.260000 4.455000 2.495000 ;
+      RECT 3.265000  2.495000 3.595000 3.245000 ;
+      RECT 3.765000  2.665000 4.815000 3.065000 ;
+      RECT 4.625000  2.090000 4.815000 2.665000 ;
+      RECT 4.985000  2.260000 5.315000 3.245000 ;
+      RECT 5.055000  0.525000 5.315000 0.735000 ;
+      RECT 5.055000  0.735000 6.135000 0.905000 ;
+      RECT 5.335000  1.685000 6.605000 1.920000 ;
+      RECT 5.485000  0.085000 5.715000 0.565000 ;
+      RECT 5.485000  2.090000 5.665000 3.075000 ;
+      RECT 5.845000  2.105000 6.175000 3.245000 ;
+      RECT 5.885000  0.255000 6.135000 0.735000 ;
+      RECT 5.905000  0.905000 6.135000 1.040000 ;
+      RECT 6.305000  0.085000 6.605000 1.040000 ;
+      RECT 6.345000  1.925000 6.605000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a21boi_4
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef
index 00207fd..a5f436f 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.magic.lef
@@ -74,18 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.405000  0.085000 0.735000 0.630000 ;
-        RECT 2.015000  0.085000 2.345000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -94,33 +82,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.655000 2.680000 0.985000 3.245000 ;
-        RECT 2.370000 2.025000 2.700000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.125000 2.025000 0.455000 2.330000 ;
-      RECT 0.125000 2.330000 1.515000 2.500000 ;
-      RECT 0.125000 2.500000 0.455000 3.065000 ;
-      RECT 1.185000 2.500000 1.515000 3.065000 ;
-      RECT 1.845000 1.070000 2.215000 1.675000 ;
-      RECT 1.845000 1.675000 3.230000 1.740000 ;
-      RECT 2.045000 1.740000 3.230000 1.845000 ;
-      RECT 2.900000 0.265000 3.230000 0.645000 ;
-      RECT 2.900000 1.845000 3.230000 3.065000 ;
-      RECT 3.060000 0.645000 3.230000 1.675000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  2.025000 0.455000 2.330000 ;
+      RECT 0.125000  2.330000 1.515000 2.500000 ;
+      RECT 0.125000  2.500000 0.455000 3.065000 ;
+      RECT 0.405000  0.085000 0.735000 0.630000 ;
+      RECT 0.655000  2.680000 0.985000 3.245000 ;
+      RECT 1.185000  2.500000 1.515000 3.065000 ;
+      RECT 1.845000  1.070000 2.215000 1.675000 ;
+      RECT 1.845000  1.675000 3.230000 1.740000 ;
+      RECT 2.015000  0.085000 2.345000 0.675000 ;
+      RECT 2.045000  1.740000 3.230000 1.845000 ;
+      RECT 2.370000  2.025000 2.700000 3.245000 ;
+      RECT 2.900000  0.265000 3.230000 0.645000 ;
+      RECT 2.900000  1.845000 3.230000 3.065000 ;
+      RECT 3.060000  0.645000 3.230000 1.675000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a21boi_lp
diff --git a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef
index 25c7bdd..a7b2197 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.magic.lef
@@ -70,17 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.725000  0.085000 0.935000 0.545000 ;
-        RECT 2.110000  0.085000 2.440000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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
@@ -89,30 +78,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.525000 2.845000 0.855000 3.245000 ;
-        RECT 1.935000 2.145000 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.130000 0.295000 0.505000 0.625000 ;
-      RECT 0.130000 0.625000 0.300000 2.495000 ;
-      RECT 0.130000 2.495000 1.225000 2.665000 ;
-      RECT 0.130000 2.665000 0.345000 2.985000 ;
-      RECT 1.055000 2.665000 1.225000 3.065000 ;
-      RECT 1.565000 1.795000 2.635000 1.965000 ;
-      RECT 1.565000 1.965000 1.755000 2.285000 ;
-      RECT 2.445000 1.965000 2.635000 2.285000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.130000  0.295000 0.505000 0.625000 ;
+      RECT 0.130000  0.625000 0.300000 2.495000 ;
+      RECT 0.130000  2.495000 1.225000 2.665000 ;
+      RECT 0.130000  2.665000 0.345000 2.985000 ;
+      RECT 0.525000  2.845000 0.855000 3.245000 ;
+      RECT 0.725000  0.085000 0.935000 0.545000 ;
+      RECT 1.055000  2.665000 1.225000 3.065000 ;
+      RECT 1.565000  1.795000 2.635000 1.965000 ;
+      RECT 1.565000  1.965000 1.755000 2.285000 ;
+      RECT 1.935000  2.145000 2.265000 3.245000 ;
+      RECT 2.110000  0.085000 2.440000 0.485000 ;
+      RECT 2.445000  1.965000 2.635000 2.285000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a21boi_m
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef
index fdb0944..4e56afa 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_0.magic.lef
@@ -72,17 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.050000  0.085000 1.380000 0.570000 ;
-        RECT 2.470000  0.085000 2.720000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -91,32 +80,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.565000 2.395000 0.855000 3.245000 ;
-        RECT 2.040000 2.345000 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 ;
-        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.710000 0.780000 1.785000 0.910000 ;
-      RECT 0.710000 0.910000 1.205000 1.525000 ;
-      RECT 1.035000 0.740000 1.785000 0.780000 ;
-      RECT 1.035000 1.525000 1.205000 2.055000 ;
-      RECT 1.035000 2.055000 1.425000 2.225000 ;
-      RECT 1.140000 2.225000 1.425000 3.025000 ;
-      RECT 1.550000 0.280000 1.785000 0.740000 ;
-      RECT 1.595000 2.005000 2.760000 2.175000 ;
-      RECT 1.595000 2.175000 1.870000 3.025000 ;
-      RECT 2.465000 2.175000 2.760000 3.025000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.565000  2.395000 0.855000 3.245000 ;
+      RECT 0.710000  0.780000 1.785000 0.910000 ;
+      RECT 0.710000  0.910000 1.205000 1.525000 ;
+      RECT 1.035000  0.740000 1.785000 0.780000 ;
+      RECT 1.035000  1.525000 1.205000 2.055000 ;
+      RECT 1.035000  2.055000 1.425000 2.225000 ;
+      RECT 1.050000  0.085000 1.380000 0.570000 ;
+      RECT 1.140000  2.225000 1.425000 3.025000 ;
+      RECT 1.550000  0.280000 1.785000 0.740000 ;
+      RECT 1.595000  2.005000 2.760000 2.175000 ;
+      RECT 1.595000  2.175000 1.870000 3.025000 ;
+      RECT 2.040000  2.345000 2.295000 3.245000 ;
+      RECT 2.465000  2.175000 2.760000 3.025000 ;
+      RECT 2.470000  0.085000 2.720000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a21o_0
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_1.magic.lef
index df0ad99..2ae3160 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_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.530000  0.085000 1.220000 0.815000 ;
-        RECT 2.435000  0.085000 2.765000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,33 +79,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.525000 2.270000 0.855000 3.245000 ;
-        RECT 1.960000 2.025000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.185000 0.885000 1.515000 ;
-      RECT 0.715000 0.985000 1.720000 1.015000 ;
-      RECT 0.715000 1.015000 1.570000 1.155000 ;
-      RECT 0.715000 1.155000 0.885000 1.185000 ;
-      RECT 0.715000 1.515000 0.885000 1.920000 ;
-      RECT 0.715000 1.920000 1.315000 2.100000 ;
-      RECT 1.045000 2.100000 1.315000 3.075000 ;
-      RECT 1.390000 0.255000 1.720000 0.985000 ;
-      RECT 1.555000 1.685000 2.765000 1.855000 ;
-      RECT 1.555000 1.855000 1.745000 3.075000 ;
-      RECT 2.460000 1.855000 2.765000 3.075000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.525000  1.185000 0.885000 1.515000 ;
+      RECT 0.525000  2.270000 0.855000 3.245000 ;
+      RECT 0.530000  0.085000 1.220000 0.815000 ;
+      RECT 0.715000  0.985000 1.720000 1.015000 ;
+      RECT 0.715000  1.015000 1.570000 1.155000 ;
+      RECT 0.715000  1.155000 0.885000 1.185000 ;
+      RECT 0.715000  1.515000 0.885000 1.920000 ;
+      RECT 0.715000  1.920000 1.315000 2.100000 ;
+      RECT 1.045000  2.100000 1.315000 3.075000 ;
+      RECT 1.390000  0.255000 1.720000 0.985000 ;
+      RECT 1.555000  1.685000 2.765000 1.855000 ;
+      RECT 1.555000  1.855000 1.745000 3.075000 ;
+      RECT 1.960000  2.025000 2.290000 3.245000 ;
+      RECT 2.435000  0.085000 2.765000 1.015000 ;
+      RECT 2.460000  1.855000 2.765000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a21o_1
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef
index 6f46936..fab0858 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_2.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.295000  0.085000 0.625000 0.815000 ;
-        RECT 1.155000  0.085000 1.485000 0.815000 ;
-        RECT 2.905000  0.085000 3.175000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -93,33 +80,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.125000 1.815000 0.415000 3.245000 ;
-        RECT 0.985000 2.270000 1.315000 3.245000 ;
-        RECT 2.385000 2.025000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.345000 1.325000 1.930000 ;
-      RECT 0.985000 1.930000 1.820000 2.100000 ;
-      RECT 1.155000 0.985000 1.895000 1.155000 ;
-      RECT 1.155000 1.155000 1.325000 1.345000 ;
-      RECT 1.505000 2.100000 1.820000 3.075000 ;
-      RECT 1.705000 0.255000 1.895000 0.985000 ;
-      RECT 1.990000 1.685000 3.105000 1.855000 ;
-      RECT 1.990000 1.855000 2.215000 3.075000 ;
-      RECT 2.885000 1.855000 3.105000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  1.815000 0.415000 3.245000 ;
+      RECT 0.295000  0.085000 0.625000 0.815000 ;
+      RECT 0.985000  1.345000 1.325000 1.930000 ;
+      RECT 0.985000  1.930000 1.820000 2.100000 ;
+      RECT 0.985000  2.270000 1.315000 3.245000 ;
+      RECT 1.155000  0.085000 1.485000 0.815000 ;
+      RECT 1.155000  0.985000 1.895000 1.155000 ;
+      RECT 1.155000  1.155000 1.325000 1.345000 ;
+      RECT 1.505000  2.100000 1.820000 3.075000 ;
+      RECT 1.705000  0.255000 1.895000 0.985000 ;
+      RECT 1.990000  1.685000 3.105000 1.855000 ;
+      RECT 1.990000  1.855000 2.215000 3.075000 ;
+      RECT 2.385000  2.025000 2.715000 3.245000 ;
+      RECT 2.885000  1.855000 3.105000 3.075000 ;
+      RECT 2.905000  0.085000 3.175000 1.015000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a21o_2
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_4.magic.lef
index c281f93..f024f8e 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_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.485000  0.085000 0.815000 0.905000 ;
-        RECT 1.345000  0.085000 1.675000 0.905000 ;
-        RECT 2.240000  0.085000 2.895000 0.700000 ;
-        RECT 3.475000  0.085000 3.815000 0.690000 ;
-        RECT 5.260000  0.085000 5.555000 1.105000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,51 +88,68 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.365000 2.155000 0.695000 3.245000 ;
-        RECT 1.225000 2.155000 1.555000 3.245000 ;
-        RECT 2.085000 1.815000 2.385000 3.245000 ;
-        RECT 3.915000 2.640000 4.245000 3.245000 ;
-        RECT 4.795000 2.640000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.415000 2.375000 1.610000 ;
-      RECT 2.205000 0.870000 4.625000 1.030000 ;
-      RECT 2.205000 1.030000 3.365000 1.040000 ;
-      RECT 2.205000 1.040000 2.375000 1.415000 ;
-      RECT 2.605000 1.930000 2.865000 2.905000 ;
-      RECT 2.605000 2.905000 3.735000 3.075000 ;
-      RECT 3.035000 1.910000 3.365000 2.735000 ;
-      RECT 3.065000 0.255000 3.305000 0.860000 ;
-      RECT 3.065000 0.860000 4.625000 0.870000 ;
-      RECT 3.105000 1.040000 3.365000 1.910000 ;
-      RECT 3.535000 1.815000 3.745000 2.300000 ;
-      RECT 3.535000 2.300000 5.495000 2.470000 ;
-      RECT 3.535000 2.470000 3.735000 2.905000 ;
-      RECT 3.985000 0.255000 5.090000 0.435000 ;
-      RECT 3.985000 0.435000 4.235000 0.690000 ;
-      RECT 4.405000 0.605000 4.625000 0.860000 ;
-      RECT 4.415000 2.470000 4.625000 3.075000 ;
-      RECT 4.795000 0.435000 5.090000 1.105000 ;
-      RECT 5.295000 1.815000 5.495000 2.300000 ;
-      RECT 5.295000 2.470000 5.495000 3.075000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.365000  2.155000 0.695000 3.245000 ;
+      RECT 0.485000  0.085000 0.815000 0.905000 ;
+      RECT 0.985000  1.415000 2.375000 1.610000 ;
+      RECT 1.225000  2.155000 1.555000 3.245000 ;
+      RECT 1.345000  0.085000 1.675000 0.905000 ;
+      RECT 2.085000  1.815000 2.385000 3.245000 ;
+      RECT 2.205000  0.870000 4.625000 1.030000 ;
+      RECT 2.205000  1.030000 3.365000 1.040000 ;
+      RECT 2.205000  1.040000 2.375000 1.415000 ;
+      RECT 2.240000  0.085000 2.895000 0.700000 ;
+      RECT 2.605000  1.930000 2.865000 2.905000 ;
+      RECT 2.605000  2.905000 3.735000 3.075000 ;
+      RECT 3.035000  1.910000 3.365000 2.735000 ;
+      RECT 3.065000  0.255000 3.305000 0.860000 ;
+      RECT 3.065000  0.860000 4.625000 0.870000 ;
+      RECT 3.105000  1.040000 3.365000 1.910000 ;
+      RECT 3.475000  0.085000 3.815000 0.690000 ;
+      RECT 3.535000  1.815000 3.745000 2.300000 ;
+      RECT 3.535000  2.300000 5.495000 2.470000 ;
+      RECT 3.535000  2.470000 3.735000 2.905000 ;
+      RECT 3.915000  2.640000 4.245000 3.245000 ;
+      RECT 3.985000  0.255000 5.090000 0.435000 ;
+      RECT 3.985000  0.435000 4.235000 0.690000 ;
+      RECT 4.405000  0.605000 4.625000 0.860000 ;
+      RECT 4.415000  2.470000 4.625000 3.075000 ;
+      RECT 4.795000  0.435000 5.090000 1.105000 ;
+      RECT 4.795000  2.640000 5.125000 3.245000 ;
+      RECT 5.260000  0.085000 5.555000 1.105000 ;
+      RECT 5.295000  1.815000 5.495000 2.300000 ;
+      RECT 5.295000  2.470000 5.495000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a21o_4
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef
index f643c4c..195c204 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_lp.magic.lef
@@ -71,18 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.245000  0.085000 0.575000 0.725000 ;
-        RECT 1.995000  0.085000 2.325000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -91,31 +79,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.675000 2.325000 1.005000 3.245000 ;
-        RECT 2.385000 1.960000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 1.975000 1.535000 2.145000 ;
-      RECT 0.145000 2.145000 0.475000 3.065000 ;
-      RECT 1.205000 0.265000 1.535000 0.775000 ;
-      RECT 1.205000 0.775000 2.630000 0.945000 ;
-      RECT 1.205000 2.145000 1.535000 3.065000 ;
-      RECT 1.735000 2.025000 2.190000 3.065000 ;
-      RECT 2.020000 0.945000 2.630000 1.485000 ;
-      RECT 2.020000 1.485000 2.190000 2.025000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.145000  1.975000 1.535000 2.145000 ;
+      RECT 0.145000  2.145000 0.475000 3.065000 ;
+      RECT 0.245000  0.085000 0.575000 0.725000 ;
+      RECT 0.675000  2.325000 1.005000 3.245000 ;
+      RECT 1.205000  0.265000 1.535000 0.775000 ;
+      RECT 1.205000  0.775000 2.630000 0.945000 ;
+      RECT 1.205000  2.145000 1.535000 3.065000 ;
+      RECT 1.735000  2.025000 2.190000 3.065000 ;
+      RECT 1.995000  0.085000 2.325000 0.595000 ;
+      RECT 2.020000  0.945000 2.630000 1.485000 ;
+      RECT 2.020000  1.485000 2.190000 2.025000 ;
+      RECT 2.385000  1.960000 2.715000 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_lp__a21o_lp
diff --git a/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef b/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef
index 3dac2f6..53ea93b 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_m.magic.lef
@@ -71,17 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.855000  0.085000 1.065000 0.545000 ;
-        RECT 2.015000  0.085000 2.345000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,30 +79,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.525000 2.845000 0.855000 3.245000 ;
-        RECT 2.085000 2.650000 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 ;
-        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.525000 0.860000 1.495000 1.030000 ;
-      RECT 0.525000 1.030000 0.695000 2.345000 ;
-      RECT 0.525000 2.345000 1.435000 2.515000 ;
-      RECT 1.225000 2.515000 1.435000 2.850000 ;
-      RECT 1.285000 0.330000 1.495000 0.860000 ;
-      RECT 1.655000 2.300000 2.725000 2.470000 ;
-      RECT 1.655000 2.470000 1.865000 2.850000 ;
-      RECT 2.515000 2.470000 2.725000 2.850000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.525000  0.860000 1.495000 1.030000 ;
+      RECT 0.525000  1.030000 0.695000 2.345000 ;
+      RECT 0.525000  2.345000 1.435000 2.515000 ;
+      RECT 0.525000  2.845000 0.855000 3.245000 ;
+      RECT 0.855000  0.085000 1.065000 0.545000 ;
+      RECT 1.225000  2.515000 1.435000 2.850000 ;
+      RECT 1.285000  0.330000 1.495000 0.860000 ;
+      RECT 1.655000  2.300000 2.725000 2.470000 ;
+      RECT 1.655000  2.470000 1.865000 2.850000 ;
+      RECT 2.015000  0.085000 2.345000 0.485000 ;
+      RECT 2.085000  2.650000 2.295000 3.245000 ;
+      RECT 2.515000  2.470000 2.725000 2.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 ;
   END
 END sky130_fd_sc_lp__a21o_m
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef
index fbf369a..2969043 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.magic.lef
@@ -74,15 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.205000  0.085000 0.455000 0.610000 ;
-        RECT 1.510000  0.085000 1.805000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -91,22 +82,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.645000 2.345000 0.915000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 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.185000 2.005000 1.340000 2.175000 ;
-      RECT 0.185000 2.175000 0.475000 3.025000 ;
-      RECT 1.085000 2.175000 1.340000 3.025000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.185000  2.005000 1.340000 2.175000 ;
+      RECT 0.185000  2.175000 0.475000 3.025000 ;
+      RECT 0.205000  0.085000 0.455000 0.610000 ;
+      RECT 0.645000  2.345000 0.915000 3.245000 ;
+      RECT 1.085000  2.175000 1.340000 3.025000 ;
+      RECT 1.510000  0.085000 1.805000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__a21oi_0
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.magic.lef
index 9a1408e..7458a07 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__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.095000  0.085000 0.425000 1.040000 ;
-        RECT 1.530000  0.085000 1.810000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -91,23 +82,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.560000 2.640000 0.890000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 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.095000 1.930000 1.020000 2.300000 ;
-      RECT 0.095000 2.300000 1.355000 2.470000 ;
-      RECT 0.095000 2.470000 0.390000 3.075000 ;
-      RECT 1.060000 2.470000 1.355000 3.075000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 1.040000 ;
+      RECT 0.095000  1.930000 1.020000 2.300000 ;
+      RECT 0.095000  2.300000 1.355000 2.470000 ;
+      RECT 0.095000  2.470000 0.390000 3.075000 ;
+      RECT 0.560000  2.640000 0.890000 3.245000 ;
+      RECT 1.060000  2.470000 1.355000 3.075000 ;
+      RECT 1.530000  0.085000 1.810000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__a21oi_1
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef
index c2c46c8..8b03ec3 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.magic.lef
@@ -80,19 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.355000 1.095000 ;
-        RECT 1.835000  0.085000 2.165000 0.695000 ;
-        RECT 2.715000  0.085000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -101,32 +88,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.525000 2.295000 0.855000 3.245000 ;
-        RECT 1.405000 2.295000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.955000 2.115000 2.125000 ;
-      RECT 0.095000 2.125000 0.355000 3.075000 ;
-      RECT 0.525000 0.255000 1.665000 0.425000 ;
-      RECT 0.525000 0.425000 0.855000 1.035000 ;
-      RECT 1.025000 2.125000 1.235000 3.075000 ;
-      RECT 1.430000 0.425000 1.665000 0.695000 ;
-      RECT 1.905000 2.125000 2.115000 2.905000 ;
-      RECT 1.905000 2.905000 3.045000 3.075000 ;
-      RECT 2.785000 2.270000 3.045000 2.905000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.085000 0.355000 1.095000 ;
+      RECT 0.095000  1.955000 2.115000 2.125000 ;
+      RECT 0.095000  2.125000 0.355000 3.075000 ;
+      RECT 0.525000  0.255000 1.665000 0.425000 ;
+      RECT 0.525000  0.425000 0.855000 1.035000 ;
+      RECT 0.525000  2.295000 0.855000 3.245000 ;
+      RECT 1.025000  2.125000 1.235000 3.075000 ;
+      RECT 1.405000  2.295000 1.735000 3.245000 ;
+      RECT 1.430000  0.425000 1.665000 0.695000 ;
+      RECT 1.835000  0.085000 2.165000 0.695000 ;
+      RECT 1.905000  2.125000 2.115000 2.905000 ;
+      RECT 1.905000  2.905000 3.045000 3.075000 ;
+      RECT 2.715000  0.085000 3.045000 0.835000 ;
+      RECT 2.785000  2.270000 3.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 ;
   END
 END sky130_fd_sc_lp__a21oi_2
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.magic.lef
index ad536fb..75c6a07 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_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.100000  0.085000 0.390000 1.095000 ;
-        RECT 0.960000  0.085000 1.290000 0.865000 ;
-        RECT 3.560000  0.085000 3.890000 0.650000 ;
-        RECT 4.440000  0.085000 4.770000 0.915000 ;
-        RECT 5.300000  0.085000 5.630000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -108,43 +88,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.530000 2.295000 0.860000 3.245000 ;
-        RECT 1.390000 2.295000 1.720000 3.245000 ;
-        RECT 2.250000 2.295000 2.580000 3.245000 ;
-        RECT 3.110000 2.295000 3.440000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.100000 1.955000 3.885000 2.125000 ;
-      RECT 0.100000 2.125000 0.360000 3.075000 ;
-      RECT 0.560000 0.255000 0.790000 1.035000 ;
-      RECT 0.560000 1.035000 1.650000 1.205000 ;
-      RECT 1.030000 2.125000 1.220000 3.075000 ;
-      RECT 1.460000 0.255000 3.380000 0.640000 ;
-      RECT 1.460000 0.640000 1.650000 1.035000 ;
-      RECT 1.900000 2.125000 2.080000 3.075000 ;
-      RECT 2.750000 2.125000 2.940000 3.075000 ;
-      RECT 3.610000 2.125000 3.885000 2.905000 ;
-      RECT 3.610000 2.905000 5.630000 3.075000 ;
-      RECT 4.465000 2.270000 4.740000 2.905000 ;
-      RECT 5.325000 2.270000 5.630000 2.905000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.100000  0.085000 0.390000 1.095000 ;
+      RECT 0.100000  1.955000 3.885000 2.125000 ;
+      RECT 0.100000  2.125000 0.360000 3.075000 ;
+      RECT 0.530000  2.295000 0.860000 3.245000 ;
+      RECT 0.560000  0.255000 0.790000 1.035000 ;
+      RECT 0.560000  1.035000 1.650000 1.205000 ;
+      RECT 0.960000  0.085000 1.290000 0.865000 ;
+      RECT 1.030000  2.125000 1.220000 3.075000 ;
+      RECT 1.390000  2.295000 1.720000 3.245000 ;
+      RECT 1.460000  0.255000 3.380000 0.640000 ;
+      RECT 1.460000  0.640000 1.650000 1.035000 ;
+      RECT 1.900000  2.125000 2.080000 3.075000 ;
+      RECT 2.250000  2.295000 2.580000 3.245000 ;
+      RECT 2.750000  2.125000 2.940000 3.075000 ;
+      RECT 3.110000  2.295000 3.440000 3.245000 ;
+      RECT 3.560000  0.085000 3.890000 0.650000 ;
+      RECT 3.610000  2.125000 3.885000 2.905000 ;
+      RECT 3.610000  2.905000 5.630000 3.075000 ;
+      RECT 4.440000  0.085000 4.770000 0.915000 ;
+      RECT 4.465000  2.270000 4.740000 2.905000 ;
+      RECT 5.300000  0.085000 5.630000 0.915000 ;
+      RECT 5.325000  2.270000 5.630000 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_lp__a21oi_4
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef
index 4bf54ae..5b8bdba 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.magic.lef
@@ -73,16 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.205000  0.085000 0.535000 0.675000 ;
-        RECT 1.955000  0.085000 2.285000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -91,23 +81,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.665000 2.275000 0.995000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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 1.925000 1.525000 2.095000 ;
-      RECT 0.135000 2.095000 0.465000 3.065000 ;
-      RECT 1.195000 2.095000 1.525000 3.065000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.135000  1.925000 1.525000 2.095000 ;
+      RECT 0.135000  2.095000 0.465000 3.065000 ;
+      RECT 0.205000  0.085000 0.535000 0.675000 ;
+      RECT 0.665000  2.275000 0.995000 3.245000 ;
+      RECT 1.195000  2.095000 1.525000 3.065000 ;
+      RECT 1.955000  0.085000 2.285000 0.545000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__a21oi_lp
diff --git a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef
index 1c06319..162479e 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.magic.lef
@@ -73,15 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.195000  0.085000 0.405000 0.545000 ;
-        RECT 1.430000  0.085000 1.760000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -90,22 +81,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.585000 2.650000 0.795000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 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.155000 2.300000 1.225000 2.470000 ;
-      RECT 0.155000 2.470000 0.365000 2.830000 ;
-      RECT 1.015000 2.470000 1.225000 2.810000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.155000  2.300000 1.225000 2.470000 ;
+      RECT 0.155000  2.470000 0.365000 2.830000 ;
+      RECT 0.195000  0.085000 0.405000 0.545000 ;
+      RECT 0.585000  2.650000 0.795000 3.245000 ;
+      RECT 1.015000  2.470000 1.225000 2.810000 ;
+      RECT 1.430000  0.085000 1.760000 0.485000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__a21oi_m
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef
index 17de2aa..9e17837 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_0.magic.lef
@@ -91,19 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.715000  0.085000 1.030000 0.555000 ;
-        RECT 2.780000  0.085000 3.110000 0.475000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,41 +99,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.645000 2.400000 0.925000 3.245000 ;
-        RECT 1.520000 2.400000 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 ;
-        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.440000 1.560000 0.675000 2.230000 ;
-      RECT 0.505000 0.725000 1.370000 0.895000 ;
-      RECT 0.505000 0.895000 0.675000 1.560000 ;
-      RECT 1.095000 1.785000 2.785000 1.955000 ;
-      RECT 1.095000 1.955000 1.350000 3.075000 ;
-      RECT 1.200000 0.280000 2.610000 0.610000 ;
-      RECT 1.200000 0.610000 1.370000 0.725000 ;
-      RECT 2.005000 2.135000 2.285000 2.905000 ;
-      RECT 2.005000 2.905000 3.285000 3.075000 ;
-      RECT 2.440000 0.610000 2.610000 0.645000 ;
-      RECT 2.440000 0.645000 3.575000 0.815000 ;
-      RECT 2.455000 1.955000 2.785000 2.735000 ;
-      RECT 2.955000 2.185000 3.285000 2.905000 ;
-      RECT 3.010000 0.815000 3.190000 1.845000 ;
-      RECT 3.010000 1.845000 3.715000 2.015000 ;
-      RECT 3.280000 0.280000 3.575000 0.645000 ;
-      RECT 3.455000 2.015000 3.715000 2.795000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.440000  1.560000 0.675000 2.230000 ;
+      RECT 0.505000  0.725000 1.370000 0.895000 ;
+      RECT 0.505000  0.895000 0.675000 1.560000 ;
+      RECT 0.645000  2.400000 0.925000 3.245000 ;
+      RECT 0.715000  0.085000 1.030000 0.555000 ;
+      RECT 1.095000  1.785000 2.785000 1.955000 ;
+      RECT 1.095000  1.955000 1.350000 3.075000 ;
+      RECT 1.200000  0.280000 2.610000 0.610000 ;
+      RECT 1.200000  0.610000 1.370000 0.725000 ;
+      RECT 1.520000  2.400000 1.815000 3.245000 ;
+      RECT 2.005000  2.135000 2.285000 2.905000 ;
+      RECT 2.005000  2.905000 3.285000 3.075000 ;
+      RECT 2.440000  0.610000 2.610000 0.645000 ;
+      RECT 2.440000  0.645000 3.575000 0.815000 ;
+      RECT 2.455000  1.955000 2.785000 2.735000 ;
+      RECT 2.780000  0.085000 3.110000 0.475000 ;
+      RECT 2.955000  2.185000 3.285000 2.905000 ;
+      RECT 3.010000  0.815000 3.190000 1.845000 ;
+      RECT 3.010000  1.845000 3.715000 2.015000 ;
+      RECT 3.280000  0.280000 3.575000 0.645000 ;
+      RECT 3.455000  2.015000 3.715000 2.795000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a221o_0
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef
index 13f3b8f..904dace 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_1.magic.lef
@@ -91,20 +91,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.015000 ;
-        RECT 3.130000  0.085000 3.460000 0.665000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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 +99,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.525000 2.025000 1.195000 3.245000 ;
-        RECT 1.730000 2.365000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.305000 0.765000 1.685000 ;
-      RECT 0.515000 1.685000 3.970000 1.855000 ;
-      RECT 1.365000 2.025000 3.080000 2.195000 ;
-      RECT 1.365000 2.195000 1.560000 3.075000 ;
-      RECT 1.935000 0.255000 2.580000 0.835000 ;
-      RECT 1.935000 0.835000 3.970000 1.015000 ;
-      RECT 2.025000 1.015000 2.205000 1.685000 ;
-      RECT 2.250000 2.365000 2.580000 2.905000 ;
-      RECT 2.250000 2.905000 3.470000 3.075000 ;
-      RECT 2.750000 2.195000 3.080000 2.735000 ;
-      RECT 3.250000 2.025000 3.470000 2.905000 ;
-      RECT 3.640000 1.855000 3.970000 3.075000 ;
-      RECT 3.700000 0.255000 3.970000 0.835000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.515000  1.305000 0.765000 1.685000 ;
+      RECT 0.515000  1.685000 3.970000 1.855000 ;
+      RECT 0.525000  2.025000 1.195000 3.245000 ;
+      RECT 0.615000  0.085000 0.945000 1.015000 ;
+      RECT 1.365000  2.025000 3.080000 2.195000 ;
+      RECT 1.365000  2.195000 1.560000 3.075000 ;
+      RECT 1.730000  2.365000 2.060000 3.245000 ;
+      RECT 1.935000  0.255000 2.580000 0.835000 ;
+      RECT 1.935000  0.835000 3.970000 1.015000 ;
+      RECT 2.025000  1.015000 2.205000 1.685000 ;
+      RECT 2.250000  2.365000 2.580000 2.905000 ;
+      RECT 2.250000  2.905000 3.470000 3.075000 ;
+      RECT 2.750000  2.195000 3.080000 2.735000 ;
+      RECT 3.130000  0.085000 3.460000 0.665000 ;
+      RECT 3.250000  2.025000 3.470000 2.905000 ;
+      RECT 3.640000  1.855000 3.970000 3.075000 ;
+      RECT 3.700000  0.255000 3.970000 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_lp__a221o_1
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef
index 0995379..e920ab4 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_2.magic.lef
@@ -88,23 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.125000  0.085000 0.425000 1.125000 ;
-        RECT 0.985000  0.085000 1.655000 0.905000 ;
-        RECT 2.810000  0.085000 3.140000 0.905000 ;
-        RECT 4.140000  0.085000 4.470000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -113,40 +96,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.125000 1.815000 0.425000 3.245000 ;
-        RECT 1.105000 1.920000 1.435000 3.245000 ;
-        RECT 2.110000 2.845000 2.440000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.985000 1.075000 3.570000 1.245000 ;
-      RECT 0.985000 1.245000 1.235000 1.545000 ;
-      RECT 1.645000 1.920000 1.905000 2.430000 ;
-      RECT 1.645000 2.430000 4.000000 2.600000 ;
-      RECT 1.645000 2.600000 1.940000 3.075000 ;
-      RECT 2.115000 0.255000 2.445000 1.075000 ;
-      RECT 2.585000 1.245000 3.570000 1.255000 ;
-      RECT 2.585000 1.255000 2.755000 1.930000 ;
-      RECT 2.585000 1.930000 3.080000 2.260000 ;
-      RECT 3.240000 2.770000 4.470000 3.075000 ;
-      RECT 3.310000 0.255000 3.570000 1.075000 ;
-      RECT 3.670000 1.920000 4.000000 2.430000 ;
-      RECT 4.170000 1.920000 4.470000 2.770000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.125000  0.085000 0.425000 1.125000 ;
+      RECT 0.125000  1.815000 0.425000 3.245000 ;
+      RECT 0.985000  0.085000 1.655000 0.905000 ;
+      RECT 0.985000  1.075000 3.570000 1.245000 ;
+      RECT 0.985000  1.245000 1.235000 1.545000 ;
+      RECT 1.105000  1.920000 1.435000 3.245000 ;
+      RECT 1.645000  1.920000 1.905000 2.430000 ;
+      RECT 1.645000  2.430000 4.000000 2.600000 ;
+      RECT 1.645000  2.600000 1.940000 3.075000 ;
+      RECT 2.110000  2.845000 2.440000 3.245000 ;
+      RECT 2.115000  0.255000 2.445000 1.075000 ;
+      RECT 2.585000  1.245000 3.570000 1.255000 ;
+      RECT 2.585000  1.255000 2.755000 1.930000 ;
+      RECT 2.585000  1.930000 3.080000 2.260000 ;
+      RECT 2.810000  0.085000 3.140000 0.905000 ;
+      RECT 3.240000  2.770000 4.470000 3.075000 ;
+      RECT 3.310000  0.255000 3.570000 1.075000 ;
+      RECT 3.670000  1.920000 4.000000 2.430000 ;
+      RECT 4.140000  0.085000 4.470000 1.040000 ;
+      RECT 4.170000  1.920000 4.470000 2.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  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a221o_2
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef
index 743d068..2e82b5d 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_4.magic.lef
@@ -96,31 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 0.890000 ;
-        RECT 0.970000  0.085000 1.300000 0.875000 ;
-        RECT 1.830000  0.085000 2.160000 1.015000 ;
-        RECT 2.690000  0.085000 3.020000 0.675000 ;
-        RECT 4.535000  0.085000 4.795000 0.685000 ;
-        RECT 6.740000  0.085000 7.070000 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 ;
-        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
@@ -129,68 +104,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.110000 2.095000 0.440000 3.245000 ;
-        RECT 0.970000 2.095000 1.300000 3.245000 ;
-        RECT 1.830000 2.045000 2.160000 3.245000 ;
-        RECT 2.690000 2.395000 3.020000 3.245000 ;
-        RECT 3.550000 2.385000 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 ;
-        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.505000 1.400000 2.020000 1.585000 ;
-      RECT 1.850000 1.585000 2.020000 1.690000 ;
-      RECT 1.850000 1.690000 4.295000 1.705000 ;
-      RECT 1.850000 1.705000 4.830000 1.875000 ;
-      RECT 2.330000 0.255000 2.520000 0.845000 ;
-      RECT 2.330000 0.845000 3.955000 1.015000 ;
-      RECT 2.330000 2.045000 4.315000 2.215000 ;
-      RECT 2.330000 2.215000 3.380000 2.225000 ;
-      RECT 2.330000 2.225000 2.520000 3.075000 ;
-      RECT 3.190000 2.225000 3.380000 3.065000 ;
-      RECT 3.210000 0.255000 4.365000 0.425000 ;
-      RECT 3.210000 0.425000 3.530000 0.675000 ;
-      RECT 3.700000 0.595000 3.955000 0.845000 ;
-      RECT 4.070000 2.215000 4.315000 2.445000 ;
-      RECT 4.070000 2.445000 5.620000 2.615000 ;
-      RECT 4.070000 2.785000 6.120000 2.895000 ;
-      RECT 4.070000 2.895000 6.980000 3.065000 ;
-      RECT 4.125000 0.425000 4.365000 0.855000 ;
-      RECT 4.125000 0.855000 5.235000 1.025000 ;
-      RECT 4.125000 1.025000 4.295000 1.690000 ;
-      RECT 4.500000 1.875000 4.830000 2.275000 ;
-      RECT 4.965000 0.255000 6.120000 0.515000 ;
-      RECT 4.965000 0.515000 5.235000 0.855000 ;
-      RECT 5.360000 1.705000 6.470000 1.875000 ;
-      RECT 5.360000 1.875000 5.620000 2.445000 ;
-      RECT 5.405000 0.685000 6.570000 1.015000 ;
-      RECT 5.790000 2.055000 6.120000 2.785000 ;
-      RECT 6.290000 1.875000 6.470000 2.725000 ;
-      RECT 6.310000 0.255000 6.570000 0.685000 ;
-      RECT 6.370000 1.015000 6.570000 1.065000 ;
-      RECT 6.370000 1.065000 7.500000 1.235000 ;
-      RECT 6.650000 1.920000 6.980000 2.895000 ;
-      RECT 7.240000 0.255000 7.500000 1.065000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.110000  0.085000 0.440000 0.890000 ;
+      RECT 0.110000  2.095000 0.440000 3.245000 ;
+      RECT 0.505000  1.400000 2.020000 1.585000 ;
+      RECT 0.970000  0.085000 1.300000 0.875000 ;
+      RECT 0.970000  2.095000 1.300000 3.245000 ;
+      RECT 1.830000  0.085000 2.160000 1.015000 ;
+      RECT 1.830000  2.045000 2.160000 3.245000 ;
+      RECT 1.850000  1.585000 2.020000 1.690000 ;
+      RECT 1.850000  1.690000 4.295000 1.705000 ;
+      RECT 1.850000  1.705000 4.830000 1.875000 ;
+      RECT 2.330000  0.255000 2.520000 0.845000 ;
+      RECT 2.330000  0.845000 3.955000 1.015000 ;
+      RECT 2.330000  2.045000 4.315000 2.215000 ;
+      RECT 2.330000  2.215000 3.380000 2.225000 ;
+      RECT 2.330000  2.225000 2.520000 3.075000 ;
+      RECT 2.690000  0.085000 3.020000 0.675000 ;
+      RECT 2.690000  2.395000 3.020000 3.245000 ;
+      RECT 3.190000  2.225000 3.380000 3.065000 ;
+      RECT 3.210000  0.255000 4.365000 0.425000 ;
+      RECT 3.210000  0.425000 3.530000 0.675000 ;
+      RECT 3.550000  2.385000 3.880000 3.245000 ;
+      RECT 3.700000  0.595000 3.955000 0.845000 ;
+      RECT 4.070000  2.215000 4.315000 2.445000 ;
+      RECT 4.070000  2.445000 5.620000 2.615000 ;
+      RECT 4.070000  2.785000 6.120000 2.895000 ;
+      RECT 4.070000  2.895000 6.980000 3.065000 ;
+      RECT 4.125000  0.425000 4.365000 0.855000 ;
+      RECT 4.125000  0.855000 5.235000 1.025000 ;
+      RECT 4.125000  1.025000 4.295000 1.690000 ;
+      RECT 4.500000  1.875000 4.830000 2.275000 ;
+      RECT 4.535000  0.085000 4.795000 0.685000 ;
+      RECT 4.965000  0.255000 6.120000 0.515000 ;
+      RECT 4.965000  0.515000 5.235000 0.855000 ;
+      RECT 5.360000  1.705000 6.470000 1.875000 ;
+      RECT 5.360000  1.875000 5.620000 2.445000 ;
+      RECT 5.405000  0.685000 6.570000 1.015000 ;
+      RECT 5.790000  2.055000 6.120000 2.785000 ;
+      RECT 6.290000  1.875000 6.470000 2.725000 ;
+      RECT 6.310000  0.255000 6.570000 0.685000 ;
+      RECT 6.370000  1.015000 6.570000 1.065000 ;
+      RECT 6.370000  1.065000 7.500000 1.235000 ;
+      RECT 6.650000  1.920000 6.980000 2.895000 ;
+      RECT 6.740000  0.085000 7.070000 0.895000 ;
+      RECT 7.240000  0.255000 7.500000 1.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a221o_4
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef
index e29a518..0426d60 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_lp.magic.lef
@@ -91,21 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 1.225000  0.085000 1.555000 0.735000 ;
-        RECT 3.275000  0.085000 3.605000 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 ;
-        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,42 +99,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 1.015000 2.115000 1.345000 3.245000 ;
-        RECT 2.115000 2.410000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.480000 0.915000 1.750000 1.085000 ;
-      RECT 0.480000 1.085000 0.810000 1.585000 ;
-      RECT 1.580000 1.085000 1.750000 1.710000 ;
-      RECT 1.580000 1.710000 3.180000 1.880000 ;
-      RECT 1.585000 2.060000 3.565000 2.230000 ;
-      RECT 1.585000 2.230000 1.915000 3.065000 ;
-      RECT 2.455000 0.310000 2.785000 0.820000 ;
-      RECT 2.455000 0.820000 4.710000 0.990000 ;
-      RECT 2.705000 2.410000 3.035000 2.895000 ;
-      RECT 2.705000 2.895000 4.095000 3.065000 ;
-      RECT 3.010000 0.990000 3.180000 1.710000 ;
-      RECT 3.235000 2.230000 3.565000 2.715000 ;
-      RECT 3.765000 2.020000 4.095000 2.895000 ;
-      RECT 4.155000 0.310000 4.710000 0.820000 ;
-      RECT 4.295000 2.020000 4.710000 3.020000 ;
-      RECT 4.540000 0.990000 4.710000 2.020000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.480000  0.915000 1.750000 1.085000 ;
+      RECT 0.480000  1.085000 0.810000 1.585000 ;
+      RECT 1.015000  2.115000 1.345000 3.245000 ;
+      RECT 1.225000  0.085000 1.555000 0.735000 ;
+      RECT 1.580000  1.085000 1.750000 1.710000 ;
+      RECT 1.580000  1.710000 3.180000 1.880000 ;
+      RECT 1.585000  2.060000 3.565000 2.230000 ;
+      RECT 1.585000  2.230000 1.915000 3.065000 ;
+      RECT 2.115000  2.410000 2.445000 3.245000 ;
+      RECT 2.455000  0.310000 2.785000 0.820000 ;
+      RECT 2.455000  0.820000 4.710000 0.990000 ;
+      RECT 2.705000  2.410000 3.035000 2.895000 ;
+      RECT 2.705000  2.895000 4.095000 3.065000 ;
+      RECT 3.010000  0.990000 3.180000 1.710000 ;
+      RECT 3.235000  2.230000 3.565000 2.715000 ;
+      RECT 3.275000  0.085000 3.605000 0.640000 ;
+      RECT 3.765000  2.020000 4.095000 2.895000 ;
+      RECT 4.155000  0.310000 4.710000 0.820000 ;
+      RECT 4.295000  2.020000 4.710000 3.020000 ;
+      RECT 4.540000  0.990000 4.710000 2.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 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a221o_lp
diff --git a/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef b/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef
index e7ee439..53773c8 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_m.magic.lef
@@ -89,18 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.485000 ;
-        RECT 2.330000  0.085000 2.660000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -109,38 +97,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.770000 2.785000 0.980000 3.245000 ;
-        RECT 1.570000 2.845000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.695000 1.155000 1.865000 ;
-      RECT 0.525000 1.865000 0.695000 2.365000 ;
-      RECT 0.985000 1.395000 1.790000 1.565000 ;
-      RECT 0.985000 1.565000 1.155000 1.695000 ;
-      RECT 1.200000 2.495000 2.345000 2.665000 ;
-      RECT 1.200000 2.665000 1.390000 2.985000 ;
-      RECT 1.620000 0.345000 1.810000 0.665000 ;
-      RECT 1.620000 0.665000 3.245000 0.835000 ;
-      RECT 1.620000 0.835000 1.790000 1.395000 ;
-      RECT 1.705000 1.745000 2.775000 1.915000 ;
-      RECT 1.705000 1.915000 1.915000 2.295000 ;
-      RECT 2.135000 2.095000 2.345000 2.495000 ;
-      RECT 2.565000 1.915000 2.775000 2.295000 ;
-      RECT 2.915000 0.405000 3.245000 0.665000 ;
-      RECT 2.995000 0.835000 3.245000 2.295000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.525000  0.085000 0.855000 0.485000 ;
+      RECT 0.525000  1.695000 1.155000 1.865000 ;
+      RECT 0.525000  1.865000 0.695000 2.365000 ;
+      RECT 0.770000  2.785000 0.980000 3.245000 ;
+      RECT 0.985000  1.395000 1.790000 1.565000 ;
+      RECT 0.985000  1.565000 1.155000 1.695000 ;
+      RECT 1.200000  2.495000 2.345000 2.665000 ;
+      RECT 1.200000  2.665000 1.390000 2.985000 ;
+      RECT 1.570000  2.845000 1.900000 3.245000 ;
+      RECT 1.620000  0.345000 1.810000 0.665000 ;
+      RECT 1.620000  0.665000 3.245000 0.835000 ;
+      RECT 1.620000  0.835000 1.790000 1.395000 ;
+      RECT 1.705000  1.745000 2.775000 1.915000 ;
+      RECT 1.705000  1.915000 1.915000 2.295000 ;
+      RECT 2.135000  2.095000 2.345000 2.495000 ;
+      RECT 2.330000  0.085000 2.660000 0.485000 ;
+      RECT 2.565000  1.915000 2.775000 2.295000 ;
+      RECT 2.915000  0.405000 3.245000 0.665000 ;
+      RECT 2.995000  0.835000 3.245000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a221o_m
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef
index 5b67a05..f6e0265 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.magic.lef
@@ -96,18 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.610000  0.085000 0.830000 0.610000 ;
-        RECT 2.405000  0.085000 2.735000 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 ;
       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 1.815000 2.825000 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.825000 2.305000 1.145000 3.075000 ;
-      RECT 0.975000 2.135000 3.145000 2.305000 ;
-      RECT 1.315000 2.475000 2.645000 2.655000 ;
-      RECT 1.315000 2.655000 1.645000 3.075000 ;
-      RECT 2.315000 2.655000 2.645000 3.075000 ;
-      RECT 2.815000 2.305000 3.145000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.610000  0.085000 0.830000 0.610000 ;
+      RECT 0.825000  2.305000 1.145000 3.075000 ;
+      RECT 0.975000  2.135000 3.145000 2.305000 ;
+      RECT 1.315000  2.475000 2.645000 2.655000 ;
+      RECT 1.315000  2.655000 1.645000 3.075000 ;
+      RECT 1.815000  2.825000 2.145000 3.245000 ;
+      RECT 2.315000  2.655000 2.645000 3.075000 ;
+      RECT 2.405000  0.085000 2.735000 0.610000 ;
+      RECT 2.815000  2.305000 3.145000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a221oi_0
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.magic.lef
index d839fe6..5c2ceb2 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_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.690000  0.085000 1.375000 0.675000 ;
-        RECT 2.915000  0.085000 3.245000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,29 +100,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 2.440000 2.045000 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 0.545000 1.920000 0.855000 2.905000 ;
-      RECT 0.545000 2.905000 1.780000 3.075000 ;
-      RECT 1.045000 1.705000 3.245000 1.875000 ;
-      RECT 1.045000 1.875000 1.375000 2.735000 ;
-      RECT 1.545000 2.045000 1.780000 2.905000 ;
-      RECT 1.950000 1.875000 2.270000 3.075000 ;
-      RECT 2.975000 1.875000 3.245000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.545000  1.920000 0.855000 2.905000 ;
+      RECT 0.545000  2.905000 1.780000 3.075000 ;
+      RECT 0.690000  0.085000 1.375000 0.675000 ;
+      RECT 1.045000  1.705000 3.245000 1.875000 ;
+      RECT 1.045000  1.875000 1.375000 2.735000 ;
+      RECT 1.545000  2.045000 1.780000 2.905000 ;
+      RECT 1.950000  1.875000 2.270000 3.075000 ;
+      RECT 2.440000  2.045000 2.770000 3.245000 ;
+      RECT 2.915000  0.085000 3.245000 1.015000 ;
+      RECT 2.975000  1.875000 3.245000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a221oi_1
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef
index 6efda6a..3a9759d 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.magic.lef
@@ -96,25 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.205000  0.085000 0.465000 1.040000 ;
-        RECT 1.065000  0.085000 1.775000 0.615000 ;
-        RECT 3.260000  0.085000 3.590000 0.615000 ;
-        RECT 5.135000  0.085000 5.395000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -123,44 +104,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 3.720000 2.295000 4.050000 3.245000 ;
-        RECT 4.635000 2.295000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.925000 0.355000 2.905000 ;
-      RECT 0.095000 2.905000 1.285000 3.075000 ;
-      RECT 1.025000 1.955000 3.095000 2.125000 ;
-      RECT 1.025000 2.125000 1.285000 2.905000 ;
-      RECT 1.475000 2.295000 1.735000 2.905000 ;
-      RECT 1.475000 2.905000 3.550000 3.075000 ;
-      RECT 1.905000 2.125000 2.235000 2.735000 ;
-      RECT 1.955000 0.285000 3.085000 0.615000 ;
-      RECT 2.405000 2.295000 2.595000 2.905000 ;
-      RECT 2.765000 2.125000 3.095000 2.735000 ;
-      RECT 3.265000 1.955000 5.395000 2.125000 ;
-      RECT 3.265000 2.125000 3.550000 2.905000 ;
-      RECT 3.775000 0.255000 4.965000 0.485000 ;
-      RECT 4.220000 2.125000 4.455000 3.075000 ;
-      RECT 4.635000 0.485000 4.965000 1.040000 ;
-      RECT 5.145000 2.125000 5.395000 3.075000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.095000  1.925000 0.355000 2.905000 ;
+      RECT 0.095000  2.905000 1.285000 3.075000 ;
+      RECT 0.205000  0.085000 0.465000 1.040000 ;
+      RECT 1.025000  1.955000 3.095000 2.125000 ;
+      RECT 1.025000  2.125000 1.285000 2.905000 ;
+      RECT 1.065000  0.085000 1.775000 0.615000 ;
+      RECT 1.475000  2.295000 1.735000 2.905000 ;
+      RECT 1.475000  2.905000 3.550000 3.075000 ;
+      RECT 1.905000  2.125000 2.235000 2.735000 ;
+      RECT 1.955000  0.285000 3.085000 0.615000 ;
+      RECT 2.405000  2.295000 2.595000 2.905000 ;
+      RECT 2.765000  2.125000 3.095000 2.735000 ;
+      RECT 3.260000  0.085000 3.590000 0.615000 ;
+      RECT 3.265000  1.955000 5.395000 2.125000 ;
+      RECT 3.265000  2.125000 3.550000 2.905000 ;
+      RECT 3.720000  2.295000 4.050000 3.245000 ;
+      RECT 3.775000  0.255000 4.965000 0.485000 ;
+      RECT 4.220000  2.125000 4.455000 3.075000 ;
+      RECT 4.635000  0.485000 4.965000 1.040000 ;
+      RECT 4.635000  2.295000 4.965000 3.245000 ;
+      RECT 5.135000  0.085000 5.395000 1.040000 ;
+      RECT 5.145000  2.125000 5.395000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a221oi_2
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef
index 09edece..2be8e70 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.magic.lef
@@ -108,37 +108,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.555000  0.085000  0.885000 1.040000 ;
-        RECT 1.415000  0.085000  1.745000 0.700000 ;
-        RECT 2.275000  0.085000  2.605000 0.700000 ;
-        RECT 3.135000  0.085000  3.465000 0.505000 ;
-        RECT 6.135000  0.085000  6.465000 0.690000 ;
-        RECT 8.795000  0.085000  9.125000 0.700000 ;
-        RECT 9.655000  0.085000  9.985000 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 ;
-        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
@@ -147,66 +116,94 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 6.625000 2.295000  6.955000 3.245000 ;
-        RECT 7.505000 2.295000  7.835000 3.245000 ;
-        RECT 8.365000 2.295000  8.695000 3.245000 ;
-        RECT 9.225000 1.945000  9.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 ;
-        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.385000 1.815000 0.645000 2.905000 ;
-      RECT 0.385000 2.905000 2.435000 3.075000 ;
-      RECT 1.315000 1.945000 1.505000 2.905000 ;
-      RECT 2.175000 1.945000 3.325000 2.115000 ;
-      RECT 2.175000 2.115000 2.435000 2.905000 ;
-      RECT 2.625000 2.285000 2.955000 2.770000 ;
-      RECT 2.625000 2.770000 6.455000 3.075000 ;
-      RECT 2.775000 0.505000 2.965000 0.675000 ;
-      RECT 2.775000 0.675000 3.815000 0.845000 ;
-      RECT 3.055000 1.795000 3.325000 1.945000 ;
-      RECT 3.125000 2.115000 3.325000 2.270000 ;
-      RECT 3.125000 2.270000 5.965000 2.600000 ;
-      RECT 3.635000 0.255000 5.955000 0.585000 ;
-      RECT 3.635000 0.585000 3.815000 0.675000 ;
-      RECT 6.135000 2.270000 6.455000 2.770000 ;
-      RECT 6.255000 1.955000 9.055000 2.125000 ;
-      RECT 6.255000 2.125000 6.455000 2.270000 ;
-      RECT 6.645000 0.255000 8.625000 0.530000 ;
-      RECT 7.135000 2.125000 7.335000 3.075000 ;
-      RECT 8.005000 2.125000 8.195000 3.075000 ;
-      RECT 8.425000 0.530000 8.625000 0.870000 ;
-      RECT 8.425000 0.870000 9.485000 1.040000 ;
-      RECT 8.795000 1.605000 9.985000 1.775000 ;
-      RECT 8.795000 1.775000 9.055000 1.955000 ;
-      RECT 8.865000 2.125000 9.055000 3.075000 ;
-      RECT 9.295000 0.255000 9.485000 0.870000 ;
-      RECT 9.725000 1.775000 9.985000 3.075000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.385000  1.815000  0.645000 2.905000 ;
+      RECT 0.385000  2.905000  2.435000 3.075000 ;
+      RECT 0.555000  0.085000  0.885000 1.040000 ;
+      RECT 1.315000  1.945000  1.505000 2.905000 ;
+      RECT 1.415000  0.085000  1.745000 0.700000 ;
+      RECT 2.175000  1.945000  3.325000 2.115000 ;
+      RECT 2.175000  2.115000  2.435000 2.905000 ;
+      RECT 2.275000  0.085000  2.605000 0.700000 ;
+      RECT 2.625000  2.285000  2.955000 2.770000 ;
+      RECT 2.625000  2.770000  6.455000 3.075000 ;
+      RECT 2.775000  0.505000  2.965000 0.675000 ;
+      RECT 2.775000  0.675000  3.815000 0.845000 ;
+      RECT 3.055000  1.795000  3.325000 1.945000 ;
+      RECT 3.125000  2.115000  3.325000 2.270000 ;
+      RECT 3.125000  2.270000  5.965000 2.600000 ;
+      RECT 3.135000  0.085000  3.465000 0.505000 ;
+      RECT 3.635000  0.255000  5.955000 0.585000 ;
+      RECT 3.635000  0.585000  3.815000 0.675000 ;
+      RECT 6.135000  0.085000  6.465000 0.690000 ;
+      RECT 6.135000  2.270000  6.455000 2.770000 ;
+      RECT 6.255000  1.955000  9.055000 2.125000 ;
+      RECT 6.255000  2.125000  6.455000 2.270000 ;
+      RECT 6.625000  2.295000  6.955000 3.245000 ;
+      RECT 6.645000  0.255000  8.625000 0.530000 ;
+      RECT 7.135000  2.125000  7.335000 3.075000 ;
+      RECT 7.505000  2.295000  7.835000 3.245000 ;
+      RECT 8.005000  2.125000  8.195000 3.075000 ;
+      RECT 8.365000  2.295000  8.695000 3.245000 ;
+      RECT 8.425000  0.530000  8.625000 0.870000 ;
+      RECT 8.425000  0.870000  9.485000 1.040000 ;
+      RECT 8.795000  0.085000  9.125000 0.700000 ;
+      RECT 8.795000  1.605000  9.985000 1.775000 ;
+      RECT 8.795000  1.775000  9.055000 1.955000 ;
+      RECT 8.865000  2.125000  9.055000 3.075000 ;
+      RECT 9.225000  1.945000  9.555000 3.245000 ;
+      RECT 9.295000  0.255000  9.485000 0.870000 ;
+      RECT 9.655000  0.085000  9.985000 1.040000 ;
+      RECT 9.725000  1.775000  9.985000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a221oi_4
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef
index dd0f0e5..5242f7a 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.magic.lef
@@ -94,19 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.320000  0.085000 0.650000 0.680000 ;
-        RECT 2.070000  0.085000 2.400000 0.470000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -115,30 +102,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.320000 2.780000 1.650000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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 2.040000 0.590000 2.080000 ;
-      RECT 0.260000 2.080000 3.000000 2.250000 ;
-      RECT 0.260000 2.250000 0.590000 3.065000 ;
-      RECT 0.790000 2.430000 2.470000 2.600000 ;
-      RECT 0.790000 2.600000 1.120000 3.065000 ;
-      RECT 2.140000 2.600000 2.470000 3.065000 ;
-      RECT 2.670000 2.250000 3.000000 3.065000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.260000  2.040000 0.590000 2.080000 ;
+      RECT 0.260000  2.080000 3.000000 2.250000 ;
+      RECT 0.260000  2.250000 0.590000 3.065000 ;
+      RECT 0.320000  0.085000 0.650000 0.680000 ;
+      RECT 0.790000  2.430000 2.470000 2.600000 ;
+      RECT 0.790000  2.600000 1.120000 3.065000 ;
+      RECT 1.320000  2.780000 1.650000 3.245000 ;
+      RECT 2.070000  0.085000 2.400000 0.470000 ;
+      RECT 2.140000  2.600000 2.470000 3.065000 ;
+      RECT 2.670000  2.250000 3.000000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a221oi_lp
diff --git a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef
index 7dc24a0..90277b0 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.magic.lef
@@ -95,18 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.735000  0.085000 0.945000 0.565000 ;
-        RECT 2.425000  0.085000 2.635000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -115,28 +103,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.980000 2.845000 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 ;
-        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.085000 2.145000 3.205000 2.315000 ;
-      RECT 1.085000 2.315000 1.295000 2.985000 ;
-      RECT 1.515000 2.495000 2.775000 2.665000 ;
-      RECT 1.515000 2.665000 1.725000 2.985000 ;
-      RECT 2.565000 2.665000 2.775000 2.985000 ;
-      RECT 2.995000 2.315000 3.205000 2.985000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.735000  0.085000 0.945000 0.565000 ;
+      RECT 1.085000  2.145000 3.205000 2.315000 ;
+      RECT 1.085000  2.315000 1.295000 2.985000 ;
+      RECT 1.515000  2.495000 2.775000 2.665000 ;
+      RECT 1.515000  2.665000 1.725000 2.985000 ;
+      RECT 1.980000  2.845000 2.310000 3.245000 ;
+      RECT 2.425000  0.085000 2.635000 0.585000 ;
+      RECT 2.565000  2.665000 2.775000 2.985000 ;
+      RECT 2.995000  2.315000 3.205000 2.985000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a221oi_m
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef
index 273200b..2bef3e1 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_0.magic.lef
@@ -82,18 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.645000  0.085000 0.875000 0.545000 ;
-        RECT 2.410000  0.085000 2.740000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -102,32 +90,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.760000 2.495000 1.090000 3.245000 ;
-        RECT 2.820000 2.445000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 0.775000 1.215000 0.945000 ;
-      RECT 0.505000 0.945000 0.760000 2.155000 ;
-      RECT 0.505000 2.155000 2.090000 2.325000 ;
-      RECT 1.045000 0.280000 1.780000 0.610000 ;
-      RECT 1.045000 0.610000 1.215000 0.775000 ;
-      RECT 1.260000 2.505000 1.590000 2.905000 ;
-      RECT 1.260000 2.905000 2.640000 3.075000 ;
-      RECT 1.760000 2.325000 2.090000 2.735000 ;
-      RECT 2.310000 2.445000 2.640000 2.905000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.505000  0.775000 1.215000 0.945000 ;
+      RECT 0.505000  0.945000 0.760000 2.155000 ;
+      RECT 0.505000  2.155000 2.090000 2.325000 ;
+      RECT 0.645000  0.085000 0.875000 0.545000 ;
+      RECT 0.760000  2.495000 1.090000 3.245000 ;
+      RECT 1.045000  0.280000 1.780000 0.610000 ;
+      RECT 1.045000  0.610000 1.215000 0.775000 ;
+      RECT 1.260000  2.505000 1.590000 2.905000 ;
+      RECT 1.260000  2.905000 2.640000 3.075000 ;
+      RECT 1.760000  2.325000 2.090000 2.735000 ;
+      RECT 2.310000  2.445000 2.640000 2.905000 ;
+      RECT 2.410000  0.085000 2.740000 0.610000 ;
+      RECT 2.820000  2.445000 3.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 ;
   END
 END sky130_fd_sc_lp__a22o_0
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_1.magic.lef
index ff1eef5..4f1455c 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_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.605000  0.085000 1.345000 0.700000 ;
-        RECT 2.915000  0.085000 3.245000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -101,33 +89,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.585000 1.990000 0.855000 3.245000 ;
-        RECT 2.425000 2.070000 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 ;
-        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.870000 2.225000 1.040000 ;
-      RECT 0.605000 1.040000 0.845000 1.650000 ;
-      RECT 0.605000 1.650000 1.805000 1.820000 ;
-      RECT 1.045000 1.990000 1.305000 2.905000 ;
-      RECT 1.045000 2.905000 2.255000 3.075000 ;
-      RECT 1.475000 1.820000 1.805000 2.735000 ;
-      RECT 1.895000 0.255000 2.225000 0.870000 ;
-      RECT 1.975000 1.730000 3.245000 1.900000 ;
-      RECT 1.975000 1.900000 2.255000 2.905000 ;
-      RECT 2.935000 1.900000 3.245000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.585000  1.990000 0.855000 3.245000 ;
+      RECT 0.605000  0.085000 1.345000 0.700000 ;
+      RECT 0.605000  0.870000 2.225000 1.040000 ;
+      RECT 0.605000  1.040000 0.845000 1.650000 ;
+      RECT 0.605000  1.650000 1.805000 1.820000 ;
+      RECT 1.045000  1.990000 1.305000 2.905000 ;
+      RECT 1.045000  2.905000 2.255000 3.075000 ;
+      RECT 1.475000  1.820000 1.805000 2.735000 ;
+      RECT 1.895000  0.255000 2.225000 0.870000 ;
+      RECT 1.975000  1.730000 3.245000 1.900000 ;
+      RECT 1.975000  1.900000 2.255000 2.905000 ;
+      RECT 2.425000  2.070000 2.765000 3.245000 ;
+      RECT 2.915000  0.085000 3.245000 1.040000 ;
+      RECT 2.935000  1.900000 3.245000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a22o_1
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_2.magic.lef
index 6ffe8b3..61ae29b 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__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.130000  0.085000 0.400000 1.105000 ;
-        RECT 1.180000  0.085000 1.510000 0.825000 ;
-        RECT 2.595000  0.085000 2.925000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.165000 2.000000 0.415000 3.245000 ;
-        RECT 1.100000 1.920000 1.430000 3.245000 ;
-        RECT 2.035000 2.650000 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 0.910000 1.245000 1.280000 1.585000 ;
-      RECT 1.110000 0.995000 3.715000 1.165000 ;
-      RECT 1.110000 1.165000 1.280000 1.245000 ;
-      RECT 1.605000 1.920000 1.885000 2.310000 ;
-      RECT 1.605000 2.310000 3.315000 2.480000 ;
-      RECT 1.605000 2.480000 1.865000 3.075000 ;
-      RECT 2.035000 0.255000 2.365000 0.995000 ;
-      RECT 2.450000 1.165000 2.620000 1.930000 ;
-      RECT 2.450000 1.930000 3.745000 2.140000 ;
-      RECT 2.985000 2.480000 3.315000 3.075000 ;
-      RECT 3.385000 0.255000 3.715000 0.995000 ;
-      RECT 3.485000 2.140000 3.745000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.130000  0.085000 0.400000 1.105000 ;
+      RECT 0.165000  2.000000 0.415000 3.245000 ;
+      RECT 0.910000  1.245000 1.280000 1.585000 ;
+      RECT 1.100000  1.920000 1.430000 3.245000 ;
+      RECT 1.110000  0.995000 3.715000 1.165000 ;
+      RECT 1.110000  1.165000 1.280000 1.245000 ;
+      RECT 1.180000  0.085000 1.510000 0.825000 ;
+      RECT 1.605000  1.920000 1.885000 2.310000 ;
+      RECT 1.605000  2.310000 3.315000 2.480000 ;
+      RECT 1.605000  2.480000 1.865000 3.075000 ;
+      RECT 2.035000  0.255000 2.365000 0.995000 ;
+      RECT 2.035000  2.650000 2.365000 3.245000 ;
+      RECT 2.450000  1.165000 2.620000 1.930000 ;
+      RECT 2.450000  1.930000 3.745000 2.140000 ;
+      RECT 2.595000  0.085000 2.925000 0.825000 ;
+      RECT 2.985000  2.480000 3.315000 3.075000 ;
+      RECT 3.385000  0.255000 3.715000 0.995000 ;
+      RECT 3.485000  2.140000 3.745000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a22o_2
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_4.magic.lef
index 8bd6d50..389eff9 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_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.910000  0.085000 1.240000 0.875000 ;
-        RECT 1.770000  0.085000 2.100000 0.865000 ;
-        RECT 2.630000  0.085000 2.960000 0.650000 ;
-        RECT 4.445000  0.085000 4.775000 0.650000 ;
-        RECT 6.335000  0.085000 6.625000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -120,52 +98,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.460000 2.095000 0.790000 3.245000 ;
-        RECT 1.320000 2.095000 1.650000 3.245000 ;
-        RECT 2.220000 1.815000 2.460000 3.245000 ;
-        RECT 4.965000 2.295000 5.295000 3.245000 ;
-        RECT 5.865000 2.295000 6.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 ;
-        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.515000 1.385000 2.800000 1.585000 ;
-      RECT 2.630000 0.820000 5.765000 1.030000 ;
-      RECT 2.630000 1.030000 2.800000 1.385000 ;
-      RECT 2.630000 1.585000 2.800000 1.955000 ;
-      RECT 2.630000 1.955000 4.295000 2.135000 ;
-      RECT 2.705000 2.305000 3.035000 2.905000 ;
-      RECT 2.705000 2.905000 4.795000 3.075000 ;
-      RECT 3.130000 0.255000 4.275000 0.650000 ;
-      RECT 3.205000 2.135000 3.395000 2.735000 ;
-      RECT 3.565000 2.305000 3.895000 2.905000 ;
-      RECT 4.065000 2.135000 4.295000 2.735000 ;
-      RECT 4.465000 1.955000 6.625000 2.125000 ;
-      RECT 4.465000 2.125000 4.795000 2.905000 ;
-      RECT 5.005000 0.255000 6.165000 0.530000 ;
-      RECT 5.005000 0.530000 5.315000 0.650000 ;
-      RECT 5.465000 2.125000 5.695000 3.075000 ;
-      RECT 5.485000 0.700000 5.765000 0.820000 ;
-      RECT 5.935000 0.530000 6.165000 1.030000 ;
-      RECT 6.365000 2.125000 6.625000 3.075000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.460000  2.095000 0.790000 3.245000 ;
+      RECT 0.515000  1.385000 2.800000 1.585000 ;
+      RECT 0.910000  0.085000 1.240000 0.875000 ;
+      RECT 1.320000  2.095000 1.650000 3.245000 ;
+      RECT 1.770000  0.085000 2.100000 0.865000 ;
+      RECT 2.220000  1.815000 2.460000 3.245000 ;
+      RECT 2.630000  0.085000 2.960000 0.650000 ;
+      RECT 2.630000  0.820000 5.765000 1.030000 ;
+      RECT 2.630000  1.030000 2.800000 1.385000 ;
+      RECT 2.630000  1.585000 2.800000 1.955000 ;
+      RECT 2.630000  1.955000 4.295000 2.135000 ;
+      RECT 2.705000  2.305000 3.035000 2.905000 ;
+      RECT 2.705000  2.905000 4.795000 3.075000 ;
+      RECT 3.130000  0.255000 4.275000 0.650000 ;
+      RECT 3.205000  2.135000 3.395000 2.735000 ;
+      RECT 3.565000  2.305000 3.895000 2.905000 ;
+      RECT 4.065000  2.135000 4.295000 2.735000 ;
+      RECT 4.445000  0.085000 4.775000 0.650000 ;
+      RECT 4.465000  1.955000 6.625000 2.125000 ;
+      RECT 4.465000  2.125000 4.795000 2.905000 ;
+      RECT 4.965000  2.295000 5.295000 3.245000 ;
+      RECT 5.005000  0.255000 6.165000 0.530000 ;
+      RECT 5.005000  0.530000 5.315000 0.650000 ;
+      RECT 5.465000  2.125000 5.695000 3.075000 ;
+      RECT 5.485000  0.700000 5.765000 0.820000 ;
+      RECT 5.865000  2.295000 6.195000 3.245000 ;
+      RECT 5.935000  0.530000 6.165000 1.030000 ;
+      RECT 6.335000  0.085000 6.625000 1.030000 ;
+      RECT 6.365000  2.125000 6.625000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a22o_4
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef
index 2a6c6ca..6f2836c 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_lp.magic.lef
@@ -85,19 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.670000  0.085000 1.000000 0.675000 ;
-        RECT 2.655000  0.085000 2.905000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,35 +93,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.130000 2.025000 0.460000 3.245000 ;
-        RECT 2.555000 2.325000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.660000 2.055000 0.990000 2.895000 ;
-      RECT 0.660000 2.895000 2.355000 3.065000 ;
-      RECT 1.490000 0.295000 1.820000 0.505000 ;
-      RECT 1.490000 0.505000 2.475000 0.675000 ;
-      RECT 1.495000 1.975000 3.135000 2.145000 ;
-      RECT 1.495000 2.145000 1.825000 2.715000 ;
-      RECT 2.025000 2.325000 2.355000 2.895000 ;
-      RECT 2.305000 0.675000 2.475000 0.775000 ;
-      RECT 2.305000 0.775000 3.375000 0.945000 ;
-      RECT 2.965000 0.945000 3.375000 1.445000 ;
-      RECT 2.965000 1.445000 3.135000 1.975000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.130000  2.025000 0.460000 3.245000 ;
+      RECT 0.660000  2.055000 0.990000 2.895000 ;
+      RECT 0.660000  2.895000 2.355000 3.065000 ;
+      RECT 0.670000  0.085000 1.000000 0.675000 ;
+      RECT 1.490000  0.295000 1.820000 0.505000 ;
+      RECT 1.490000  0.505000 2.475000 0.675000 ;
+      RECT 1.495000  1.975000 3.135000 2.145000 ;
+      RECT 1.495000  2.145000 1.825000 2.715000 ;
+      RECT 2.025000  2.325000 2.355000 2.895000 ;
+      RECT 2.305000  0.675000 2.475000 0.775000 ;
+      RECT 2.305000  0.775000 3.375000 0.945000 ;
+      RECT 2.555000  2.325000 2.885000 3.245000 ;
+      RECT 2.655000  0.085000 2.905000 0.595000 ;
+      RECT 2.965000  0.945000 3.375000 1.445000 ;
+      RECT 2.965000  1.445000 3.135000 1.975000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a22o_lp
diff --git a/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef b/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef
index 4604fe8..adb5525 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_m.magic.lef
@@ -84,18 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.820000  0.085000 1.150000 0.875000 ;
-        RECT 2.795000  0.085000 2.985000 0.935000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,33 +92,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.730000 2.675000 1.060000 3.245000 ;
-        RECT 2.840000 2.715000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 1.585000 1.795000 1.755000 ;
-      RECT 0.505000 1.755000 0.935000 2.255000 ;
-      RECT 0.765000 2.255000 0.935000 2.325000 ;
-      RECT 0.765000 2.325000 2.175000 2.495000 ;
-      RECT 1.300000 2.675000 1.630000 2.895000 ;
-      RECT 1.300000 2.895000 2.660000 3.065000 ;
-      RECT 1.625000 0.645000 1.930000 0.975000 ;
-      RECT 1.625000 0.975000 1.795000 1.585000 ;
-      RECT 1.845000 2.495000 2.175000 2.715000 ;
-      RECT 2.450000 2.675000 2.660000 2.895000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.505000  1.585000 1.795000 1.755000 ;
+      RECT 0.505000  1.755000 0.935000 2.255000 ;
+      RECT 0.730000  2.675000 1.060000 3.245000 ;
+      RECT 0.765000  2.255000 0.935000 2.325000 ;
+      RECT 0.765000  2.325000 2.175000 2.495000 ;
+      RECT 0.820000  0.085000 1.150000 0.875000 ;
+      RECT 1.300000  2.675000 1.630000 2.895000 ;
+      RECT 1.300000  2.895000 2.660000 3.065000 ;
+      RECT 1.625000  0.645000 1.930000 0.975000 ;
+      RECT 1.625000  0.975000 1.795000 1.585000 ;
+      RECT 1.845000  2.495000 2.175000 2.715000 ;
+      RECT 2.450000  2.675000 2.660000 2.895000 ;
+      RECT 2.795000  0.085000 2.985000 0.935000 ;
+      RECT 2.840000  2.715000 3.170000 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_lp__a22o_m
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef
index d9fc188..9020527 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.magic.lef
@@ -82,16 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.125000  0.085000 0.375000 0.595000 ;
-        RECT 1.945000  0.085000 2.275000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -100,25 +90,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.540000 2.005000 1.810000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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.185000 2.005000 0.455000 2.855000 ;
-      RECT 0.185000 2.855000 1.370000 3.025000 ;
-      RECT 1.115000 1.665000 2.270000 1.835000 ;
-      RECT 1.115000 1.835000 1.370000 2.855000 ;
-      RECT 1.980000 1.835000 2.270000 2.685000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.125000  0.085000 0.375000 0.595000 ;
+      RECT 0.185000  2.005000 0.455000 2.855000 ;
+      RECT 0.185000  2.855000 1.370000 3.025000 ;
+      RECT 1.115000  1.665000 2.270000 1.835000 ;
+      RECT 1.115000  1.835000 1.370000 2.855000 ;
+      RECT 1.540000  2.005000 1.810000 3.245000 ;
+      RECT 1.945000  0.085000 2.275000 0.595000 ;
+      RECT 1.980000  1.835000 2.270000 2.685000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__a22oi_0
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.magic.lef
index 0d6370c..1e26117 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_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.285000  0.085000 0.535000 1.040000 ;
-        RECT 2.170000  0.085000 2.500000 0.995000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,27 +93,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.630000 2.640000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.285000 1.920000 0.535000 2.905000 ;
-      RECT 0.285000 2.905000 1.460000 3.075000 ;
-      RECT 1.215000 2.300000 2.730000 2.470000 ;
-      RECT 1.215000 2.470000 1.460000 2.905000 ;
-      RECT 2.415000 1.920000 2.730000 2.300000 ;
-      RECT 2.470000 2.470000 2.730000 3.075000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.285000  0.085000 0.535000 1.040000 ;
+      RECT 0.285000  1.920000 0.535000 2.905000 ;
+      RECT 0.285000  2.905000 1.460000 3.075000 ;
+      RECT 1.215000  2.300000 2.730000 2.470000 ;
+      RECT 1.215000  2.470000 1.460000 2.905000 ;
+      RECT 1.630000  2.640000 2.300000 3.245000 ;
+      RECT 2.170000  0.085000 2.500000 0.995000 ;
+      RECT 2.415000  1.920000 2.730000 2.300000 ;
+      RECT 2.470000  2.470000 2.730000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a22oi_1
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef
index 4f13477..7b6914e 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.magic.lef
@@ -92,21 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 1.380000  0.085000 1.710000 0.485000 ;
-        RECT 3.490000  0.085000 3.820000 0.495000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,42 +100,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.750000 2.630000 1.080000 3.245000 ;
-        RECT 1.710000 2.630000 2.040000 2.945000 ;
-        RECT 1.710000 2.945000 2.410000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.205000 1.855000 0.455000 2.290000 ;
-      RECT 0.205000 2.290000 2.380000 2.460000 ;
-      RECT 0.205000 2.460000 0.535000 3.075000 ;
-      RECT 0.870000 0.265000 1.200000 0.655000 ;
-      RECT 0.870000 0.655000 2.220000 0.825000 ;
-      RECT 1.280000 2.460000 1.540000 3.075000 ;
-      RECT 1.890000 0.265000 2.220000 0.655000 ;
-      RECT 2.210000 2.460000 2.380000 2.605000 ;
-      RECT 2.210000 2.605000 3.725000 2.765000 ;
-      RECT 2.210000 2.765000 4.680000 2.775000 ;
-      RECT 2.590000 2.775000 4.680000 3.075000 ;
-      RECT 2.980000 0.255000 3.320000 0.665000 ;
-      RECT 2.980000 0.665000 4.230000 0.835000 ;
-      RECT 3.990000 0.505000 4.230000 0.665000 ;
-      RECT 4.410000 1.990000 4.680000 2.765000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.205000  1.855000 0.455000 2.290000 ;
+      RECT 0.205000  2.290000 2.380000 2.460000 ;
+      RECT 0.205000  2.460000 0.535000 3.075000 ;
+      RECT 0.750000  2.630000 1.080000 3.245000 ;
+      RECT 0.870000  0.265000 1.200000 0.655000 ;
+      RECT 0.870000  0.655000 2.220000 0.825000 ;
+      RECT 1.280000  2.460000 1.540000 3.075000 ;
+      RECT 1.380000  0.085000 1.710000 0.485000 ;
+      RECT 1.710000  2.630000 2.040000 2.945000 ;
+      RECT 1.710000  2.945000 2.410000 3.245000 ;
+      RECT 1.890000  0.265000 2.220000 0.655000 ;
+      RECT 2.210000  2.460000 2.380000 2.605000 ;
+      RECT 2.210000  2.605000 3.725000 2.765000 ;
+      RECT 2.210000  2.765000 4.680000 2.775000 ;
+      RECT 2.590000  2.775000 4.680000 3.075000 ;
+      RECT 2.980000  0.255000 3.320000 0.665000 ;
+      RECT 2.980000  0.665000 4.230000 0.835000 ;
+      RECT 3.490000  0.085000 3.820000 0.495000 ;
+      RECT 3.990000  0.505000 4.230000 0.665000 ;
+      RECT 4.410000  1.990000 4.680000 2.765000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a22oi_2
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.magic.lef
index 4aeef67..8c5b8b0 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_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.705000  0.085000 1.035000 0.700000 ;
-        RECT 1.565000  0.085000 1.895000 0.700000 ;
-        RECT 6.445000  0.085000 6.775000 0.605000 ;
-        RECT 7.305000  0.085000 7.635000 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 ;
-        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,61 +97,82 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 4.460000 2.095000 4.790000 3.245000 ;
-        RECT 5.320000 2.095000 5.650000 3.245000 ;
-        RECT 6.225000 2.270000 6.555000 3.245000 ;
-        RECT 7.085000 2.270000 7.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 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.275000 0.315000 0.535000 0.870000 ;
-      RECT 0.275000 0.870000 2.245000 1.040000 ;
-      RECT 0.405000 1.825000 0.665000 2.905000 ;
-      RECT 0.405000 2.905000 4.290000 3.075000 ;
-      RECT 1.205000 0.315000 1.395000 0.870000 ;
-      RECT 1.335000 2.045000 1.525000 2.905000 ;
-      RECT 2.065000 0.255000 4.045000 0.425000 ;
-      RECT 2.065000 0.425000 2.245000 0.870000 ;
-      RECT 2.195000 2.045000 2.385000 2.905000 ;
-      RECT 2.995000 0.425000 4.045000 0.635000 ;
-      RECT 3.055000 2.045000 3.325000 2.905000 ;
-      RECT 3.995000 1.755000 6.045000 1.925000 ;
-      RECT 3.995000 1.925000 4.290000 2.905000 ;
-      RECT 4.295000 0.275000 6.275000 0.525000 ;
-      RECT 4.960000 1.925000 5.150000 3.075000 ;
-      RECT 5.820000 1.925000 6.045000 1.930000 ;
-      RECT 5.820000 1.930000 7.845000 2.100000 ;
-      RECT 5.820000 2.100000 6.055000 3.075000 ;
-      RECT 6.015000 0.525000 6.275000 0.775000 ;
-      RECT 6.015000 0.775000 7.135000 1.040000 ;
-      RECT 6.725000 2.100000 6.915000 3.075000 ;
-      RECT 6.855000 1.040000 7.135000 1.065000 ;
-      RECT 6.855000 1.065000 8.065000 1.255000 ;
-      RECT 6.945000 0.255000 7.135000 0.775000 ;
-      RECT 7.585000 2.100000 7.845000 3.075000 ;
-      RECT 7.805000 0.255000 8.065000 1.065000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.275000  0.315000 0.535000 0.870000 ;
+      RECT 0.275000  0.870000 2.245000 1.040000 ;
+      RECT 0.405000  1.825000 0.665000 2.905000 ;
+      RECT 0.405000  2.905000 4.290000 3.075000 ;
+      RECT 0.705000  0.085000 1.035000 0.700000 ;
+      RECT 1.205000  0.315000 1.395000 0.870000 ;
+      RECT 1.335000  2.045000 1.525000 2.905000 ;
+      RECT 1.565000  0.085000 1.895000 0.700000 ;
+      RECT 2.065000  0.255000 4.045000 0.425000 ;
+      RECT 2.065000  0.425000 2.245000 0.870000 ;
+      RECT 2.195000  2.045000 2.385000 2.905000 ;
+      RECT 2.995000  0.425000 4.045000 0.635000 ;
+      RECT 3.055000  2.045000 3.325000 2.905000 ;
+      RECT 3.995000  1.755000 6.045000 1.925000 ;
+      RECT 3.995000  1.925000 4.290000 2.905000 ;
+      RECT 4.295000  0.275000 6.275000 0.525000 ;
+      RECT 4.460000  2.095000 4.790000 3.245000 ;
+      RECT 4.960000  1.925000 5.150000 3.075000 ;
+      RECT 5.320000  2.095000 5.650000 3.245000 ;
+      RECT 5.820000  1.925000 6.045000 1.930000 ;
+      RECT 5.820000  1.930000 7.845000 2.100000 ;
+      RECT 5.820000  2.100000 6.055000 3.075000 ;
+      RECT 6.015000  0.525000 6.275000 0.775000 ;
+      RECT 6.015000  0.775000 7.135000 1.040000 ;
+      RECT 6.225000  2.270000 6.555000 3.245000 ;
+      RECT 6.445000  0.085000 6.775000 0.605000 ;
+      RECT 6.725000  2.100000 6.915000 3.075000 ;
+      RECT 6.855000  1.040000 7.135000 1.065000 ;
+      RECT 6.855000  1.065000 8.065000 1.255000 ;
+      RECT 6.945000  0.255000 7.135000 0.775000 ;
+      RECT 7.085000  2.270000 7.415000 3.245000 ;
+      RECT 7.305000  0.085000 7.635000 0.895000 ;
+      RECT 7.585000  2.100000 7.845000 3.075000 ;
+      RECT 7.805000  0.255000 8.065000 1.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a22oi_4
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef
index 79c5995..795b5bb 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.magic.lef
@@ -83,17 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.400000  0.085000 0.730000 0.545000 ;
-        RECT 2.330000  0.085000 2.660000 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 ;
       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.890000 2.275000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.300000 2.275000 0.630000 2.895000 ;
-      RECT 0.300000 2.895000 1.690000 3.065000 ;
-      RECT 1.360000 1.925000 2.760000 2.095000 ;
-      RECT 1.360000 2.095000 1.690000 2.895000 ;
-      RECT 2.430000 2.095000 2.760000 3.065000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.300000  2.275000 0.630000 2.895000 ;
+      RECT 0.300000  2.895000 1.690000 3.065000 ;
+      RECT 0.400000  0.085000 0.730000 0.545000 ;
+      RECT 1.360000  1.925000 2.760000 2.095000 ;
+      RECT 1.360000  2.095000 1.690000 2.895000 ;
+      RECT 1.890000  2.275000 2.220000 3.245000 ;
+      RECT 2.330000  0.085000 2.660000 0.675000 ;
+      RECT 2.430000  2.095000 2.760000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a22oi_lp
diff --git a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef
index bb201ff..c75edcb 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.magic.lef
@@ -82,16 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.240000  0.085000 0.430000 0.545000 ;
-        RECT 1.945000  0.085000 2.275000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -100,25 +90,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.545000 2.670000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 2.670000 0.505000 2.890000 ;
-      RECT 0.175000 2.890000 1.365000 3.060000 ;
-      RECT 1.195000 2.320000 2.245000 2.490000 ;
-      RECT 1.195000 2.490000 1.365000 2.890000 ;
-      RECT 2.055000 2.490000 2.245000 2.790000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.175000  2.670000 0.505000 2.890000 ;
+      RECT 0.175000  2.890000 1.365000 3.060000 ;
+      RECT 0.240000  0.085000 0.430000 0.545000 ;
+      RECT 1.195000  2.320000 2.245000 2.490000 ;
+      RECT 1.195000  2.490000 1.365000 2.890000 ;
+      RECT 1.545000  2.670000 1.875000 3.245000 ;
+      RECT 1.945000  0.085000 2.275000 0.485000 ;
+      RECT 2.055000  2.490000 2.245000 2.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 ;
   END
 END sky130_fd_sc_lp__a22oi_m
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef
index 252410e..a4c7a62 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.765000  0.085000 1.025000 0.610000 ;
-        RECT 1.660000  0.085000 1.990000 0.610000 ;
-        RECT 2.980000  0.085000 3.250000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -103,40 +89,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.615000 2.430000 0.970000 3.245000 ;
-        RECT 3.020000 2.755000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 1.930000 1.310000 2.260000 ;
-      RECT 1.140000 2.260000 1.310000 2.880000 ;
-      RECT 1.140000 2.880000 2.420000 3.050000 ;
-      RECT 1.195000 0.280000 1.465000 0.780000 ;
-      RECT 1.195000 0.780000 2.005000 0.975000 ;
-      RECT 1.480000 2.430000 2.005000 2.710000 ;
-      RECT 1.835000 0.975000 2.005000 1.235000 ;
-      RECT 1.835000 1.235000 2.155000 1.905000 ;
-      RECT 1.835000 1.905000 2.005000 2.430000 ;
-      RECT 2.160000 0.280000 2.495000 0.610000 ;
-      RECT 2.185000 2.075000 2.495000 2.245000 ;
-      RECT 2.185000 2.245000 2.420000 2.880000 ;
-      RECT 2.325000 0.610000 2.495000 2.075000 ;
-      RECT 2.590000 2.415000 3.745000 2.585000 ;
-      RECT 2.590000 2.585000 2.825000 3.050000 ;
-      RECT 3.455000 2.585000 3.745000 3.050000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.505000  1.930000 1.310000 2.260000 ;
+      RECT 0.615000  2.430000 0.970000 3.245000 ;
+      RECT 0.765000  0.085000 1.025000 0.610000 ;
+      RECT 1.140000  2.260000 1.310000 2.880000 ;
+      RECT 1.140000  2.880000 2.420000 3.050000 ;
+      RECT 1.195000  0.280000 1.465000 0.780000 ;
+      RECT 1.195000  0.780000 2.005000 0.975000 ;
+      RECT 1.480000  2.430000 2.005000 2.710000 ;
+      RECT 1.660000  0.085000 1.990000 0.610000 ;
+      RECT 1.835000  0.975000 2.005000 1.235000 ;
+      RECT 1.835000  1.235000 2.155000 1.905000 ;
+      RECT 1.835000  1.905000 2.005000 2.430000 ;
+      RECT 2.160000  0.280000 2.495000 0.610000 ;
+      RECT 2.185000  2.075000 2.495000 2.245000 ;
+      RECT 2.185000  2.245000 2.420000 2.880000 ;
+      RECT 2.325000  0.610000 2.495000 2.075000 ;
+      RECT 2.590000  2.415000 3.745000 2.585000 ;
+      RECT 2.590000  2.585000 2.825000 3.050000 ;
+      RECT 2.980000  0.085000 3.250000 0.610000 ;
+      RECT 3.020000  2.755000 3.285000 3.245000 ;
+      RECT 3.455000  2.585000 3.745000 3.050000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2bb2o_0
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef
index 84d3fb2..01e937d 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.675000  0.085000 0.935000 1.095000 ;
-        RECT 1.890000  0.085000 2.220000 0.495000 ;
-        RECT 3.385000  0.085000 3.655000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -103,41 +89,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.735000 2.665000 1.065000 3.245000 ;
-        RECT 2.930000 2.735000 3.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 ;
-        RECT 2.555000 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.455000 1.345000 0.925000 1.645000 ;
-      RECT 0.755000 1.645000 0.925000 2.325000 ;
-      RECT 0.755000 2.325000 2.365000 2.495000 ;
-      RECT 1.465000 0.280000 1.715000 0.665000 ;
-      RECT 1.465000 0.665000 2.280000 0.835000 ;
-      RECT 1.780000 1.705000 2.385000 1.875000 ;
-      RECT 1.780000 1.875000 1.990000 2.145000 ;
-      RECT 2.070000 2.495000 2.365000 3.020000 ;
-      RECT 2.110000 0.835000 2.280000 1.005000 ;
-      RECT 2.110000 1.005000 2.385000 1.705000 ;
-      RECT 2.170000 2.055000 2.735000 2.225000 ;
-      RECT 2.170000 2.225000 2.365000 2.325000 ;
-      RECT 2.450000 0.280000 2.735000 0.675000 ;
-      RECT 2.535000 2.395000 3.690000 2.565000 ;
-      RECT 2.535000 2.565000 2.760000 3.020000 ;
-      RECT 2.565000 0.675000 2.735000 2.055000 ;
-      RECT 3.430000 2.565000 3.690000 3.020000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.455000  1.345000 0.925000 1.645000 ;
+      RECT 0.675000  0.085000 0.935000 1.095000 ;
+      RECT 0.735000  2.665000 1.065000 3.245000 ;
+      RECT 0.755000  1.645000 0.925000 2.325000 ;
+      RECT 0.755000  2.325000 2.365000 2.495000 ;
+      RECT 1.465000  0.280000 1.715000 0.665000 ;
+      RECT 1.465000  0.665000 2.280000 0.835000 ;
+      RECT 1.780000  1.705000 2.385000 1.875000 ;
+      RECT 1.780000  1.875000 1.990000 2.145000 ;
+      RECT 1.890000  0.085000 2.220000 0.495000 ;
+      RECT 2.070000  2.495000 2.365000 3.020000 ;
+      RECT 2.110000  0.835000 2.280000 1.005000 ;
+      RECT 2.110000  1.005000 2.385000 1.705000 ;
+      RECT 2.170000  2.055000 2.735000 2.225000 ;
+      RECT 2.170000  2.225000 2.365000 2.325000 ;
+      RECT 2.450000  0.280000 2.735000 0.675000 ;
+      RECT 2.535000  2.395000 3.690000 2.565000 ;
+      RECT 2.535000  2.565000 2.760000 3.020000 ;
+      RECT 2.565000  0.675000 2.735000 2.055000 ;
+      RECT 2.930000  2.735000 3.260000 3.245000 ;
+      RECT 3.385000  0.085000 3.655000 0.610000 ;
+      RECT 3.430000  2.565000 3.690000 3.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 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2bb2o_1
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.magic.lef
index 874301f..2d33264 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_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.275000  0.085000 0.605000 1.015000 ;
-        RECT 1.610000  0.085000 1.940000 0.680000 ;
-        RECT 2.940000  0.085000 3.130000 0.885000 ;
-        RECT 3.910000  0.085000 4.120000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,42 +89,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.545000 2.725000 0.875000 3.245000 ;
-        RECT 2.880000 2.640000 3.210000 3.245000 ;
-        RECT 3.910000 1.815000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 2.385000 1.290000 2.555000 ;
-      RECT 0.095000 2.555000 0.365000 3.075000 ;
-      RECT 1.055000 2.555000 1.290000 3.065000 ;
-      RECT 1.065000 0.685000 1.360000 1.015000 ;
-      RECT 1.190000 1.015000 1.360000 2.045000 ;
-      RECT 1.190000 2.045000 1.695000 2.215000 ;
-      RECT 1.460000 2.215000 1.695000 2.300000 ;
-      RECT 1.460000 2.300000 3.210000 2.470000 ;
-      RECT 1.460000 2.470000 1.755000 3.055000 ;
-      RECT 1.530000 0.860000 2.625000 1.030000 ;
-      RECT 1.530000 1.030000 1.790000 1.685000 ;
-      RECT 1.530000 1.685000 2.275000 1.855000 ;
-      RECT 1.945000 1.855000 2.275000 2.130000 ;
-      RECT 2.415000 0.700000 2.625000 0.860000 ;
-      RECT 3.040000 1.340000 3.400000 1.670000 ;
-      RECT 3.040000 1.670000 3.210000 2.300000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  2.385000 1.290000 2.555000 ;
+      RECT 0.095000  2.555000 0.365000 3.075000 ;
+      RECT 0.275000  0.085000 0.605000 1.015000 ;
+      RECT 0.545000  2.725000 0.875000 3.245000 ;
+      RECT 1.055000  2.555000 1.290000 3.065000 ;
+      RECT 1.065000  0.685000 1.360000 1.015000 ;
+      RECT 1.190000  1.015000 1.360000 2.045000 ;
+      RECT 1.190000  2.045000 1.695000 2.215000 ;
+      RECT 1.460000  2.215000 1.695000 2.300000 ;
+      RECT 1.460000  2.300000 3.210000 2.470000 ;
+      RECT 1.460000  2.470000 1.755000 3.055000 ;
+      RECT 1.530000  0.860000 2.625000 1.030000 ;
+      RECT 1.530000  1.030000 1.790000 1.685000 ;
+      RECT 1.530000  1.685000 2.275000 1.855000 ;
+      RECT 1.610000  0.085000 1.940000 0.680000 ;
+      RECT 1.945000  1.855000 2.275000 2.130000 ;
+      RECT 2.415000  0.700000 2.625000 0.860000 ;
+      RECT 2.880000  2.640000 3.210000 3.245000 ;
+      RECT 2.940000  0.085000 3.130000 0.885000 ;
+      RECT 3.040000  1.340000 3.400000 1.670000 ;
+      RECT 3.040000  1.670000 3.210000 2.300000 ;
+      RECT 3.910000  0.085000 4.120000 1.095000 ;
+      RECT 3.910000  1.815000 4.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 ;
   END
 END sky130_fd_sc_lp__a2bb2o_2
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef
index 6a20e45..7ec9119 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.magic.lef
@@ -91,31 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.115000  0.085000 0.400000 1.095000 ;
-        RECT 1.905000  0.085000 2.185000 0.895000 ;
-        RECT 2.735000  0.085000 3.405000 0.555000 ;
-        RECT 4.015000  0.085000 4.345000 0.555000 ;
-        RECT 5.025000  0.085000 5.305000 0.885000 ;
-        RECT 5.875000  0.085000 6.205000 0.865000 ;
-        RECT 6.735000  0.085000 7.065000 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 ;
-        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
@@ -124,63 +99,85 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.545000 2.630000 0.875000 3.245000 ;
-        RECT 1.425000 2.630000 1.755000 3.245000 ;
-        RECT 3.255000 2.650000 3.585000 3.245000 ;
-        RECT 5.020000 2.650000 5.350000 3.245000 ;
-        RECT 5.910000 2.095000 6.240000 3.245000 ;
-        RECT 6.800000 2.095000 7.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 ;
-        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 1.815000 0.375000 2.290000 ;
-      RECT 0.095000 2.290000 2.175000 2.460000 ;
-      RECT 0.095000 2.460000 0.375000 3.075000 ;
-      RECT 0.570000 0.255000 1.735000 0.425000 ;
-      RECT 0.570000 0.425000 0.850000 1.095000 ;
-      RECT 1.020000 0.595000 1.235000 1.065000 ;
-      RECT 1.020000 1.065000 2.565000 1.235000 ;
-      RECT 1.045000 2.460000 1.255000 3.075000 ;
-      RECT 1.405000 0.425000 1.735000 0.895000 ;
-      RECT 1.935000 1.815000 2.175000 2.290000 ;
-      RECT 1.935000 2.460000 2.175000 2.905000 ;
-      RECT 1.935000 2.905000 3.065000 3.075000 ;
-      RECT 2.345000 1.235000 2.565000 2.100000 ;
-      RECT 2.345000 2.100000 3.405000 2.270000 ;
-      RECT 2.345000 2.270000 2.565000 2.735000 ;
-      RECT 2.365000 0.255000 2.565000 1.065000 ;
-      RECT 2.735000 2.440000 3.065000 2.905000 ;
-      RECT 2.755000 0.725000 4.855000 0.895000 ;
-      RECT 2.755000 0.895000 2.925000 1.760000 ;
-      RECT 2.755000 1.760000 3.745000 1.930000 ;
-      RECT 3.235000 2.270000 3.405000 2.310000 ;
-      RECT 3.235000 2.310000 5.380000 2.480000 ;
-      RECT 3.575000 0.255000 3.835000 0.725000 ;
-      RECT 3.575000 1.930000 4.445000 2.140000 ;
-      RECT 3.755000 2.670000 4.850000 3.000000 ;
-      RECT 4.525000 0.255000 4.855000 0.725000 ;
-      RECT 5.210000 1.405000 6.695000 1.585000 ;
-      RECT 5.210000 1.585000 5.380000 2.310000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.095000  1.815000 0.375000 2.290000 ;
+      RECT 0.095000  2.290000 2.175000 2.460000 ;
+      RECT 0.095000  2.460000 0.375000 3.075000 ;
+      RECT 0.115000  0.085000 0.400000 1.095000 ;
+      RECT 0.545000  2.630000 0.875000 3.245000 ;
+      RECT 0.570000  0.255000 1.735000 0.425000 ;
+      RECT 0.570000  0.425000 0.850000 1.095000 ;
+      RECT 1.020000  0.595000 1.235000 1.065000 ;
+      RECT 1.020000  1.065000 2.565000 1.235000 ;
+      RECT 1.045000  2.460000 1.255000 3.075000 ;
+      RECT 1.405000  0.425000 1.735000 0.895000 ;
+      RECT 1.425000  2.630000 1.755000 3.245000 ;
+      RECT 1.905000  0.085000 2.185000 0.895000 ;
+      RECT 1.935000  1.815000 2.175000 2.290000 ;
+      RECT 1.935000  2.460000 2.175000 2.905000 ;
+      RECT 1.935000  2.905000 3.065000 3.075000 ;
+      RECT 2.345000  1.235000 2.565000 2.100000 ;
+      RECT 2.345000  2.100000 3.405000 2.270000 ;
+      RECT 2.345000  2.270000 2.565000 2.735000 ;
+      RECT 2.365000  0.255000 2.565000 1.065000 ;
+      RECT 2.735000  0.085000 3.405000 0.555000 ;
+      RECT 2.735000  2.440000 3.065000 2.905000 ;
+      RECT 2.755000  0.725000 4.855000 0.895000 ;
+      RECT 2.755000  0.895000 2.925000 1.760000 ;
+      RECT 2.755000  1.760000 3.745000 1.930000 ;
+      RECT 3.235000  2.270000 3.405000 2.310000 ;
+      RECT 3.235000  2.310000 5.380000 2.480000 ;
+      RECT 3.255000  2.650000 3.585000 3.245000 ;
+      RECT 3.575000  0.255000 3.835000 0.725000 ;
+      RECT 3.575000  1.930000 4.445000 2.140000 ;
+      RECT 3.755000  2.670000 4.850000 3.000000 ;
+      RECT 4.015000  0.085000 4.345000 0.555000 ;
+      RECT 4.525000  0.255000 4.855000 0.725000 ;
+      RECT 5.020000  2.650000 5.350000 3.245000 ;
+      RECT 5.025000  0.085000 5.305000 0.885000 ;
+      RECT 5.210000  1.405000 6.695000 1.585000 ;
+      RECT 5.210000  1.585000 5.380000 2.310000 ;
+      RECT 5.875000  0.085000 6.205000 0.865000 ;
+      RECT 5.910000  2.095000 6.240000 3.245000 ;
+      RECT 6.735000  0.085000 7.065000 0.895000 ;
+      RECT 6.800000  2.095000 7.100000 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_lp__a2bb2o_4
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef
index 0e47dfe..81294b4 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.magic.lef
@@ -82,23 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 1.115000  0.085000 1.445000 0.640000 ;
-        RECT 3.255000  0.085000 3.585000 0.810000 ;
-        RECT 4.835000  0.085000 5.165000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -107,42 +90,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.725000 2.370000 1.055000 3.245000 ;
-        RECT 3.335000 2.835000 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 ;
-        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.195000 2.020000 1.585000 2.190000 ;
-      RECT 0.195000 2.190000 0.525000 3.060000 ;
-      RECT 0.295000 0.265000 0.625000 0.820000 ;
-      RECT 0.295000 0.820000 2.285000 0.990000 ;
-      RECT 1.255000 2.190000 1.585000 3.060000 ;
-      RECT 1.600000 1.170000 1.935000 1.840000 ;
-      RECT 1.765000 1.840000 1.935000 2.495000 ;
-      RECT 1.765000 2.495000 4.765000 2.665000 ;
-      RECT 1.905000 0.265000 2.235000 0.820000 ;
-      RECT 2.115000 0.990000 2.500000 1.660000 ;
-      RECT 2.115000 1.660000 2.445000 2.325000 ;
-      RECT 4.045000 0.350000 4.375000 0.810000 ;
-      RECT 4.095000 0.810000 4.265000 2.025000 ;
-      RECT 4.095000 2.025000 4.765000 2.495000 ;
-      RECT 4.265000 2.665000 4.765000 3.065000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.195000  2.020000 1.585000 2.190000 ;
+      RECT 0.195000  2.190000 0.525000 3.060000 ;
+      RECT 0.295000  0.265000 0.625000 0.820000 ;
+      RECT 0.295000  0.820000 2.285000 0.990000 ;
+      RECT 0.725000  2.370000 1.055000 3.245000 ;
+      RECT 1.115000  0.085000 1.445000 0.640000 ;
+      RECT 1.255000  2.190000 1.585000 3.060000 ;
+      RECT 1.600000  1.170000 1.935000 1.840000 ;
+      RECT 1.765000  1.840000 1.935000 2.495000 ;
+      RECT 1.765000  2.495000 4.765000 2.665000 ;
+      RECT 1.905000  0.265000 2.235000 0.820000 ;
+      RECT 2.115000  0.990000 2.500000 1.660000 ;
+      RECT 2.115000  1.660000 2.445000 2.325000 ;
+      RECT 3.255000  0.085000 3.585000 0.810000 ;
+      RECT 3.335000  2.835000 3.665000 3.245000 ;
+      RECT 4.045000  0.350000 4.375000 0.810000 ;
+      RECT 4.095000  0.810000 4.265000 2.025000 ;
+      RECT 4.095000  2.025000 4.765000 2.495000 ;
+      RECT 4.265000  2.665000 4.765000 3.065000 ;
+      RECT 4.835000  0.085000 5.165000 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 ;
+      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_lp__a2bb2o_lp
diff --git a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef
index 07548dd..ef9e06e 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.magic.lef
@@ -81,21 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.655000  0.085000 0.865000 0.860000 ;
-        RECT 0.655000  0.860000 1.865000 1.030000 ;
-        RECT 1.675000  0.700000 1.865000 0.860000 ;
-        RECT 3.270000  0.085000 3.600000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,35 +89,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.660000 2.845000 0.990000 3.245000 ;
-        RECT 2.820000 2.355000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 1.600000 2.215000 1.770000 ;
-      RECT 0.505000 1.770000 0.675000 2.395000 ;
-      RECT 1.105000 0.265000 2.250000 0.435000 ;
-      RECT 1.105000 0.435000 1.435000 0.680000 ;
-      RECT 1.450000 2.735000 2.315000 3.065000 ;
-      RECT 2.000000 1.770000 2.215000 2.435000 ;
-      RECT 2.045000 0.795000 2.375000 1.380000 ;
-      RECT 2.045000 1.380000 2.215000 1.600000 ;
-      RECT 2.430000 2.005000 3.570000 2.175000 ;
-      RECT 2.430000 2.175000 2.640000 2.455000 ;
-      RECT 3.360000 2.175000 3.570000 2.455000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.505000  1.600000 2.215000 1.770000 ;
+      RECT 0.505000  1.770000 0.675000 2.395000 ;
+      RECT 0.655000  0.085000 0.865000 0.860000 ;
+      RECT 0.655000  0.860000 1.865000 1.030000 ;
+      RECT 0.660000  2.845000 0.990000 3.245000 ;
+      RECT 1.105000  0.265000 2.250000 0.435000 ;
+      RECT 1.105000  0.435000 1.435000 0.680000 ;
+      RECT 1.450000  2.735000 2.315000 3.065000 ;
+      RECT 1.675000  0.700000 1.865000 0.860000 ;
+      RECT 2.000000  1.770000 2.215000 2.435000 ;
+      RECT 2.045000  0.795000 2.375000 1.380000 ;
+      RECT 2.045000  1.380000 2.215000 1.600000 ;
+      RECT 2.430000  2.005000 3.570000 2.175000 ;
+      RECT 2.430000  2.175000 2.640000 2.455000 ;
+      RECT 2.820000  2.355000 3.150000 3.245000 ;
+      RECT 3.270000  0.085000 3.600000 0.875000 ;
+      RECT 3.360000  2.175000 3.570000 2.455000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2bb2o_m
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef
index 85ce46d..9f38069 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.magic.lef
@@ -82,19 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.385000 0.610000 ;
-        RECT 1.000000  0.085000 1.545000 0.610000 ;
-        RECT 2.910000  0.085000 3.240000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -103,30 +90,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.095000 2.115000 0.425000 3.245000 ;
-        RECT 2.505000 1.985000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.555000 0.280000 0.830000 0.610000 ;
-      RECT 0.625000 0.610000 0.830000 1.645000 ;
-      RECT 0.625000 1.645000 1.400000 2.155000 ;
-      RECT 0.885000 2.155000 1.215000 2.795000 ;
-      RECT 2.105000 1.645000 3.265000 1.815000 ;
-      RECT 2.105000 1.815000 2.335000 2.595000 ;
-      RECT 3.015000 1.815000 3.265000 2.595000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.085000 0.385000 0.610000 ;
+      RECT 0.095000  2.115000 0.425000 3.245000 ;
+      RECT 0.555000  0.280000 0.830000 0.610000 ;
+      RECT 0.625000  0.610000 0.830000 1.645000 ;
+      RECT 0.625000  1.645000 1.400000 2.155000 ;
+      RECT 0.885000  2.155000 1.215000 2.795000 ;
+      RECT 1.000000  0.085000 1.545000 0.610000 ;
+      RECT 2.105000  1.645000 3.265000 1.815000 ;
+      RECT 2.105000  1.815000 2.335000 2.595000 ;
+      RECT 2.505000  1.985000 2.835000 3.245000 ;
+      RECT 2.910000  0.085000 3.240000 0.610000 ;
+      RECT 3.015000  1.815000 3.265000 2.595000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a2bb2oi_0
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.magic.lef
index e84e989..9359273 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_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.110000  0.085000 0.440000 1.040000 ;
-        RECT 0.970000  0.085000 1.780000 0.675000 ;
-        RECT 2.925000  0.085000 3.195000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -104,35 +91,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.110000 1.920000 0.440000 3.245000 ;
-        RECT 2.380000 2.715000 2.710000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.610000 0.255000 0.800000 0.845000 ;
-      RECT 0.610000 0.845000 1.735000 1.015000 ;
-      RECT 0.930000 1.920000 1.260000 3.075000 ;
-      RECT 0.975000 1.695000 1.735000 1.865000 ;
-      RECT 0.975000 1.865000 1.260000 1.920000 ;
-      RECT 1.555000 1.015000 1.735000 1.200000 ;
-      RECT 1.555000 1.200000 1.895000 1.515000 ;
-      RECT 1.555000 1.515000 1.735000 1.695000 ;
-      RECT 1.945000 2.375000 3.195000 2.545000 ;
-      RECT 1.945000 2.545000 2.210000 3.075000 ;
-      RECT 2.880000 2.545000 3.195000 3.075000 ;
-      RECT 2.915000 1.930000 3.195000 2.375000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.110000  0.085000 0.440000 1.040000 ;
+      RECT 0.110000  1.920000 0.440000 3.245000 ;
+      RECT 0.610000  0.255000 0.800000 0.845000 ;
+      RECT 0.610000  0.845000 1.735000 1.015000 ;
+      RECT 0.930000  1.920000 1.260000 3.075000 ;
+      RECT 0.970000  0.085000 1.780000 0.675000 ;
+      RECT 0.975000  1.695000 1.735000 1.865000 ;
+      RECT 0.975000  1.865000 1.260000 1.920000 ;
+      RECT 1.555000  1.015000 1.735000 1.200000 ;
+      RECT 1.555000  1.200000 1.895000 1.515000 ;
+      RECT 1.555000  1.515000 1.735000 1.695000 ;
+      RECT 1.945000  2.375000 3.195000 2.545000 ;
+      RECT 1.945000  2.545000 2.210000 3.075000 ;
+      RECT 2.380000  2.715000 2.710000 3.245000 ;
+      RECT 2.880000  2.545000 3.195000 3.075000 ;
+      RECT 2.915000  1.930000 3.195000 2.375000 ;
+      RECT 2.925000  0.085000 3.195000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a2bb2oi_1
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef
index 4a2b23a..649db92 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.magic.lef
@@ -87,26 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.110000  0.085000 0.405000 1.185000 ;
-        RECT 1.990000  0.085000 2.320000 0.895000 ;
-        RECT 2.920000  0.085000 3.785000 0.895000 ;
-        RECT 4.315000  0.085000 4.645000 0.895000 ;
-        RECT 5.175000  0.085000 5.505000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -115,52 +95,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.540000 2.630000 0.870000 3.245000 ;
-        RECT 1.490000 2.630000 1.820000 3.245000 ;
-        RECT 3.885000 2.385000 4.215000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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 1.815000 0.380000 2.290000 ;
-      RECT 0.110000 2.290000 2.250000 2.460000 ;
-      RECT 0.110000 2.460000 0.370000 3.075000 ;
-      RECT 0.575000 0.265000 1.820000 0.435000 ;
-      RECT 0.575000 0.435000 0.800000 1.185000 ;
-      RECT 1.040000 2.460000 1.240000 3.075000 ;
-      RECT 1.470000 0.435000 1.820000 0.905000 ;
-      RECT 2.050000 1.825000 2.250000 2.290000 ;
-      RECT 2.050000 2.460000 2.250000 2.905000 ;
-      RECT 2.050000 2.905000 3.180000 3.075000 ;
-      RECT 2.920000 1.825000 3.180000 2.905000 ;
-      RECT 3.085000 1.075000 4.995000 1.245000 ;
-      RECT 3.085000 1.245000 3.335000 1.605000 ;
-      RECT 3.455000 2.045000 4.615000 2.215000 ;
-      RECT 3.455000 2.215000 3.715000 3.075000 ;
-      RECT 3.955000 0.305000 4.145000 1.075000 ;
-      RECT 4.135000 1.245000 4.305000 1.705000 ;
-      RECT 4.135000 1.705000 5.005000 1.875000 ;
-      RECT 4.385000 2.215000 4.615000 2.905000 ;
-      RECT 4.385000 2.905000 5.505000 3.075000 ;
-      RECT 4.785000 1.875000 5.005000 2.735000 ;
-      RECT 4.825000 0.305000 4.995000 1.075000 ;
-      RECT 5.175000 1.920000 5.505000 2.905000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.110000  0.085000 0.405000 1.185000 ;
+      RECT 0.110000  1.815000 0.380000 2.290000 ;
+      RECT 0.110000  2.290000 2.250000 2.460000 ;
+      RECT 0.110000  2.460000 0.370000 3.075000 ;
+      RECT 0.540000  2.630000 0.870000 3.245000 ;
+      RECT 0.575000  0.265000 1.820000 0.435000 ;
+      RECT 0.575000  0.435000 0.800000 1.185000 ;
+      RECT 1.040000  2.460000 1.240000 3.075000 ;
+      RECT 1.470000  0.435000 1.820000 0.905000 ;
+      RECT 1.490000  2.630000 1.820000 3.245000 ;
+      RECT 1.990000  0.085000 2.320000 0.895000 ;
+      RECT 2.050000  1.825000 2.250000 2.290000 ;
+      RECT 2.050000  2.460000 2.250000 2.905000 ;
+      RECT 2.050000  2.905000 3.180000 3.075000 ;
+      RECT 2.920000  0.085000 3.785000 0.895000 ;
+      RECT 2.920000  1.825000 3.180000 2.905000 ;
+      RECT 3.085000  1.075000 4.995000 1.245000 ;
+      RECT 3.085000  1.245000 3.335000 1.605000 ;
+      RECT 3.455000  2.045000 4.615000 2.215000 ;
+      RECT 3.455000  2.215000 3.715000 3.075000 ;
+      RECT 3.885000  2.385000 4.215000 3.245000 ;
+      RECT 3.955000  0.305000 4.145000 1.075000 ;
+      RECT 4.135000  1.245000 4.305000 1.705000 ;
+      RECT 4.135000  1.705000 5.005000 1.875000 ;
+      RECT 4.315000  0.085000 4.645000 0.895000 ;
+      RECT 4.385000  2.215000 4.615000 2.905000 ;
+      RECT 4.385000  2.905000 5.505000 3.075000 ;
+      RECT 4.785000  1.875000 5.005000 2.735000 ;
+      RECT 4.825000  0.305000 4.995000 1.075000 ;
+      RECT 5.175000  0.085000 5.505000 1.040000 ;
+      RECT 5.175000  1.920000 5.505000 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_lp__a2bb2oi_2
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef
index 57c16f2..fbc4265 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.magic.lef
@@ -94,40 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.330000  0.085000  0.620000 1.095000 ;
-        RECT 1.190000  0.085000  1.520000 0.840000 ;
-        RECT 3.810000  0.085000  4.140000 0.585000 ;
-        RECT 4.715000  0.085000  5.045000 0.865000 ;
-        RECT 5.575000  0.085000  5.905000 0.875000 ;
-        RECT 6.435000  0.085000  6.765000 0.895000 ;
-        RECT 7.295000  0.085000  8.135000 0.700000 ;
-        RECT 7.295000  0.700000  7.625000 0.870000 ;
-        RECT 8.675000  0.085000  9.005000 0.700000 ;
-        RECT 9.535000  0.085000  9.865000 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 ;
-        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,84 +102,115 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.755000 2.065000  1.085000 3.245000 ;
-        RECT 1.615000 2.355000  1.945000 3.245000 ;
-        RECT 2.475000 2.355000  2.805000 3.245000 ;
-        RECT 3.415000 2.585000  3.745000 3.245000 ;
-        RECT 6.595000 2.270000  6.925000 3.245000 ;
-        RECT 7.455000 2.270000  7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.325000 1.725000 1.465000 1.895000 ;
-      RECT 0.325000 1.895000 0.585000 3.075000 ;
-      RECT 0.790000 0.255000 1.020000 1.010000 ;
-      RECT 0.790000 1.010000 1.870000 1.180000 ;
-      RECT 1.255000 1.895000 1.465000 2.015000 ;
-      RECT 1.255000 2.015000 3.715000 2.185000 ;
-      RECT 1.255000 2.185000 1.445000 3.075000 ;
-      RECT 1.690000 0.255000 3.640000 0.585000 ;
-      RECT 1.690000 0.585000 1.870000 1.010000 ;
-      RECT 2.115000 2.185000 2.305000 3.075000 ;
-      RECT 2.975000 2.185000 3.715000 2.245000 ;
-      RECT 2.975000 2.245000 3.905000 2.255000 ;
-      RECT 2.975000 2.255000 4.185000 2.415000 ;
-      RECT 2.975000 2.415000 3.175000 3.075000 ;
-      RECT 3.845000 2.415000 4.185000 2.425000 ;
-      RECT 3.915000 2.425000 4.185000 2.905000 ;
-      RECT 3.915000 2.905000 5.975000 3.075000 ;
-      RECT 4.335000 1.385000 5.185000 1.550000 ;
-      RECT 4.335000 1.550000 6.050000 1.715000 ;
-      RECT 4.855000 2.255000 5.045000 2.905000 ;
-      RECT 4.940000 1.715000 6.050000 1.720000 ;
-      RECT 5.715000 1.890000 5.975000 2.905000 ;
-      RECT 5.880000 1.065000 8.040000 1.235000 ;
-      RECT 5.880000 1.235000 6.050000 1.550000 ;
-      RECT 6.075000 0.255000 6.265000 1.065000 ;
-      RECT 6.165000 1.930000 8.170000 2.100000 ;
-      RECT 6.165000 2.100000 6.425000 3.075000 ;
-      RECT 6.935000 0.255000 7.125000 1.040000 ;
-      RECT 6.935000 1.040000 8.040000 1.065000 ;
-      RECT 7.095000 2.100000 7.285000 3.075000 ;
-      RECT 7.870000 0.870000 9.365000 1.005000 ;
-      RECT 7.870000 1.005000 9.935000 1.040000 ;
-      RECT 7.955000 2.100000 8.170000 2.905000 ;
-      RECT 7.955000 2.905000 9.935000 3.075000 ;
-      RECT 8.305000 0.255000 8.505000 0.870000 ;
-      RECT 8.340000 1.695000 9.935000 1.875000 ;
-      RECT 8.340000 1.875000 8.615000 2.735000 ;
-      RECT 8.785000 2.045000 9.045000 2.905000 ;
-      RECT 9.165000 1.040000 9.935000 1.175000 ;
-      RECT 9.175000 0.255000 9.365000 0.870000 ;
-      RECT 9.215000 1.875000 9.475000 2.735000 ;
-      RECT 9.645000 2.045000 9.935000 2.905000 ;
-      RECT 9.730000 1.175000 9.935000 1.695000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.325000  1.725000  1.465000 1.895000 ;
+      RECT 0.325000  1.895000  0.585000 3.075000 ;
+      RECT 0.330000  0.085000  0.620000 1.095000 ;
+      RECT 0.755000  2.065000  1.085000 3.245000 ;
+      RECT 0.790000  0.255000  1.020000 1.010000 ;
+      RECT 0.790000  1.010000  1.870000 1.180000 ;
+      RECT 1.190000  0.085000  1.520000 0.840000 ;
+      RECT 1.255000  1.895000  1.465000 2.015000 ;
+      RECT 1.255000  2.015000  3.715000 2.185000 ;
+      RECT 1.255000  2.185000  1.445000 3.075000 ;
+      RECT 1.615000  2.355000  1.945000 3.245000 ;
+      RECT 1.690000  0.255000  3.640000 0.585000 ;
+      RECT 1.690000  0.585000  1.870000 1.010000 ;
+      RECT 2.115000  2.185000  2.305000 3.075000 ;
+      RECT 2.475000  2.355000  2.805000 3.245000 ;
+      RECT 2.975000  2.185000  3.715000 2.245000 ;
+      RECT 2.975000  2.245000  3.905000 2.255000 ;
+      RECT 2.975000  2.255000  4.185000 2.415000 ;
+      RECT 2.975000  2.415000  3.175000 3.075000 ;
+      RECT 3.415000  2.585000  3.745000 3.245000 ;
+      RECT 3.810000  0.085000  4.140000 0.585000 ;
+      RECT 3.845000  2.415000  4.185000 2.425000 ;
+      RECT 3.915000  2.425000  4.185000 2.905000 ;
+      RECT 3.915000  2.905000  5.975000 3.075000 ;
+      RECT 4.335000  1.385000  5.185000 1.550000 ;
+      RECT 4.335000  1.550000  6.050000 1.715000 ;
+      RECT 4.715000  0.085000  5.045000 0.865000 ;
+      RECT 4.855000  2.255000  5.045000 2.905000 ;
+      RECT 4.940000  1.715000  6.050000 1.720000 ;
+      RECT 5.575000  0.085000  5.905000 0.875000 ;
+      RECT 5.715000  1.890000  5.975000 2.905000 ;
+      RECT 5.880000  1.065000  8.040000 1.235000 ;
+      RECT 5.880000  1.235000  6.050000 1.550000 ;
+      RECT 6.075000  0.255000  6.265000 1.065000 ;
+      RECT 6.165000  1.930000  8.170000 2.100000 ;
+      RECT 6.165000  2.100000  6.425000 3.075000 ;
+      RECT 6.435000  0.085000  6.765000 0.895000 ;
+      RECT 6.595000  2.270000  6.925000 3.245000 ;
+      RECT 6.935000  0.255000  7.125000 1.040000 ;
+      RECT 6.935000  1.040000  8.040000 1.065000 ;
+      RECT 7.095000  2.100000  7.285000 3.075000 ;
+      RECT 7.295000  0.085000  8.135000 0.700000 ;
+      RECT 7.295000  0.700000  7.625000 0.870000 ;
+      RECT 7.455000  2.270000  7.785000 3.245000 ;
+      RECT 7.870000  0.870000  9.365000 1.005000 ;
+      RECT 7.870000  1.005000  9.935000 1.040000 ;
+      RECT 7.955000  2.100000  8.170000 2.905000 ;
+      RECT 7.955000  2.905000  9.935000 3.075000 ;
+      RECT 8.305000  0.255000  8.505000 0.870000 ;
+      RECT 8.340000  1.695000  9.935000 1.875000 ;
+      RECT 8.340000  1.875000  8.615000 2.735000 ;
+      RECT 8.675000  0.085000  9.005000 0.700000 ;
+      RECT 8.785000  2.045000  9.045000 2.905000 ;
+      RECT 9.165000  1.040000  9.935000 1.175000 ;
+      RECT 9.175000  0.255000  9.365000 0.870000 ;
+      RECT 9.215000  1.875000  9.475000 2.735000 ;
+      RECT 9.535000  0.085000  9.865000 0.835000 ;
+      RECT 9.645000  2.045000  9.935000 2.905000 ;
+      RECT 9.730000  1.175000  9.935000 1.695000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a2bb2oi_4
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef
index 35380d8..b10b709 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.magic.lef
@@ -82,21 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.395000  0.085000 0.725000 0.630000 ;
-        RECT 2.005000  0.085000 2.335000 0.675000 ;
-        RECT 3.595000  0.085000 3.925000 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 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -105,36 +90,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.645000 2.335000 0.975000 3.245000 ;
-        RECT 3.880000 2.025000 4.210000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.985000 1.505000 2.155000 ;
-      RECT 0.115000 2.155000 0.445000 3.065000 ;
-      RECT 1.175000 2.155000 1.505000 3.065000 ;
-      RECT 1.845000 1.125000 2.175000 1.285000 ;
-      RECT 1.845000 1.285000 3.195000 1.455000 ;
-      RECT 2.260000 1.675000 2.590000 2.895000 ;
-      RECT 2.260000 2.895000 3.680000 3.065000 ;
-      RECT 2.790000 1.455000 3.120000 2.715000 ;
-      RECT 2.805000 0.265000 3.195000 0.595000 ;
-      RECT 3.025000 0.595000 3.195000 1.285000 ;
-      RECT 3.350000 2.025000 3.680000 2.895000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  1.985000 1.505000 2.155000 ;
+      RECT 0.115000  2.155000 0.445000 3.065000 ;
+      RECT 0.395000  0.085000 0.725000 0.630000 ;
+      RECT 0.645000  2.335000 0.975000 3.245000 ;
+      RECT 1.175000  2.155000 1.505000 3.065000 ;
+      RECT 1.845000  1.125000 2.175000 1.285000 ;
+      RECT 1.845000  1.285000 3.195000 1.455000 ;
+      RECT 2.005000  0.085000 2.335000 0.675000 ;
+      RECT 2.260000  1.675000 2.590000 2.895000 ;
+      RECT 2.260000  2.895000 3.680000 3.065000 ;
+      RECT 2.790000  1.455000 3.120000 2.715000 ;
+      RECT 2.805000  0.265000 3.195000 0.595000 ;
+      RECT 3.025000  0.595000 3.195000 1.285000 ;
+      RECT 3.350000  2.025000 3.680000 2.895000 ;
+      RECT 3.595000  0.085000 3.925000 0.675000 ;
+      RECT 3.880000  2.025000 4.210000 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_lp__a2bb2oi_lp
diff --git a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef
index 7777ba6..f2a6eef 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.magic.lef
@@ -82,19 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.535000  0.085000 0.865000 0.485000 ;
-        RECT 1.475000  0.085000 1.665000 0.545000 ;
-        RECT 2.780000  0.085000 3.110000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -103,29 +90,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.125000 2.755000 0.455000 3.245000 ;
-        RECT 2.420000 2.105000 2.750000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.045000 0.330000 1.265000 0.660000 ;
-      RECT 1.075000 0.660000 1.265000 2.695000 ;
-      RECT 1.075000 2.695000 1.695000 3.025000 ;
-      RECT 2.050000 1.755000 3.120000 1.925000 ;
-      RECT 2.050000 1.925000 2.240000 2.245000 ;
-      RECT 2.930000 1.925000 3.120000 2.245000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  2.755000 0.455000 3.245000 ;
+      RECT 0.535000  0.085000 0.865000 0.485000 ;
+      RECT 1.045000  0.330000 1.265000 0.660000 ;
+      RECT 1.075000  0.660000 1.265000 2.695000 ;
+      RECT 1.075000  2.695000 1.695000 3.025000 ;
+      RECT 1.475000  0.085000 1.665000 0.545000 ;
+      RECT 2.050000  1.755000 3.120000 1.925000 ;
+      RECT 2.050000  1.925000 2.240000 2.245000 ;
+      RECT 2.420000  2.105000 2.750000 3.245000 ;
+      RECT 2.780000  0.085000 3.110000 0.485000 ;
+      RECT 2.930000  1.925000 3.120000 2.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_lp__a2bb2oi_m
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef
index 91fe9f5..dcdfc3b 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_0.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.735000  0.085000 1.065000 0.600000 ;
-        RECT 2.895000  0.085000 3.205000 0.570000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,35 +98,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.735000 2.410000 0.965000 3.245000 ;
-        RECT 1.635000 2.740000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 1.560000 0.690000 2.035000 ;
-      RECT 0.430000 2.035000 3.200000 2.230000 ;
-      RECT 1.135000 2.400000 2.665000 2.570000 ;
-      RECT 1.135000 2.570000 1.465000 3.075000 ;
-      RECT 2.335000 2.570000 2.665000 3.020000 ;
-      RECT 2.480000 0.285000 2.725000 0.740000 ;
-      RECT 2.480000 0.740000 3.645000 0.910000 ;
-      RECT 3.000000 0.910000 3.200000 2.035000 ;
-      RECT 3.020000 2.230000 3.200000 2.390000 ;
-      RECT 3.020000 2.390000 3.455000 3.075000 ;
-      RECT 3.375000 0.285000 3.645000 0.740000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.430000  1.560000 0.690000 2.035000 ;
+      RECT 0.430000  2.035000 3.200000 2.230000 ;
+      RECT 0.735000  0.085000 1.065000 0.600000 ;
+      RECT 0.735000  2.410000 0.965000 3.245000 ;
+      RECT 1.135000  2.400000 2.665000 2.570000 ;
+      RECT 1.135000  2.570000 1.465000 3.075000 ;
+      RECT 1.635000  2.740000 2.165000 3.245000 ;
+      RECT 2.335000  2.570000 2.665000 3.020000 ;
+      RECT 2.480000  0.285000 2.725000 0.740000 ;
+      RECT 2.480000  0.740000 3.645000 0.910000 ;
+      RECT 2.895000  0.085000 3.205000 0.570000 ;
+      RECT 3.000000  0.910000 3.200000 2.035000 ;
+      RECT 3.020000  2.230000 3.200000 2.390000 ;
+      RECT 3.020000  2.390000 3.455000 3.075000 ;
+      RECT 3.375000  0.285000 3.645000 0.740000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a311o_0
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef
index 705a862..1d2faf8 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_1.magic.lef
@@ -89,19 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.525000  0.085000 1.240000 0.685000 ;
-        RECT 2.880000  0.085000 3.210000 0.685000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -110,34 +97,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.840000 2.035000 1.100000 3.245000 ;
-        RECT 1.700000 2.375000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 0.855000 3.710000 1.025000 ;
-      RECT 0.525000 1.025000 0.840000 1.515000 ;
-      RECT 0.605000 1.515000 0.840000 1.695000 ;
-      RECT 0.605000 1.695000 3.710000 1.865000 ;
-      RECT 1.270000 2.035000 2.880000 2.205000 ;
-      RECT 1.270000 2.205000 1.530000 3.075000 ;
-      RECT 2.325000 0.255000 2.655000 0.855000 ;
-      RECT 2.550000 2.205000 2.880000 3.075000 ;
-      RECT 3.380000 0.255000 3.710000 0.855000 ;
-      RECT 3.380000 1.865000 3.710000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.525000  0.085000 1.240000 0.685000 ;
+      RECT 0.525000  0.855000 3.710000 1.025000 ;
+      RECT 0.525000  1.025000 0.840000 1.515000 ;
+      RECT 0.605000  1.515000 0.840000 1.695000 ;
+      RECT 0.605000  1.695000 3.710000 1.865000 ;
+      RECT 0.840000  2.035000 1.100000 3.245000 ;
+      RECT 1.270000  2.035000 2.880000 2.205000 ;
+      RECT 1.270000  2.205000 1.530000 3.075000 ;
+      RECT 1.700000  2.375000 2.380000 3.245000 ;
+      RECT 2.325000  0.255000 2.655000 0.855000 ;
+      RECT 2.550000  2.205000 2.880000 3.075000 ;
+      RECT 2.880000  0.085000 3.210000 0.685000 ;
+      RECT 3.380000  0.255000 3.710000 0.855000 ;
+      RECT 3.380000  1.865000 3.710000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a311o_1
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_2.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_2.magic.lef
index a7e6ad7..ef711e3 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_2.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__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.120000  0.085000 0.410000 1.095000 ;
-        RECT 0.980000  0.085000 1.650000 0.675000 ;
-        RECT 3.250000  0.085000 3.580000 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 ;
-        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.195000 1.815000 0.465000 3.245000 ;
-        RECT 1.150000 2.045000 1.480000 3.245000 ;
-        RECT 2.260000 2.385000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 0.845000 4.060000 1.015000 ;
-      RECT 0.985000 1.015000 1.245000 1.515000 ;
-      RECT 1.075000 1.515000 1.245000 1.695000 ;
-      RECT 1.075000 1.695000 4.060000 1.875000 ;
-      RECT 1.680000 2.045000 3.160000 2.215000 ;
-      RECT 1.680000 2.215000 2.010000 3.065000 ;
-      RECT 2.705000 0.255000 3.035000 0.845000 ;
-      RECT 2.830000 2.215000 3.160000 3.065000 ;
-      RECT 3.730000 1.875000 4.060000 3.075000 ;
-      RECT 3.750000 0.255000 4.060000 0.845000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.120000  0.085000 0.410000 1.095000 ;
+      RECT 0.195000  1.815000 0.465000 3.245000 ;
+      RECT 0.980000  0.085000 1.650000 0.675000 ;
+      RECT 0.985000  0.845000 4.060000 1.015000 ;
+      RECT 0.985000  1.015000 1.245000 1.515000 ;
+      RECT 1.075000  1.515000 1.245000 1.695000 ;
+      RECT 1.075000  1.695000 4.060000 1.875000 ;
+      RECT 1.150000  2.045000 1.480000 3.245000 ;
+      RECT 1.680000  2.045000 3.160000 2.215000 ;
+      RECT 1.680000  2.215000 2.010000 3.065000 ;
+      RECT 2.260000  2.385000 2.590000 3.245000 ;
+      RECT 2.705000  0.255000 3.035000 0.845000 ;
+      RECT 2.830000  2.215000 3.160000 3.065000 ;
+      RECT 3.250000  0.085000 3.580000 0.675000 ;
+      RECT 3.730000  1.875000 4.060000 3.075000 ;
+      RECT 3.750000  0.255000 4.060000 0.845000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a311o_2
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef
index 6cba288..19bb457 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_4.magic.lef
@@ -93,31 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.100000  0.085000 0.430000 1.040000 ;
-        RECT 0.975000  0.085000 1.305000 0.905000 ;
-        RECT 1.860000  0.085000 2.190000 0.905000 ;
-        RECT 2.730000  0.085000 3.060000 0.855000 ;
-        RECT 3.590000  0.085000 4.260000 0.855000 ;
-        RECT 4.790000  0.085000 5.120000 0.845000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -126,73 +101,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 2.465000 2.865000 2.795000 3.245000 ;
-        RECT 3.480000 2.865000 3.810000 3.245000 ;
-        RECT 4.590000 2.865000 4.920000 3.245000 ;
-        RECT 5.450000 2.600000 5.780000 3.245000 ;
-        RECT 6.345000 2.600000 6.675000 3.245000 ;
-        RECT 7.245000 1.920000 7.575000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.100000 1.920000 0.430000 2.905000 ;
-      RECT 0.100000 2.905000 2.120000 3.075000 ;
-      RECT 0.600000 0.255000 0.805000 1.075000 ;
-      RECT 0.600000 1.075000 2.205000 1.245000 ;
-      RECT 0.600000 1.245000 0.790000 2.735000 ;
-      RECT 0.960000 1.920000 1.290000 2.905000 ;
-      RECT 1.460000 1.920000 2.460000 2.090000 ;
-      RECT 1.460000 2.090000 1.690000 2.735000 ;
-      RECT 1.475000 0.255000 1.690000 1.075000 ;
-      RECT 1.860000 2.260000 2.120000 2.905000 ;
-      RECT 2.035000 1.245000 2.205000 1.365000 ;
-      RECT 2.035000 1.365000 3.865000 1.535000 ;
-      RECT 2.035000 1.535000 2.810000 1.585000 ;
-      RECT 2.290000 2.090000 2.460000 2.525000 ;
-      RECT 2.290000 2.525000 5.280000 2.695000 ;
-      RECT 2.640000 1.585000 2.810000 2.185000 ;
-      RECT 2.640000 2.185000 4.735000 2.355000 ;
-      RECT 4.430000 0.255000 4.620000 1.065000 ;
-      RECT 4.430000 1.065000 6.245000 1.175000 ;
-      RECT 4.430000 1.175000 5.380000 1.235000 ;
-      RECT 4.565000 1.920000 6.715000 2.090000 ;
-      RECT 4.565000 2.090000 4.735000 2.185000 ;
-      RECT 5.020000 2.260000 7.075000 2.430000 ;
-      RECT 5.020000 2.430000 5.280000 2.525000 ;
-      RECT 5.090000 2.695000 5.280000 3.075000 ;
-      RECT 5.210000 1.005000 6.245000 1.065000 ;
-      RECT 5.450000 0.255000 7.575000 0.425000 ;
-      RECT 5.450000 0.425000 5.745000 0.835000 ;
-      RECT 5.915000 0.595000 6.245000 1.005000 ;
-      RECT 5.950000 2.430000 6.160000 3.075000 ;
-      RECT 6.415000 0.425000 6.645000 1.175000 ;
-      RECT 6.545000 1.345000 7.145000 1.645000 ;
-      RECT 6.545000 1.645000 6.715000 1.920000 ;
-      RECT 6.815000 0.595000 7.145000 1.345000 ;
-      RECT 6.845000 2.430000 7.075000 3.075000 ;
-      RECT 6.885000 1.815000 7.075000 2.260000 ;
-      RECT 7.315000 0.425000 7.575000 1.040000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.100000  0.085000 0.430000 1.040000 ;
+      RECT 0.100000  1.920000 0.430000 2.905000 ;
+      RECT 0.100000  2.905000 2.120000 3.075000 ;
+      RECT 0.600000  0.255000 0.805000 1.075000 ;
+      RECT 0.600000  1.075000 2.205000 1.245000 ;
+      RECT 0.600000  1.245000 0.790000 2.735000 ;
+      RECT 0.960000  1.920000 1.290000 2.905000 ;
+      RECT 0.975000  0.085000 1.305000 0.905000 ;
+      RECT 1.460000  1.920000 2.460000 2.090000 ;
+      RECT 1.460000  2.090000 1.690000 2.735000 ;
+      RECT 1.475000  0.255000 1.690000 1.075000 ;
+      RECT 1.860000  0.085000 2.190000 0.905000 ;
+      RECT 1.860000  2.260000 2.120000 2.905000 ;
+      RECT 2.035000  1.245000 2.205000 1.365000 ;
+      RECT 2.035000  1.365000 3.865000 1.535000 ;
+      RECT 2.035000  1.535000 2.810000 1.585000 ;
+      RECT 2.290000  2.090000 2.460000 2.525000 ;
+      RECT 2.290000  2.525000 5.280000 2.695000 ;
+      RECT 2.465000  2.865000 2.795000 3.245000 ;
+      RECT 2.640000  1.585000 2.810000 2.185000 ;
+      RECT 2.640000  2.185000 4.735000 2.355000 ;
+      RECT 2.730000  0.085000 3.060000 0.855000 ;
+      RECT 3.480000  2.865000 3.810000 3.245000 ;
+      RECT 3.590000  0.085000 4.260000 0.855000 ;
+      RECT 4.430000  0.255000 4.620000 1.065000 ;
+      RECT 4.430000  1.065000 6.245000 1.175000 ;
+      RECT 4.430000  1.175000 5.380000 1.235000 ;
+      RECT 4.565000  1.920000 6.715000 2.090000 ;
+      RECT 4.565000  2.090000 4.735000 2.185000 ;
+      RECT 4.590000  2.865000 4.920000 3.245000 ;
+      RECT 4.790000  0.085000 5.120000 0.845000 ;
+      RECT 5.020000  2.260000 7.075000 2.430000 ;
+      RECT 5.020000  2.430000 5.280000 2.525000 ;
+      RECT 5.090000  2.695000 5.280000 3.075000 ;
+      RECT 5.210000  1.005000 6.245000 1.065000 ;
+      RECT 5.450000  0.255000 7.575000 0.425000 ;
+      RECT 5.450000  0.425000 5.745000 0.835000 ;
+      RECT 5.450000  2.600000 5.780000 3.245000 ;
+      RECT 5.915000  0.595000 6.245000 1.005000 ;
+      RECT 5.950000  2.430000 6.160000 3.075000 ;
+      RECT 6.345000  2.600000 6.675000 3.245000 ;
+      RECT 6.415000  0.425000 6.645000 1.175000 ;
+      RECT 6.545000  1.345000 7.145000 1.645000 ;
+      RECT 6.545000  1.645000 6.715000 1.920000 ;
+      RECT 6.815000  0.595000 7.145000 1.345000 ;
+      RECT 6.845000  2.430000 7.075000 3.075000 ;
+      RECT 6.885000  1.815000 7.075000 2.260000 ;
+      RECT 7.245000  1.920000 7.575000 3.245000 ;
+      RECT 7.315000  0.425000 7.575000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a311o_4
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef
index 59a6395..fe166af 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_lp.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.015000  0.085000 1.345000 0.670000 ;
-        RECT 3.015000  0.085000 3.345000 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
@@ -112,34 +98,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.730000 2.050000 1.060000 3.245000 ;
-        RECT 1.790000 2.400000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.455000 0.850000 4.185000 1.020000 ;
-      RECT 0.455000 1.020000 0.785000 1.520000 ;
-      RECT 1.260000 2.050000 2.755000 2.220000 ;
-      RECT 1.260000 2.220000 1.590000 3.065000 ;
-      RECT 2.225000 0.265000 2.555000 0.850000 ;
-      RECT 2.425000 2.220000 2.755000 3.065000 ;
-      RECT 3.730000 2.050000 4.185000 3.065000 ;
-      RECT 3.805000 0.265000 4.135000 0.850000 ;
-      RECT 4.015000 1.020000 4.185000 2.050000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.455000  0.850000 4.185000 1.020000 ;
+      RECT 0.455000  1.020000 0.785000 1.520000 ;
+      RECT 0.730000  2.050000 1.060000 3.245000 ;
+      RECT 1.015000  0.085000 1.345000 0.670000 ;
+      RECT 1.260000  2.050000 2.755000 2.220000 ;
+      RECT 1.260000  2.220000 1.590000 3.065000 ;
+      RECT 1.790000  2.400000 2.120000 3.245000 ;
+      RECT 2.225000  0.265000 2.555000 0.850000 ;
+      RECT 2.425000  2.220000 2.755000 3.065000 ;
+      RECT 3.015000  0.085000 3.345000 0.670000 ;
+      RECT 3.730000  2.050000 4.185000 3.065000 ;
+      RECT 3.805000  0.265000 4.135000 0.850000 ;
+      RECT 4.015000  1.020000 4.185000 2.050000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a311o_lp
diff --git a/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef b/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef
index f2d44a0..2128c2c 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_m.magic.lef
@@ -88,18 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.605000  0.085000 0.935000 0.490000 ;
-        RECT 2.245000  0.085000 2.575000 0.470000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,33 +96,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.605000 2.125000 0.795000 3.245000 ;
-        RECT 1.465000 2.280000 1.795000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.015000 1.930000 2.245000 2.100000 ;
-      RECT 1.015000 2.100000 1.225000 2.325000 ;
-      RECT 1.855000 0.350000 2.065000 0.650000 ;
-      RECT 1.855000 0.650000 3.035000 0.820000 ;
-      RECT 1.975000 2.855000 2.780000 3.025000 ;
-      RECT 2.035000 2.100000 2.245000 2.325000 ;
-      RECT 2.610000 0.820000 2.780000 2.055000 ;
-      RECT 2.610000 2.055000 3.095000 2.265000 ;
-      RECT 2.610000 2.265000 2.780000 2.855000 ;
-      RECT 2.825000 0.350000 3.035000 0.650000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.605000  0.085000 0.935000 0.490000 ;
+      RECT 0.605000  2.125000 0.795000 3.245000 ;
+      RECT 1.015000  1.930000 2.245000 2.100000 ;
+      RECT 1.015000  2.100000 1.225000 2.325000 ;
+      RECT 1.465000  2.280000 1.795000 3.245000 ;
+      RECT 1.855000  0.350000 2.065000 0.650000 ;
+      RECT 1.855000  0.650000 3.035000 0.820000 ;
+      RECT 1.975000  2.855000 2.780000 3.025000 ;
+      RECT 2.035000  2.100000 2.245000 2.325000 ;
+      RECT 2.245000  0.085000 2.575000 0.470000 ;
+      RECT 2.610000  0.820000 2.780000 2.055000 ;
+      RECT 2.610000  2.055000 3.095000 2.265000 ;
+      RECT 2.610000  2.265000 2.780000 2.855000 ;
+      RECT 2.825000  0.350000 3.035000 0.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_lp__a311o_m
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef
index 300ea3c..9db593d 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.magic.lef
@@ -93,18 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.105000  0.085000 0.775000 0.610000 ;
-        RECT 2.090000  0.085000 2.685000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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.335000 2.355000 0.630000 3.245000 ;
-        RECT 1.230000 2.345000 1.500000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.800000 2.005000 1.895000 2.175000 ;
-      RECT 0.800000 2.175000 1.060000 3.025000 ;
-      RECT 1.670000 2.175000 1.895000 3.025000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.105000  0.085000 0.775000 0.610000 ;
+      RECT 0.335000  2.355000 0.630000 3.245000 ;
+      RECT 0.800000  2.005000 1.895000 2.175000 ;
+      RECT 0.800000  2.175000 1.060000 3.025000 ;
+      RECT 1.230000  2.345000 1.500000 3.245000 ;
+      RECT 1.670000  2.175000 1.895000 3.025000 ;
+      RECT 2.090000  0.085000 2.685000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a311oi_0
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.magic.lef
index 3603e99..c24ff1c 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__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.450000  0.085000 0.780000 1.020000 ;
-        RECT 2.425000  0.085000 2.755000 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
@@ -113,26 +101,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.450000 1.815000 0.780000 3.245000 ;
-        RECT 1.460000 2.030000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.950000 1.690000 2.405000 1.860000 ;
-      RECT 0.950000 1.860000 1.235000 3.075000 ;
-      RECT 2.075000 1.860000 2.405000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.450000  0.085000 0.780000 1.020000 ;
+      RECT 0.450000  1.815000 0.780000 3.245000 ;
+      RECT 0.950000  1.690000 2.405000 1.860000 ;
+      RECT 0.950000  1.860000 1.235000 3.075000 ;
+      RECT 1.460000  2.030000 1.790000 3.245000 ;
+      RECT 2.075000  1.860000 2.405000 3.075000 ;
+      RECT 2.425000  0.085000 2.755000 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  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a311oi_1
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef
index de1f076..9d9ed52 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.magic.lef
@@ -98,24 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.650000  0.085000 0.980000 0.905000 ;
-        RECT 4.025000  0.085000 4.355000 0.915000 ;
-        RECT 4.885000  0.085000 5.215000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -124,48 +106,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.220000 1.920000 0.550000 3.245000 ;
-        RECT 1.080000 2.095000 1.410000 3.245000 ;
-        RECT 2.060000 2.630000 2.390000 3.245000 ;
-        RECT 3.035000 2.630000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.220000 0.325000 0.480000 1.075000 ;
-      RECT 0.220000 1.075000 2.350000 1.245000 ;
-      RECT 0.720000 1.755000 1.770000 1.925000 ;
-      RECT 0.720000 1.925000 0.900000 3.075000 ;
-      RECT 1.150000 0.325000 1.340000 1.075000 ;
-      RECT 1.510000 0.255000 3.495000 0.425000 ;
-      RECT 1.510000 0.425000 1.840000 0.905000 ;
-      RECT 1.580000 1.925000 1.770000 2.290000 ;
-      RECT 1.580000 2.290000 4.320000 2.460000 ;
-      RECT 1.580000 2.460000 1.840000 3.075000 ;
-      RECT 2.010000 0.595000 2.350000 1.075000 ;
-      RECT 2.605000 2.460000 2.865000 3.075000 ;
-      RECT 3.165000 0.425000 3.495000 0.895000 ;
-      RECT 3.595000 2.800000 4.750000 2.905000 ;
-      RECT 3.595000 2.905000 5.645000 3.075000 ;
-      RECT 4.025000 2.460000 4.320000 2.630000 ;
-      RECT 4.490000 2.290000 4.750000 2.800000 ;
-      RECT 5.365000 1.920000 5.645000 2.905000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.220000  0.325000 0.480000 1.075000 ;
+      RECT 0.220000  1.075000 2.350000 1.245000 ;
+      RECT 0.220000  1.920000 0.550000 3.245000 ;
+      RECT 0.650000  0.085000 0.980000 0.905000 ;
+      RECT 0.720000  1.755000 1.770000 1.925000 ;
+      RECT 0.720000  1.925000 0.900000 3.075000 ;
+      RECT 1.080000  2.095000 1.410000 3.245000 ;
+      RECT 1.150000  0.325000 1.340000 1.075000 ;
+      RECT 1.510000  0.255000 3.495000 0.425000 ;
+      RECT 1.510000  0.425000 1.840000 0.905000 ;
+      RECT 1.580000  1.925000 1.770000 2.290000 ;
+      RECT 1.580000  2.290000 4.320000 2.460000 ;
+      RECT 1.580000  2.460000 1.840000 3.075000 ;
+      RECT 2.010000  0.595000 2.350000 1.075000 ;
+      RECT 2.060000  2.630000 2.390000 3.245000 ;
+      RECT 2.605000  2.460000 2.865000 3.075000 ;
+      RECT 3.035000  2.630000 3.365000 3.245000 ;
+      RECT 3.165000  0.425000 3.495000 0.895000 ;
+      RECT 3.595000  2.800000 4.750000 2.905000 ;
+      RECT 3.595000  2.905000 5.645000 3.075000 ;
+      RECT 4.025000  0.085000 4.355000 0.915000 ;
+      RECT 4.025000  2.460000 4.320000 2.630000 ;
+      RECT 4.490000  2.290000 4.750000 2.800000 ;
+      RECT 4.885000  0.085000 5.215000 0.915000 ;
+      RECT 5.365000  1.920000 5.645000 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_lp__a311oi_2
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef
index caf0638..a3406f5 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.magic.lef
@@ -99,36 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.525000  0.085000  0.855000 0.700000 ;
-        RECT 1.385000  0.085000  1.715000 0.700000 ;
-        RECT 6.215000  0.085000  6.545000 0.700000 ;
-        RECT 7.120000  0.085000  7.450000 0.700000 ;
-        RECT 8.035000  0.085000  8.365000 0.700000 ;
-        RECT 8.895000  0.085000  9.225000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -137,71 +107,98 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.165000 1.815000  0.495000 3.245000 ;
-        RECT 1.025000 1.945000  1.355000 3.245000 ;
-        RECT 1.885000 1.945000  2.215000 3.245000 ;
-        RECT 2.745000 1.945000  3.075000 3.245000 ;
-        RECT 3.660000 2.285000  3.990000 3.245000 ;
-        RECT 4.575000 2.285000  4.905000 3.245000 ;
-        RECT 5.435000 2.285000  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 ;
-        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.095000 0.255000 0.355000 0.870000 ;
-      RECT 0.095000 0.870000 3.825000 1.040000 ;
-      RECT 0.665000 1.605000 3.505000 1.775000 ;
-      RECT 0.665000 1.775000 0.855000 3.075000 ;
-      RECT 1.025000 0.255000 1.215000 0.870000 ;
-      RECT 1.525000 1.775000 1.715000 3.075000 ;
-      RECT 1.885000 0.255000 2.115000 0.870000 ;
-      RECT 2.285000 0.255000 5.635000 0.445000 ;
-      RECT 2.285000 0.445000 2.540000 0.700000 ;
-      RECT 2.385000 1.775000 2.575000 3.075000 ;
-      RECT 2.710000 0.665000 2.965000 0.870000 ;
-      RECT 3.135000 0.445000 5.635000 0.485000 ;
-      RECT 3.135000 0.485000 3.400000 0.700000 ;
-      RECT 3.245000 1.775000 3.505000 1.945000 ;
-      RECT 3.245000 1.945000 7.505000 2.115000 ;
-      RECT 3.245000 2.115000 3.490000 3.075000 ;
-      RECT 3.570000 0.665000 3.825000 0.870000 ;
-      RECT 4.160000 2.115000 4.405000 3.075000 ;
-      RECT 4.525000 0.485000 4.780000 0.700000 ;
-      RECT 5.075000 2.115000 5.265000 3.075000 ;
-      RECT 5.380000 0.485000 5.635000 0.700000 ;
-      RECT 5.955000 2.285000 6.285000 2.905000 ;
-      RECT 5.955000 2.905000 9.725000 3.075000 ;
-      RECT 6.455000 2.115000 6.645000 2.735000 ;
-      RECT 6.815000 2.285000 7.145000 2.905000 ;
-      RECT 7.315000 2.115000 7.505000 2.735000 ;
-      RECT 7.675000 1.945000 8.005000 2.905000 ;
-      RECT 8.535000 1.945000 8.865000 2.905000 ;
-      RECT 9.435000 1.815000 9.725000 2.905000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.095000  0.255000  0.355000 0.870000 ;
+      RECT 0.095000  0.870000  3.825000 1.040000 ;
+      RECT 0.165000  1.815000  0.495000 3.245000 ;
+      RECT 0.525000  0.085000  0.855000 0.700000 ;
+      RECT 0.665000  1.605000  3.505000 1.775000 ;
+      RECT 0.665000  1.775000  0.855000 3.075000 ;
+      RECT 1.025000  0.255000  1.215000 0.870000 ;
+      RECT 1.025000  1.945000  1.355000 3.245000 ;
+      RECT 1.385000  0.085000  1.715000 0.700000 ;
+      RECT 1.525000  1.775000  1.715000 3.075000 ;
+      RECT 1.885000  0.255000  2.115000 0.870000 ;
+      RECT 1.885000  1.945000  2.215000 3.245000 ;
+      RECT 2.285000  0.255000  5.635000 0.445000 ;
+      RECT 2.285000  0.445000  2.540000 0.700000 ;
+      RECT 2.385000  1.775000  2.575000 3.075000 ;
+      RECT 2.710000  0.665000  2.965000 0.870000 ;
+      RECT 2.745000  1.945000  3.075000 3.245000 ;
+      RECT 3.135000  0.445000  5.635000 0.485000 ;
+      RECT 3.135000  0.485000  3.400000 0.700000 ;
+      RECT 3.245000  1.775000  3.505000 1.945000 ;
+      RECT 3.245000  1.945000  7.505000 2.115000 ;
+      RECT 3.245000  2.115000  3.490000 3.075000 ;
+      RECT 3.570000  0.665000  3.825000 0.870000 ;
+      RECT 3.660000  2.285000  3.990000 3.245000 ;
+      RECT 4.160000  2.115000  4.405000 3.075000 ;
+      RECT 4.525000  0.485000  4.780000 0.700000 ;
+      RECT 4.575000  2.285000  4.905000 3.245000 ;
+      RECT 5.075000  2.115000  5.265000 3.075000 ;
+      RECT 5.380000  0.485000  5.635000 0.700000 ;
+      RECT 5.435000  2.285000  5.765000 3.245000 ;
+      RECT 5.955000  2.285000  6.285000 2.905000 ;
+      RECT 5.955000  2.905000  9.725000 3.075000 ;
+      RECT 6.215000  0.085000  6.545000 0.700000 ;
+      RECT 6.455000  2.115000  6.645000 2.735000 ;
+      RECT 6.815000  2.285000  7.145000 2.905000 ;
+      RECT 7.120000  0.085000  7.450000 0.700000 ;
+      RECT 7.315000  2.115000  7.505000 2.735000 ;
+      RECT 7.675000  1.945000  8.005000 2.905000 ;
+      RECT 8.035000  0.085000  8.365000 0.700000 ;
+      RECT 8.535000  1.945000  8.865000 2.905000 ;
+      RECT 8.895000  0.085000  9.225000 0.700000 ;
+      RECT 9.435000  1.815000  9.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 ;
+      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_lp__a311oi_4
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef
index 01a02d3..a2246b3 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.magic.lef
@@ -96,18 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.335000  0.085000 1.665000 0.640000 ;
-        RECT 2.915000  0.085000 3.245000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -116,26 +104,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 2.025000 0.445000 3.245000 ;
-        RECT 1.175000 2.370000 1.505000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.645000 2.020000 2.055000 2.190000 ;
-      RECT 0.645000 2.190000 0.975000 3.065000 ;
-      RECT 1.725000 2.190000 2.055000 3.065000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  2.025000 0.445000 3.245000 ;
+      RECT 0.645000  2.020000 2.055000 2.190000 ;
+      RECT 0.645000  2.190000 0.975000 3.065000 ;
+      RECT 1.175000  2.370000 1.505000 3.245000 ;
+      RECT 1.335000  0.085000 1.665000 0.640000 ;
+      RECT 1.725000  2.190000 2.055000 3.065000 ;
+      RECT 2.915000  0.085000 3.245000 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 ;
   END
 END sky130_fd_sc_lp__a311oi_lp
diff --git a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef
index f2fa9d9..913001a 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.155000  0.085000 0.345000 0.565000 ;
-        RECT 2.120000  0.085000 2.450000 0.505000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,26 +100,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.155000 2.785000 0.345000 3.245000 ;
-        RECT 1.420000 2.805000 1.610000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.990000 2.455000 2.120000 2.625000 ;
-      RECT 0.990000 2.625000 1.200000 2.965000 ;
-      RECT 1.790000 2.625000 2.120000 2.925000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.155000  0.085000 0.345000 0.565000 ;
+      RECT 0.155000  2.785000 0.345000 3.245000 ;
+      RECT 0.990000  2.455000 2.120000 2.625000 ;
+      RECT 0.990000  2.625000 1.200000 2.965000 ;
+      RECT 1.420000  2.805000 1.610000 3.245000 ;
+      RECT 1.790000  2.625000 2.120000 2.925000 ;
+      RECT 2.120000  0.085000 2.450000 0.505000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a311oi_m
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef
index 780a4f6..642e9b7 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_0.magic.lef
@@ -81,18 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.735000  0.085000 1.065000 0.500000 ;
-        RECT 2.775000  0.085000 3.105000 0.625000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,33 +89,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.910000 2.395000 1.170000 3.245000 ;
-        RECT 1.775000 2.395000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.510000 0.670000 1.405000 0.840000 ;
-      RECT 0.510000 0.840000 0.760000 1.705000 ;
-      RECT 0.510000 1.705000 2.825000 1.875000 ;
-      RECT 1.235000 0.295000 2.605000 0.625000 ;
-      RECT 1.235000 0.625000 1.405000 0.670000 ;
-      RECT 1.340000 2.055000 2.455000 2.225000 ;
-      RECT 1.340000 2.225000 1.605000 3.075000 ;
-      RECT 2.195000 2.225000 2.455000 3.075000 ;
-      RECT 2.625000 1.875000 2.825000 2.395000 ;
-      RECT 2.625000 2.395000 2.925000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.510000  0.670000 1.405000 0.840000 ;
+      RECT 0.510000  0.840000 0.760000 1.705000 ;
+      RECT 0.510000  1.705000 2.825000 1.875000 ;
+      RECT 0.735000  0.085000 1.065000 0.500000 ;
+      RECT 0.910000  2.395000 1.170000 3.245000 ;
+      RECT 1.235000  0.295000 2.605000 0.625000 ;
+      RECT 1.235000  0.625000 1.405000 0.670000 ;
+      RECT 1.340000  2.055000 2.455000 2.225000 ;
+      RECT 1.340000  2.225000 1.605000 3.075000 ;
+      RECT 1.775000  2.395000 2.025000 3.245000 ;
+      RECT 2.195000  2.225000 2.455000 3.075000 ;
+      RECT 2.625000  1.875000 2.825000 2.395000 ;
+      RECT 2.625000  2.395000 2.925000 3.075000 ;
+      RECT 2.775000  0.085000 3.105000 0.625000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a31o_0
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_1.magic.lef
index 4349a16..72f46cb 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_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.525000  0.085000 1.220000 0.700000 ;
-        RECT 2.790000  0.085000 3.120000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,32 +90,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.625000 1.815000 0.925000 3.245000 ;
-        RECT 1.865000 2.050000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.870000 3.265000 1.040000 ;
-      RECT 0.515000 1.040000 0.765000 1.515000 ;
-      RECT 1.455000 1.710000 2.660000 1.880000 ;
-      RECT 1.455000 1.880000 1.695000 3.075000 ;
-      RECT 2.290000 0.255000 2.620000 0.870000 ;
-      RECT 2.365000 1.880000 2.660000 3.075000 ;
-      RECT 2.830000 1.815000 3.265000 1.985000 ;
-      RECT 2.830000 1.985000 3.120000 3.075000 ;
-      RECT 3.095000 1.040000 3.265000 1.815000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.515000  0.870000 3.265000 1.040000 ;
+      RECT 0.515000  1.040000 0.765000 1.515000 ;
+      RECT 0.525000  0.085000 1.220000 0.700000 ;
+      RECT 0.625000  1.815000 0.925000 3.245000 ;
+      RECT 1.455000  1.710000 2.660000 1.880000 ;
+      RECT 1.455000  1.880000 1.695000 3.075000 ;
+      RECT 1.865000  2.050000 2.195000 3.245000 ;
+      RECT 2.290000  0.255000 2.620000 0.870000 ;
+      RECT 2.365000  1.880000 2.660000 3.075000 ;
+      RECT 2.790000  0.085000 3.120000 0.700000 ;
+      RECT 2.830000  1.815000 3.265000 1.985000 ;
+      RECT 2.830000  1.985000 3.120000 3.075000 ;
+      RECT 3.095000  1.040000 3.265000 1.815000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a31o_1
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_2.magic.lef
index 4e396e3..f5b47ec 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__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.120000  0.085000 0.450000 1.100000 ;
-        RECT 0.980000  0.085000 1.650000 0.685000 ;
-        RECT 3.190000  0.085000 3.520000 1.025000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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 +89,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.205000 1.825000 0.465000 3.245000 ;
-        RECT 1.220000 2.045000 1.550000 3.245000 ;
-        RECT 2.225000 2.445000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.195000 1.345000 1.705000 ;
-      RECT 0.985000 1.705000 3.520000 1.875000 ;
-      RECT 1.175000 0.855000 3.020000 1.025000 ;
-      RECT 1.175000 1.025000 1.345000 1.195000 ;
-      RECT 1.720000 2.045000 3.090000 2.225000 ;
-      RECT 1.720000 2.225000 2.015000 3.075000 ;
-      RECT 2.690000 0.255000 3.020000 0.855000 ;
-      RECT 2.760000 2.225000 3.090000 3.065000 ;
-      RECT 3.260000 1.875000 3.520000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.120000  0.085000 0.450000 1.100000 ;
+      RECT 0.205000  1.825000 0.465000 3.245000 ;
+      RECT 0.980000  0.085000 1.650000 0.685000 ;
+      RECT 0.985000  1.195000 1.345000 1.705000 ;
+      RECT 0.985000  1.705000 3.520000 1.875000 ;
+      RECT 1.175000  0.855000 3.020000 1.025000 ;
+      RECT 1.175000  1.025000 1.345000 1.195000 ;
+      RECT 1.220000  2.045000 1.550000 3.245000 ;
+      RECT 1.720000  2.045000 3.090000 2.225000 ;
+      RECT 1.720000  2.225000 2.015000 3.075000 ;
+      RECT 2.225000  2.445000 2.555000 3.245000 ;
+      RECT 2.690000  0.255000 3.020000 0.855000 ;
+      RECT 2.760000  2.225000 3.090000 3.065000 ;
+      RECT 3.190000  0.085000 3.520000 1.025000 ;
+      RECT 3.260000  1.875000 3.520000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a31o_2
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef
index 76242a7..166affa 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_4.magic.lef
@@ -82,28 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 1.040000 ;
-        RECT 0.955000  0.085000 1.285000 0.465000 ;
-        RECT 2.045000  0.085000 2.375000 0.465000 ;
-        RECT 3.095000  0.085000 3.425000 0.465000 ;
-        RECT 4.105000  0.085000 4.305000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -112,58 +90,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 1.955000 2.780000 2.285000 3.245000 ;
-        RECT 2.815000 2.780000 3.145000 3.245000 ;
-        RECT 3.675000 2.780000 4.005000 3.245000 ;
-        RECT 4.555000 2.270000 4.885000 3.245000 ;
-        RECT 5.435000 2.270000 5.765000 3.245000 ;
-        RECT 6.295000 1.930000 6.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 ;
-        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 1.930000 0.425000 2.905000 ;
-      RECT 0.095000 2.905000 1.285000 3.075000 ;
-      RECT 0.595000 0.255000 0.785000 0.635000 ;
-      RECT 0.595000 0.635000 3.250000 0.805000 ;
-      RECT 0.595000 0.805000 0.855000 2.735000 ;
-      RECT 1.025000 1.930000 1.235000 2.440000 ;
-      RECT 1.025000 2.440000 4.385000 2.610000 ;
-      RECT 1.025000 2.610000 1.285000 2.905000 ;
-      RECT 1.890000 1.355000 3.250000 1.645000 ;
-      RECT 3.080000 0.805000 3.250000 1.075000 ;
-      RECT 3.080000 1.075000 6.195000 1.245000 ;
-      RECT 3.080000 1.245000 3.250000 1.355000 ;
-      RECT 3.605000 0.345000 3.935000 0.725000 ;
-      RECT 3.605000 0.725000 5.335000 0.905000 ;
-      RECT 4.105000 1.930000 6.125000 2.100000 ;
-      RECT 4.105000 2.100000 4.385000 2.440000 ;
-      RECT 4.175000 2.610000 4.385000 3.075000 ;
-      RECT 4.575000 0.275000 6.625000 0.445000 ;
-      RECT 4.575000 0.445000 5.695000 0.555000 ;
-      RECT 5.055000 2.100000 5.265000 3.075000 ;
-      RECT 5.515000 0.555000 5.695000 0.645000 ;
-      RECT 5.865000 0.615000 6.195000 1.075000 ;
-      RECT 5.935000 2.100000 6.125000 3.075000 ;
-      RECT 6.365000 0.445000 6.625000 1.195000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 1.040000 ;
+      RECT 0.095000  1.930000 0.425000 2.905000 ;
+      RECT 0.095000  2.905000 1.285000 3.075000 ;
+      RECT 0.595000  0.255000 0.785000 0.635000 ;
+      RECT 0.595000  0.635000 3.250000 0.805000 ;
+      RECT 0.595000  0.805000 0.855000 2.735000 ;
+      RECT 0.955000  0.085000 1.285000 0.465000 ;
+      RECT 1.025000  1.930000 1.235000 2.440000 ;
+      RECT 1.025000  2.440000 4.385000 2.610000 ;
+      RECT 1.025000  2.610000 1.285000 2.905000 ;
+      RECT 1.890000  1.355000 3.250000 1.645000 ;
+      RECT 1.955000  2.780000 2.285000 3.245000 ;
+      RECT 2.045000  0.085000 2.375000 0.465000 ;
+      RECT 2.815000  2.780000 3.145000 3.245000 ;
+      RECT 3.080000  0.805000 3.250000 1.075000 ;
+      RECT 3.080000  1.075000 6.195000 1.245000 ;
+      RECT 3.080000  1.245000 3.250000 1.355000 ;
+      RECT 3.095000  0.085000 3.425000 0.465000 ;
+      RECT 3.605000  0.345000 3.935000 0.725000 ;
+      RECT 3.605000  0.725000 5.335000 0.905000 ;
+      RECT 3.675000  2.780000 4.005000 3.245000 ;
+      RECT 4.105000  0.085000 4.305000 0.545000 ;
+      RECT 4.105000  1.930000 6.125000 2.100000 ;
+      RECT 4.105000  2.100000 4.385000 2.440000 ;
+      RECT 4.175000  2.610000 4.385000 3.075000 ;
+      RECT 4.555000  2.270000 4.885000 3.245000 ;
+      RECT 4.575000  0.275000 6.625000 0.445000 ;
+      RECT 4.575000  0.445000 5.695000 0.555000 ;
+      RECT 5.055000  2.100000 5.265000 3.075000 ;
+      RECT 5.435000  2.270000 5.765000 3.245000 ;
+      RECT 5.515000  0.555000 5.695000 0.645000 ;
+      RECT 5.865000  0.615000 6.195000 1.075000 ;
+      RECT 5.935000  2.100000 6.125000 3.075000 ;
+      RECT 6.295000  1.930000 6.625000 3.245000 ;
+      RECT 6.365000  0.445000 6.625000 1.195000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a31o_4
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef
index 75e280e..32e05c8 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_lp.magic.lef
@@ -81,18 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 0.635000 ;
-        RECT 2.125000  0.085000 2.455000 0.720000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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 1.280000 2.375000 1.610000 3.245000 ;
-        RECT 2.340000 2.025000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.815000 1.245000 0.985000 ;
-      RECT 0.095000 0.985000 0.265000 1.675000 ;
-      RECT 0.095000 1.675000 2.920000 1.845000 ;
-      RECT 0.095000 1.845000 0.550000 3.065000 ;
-      RECT 0.750000 2.025000 2.140000 2.195000 ;
-      RECT 0.750000 2.195000 1.080000 3.065000 ;
-      RECT 0.915000 0.265000 1.245000 0.815000 ;
-      RECT 1.810000 2.195000 2.140000 3.065000 ;
-      RECT 2.605000 1.175000 2.920000 1.675000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.815000 1.245000 0.985000 ;
+      RECT 0.095000  0.985000 0.265000 1.675000 ;
+      RECT 0.095000  1.675000 2.920000 1.845000 ;
+      RECT 0.095000  1.845000 0.550000 3.065000 ;
+      RECT 0.125000  0.085000 0.455000 0.635000 ;
+      RECT 0.750000  2.025000 2.140000 2.195000 ;
+      RECT 0.750000  2.195000 1.080000 3.065000 ;
+      RECT 0.915000  0.265000 1.245000 0.815000 ;
+      RECT 1.280000  2.375000 1.610000 3.245000 ;
+      RECT 1.810000  2.195000 2.140000 3.065000 ;
+      RECT 2.125000  0.085000 2.455000 0.720000 ;
+      RECT 2.340000  2.025000 2.670000 3.245000 ;
+      RECT 2.605000  1.175000 2.920000 1.675000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a31o_lp
diff --git a/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef b/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef
index dc48566..dc554a0 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_m.magic.lef
@@ -82,18 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.580000 ;
-        RECT 2.595000  0.085000 2.805000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -102,34 +90,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.915000 2.730000 1.245000 3.245000 ;
-        RECT 1.835000 2.670000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.510000 0.860000 3.220000 1.030000 ;
-      RECT 0.510000 1.030000 0.680000 1.530000 ;
-      RECT 1.425000 2.670000 1.635000 3.000000 ;
-      RECT 1.465000 2.320000 2.375000 2.490000 ;
-      RECT 1.465000 2.490000 1.635000 2.670000 ;
-      RECT 2.165000 0.440000 2.375000 0.860000 ;
-      RECT 2.205000 2.490000 2.375000 2.670000 ;
-      RECT 2.205000 2.670000 2.535000 2.880000 ;
-      RECT 2.715000 2.670000 3.220000 2.840000 ;
-      RECT 2.715000 2.840000 2.905000 3.000000 ;
-      RECT 3.050000 1.030000 3.220000 2.670000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.510000  0.860000 3.220000 1.030000 ;
+      RECT 0.510000  1.030000 0.680000 1.530000 ;
+      RECT 0.905000  0.085000 1.235000 0.580000 ;
+      RECT 0.915000  2.730000 1.245000 3.245000 ;
+      RECT 1.425000  2.670000 1.635000 3.000000 ;
+      RECT 1.465000  2.320000 2.375000 2.490000 ;
+      RECT 1.465000  2.490000 1.635000 2.670000 ;
+      RECT 1.835000  2.670000 2.025000 3.245000 ;
+      RECT 2.165000  0.440000 2.375000 0.860000 ;
+      RECT 2.205000  2.490000 2.375000 2.670000 ;
+      RECT 2.205000  2.670000 2.535000 2.880000 ;
+      RECT 2.595000  0.085000 2.805000 0.640000 ;
+      RECT 2.715000  2.670000 3.220000 2.840000 ;
+      RECT 2.715000  2.840000 2.905000 3.000000 ;
+      RECT 3.050000  1.030000 3.220000 2.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  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a31o_m
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef
index e325a82..72b1beb 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.magic.lef
@@ -82,16 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 0.595000 ;
-        RECT 2.015000  0.085000 2.295000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -100,25 +90,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.095000 1.995000 1.250000 2.165000 ;
-        RECT 0.095000 2.165000 0.390000 3.245000 ;
-        RECT 0.990000 2.165000 1.250000 2.735000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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.560000 2.345000 0.820000 2.905000 ;
-      RECT 0.560000 2.905000 1.675000 3.075000 ;
-      RECT 1.420000 2.345000 1.675000 2.905000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.095000  1.995000 1.250000 2.165000 ;
+      RECT 0.095000  2.165000 0.390000 3.245000 ;
+      RECT 0.125000  0.085000 0.455000 0.595000 ;
+      RECT 0.560000  2.345000 0.820000 2.905000 ;
+      RECT 0.560000  2.905000 1.675000 3.075000 ;
+      RECT 0.990000  2.165000 1.250000 2.735000 ;
+      RECT 1.420000  2.345000 1.675000 2.905000 ;
+      RECT 2.015000  0.085000 2.295000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__a31oi_0
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.magic.lef
index 981033b..905e639 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__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.300000  0.085000 0.545000 1.040000 ;
-        RECT 2.180000  0.085000 2.510000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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.300000 1.950000 0.560000 3.245000 ;
-        RECT 1.240000 2.365000 1.570000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.730000 2.025000 2.080000 2.195000 ;
-      RECT 0.730000 2.195000 1.060000 3.065000 ;
-      RECT 1.750000 2.195000 2.080000 3.065000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.300000  0.085000 0.545000 1.040000 ;
+      RECT 0.300000  1.950000 0.560000 3.245000 ;
+      RECT 0.730000  2.025000 2.080000 2.195000 ;
+      RECT 0.730000  2.195000 1.060000 3.065000 ;
+      RECT 1.240000  2.365000 1.570000 3.245000 ;
+      RECT 1.750000  2.195000 2.080000 3.065000 ;
+      RECT 2.180000  0.085000 2.510000 1.015000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a31oi_1
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef
index 2775562..99bf4e0 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.magic.lef
@@ -85,21 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.700000 ;
-        RECT 3.705000  0.085000 4.035000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -108,44 +93,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.525000 2.055000 0.855000 3.245000 ;
-        RECT 1.430000 2.055000 1.760000 3.245000 ;
-        RECT 2.325000 2.640000 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 ;
-        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.095000 0.335000 0.345000 0.870000 ;
-      RECT 0.095000 0.870000 2.145000 1.040000 ;
-      RECT 0.095000 1.715000 2.165000 1.885000 ;
-      RECT 0.095000 1.885000 0.355000 3.075000 ;
-      RECT 1.025000 0.335000 1.255000 0.870000 ;
-      RECT 1.025000 1.885000 1.260000 3.075000 ;
-      RECT 1.425000 0.255000 3.175000 0.435000 ;
-      RECT 1.425000 0.435000 1.645000 0.700000 ;
-      RECT 1.815000 0.605000 2.145000 0.870000 ;
-      RECT 1.815000 1.040000 2.145000 1.205000 ;
-      RECT 1.930000 1.885000 2.165000 2.300000 ;
-      RECT 1.930000 2.300000 3.535000 2.470000 ;
-      RECT 1.930000 2.470000 2.155000 3.075000 ;
-      RECT 2.845000 0.435000 3.175000 0.915000 ;
-      RECT 3.345000 2.470000 3.535000 2.905000 ;
-      RECT 3.345000 2.905000 4.465000 3.075000 ;
-      RECT 4.205000 1.920000 4.465000 2.905000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.095000  0.335000 0.345000 0.870000 ;
+      RECT 0.095000  0.870000 2.145000 1.040000 ;
+      RECT 0.095000  1.715000 2.165000 1.885000 ;
+      RECT 0.095000  1.885000 0.355000 3.075000 ;
+      RECT 0.525000  0.085000 0.855000 0.700000 ;
+      RECT 0.525000  2.055000 0.855000 3.245000 ;
+      RECT 1.025000  0.335000 1.255000 0.870000 ;
+      RECT 1.025000  1.885000 1.260000 3.075000 ;
+      RECT 1.425000  0.255000 3.175000 0.435000 ;
+      RECT 1.425000  0.435000 1.645000 0.700000 ;
+      RECT 1.430000  2.055000 1.760000 3.245000 ;
+      RECT 1.815000  0.605000 2.145000 0.870000 ;
+      RECT 1.815000  1.040000 2.145000 1.205000 ;
+      RECT 1.930000  1.885000 2.165000 2.300000 ;
+      RECT 1.930000  2.300000 3.535000 2.470000 ;
+      RECT 1.930000  2.470000 2.155000 3.075000 ;
+      RECT 2.325000  2.640000 3.175000 3.245000 ;
+      RECT 2.845000  0.435000 3.175000 0.915000 ;
+      RECT 3.345000  2.470000 3.535000 2.905000 ;
+      RECT 3.345000  2.905000 4.465000 3.075000 ;
+      RECT 3.705000  0.085000 4.035000 0.915000 ;
+      RECT 4.205000  1.920000 4.465000 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_lp__a31oi_2
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.magic.lef
index 2b2e357..5f1b925 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_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.525000  0.085000 0.855000 0.915000 ;
-        RECT 1.385000  0.085000 1.715000 0.915000 ;
-        RECT 6.445000  0.085000 6.775000 0.905000 ;
-        RECT 7.305000  0.085000 7.635000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,63 +97,84 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.595000 2.270000 0.925000 3.245000 ;
-        RECT 1.455000 2.270000 1.785000 3.245000 ;
-        RECT 2.315000 2.270000 2.645000 3.245000 ;
-        RECT 3.175000 2.270000 3.845000 2.640000 ;
-        RECT 3.175000 2.640000 4.015000 3.245000 ;
-        RECT 4.575000 2.630000 4.905000 3.245000 ;
-        RECT 5.435000 2.630000 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 ;
-        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.325000 0.345000 1.085000 ;
-      RECT 0.095000 1.085000 4.105000 1.255000 ;
-      RECT 0.165000 1.930000 4.185000 2.100000 ;
-      RECT 0.165000 2.100000 0.425000 3.075000 ;
-      RECT 1.025000 0.325000 1.215000 1.085000 ;
-      RECT 1.095000 2.100000 1.285000 3.075000 ;
-      RECT 1.885000 0.325000 2.075000 1.085000 ;
-      RECT 1.955000 2.100000 2.145000 3.075000 ;
-      RECT 2.245000 0.255000 5.855000 0.425000 ;
-      RECT 2.245000 0.425000 2.575000 0.915000 ;
-      RECT 2.755000 0.595000 3.085000 1.085000 ;
-      RECT 2.815000 2.100000 3.005000 3.075000 ;
-      RECT 3.265000 0.425000 3.595000 0.915000 ;
-      RECT 3.775000 0.595000 4.105000 1.085000 ;
-      RECT 4.015000 2.100000 4.185000 2.290000 ;
-      RECT 4.015000 2.290000 6.205000 2.460000 ;
-      RECT 4.015000 2.460000 4.405000 2.470000 ;
-      RECT 4.185000 2.470000 4.405000 3.075000 ;
-      RECT 4.725000 0.425000 4.985000 0.670000 ;
-      RECT 5.075000 2.460000 5.265000 3.075000 ;
-      RECT 5.655000 0.425000 5.855000 0.880000 ;
-      RECT 5.935000 2.460000 6.205000 2.905000 ;
-      RECT 5.935000 2.905000 7.995000 3.075000 ;
-      RECT 6.875000 2.290000 7.065000 2.905000 ;
-      RECT 7.745000 1.950000 7.995000 2.905000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.325000 0.345000 1.085000 ;
+      RECT 0.095000  1.085000 4.105000 1.255000 ;
+      RECT 0.165000  1.930000 4.185000 2.100000 ;
+      RECT 0.165000  2.100000 0.425000 3.075000 ;
+      RECT 0.525000  0.085000 0.855000 0.915000 ;
+      RECT 0.595000  2.270000 0.925000 3.245000 ;
+      RECT 1.025000  0.325000 1.215000 1.085000 ;
+      RECT 1.095000  2.100000 1.285000 3.075000 ;
+      RECT 1.385000  0.085000 1.715000 0.915000 ;
+      RECT 1.455000  2.270000 1.785000 3.245000 ;
+      RECT 1.885000  0.325000 2.075000 1.085000 ;
+      RECT 1.955000  2.100000 2.145000 3.075000 ;
+      RECT 2.245000  0.255000 5.855000 0.425000 ;
+      RECT 2.245000  0.425000 2.575000 0.915000 ;
+      RECT 2.315000  2.270000 2.645000 3.245000 ;
+      RECT 2.755000  0.595000 3.085000 1.085000 ;
+      RECT 2.815000  2.100000 3.005000 3.075000 ;
+      RECT 3.175000  2.270000 3.845000 2.640000 ;
+      RECT 3.175000  2.640000 4.015000 3.245000 ;
+      RECT 3.265000  0.425000 3.595000 0.915000 ;
+      RECT 3.775000  0.595000 4.105000 1.085000 ;
+      RECT 4.015000  2.100000 4.185000 2.290000 ;
+      RECT 4.015000  2.290000 6.205000 2.460000 ;
+      RECT 4.015000  2.460000 4.405000 2.470000 ;
+      RECT 4.185000  2.470000 4.405000 3.075000 ;
+      RECT 4.575000  2.630000 4.905000 3.245000 ;
+      RECT 4.725000  0.425000 4.985000 0.670000 ;
+      RECT 5.075000  2.460000 5.265000 3.075000 ;
+      RECT 5.435000  2.630000 5.765000 3.245000 ;
+      RECT 5.655000  0.425000 5.855000 0.880000 ;
+      RECT 5.935000  2.460000 6.205000 2.905000 ;
+      RECT 5.935000  2.905000 7.995000 3.075000 ;
+      RECT 6.445000  0.085000 6.775000 0.905000 ;
+      RECT 6.875000  2.290000 7.065000 2.905000 ;
+      RECT 7.305000  0.085000 7.635000 0.905000 ;
+      RECT 7.745000  1.950000 7.995000 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_lp__a31oi_4
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef
index 8c33d44..8ae4e15 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.magic.lef
@@ -82,17 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.420000  0.085000 0.750000 0.675000 ;
-        RECT 2.420000  0.085000 2.750000 0.590000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,25 +90,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.140000 2.025000 0.470000 3.245000 ;
-        RECT 1.200000 2.320000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.670000 1.970000 2.100000 2.140000 ;
-      RECT 0.670000 2.140000 1.000000 3.065000 ;
-      RECT 1.770000 2.140000 2.100000 3.065000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.140000  2.025000 0.470000 3.245000 ;
+      RECT 0.420000  0.085000 0.750000 0.675000 ;
+      RECT 0.670000  1.970000 2.100000 2.140000 ;
+      RECT 0.670000  2.140000 1.000000 3.065000 ;
+      RECT 1.200000  2.320000 1.530000 3.245000 ;
+      RECT 1.770000  2.140000 2.100000 3.065000 ;
+      RECT 2.420000  0.085000 2.750000 0.590000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a31oi_lp
diff --git a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef
index a3d5095..4b58d8b 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.magic.lef
@@ -83,17 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.490000  0.085000 0.820000 0.660000 ;
-        RECT 2.360000  0.085000 2.690000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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.390000 2.670000 0.720000 3.245000 ;
-        RECT 1.250000 2.690000 1.580000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.900000 2.340000 1.950000 2.510000 ;
-      RECT 0.900000 2.510000 1.070000 2.790000 ;
-      RECT 1.760000 2.510000 1.950000 2.790000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.390000  2.670000 0.720000 3.245000 ;
+      RECT 0.490000  0.085000 0.820000 0.660000 ;
+      RECT 0.900000  2.340000 1.950000 2.510000 ;
+      RECT 0.900000  2.510000 1.070000 2.790000 ;
+      RECT 1.250000  2.690000 1.580000 3.245000 ;
+      RECT 1.760000  2.510000 1.950000 2.790000 ;
+      RECT 2.360000  0.085000 2.690000 0.660000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__a31oi_m
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef
index 4ac7d1f..4d73a00 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_0.magic.lef
@@ -91,19 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.525000  0.085000 1.250000 0.505000 ;
-        RECT 3.425000  0.085000 3.675000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -112,37 +99,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.925000 2.125000 1.205000 3.245000 ;
-        RECT 1.865000 2.205000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 0.675000 1.850000 0.845000 ;
-      RECT 0.505000 0.845000 0.755000 1.955000 ;
-      RECT 1.375000 2.030000 2.650000 2.035000 ;
-      RECT 1.375000 2.035000 1.695000 2.805000 ;
-      RECT 1.475000 1.865000 2.650000 2.030000 ;
-      RECT 1.595000 0.280000 3.255000 0.610000 ;
-      RECT 1.595000 0.610000 1.850000 0.675000 ;
-      RECT 2.365000 2.035000 2.650000 2.895000 ;
-      RECT 2.365000 2.895000 3.600000 3.065000 ;
-      RECT 2.820000 1.785000 3.255000 1.955000 ;
-      RECT 2.820000 1.955000 3.150000 2.725000 ;
-      RECT 3.085000 0.610000 3.255000 1.785000 ;
-      RECT 3.320000 2.125000 3.600000 2.895000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.505000  0.675000 1.850000 0.845000 ;
+      RECT 0.505000  0.845000 0.755000 1.955000 ;
+      RECT 0.525000  0.085000 1.250000 0.505000 ;
+      RECT 0.925000  2.125000 1.205000 3.245000 ;
+      RECT 1.375000  2.030000 2.650000 2.035000 ;
+      RECT 1.375000  2.035000 1.695000 2.805000 ;
+      RECT 1.475000  1.865000 2.650000 2.030000 ;
+      RECT 1.595000  0.280000 3.255000 0.610000 ;
+      RECT 1.595000  0.610000 1.850000 0.675000 ;
+      RECT 1.865000  2.205000 2.195000 3.245000 ;
+      RECT 2.365000  2.035000 2.650000 2.895000 ;
+      RECT 2.365000  2.895000 3.600000 3.065000 ;
+      RECT 2.820000  1.785000 3.255000 1.955000 ;
+      RECT 2.820000  1.955000 3.150000 2.725000 ;
+      RECT 3.085000  0.610000 3.255000 1.785000 ;
+      RECT 3.320000  2.125000 3.600000 2.895000 ;
+      RECT 3.425000  0.085000 3.675000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a32o_0
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef
index 0bd0e74..4ad8c1d 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_1.magic.lef
@@ -89,19 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.545000  0.085000 1.195000 0.685000 ;
-        RECT 3.380000  0.085000 3.710000 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
@@ -110,35 +97,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.720000 2.105000 1.050000 3.245000 ;
-        RECT 1.650000 2.385000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.855000 2.920000 1.025000 ;
-      RECT 0.515000 1.025000 0.885000 1.515000 ;
-      RECT 0.715000 1.515000 0.885000 1.705000 ;
-      RECT 0.715000 1.705000 3.250000 1.875000 ;
-      RECT 1.220000 2.045000 2.750000 2.215000 ;
-      RECT 1.220000 2.215000 1.480000 3.065000 ;
-      RECT 2.240000 0.255000 2.920000 0.855000 ;
-      RECT 2.550000 2.215000 2.750000 2.905000 ;
-      RECT 2.550000 2.905000 3.710000 3.075000 ;
-      RECT 2.920000 1.875000 3.250000 2.735000 ;
-      RECT 3.420000 1.930000 3.710000 2.905000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.515000  0.855000 2.920000 1.025000 ;
+      RECT 0.515000  1.025000 0.885000 1.515000 ;
+      RECT 0.545000  0.085000 1.195000 0.685000 ;
+      RECT 0.715000  1.515000 0.885000 1.705000 ;
+      RECT 0.715000  1.705000 3.250000 1.875000 ;
+      RECT 0.720000  2.105000 1.050000 3.245000 ;
+      RECT 1.220000  2.045000 2.750000 2.215000 ;
+      RECT 1.220000  2.215000 1.480000 3.065000 ;
+      RECT 1.650000  2.385000 2.380000 3.245000 ;
+      RECT 2.240000  0.255000 2.920000 0.855000 ;
+      RECT 2.550000  2.215000 2.750000 2.905000 ;
+      RECT 2.550000  2.905000 3.710000 3.075000 ;
+      RECT 2.920000  1.875000 3.250000 2.735000 ;
+      RECT 3.380000  0.085000 3.710000 1.040000 ;
+      RECT 3.420000  1.930000 3.710000 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_lp__a32o_1
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef
index 4c40583..9cad4a4 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_2.magic.lef
@@ -93,22 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.385000  0.085000 0.715000 0.895000 ;
-        RECT 1.245000  0.085000 2.035000 0.835000 ;
-        RECT 4.335000  0.085000 4.590000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -117,38 +101,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.665000 2.115000 0.995000 3.245000 ;
-        RECT 3.300000 2.105000 3.630000 3.245000 ;
-        RECT 4.210000 1.920000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.085000 1.405000 1.415000 1.605000 ;
-      RECT 1.245000 1.005000 2.375000 1.175000 ;
-      RECT 1.245000 1.175000 1.415000 1.405000 ;
-      RECT 1.685000 1.930000 2.015000 2.905000 ;
-      RECT 1.685000 2.905000 3.130000 3.075000 ;
-      RECT 2.185000 1.175000 2.375000 2.735000 ;
-      RECT 2.205000 0.255000 2.865000 1.005000 ;
-      RECT 2.565000 2.745000 3.130000 2.905000 ;
-      RECT 2.905000 1.755000 4.040000 1.925000 ;
-      RECT 2.905000 1.925000 3.130000 2.745000 ;
-      RECT 3.800000 1.925000 4.040000 3.075000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.385000  0.085000 0.715000 0.895000 ;
+      RECT 0.665000  2.115000 0.995000 3.245000 ;
+      RECT 1.085000  1.405000 1.415000 1.605000 ;
+      RECT 1.245000  0.085000 2.035000 0.835000 ;
+      RECT 1.245000  1.005000 2.375000 1.175000 ;
+      RECT 1.245000  1.175000 1.415000 1.405000 ;
+      RECT 1.685000  1.930000 2.015000 2.905000 ;
+      RECT 1.685000  2.905000 3.130000 3.075000 ;
+      RECT 2.185000  1.175000 2.375000 2.735000 ;
+      RECT 2.205000  0.255000 2.865000 1.005000 ;
+      RECT 2.565000  2.745000 3.130000 2.905000 ;
+      RECT 2.905000  1.755000 4.040000 1.925000 ;
+      RECT 2.905000  1.925000 3.130000 2.745000 ;
+      RECT 3.300000  2.105000 3.630000 3.245000 ;
+      RECT 3.800000  1.925000 4.040000 3.075000 ;
+      RECT 4.210000  1.920000 4.540000 3.245000 ;
+      RECT 4.335000  0.085000 4.590000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a32o_2
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef
index 36169f8..7668b71 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_4.magic.lef
@@ -95,31 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.200000  0.085000 0.530000 0.875000 ;
-        RECT 1.060000  0.085000 1.390000 0.875000 ;
-        RECT 2.010000  0.085000 2.340000 0.905000 ;
-        RECT 3.030000  0.085000 3.240000 0.565000 ;
-        RECT 7.290000  0.085000 7.620000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -128,72 +103,94 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.380000 2.095000 0.710000 3.245000 ;
-        RECT 1.240000 2.095000 1.570000 3.245000 ;
-        RECT 2.140000 1.815000 2.370000 3.245000 ;
-        RECT 2.960000 2.260000 3.290000 3.245000 ;
-        RECT 4.410000 2.260000 4.740000 3.245000 ;
-        RECT 5.270000 2.260000 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 ;
-        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.505000 1.385000 2.195000 1.585000 ;
-      RECT 2.025000 1.075000 4.520000 1.095000 ;
-      RECT 2.025000 1.095000 6.760000 1.175000 ;
-      RECT 2.025000 1.175000 5.255000 1.245000 ;
-      RECT 2.025000 1.245000 2.195000 1.385000 ;
-      RECT 2.530000 0.255000 2.860000 0.735000 ;
-      RECT 2.530000 0.735000 3.580000 0.905000 ;
-      RECT 2.540000 1.920000 6.085000 2.090000 ;
-      RECT 2.540000 2.090000 2.790000 3.075000 ;
-      RECT 3.410000 0.255000 4.520000 0.515000 ;
-      RECT 3.410000 0.515000 3.580000 0.735000 ;
-      RECT 3.760000 0.685000 4.895000 0.895000 ;
-      RECT 3.865000 2.090000 4.240000 3.075000 ;
-      RECT 4.350000 1.245000 5.255000 1.265000 ;
-      RECT 4.690000 0.255000 5.810000 0.445000 ;
-      RECT 4.690000 0.445000 4.895000 0.685000 ;
-      RECT 4.690000 0.895000 4.895000 0.925000 ;
-      RECT 4.910000 2.090000 5.100000 3.075000 ;
-      RECT 5.065000 0.615000 5.310000 1.005000 ;
-      RECT 5.065000 1.005000 6.760000 1.095000 ;
-      RECT 5.480000 0.445000 5.810000 0.835000 ;
-      RECT 5.770000 2.090000 6.085000 2.905000 ;
-      RECT 5.770000 2.905000 8.040000 3.075000 ;
-      RECT 6.000000 0.255000 7.120000 0.425000 ;
-      RECT 6.000000 0.425000 6.260000 0.835000 ;
-      RECT 6.255000 1.175000 6.435000 1.920000 ;
-      RECT 6.255000 1.920000 7.610000 2.100000 ;
-      RECT 6.255000 2.100000 6.535000 2.735000 ;
-      RECT 6.430000 0.595000 6.760000 1.005000 ;
-      RECT 6.775000 2.270000 7.105000 2.905000 ;
-      RECT 6.930000 0.425000 7.120000 1.075000 ;
-      RECT 6.930000 1.075000 8.050000 1.245000 ;
-      RECT 7.280000 2.100000 7.610000 2.735000 ;
-      RECT 7.780000 1.920000 8.040000 2.905000 ;
-      RECT 7.790000 0.255000 8.050000 1.075000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.200000  0.085000 0.530000 0.875000 ;
+      RECT 0.380000  2.095000 0.710000 3.245000 ;
+      RECT 0.505000  1.385000 2.195000 1.585000 ;
+      RECT 1.060000  0.085000 1.390000 0.875000 ;
+      RECT 1.240000  2.095000 1.570000 3.245000 ;
+      RECT 2.010000  0.085000 2.340000 0.905000 ;
+      RECT 2.025000  1.075000 4.520000 1.095000 ;
+      RECT 2.025000  1.095000 6.760000 1.175000 ;
+      RECT 2.025000  1.175000 5.255000 1.245000 ;
+      RECT 2.025000  1.245000 2.195000 1.385000 ;
+      RECT 2.140000  1.815000 2.370000 3.245000 ;
+      RECT 2.530000  0.255000 2.860000 0.735000 ;
+      RECT 2.530000  0.735000 3.580000 0.905000 ;
+      RECT 2.540000  1.920000 6.085000 2.090000 ;
+      RECT 2.540000  2.090000 2.790000 3.075000 ;
+      RECT 2.960000  2.260000 3.290000 3.245000 ;
+      RECT 3.030000  0.085000 3.240000 0.565000 ;
+      RECT 3.410000  0.255000 4.520000 0.515000 ;
+      RECT 3.410000  0.515000 3.580000 0.735000 ;
+      RECT 3.760000  0.685000 4.895000 0.895000 ;
+      RECT 3.865000  2.090000 4.240000 3.075000 ;
+      RECT 4.350000  1.245000 5.255000 1.265000 ;
+      RECT 4.410000  2.260000 4.740000 3.245000 ;
+      RECT 4.690000  0.255000 5.810000 0.445000 ;
+      RECT 4.690000  0.445000 4.895000 0.685000 ;
+      RECT 4.690000  0.895000 4.895000 0.925000 ;
+      RECT 4.910000  2.090000 5.100000 3.075000 ;
+      RECT 5.065000  0.615000 5.310000 1.005000 ;
+      RECT 5.065000  1.005000 6.760000 1.095000 ;
+      RECT 5.270000  2.260000 5.600000 3.245000 ;
+      RECT 5.480000  0.445000 5.810000 0.835000 ;
+      RECT 5.770000  2.090000 6.085000 2.905000 ;
+      RECT 5.770000  2.905000 8.040000 3.075000 ;
+      RECT 6.000000  0.255000 7.120000 0.425000 ;
+      RECT 6.000000  0.425000 6.260000 0.835000 ;
+      RECT 6.255000  1.175000 6.435000 1.920000 ;
+      RECT 6.255000  1.920000 7.610000 2.100000 ;
+      RECT 6.255000  2.100000 6.535000 2.735000 ;
+      RECT 6.430000  0.595000 6.760000 1.005000 ;
+      RECT 6.775000  2.270000 7.105000 2.905000 ;
+      RECT 6.930000  0.425000 7.120000 1.075000 ;
+      RECT 6.930000  1.075000 8.050000 1.245000 ;
+      RECT 7.280000  2.100000 7.610000 2.735000 ;
+      RECT 7.290000  0.085000 7.620000 0.905000 ;
+      RECT 7.780000  1.920000 8.040000 2.905000 ;
+      RECT 7.790000  0.255000 8.050000 1.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a32o_4
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef
index 238a012..acd7f94 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_lp.magic.lef
@@ -88,20 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.230000  0.085000 0.560000 1.055000 ;
-        RECT 2.925000  0.085000 3.175000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -110,38 +96,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.720000 2.785000 2.050000 3.245000 ;
-        RECT 2.925000 2.075000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.130000 2.085000 0.460000 2.895000 ;
-      RECT 0.130000 2.895000 1.520000 3.065000 ;
-      RECT 0.660000 2.085000 2.745000 2.255000 ;
-      RECT 0.660000 2.255000 0.990000 2.715000 ;
-      RECT 1.190000 0.460000 2.745000 0.630000 ;
-      RECT 1.190000 0.630000 1.520000 1.055000 ;
-      RECT 1.190000 2.435000 2.660000 2.605000 ;
-      RECT 1.190000 2.605000 1.520000 2.895000 ;
-      RECT 2.330000 2.605000 2.660000 3.065000 ;
-      RECT 2.575000 0.630000 2.745000 1.200000 ;
-      RECT 2.575000 1.200000 3.685000 1.370000 ;
-      RECT 2.575000 1.370000 2.745000 2.085000 ;
-      RECT 3.355000 0.265000 3.685000 1.200000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.130000  2.085000 0.460000 2.895000 ;
+      RECT 0.130000  2.895000 1.520000 3.065000 ;
+      RECT 0.230000  0.085000 0.560000 1.055000 ;
+      RECT 0.660000  2.085000 2.745000 2.255000 ;
+      RECT 0.660000  2.255000 0.990000 2.715000 ;
+      RECT 1.190000  0.460000 2.745000 0.630000 ;
+      RECT 1.190000  0.630000 1.520000 1.055000 ;
+      RECT 1.190000  2.435000 2.660000 2.605000 ;
+      RECT 1.190000  2.605000 1.520000 2.895000 ;
+      RECT 1.720000  2.785000 2.050000 3.245000 ;
+      RECT 2.330000  2.605000 2.660000 3.065000 ;
+      RECT 2.575000  0.630000 2.745000 1.200000 ;
+      RECT 2.575000  1.200000 3.685000 1.370000 ;
+      RECT 2.575000  1.370000 2.745000 2.085000 ;
+      RECT 2.925000  0.085000 3.175000 1.020000 ;
+      RECT 2.925000  2.075000 3.255000 3.245000 ;
+      RECT 3.355000  0.265000 3.685000 1.200000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a32o_lp
diff --git a/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef b/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef
index ea73f8c..3394e59 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_m.magic.lef
@@ -90,18 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 0.485000 ;
-        RECT 2.915000  0.085000 3.245000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,36 +98,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.605000 1.945000 0.935000 2.335000 ;
-        RECT 0.605000 2.335000 1.815000 2.505000 ;
-        RECT 0.605000 2.505000 0.935000 3.245000 ;
-        RECT 1.625000 2.035000 1.815000 2.335000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.505000 1.335000 2.735000 1.505000 ;
-      RECT 0.505000 1.505000 0.675000 1.665000 ;
-      RECT 1.115000 1.685000 2.225000 1.855000 ;
-      RECT 1.115000 1.855000 1.445000 2.155000 ;
-      RECT 2.035000 1.855000 2.225000 2.335000 ;
-      RECT 2.035000 2.335000 3.125000 2.505000 ;
-      RECT 2.125000 0.375000 2.735000 0.585000 ;
-      RECT 2.405000 1.945000 2.735000 2.155000 ;
-      RECT 2.565000 0.585000 2.735000 1.335000 ;
-      RECT 2.565000 1.505000 2.735000 1.945000 ;
-      RECT 2.915000 2.035000 3.125000 2.335000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.505000  1.335000 2.735000 1.505000 ;
+      RECT 0.505000  1.505000 0.675000 1.665000 ;
+      RECT 0.575000  0.085000 0.905000 0.485000 ;
+      RECT 0.605000  1.945000 0.935000 2.335000 ;
+      RECT 0.605000  2.335000 1.815000 2.505000 ;
+      RECT 0.605000  2.505000 0.935000 3.245000 ;
+      RECT 1.115000  1.685000 2.225000 1.855000 ;
+      RECT 1.115000  1.855000 1.445000 2.155000 ;
+      RECT 1.625000  2.035000 1.815000 2.335000 ;
+      RECT 2.035000  1.855000 2.225000 2.335000 ;
+      RECT 2.035000  2.335000 3.125000 2.505000 ;
+      RECT 2.125000  0.375000 2.735000 0.585000 ;
+      RECT 2.405000  1.945000 2.735000 2.155000 ;
+      RECT 2.565000  0.585000 2.735000 1.335000 ;
+      RECT 2.565000  1.505000 2.735000 1.945000 ;
+      RECT 2.915000  0.085000 3.245000 0.485000 ;
+      RECT 2.915000  2.035000 3.125000 2.335000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a32o_m
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef
index c816e58..a9e3f88 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.magic.lef
@@ -89,18 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.245000  0.085000 0.455000 0.610000 ;
-        RECT 2.750000  0.085000 3.080000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -109,28 +97,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.470000 1.965000 2.075000 3.245000 ;
-        RECT 2.660000 1.965000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 1.965000 0.455000 2.815000 ;
-      RECT 0.145000 2.815000 1.300000 2.985000 ;
-      RECT 1.025000 1.615000 2.490000 1.795000 ;
-      RECT 1.025000 1.795000 1.300000 2.815000 ;
-      RECT 2.245000 1.795000 2.490000 2.645000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.145000  1.965000 0.455000 2.815000 ;
+      RECT 0.145000  2.815000 1.300000 2.985000 ;
+      RECT 0.245000  0.085000 0.455000 0.610000 ;
+      RECT 1.025000  1.615000 2.490000 1.795000 ;
+      RECT 1.025000  1.795000 1.300000 2.815000 ;
+      RECT 1.470000  1.965000 2.075000 3.245000 ;
+      RECT 2.245000  1.795000 2.490000 2.645000 ;
+      RECT 2.660000  1.965000 2.965000 3.245000 ;
+      RECT 2.750000  0.085000 3.080000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a32oi_0
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.magic.lef
index 9f69355..abe7cf5 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__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.250000  0.085000 0.510000 1.040000 ;
-        RECT 2.735000  0.085000 3.065000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -112,29 +100,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.605000 2.630000 2.275000 3.245000 ;
-        RECT 2.805000 1.925000 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.250000 1.920000 0.510000 2.905000 ;
-      RECT 0.250000 2.905000 1.435000 3.075000 ;
-      RECT 1.180000 2.290000 2.635000 2.460000 ;
-      RECT 1.180000 2.460000 1.435000 2.905000 ;
-      RECT 2.425000 1.920000 2.635000 2.290000 ;
-      RECT 2.445000 2.460000 2.635000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.250000  0.085000 0.510000 1.040000 ;
+      RECT 0.250000  1.920000 0.510000 2.905000 ;
+      RECT 0.250000  2.905000 1.435000 3.075000 ;
+      RECT 1.180000  2.290000 2.635000 2.460000 ;
+      RECT 1.180000  2.460000 1.435000 2.905000 ;
+      RECT 1.605000  2.630000 2.275000 3.245000 ;
+      RECT 2.425000  1.920000 2.635000 2.290000 ;
+      RECT 2.445000  2.460000 2.635000 3.075000 ;
+      RECT 2.735000  0.085000 3.065000 1.040000 ;
+      RECT 2.805000  1.925000 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_lp__a32oi_1
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.magic.lef
index 8cdb93b..af24dd0 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__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.605000  0.085000 0.935000 0.700000 ;
-        RECT 4.895000  0.085000 5.225000 0.905000 ;
-        RECT 5.755000  0.085000 6.085000 1.025000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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.560000 2.630000 3.335000 3.245000 ;
-        RECT 3.945000 2.260000 4.645000 3.245000 ;
-        RECT 5.175000 2.095000 5.505000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.175000 0.315000 0.435000 0.870000 ;
-      RECT 0.175000 0.870000 1.295000 1.040000 ;
-      RECT 0.175000 1.930000 0.435000 2.905000 ;
-      RECT 0.175000 2.905000 2.345000 3.075000 ;
-      RECT 1.105000 0.265000 2.295000 0.435000 ;
-      RECT 1.105000 0.435000 1.295000 0.870000 ;
-      RECT 1.105000 2.035000 1.295000 2.905000 ;
-      RECT 1.965000 0.435000 2.295000 0.905000 ;
-      RECT 2.015000 2.290000 3.775000 2.460000 ;
-      RECT 2.015000 2.460000 2.345000 2.905000 ;
-      RECT 2.505000 0.265000 4.695000 0.435000 ;
-      RECT 2.505000 0.435000 2.835000 0.905000 ;
-      RECT 3.505000 0.435000 3.695000 1.205000 ;
-      RECT 3.505000 2.460000 3.775000 3.075000 ;
-      RECT 3.515000 1.920000 5.935000 1.925000 ;
-      RECT 3.515000 1.925000 5.005000 2.090000 ;
-      RECT 3.515000 2.090000 3.775000 2.290000 ;
-      RECT 3.865000 0.605000 4.195000 1.075000 ;
-      RECT 3.865000 1.075000 5.585000 1.245000 ;
-      RECT 4.365000 0.435000 4.695000 0.905000 ;
-      RECT 4.815000 2.090000 5.005000 3.075000 ;
-      RECT 4.825000 1.755000 5.935000 1.920000 ;
-      RECT 5.395000 0.255000 5.585000 1.075000 ;
-      RECT 5.675000 1.925000 5.935000 3.075000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.175000  0.315000 0.435000 0.870000 ;
+      RECT 0.175000  0.870000 1.295000 1.040000 ;
+      RECT 0.175000  1.930000 0.435000 2.905000 ;
+      RECT 0.175000  2.905000 2.345000 3.075000 ;
+      RECT 0.605000  0.085000 0.935000 0.700000 ;
+      RECT 1.105000  0.265000 2.295000 0.435000 ;
+      RECT 1.105000  0.435000 1.295000 0.870000 ;
+      RECT 1.105000  2.035000 1.295000 2.905000 ;
+      RECT 1.965000  0.435000 2.295000 0.905000 ;
+      RECT 2.015000  2.290000 3.775000 2.460000 ;
+      RECT 2.015000  2.460000 2.345000 2.905000 ;
+      RECT 2.505000  0.265000 4.695000 0.435000 ;
+      RECT 2.505000  0.435000 2.835000 0.905000 ;
+      RECT 2.560000  2.630000 3.335000 3.245000 ;
+      RECT 3.505000  0.435000 3.695000 1.205000 ;
+      RECT 3.505000  2.460000 3.775000 3.075000 ;
+      RECT 3.515000  1.920000 5.935000 1.925000 ;
+      RECT 3.515000  1.925000 5.005000 2.090000 ;
+      RECT 3.515000  2.090000 3.775000 2.290000 ;
+      RECT 3.865000  0.605000 4.195000 1.075000 ;
+      RECT 3.865000  1.075000 5.585000 1.245000 ;
+      RECT 3.945000  2.260000 4.645000 3.245000 ;
+      RECT 4.365000  0.435000 4.695000 0.905000 ;
+      RECT 4.815000  2.090000 5.005000 3.075000 ;
+      RECT 4.825000  1.755000 5.935000 1.920000 ;
+      RECT 4.895000  0.085000 5.225000 0.905000 ;
+      RECT 5.175000  2.095000 5.505000 3.245000 ;
+      RECT 5.395000  0.255000 5.585000 1.075000 ;
+      RECT 5.675000  1.925000 5.935000 3.075000 ;
+      RECT 5.755000  0.085000 6.085000 1.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a32oi_2
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef
index 20a9516..6265cfe 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.magic.lef
@@ -94,36 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.530000  0.085000  0.860000 0.700000 ;
-        RECT 1.390000  0.085000  1.720000 0.700000 ;
-        RECT 8.120000  0.085000  8.450000 0.595000 ;
-        RECT 8.980000  0.085000  9.310000 0.595000 ;
-        RECT 9.840000  0.085000 10.170000 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 ;
-        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
@@ -132,67 +102,94 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 4.150000 2.395000  4.480000 3.245000 ;
-        RECT 5.010000 2.445000  5.680000 3.245000 ;
-        RECT 6.210000 2.395000  6.900000 3.245000 ;
-        RECT 7.430000 1.945000  7.760000 3.245000 ;
-        RECT 8.290000 1.945000  8.620000 3.245000 ;
-        RECT 9.150000 1.945000  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 ;
-        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.100000 0.255000 0.360000 0.870000 ;
-      RECT 0.100000 0.870000 2.080000 1.040000 ;
-      RECT 0.170000 1.825000 0.430000 2.905000 ;
-      RECT 0.170000 2.905000 3.980000 3.075000 ;
-      RECT 1.030000 0.255000 1.220000 0.870000 ;
-      RECT 1.100000 2.045000 1.290000 2.905000 ;
-      RECT 1.890000 0.255000 3.870000 0.595000 ;
-      RECT 1.890000 0.595000 2.080000 0.870000 ;
-      RECT 1.960000 2.045000 2.150000 2.905000 ;
-      RECT 2.820000 2.045000 3.010000 2.905000 ;
-      RECT 3.680000 2.045000 7.260000 2.225000 ;
-      RECT 3.680000 2.225000 3.980000 2.905000 ;
-      RECT 4.160000 0.265000 7.930000 0.595000 ;
-      RECT 4.650000 2.225000 4.840000 3.075000 ;
-      RECT 5.850000 2.225000 6.040000 3.075000 ;
-      RECT 6.310000 0.765000 8.810000 0.815000 ;
-      RECT 6.310000 0.815000 9.670000 1.040000 ;
-      RECT 7.000000 1.605000 9.910000 1.775000 ;
-      RECT 7.000000 1.775000 7.260000 2.045000 ;
-      RECT 7.070000 2.225000 7.260000 3.075000 ;
-      RECT 7.930000 1.775000 8.120000 3.075000 ;
-      RECT 8.620000 0.255000 8.810000 0.765000 ;
-      RECT 8.790000 1.775000 8.980000 3.075000 ;
-      RECT 9.480000 0.255000 9.670000 0.815000 ;
-      RECT 9.650000 1.775000 9.910000 3.075000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.100000  0.255000  0.360000 0.870000 ;
+      RECT 0.100000  0.870000  2.080000 1.040000 ;
+      RECT 0.170000  1.825000  0.430000 2.905000 ;
+      RECT 0.170000  2.905000  3.980000 3.075000 ;
+      RECT 0.530000  0.085000  0.860000 0.700000 ;
+      RECT 1.030000  0.255000  1.220000 0.870000 ;
+      RECT 1.100000  2.045000  1.290000 2.905000 ;
+      RECT 1.390000  0.085000  1.720000 0.700000 ;
+      RECT 1.890000  0.255000  3.870000 0.595000 ;
+      RECT 1.890000  0.595000  2.080000 0.870000 ;
+      RECT 1.960000  2.045000  2.150000 2.905000 ;
+      RECT 2.820000  2.045000  3.010000 2.905000 ;
+      RECT 3.680000  2.045000  7.260000 2.225000 ;
+      RECT 3.680000  2.225000  3.980000 2.905000 ;
+      RECT 4.150000  2.395000  4.480000 3.245000 ;
+      RECT 4.160000  0.265000  7.930000 0.595000 ;
+      RECT 4.650000  2.225000  4.840000 3.075000 ;
+      RECT 5.010000  2.445000  5.680000 3.245000 ;
+      RECT 5.850000  2.225000  6.040000 3.075000 ;
+      RECT 6.210000  2.395000  6.900000 3.245000 ;
+      RECT 6.310000  0.765000  8.810000 0.815000 ;
+      RECT 6.310000  0.815000  9.670000 1.040000 ;
+      RECT 7.000000  1.605000  9.910000 1.775000 ;
+      RECT 7.000000  1.775000  7.260000 2.045000 ;
+      RECT 7.070000  2.225000  7.260000 3.075000 ;
+      RECT 7.430000  1.945000  7.760000 3.245000 ;
+      RECT 7.930000  1.775000  8.120000 3.075000 ;
+      RECT 8.120000  0.085000  8.450000 0.595000 ;
+      RECT 8.290000  1.945000  8.620000 3.245000 ;
+      RECT 8.620000  0.255000  8.810000 0.765000 ;
+      RECT 8.790000  1.775000  8.980000 3.075000 ;
+      RECT 8.980000  0.085000  9.310000 0.595000 ;
+      RECT 9.150000  1.945000  9.480000 3.245000 ;
+      RECT 9.480000  0.255000  9.670000 0.815000 ;
+      RECT 9.650000  1.775000  9.910000 3.075000 ;
+      RECT 9.840000  0.085000 10.170000 1.040000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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_lp__a32oi_4
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef
index e25dd60..00ff573 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.245000  0.085000 0.575000 0.580000 ;
-        RECT 2.690000  0.085000 3.020000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -112,28 +100,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.850000 2.310000 2.180000 3.245000 ;
-        RECT 2.990000 2.025000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.260000 2.320000 0.590000 2.895000 ;
-      RECT 0.260000 2.895000 1.650000 3.065000 ;
-      RECT 1.320000 1.960000 2.710000 2.130000 ;
-      RECT 1.320000 2.130000 1.650000 2.895000 ;
-      RECT 2.380000 2.130000 2.710000 3.065000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.245000  0.085000 0.575000 0.580000 ;
+      RECT 0.260000  2.320000 0.590000 2.895000 ;
+      RECT 0.260000  2.895000 1.650000 3.065000 ;
+      RECT 1.320000  1.960000 2.710000 2.130000 ;
+      RECT 1.320000  2.130000 1.650000 2.895000 ;
+      RECT 1.850000  2.310000 2.180000 3.245000 ;
+      RECT 2.380000  2.130000 2.710000 3.065000 ;
+      RECT 2.690000  0.085000 3.020000 0.630000 ;
+      RECT 2.990000  2.025000 3.240000 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_lp__a32oi_lp
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef
index c3cb4d9..65ce305 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 0.485000 ;
-        RECT 2.470000  0.085000 2.800000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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 +100,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.610000 2.670000 1.940000 3.245000 ;
-        RECT 2.550000 2.670000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 2.670000 0.490000 2.890000 ;
-      RECT 0.160000 2.890000 1.390000 3.060000 ;
-      RECT 1.180000 2.320000 2.370000 2.490000 ;
-      RECT 1.180000 2.490000 1.390000 2.890000 ;
-      RECT 2.200000 2.490000 2.370000 2.810000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  0.085000 0.455000 0.485000 ;
+      RECT 0.160000  2.670000 0.490000 2.890000 ;
+      RECT 0.160000  2.890000 1.390000 3.060000 ;
+      RECT 1.180000  2.320000 2.370000 2.490000 ;
+      RECT 1.180000  2.490000 1.390000 2.890000 ;
+      RECT 1.610000  2.670000 1.940000 3.245000 ;
+      RECT 2.200000  2.490000 2.370000 2.810000 ;
+      RECT 2.470000  0.085000 2.800000 0.485000 ;
+      RECT 2.550000  2.670000 2.880000 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_lp__a32oi_m
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef
index db4b485..1b4fba9 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_0.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.740000  0.085000 0.995000 0.570000 ;
-        RECT 3.135000  0.085000 3.530000 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
@@ -111,36 +98,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.560000 2.385000 0.855000 3.245000 ;
-        RECT 2.040000 2.345000 2.305000 3.245000 ;
-        RECT 2.900000 2.345000 3.190000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.505000 1.545000 0.895000 2.045000 ;
-      RECT 0.505000 2.045000 1.445000 2.215000 ;
-      RECT 0.725000 0.740000 1.415000 0.910000 ;
-      RECT 0.725000 0.910000 0.895000 1.545000 ;
-      RECT 1.150000 2.215000 1.445000 3.025000 ;
-      RECT 1.165000 0.280000 1.800000 0.600000 ;
-      RECT 1.165000 0.600000 1.415000 0.740000 ;
-      RECT 1.615000 2.005000 3.655000 2.175000 ;
-      RECT 1.615000 2.175000 1.870000 3.025000 ;
-      RECT 2.475000 2.175000 2.730000 3.025000 ;
-      RECT 3.360000 2.175000 3.655000 3.025000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.505000  1.545000 0.895000 2.045000 ;
+      RECT 0.505000  2.045000 1.445000 2.215000 ;
+      RECT 0.560000  2.385000 0.855000 3.245000 ;
+      RECT 0.725000  0.740000 1.415000 0.910000 ;
+      RECT 0.725000  0.910000 0.895000 1.545000 ;
+      RECT 0.740000  0.085000 0.995000 0.570000 ;
+      RECT 1.150000  2.215000 1.445000 3.025000 ;
+      RECT 1.165000  0.280000 1.800000 0.600000 ;
+      RECT 1.165000  0.600000 1.415000 0.740000 ;
+      RECT 1.615000  2.005000 3.655000 2.175000 ;
+      RECT 1.615000  2.175000 1.870000 3.025000 ;
+      RECT 2.040000  2.345000 2.305000 3.245000 ;
+      RECT 2.475000  2.175000 2.730000 3.025000 ;
+      RECT 2.900000  2.345000 3.190000 3.245000 ;
+      RECT 3.135000  0.085000 3.530000 0.600000 ;
+      RECT 3.360000  2.175000 3.655000 3.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a41o_0
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef
index 06b31e9..9ce9d67 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_1.magic.lef
@@ -88,20 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.750000  0.085000 1.555000 0.700000 ;
-        RECT 3.855000  0.085000 4.135000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -110,35 +96,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.750000 1.945000 1.020000 3.245000 ;
-        RECT 2.135000 2.025000 2.805000 3.245000 ;
-        RECT 3.355000 2.025000 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.740000 0.870000 1.905000 1.040000 ;
-      RECT 0.740000 1.040000 0.945000 1.605000 ;
-      RECT 0.740000 1.605000 1.570000 1.775000 ;
-      RECT 1.275000 1.775000 1.570000 3.075000 ;
-      RECT 1.725000 0.255000 1.905000 0.870000 ;
-      RECT 1.740000 1.685000 4.135000 1.855000 ;
-      RECT 1.740000 1.855000 1.965000 3.075000 ;
-      RECT 2.975000 1.855000 3.185000 3.075000 ;
-      RECT 3.855000 1.855000 4.135000 3.075000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.740000  0.870000 1.905000 1.040000 ;
+      RECT 0.740000  1.040000 0.945000 1.605000 ;
+      RECT 0.740000  1.605000 1.570000 1.775000 ;
+      RECT 0.750000  0.085000 1.555000 0.700000 ;
+      RECT 0.750000  1.945000 1.020000 3.245000 ;
+      RECT 1.275000  1.775000 1.570000 3.075000 ;
+      RECT 1.725000  0.255000 1.905000 0.870000 ;
+      RECT 1.740000  1.685000 4.135000 1.855000 ;
+      RECT 1.740000  1.855000 1.965000 3.075000 ;
+      RECT 2.135000  2.025000 2.805000 3.245000 ;
+      RECT 2.975000  1.855000 3.185000 3.075000 ;
+      RECT 3.355000  2.025000 3.685000 3.245000 ;
+      RECT 3.855000  0.085000 4.135000 1.015000 ;
+      RECT 3.855000  1.855000 4.135000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a41o_1
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef
index 65bb40e..120184b 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_2.magic.lef
@@ -88,22 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.145000  0.085000 0.430000 1.255000 ;
-        RECT 1.005000  0.085000 1.335000 1.175000 ;
-        RECT 2.295000  0.085000 2.625000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,40 +96,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.145000 1.815000 0.430000 3.245000 ;
-        RECT 1.005000 1.845000 1.335000 3.245000 ;
-        RECT 2.690000 2.270000 3.020000 3.245000 ;
-        RECT 3.790000 2.270000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.025000 1.345000 1.835000 1.675000 ;
-      RECT 1.505000 0.255000 2.080000 0.995000 ;
-      RECT 1.505000 0.995000 4.550000 1.165000 ;
-      RECT 1.505000 1.165000 1.835000 1.345000 ;
-      RECT 1.665000 1.675000 1.835000 1.920000 ;
-      RECT 1.665000 1.920000 2.080000 2.100000 ;
-      RECT 1.810000 2.100000 2.080000 3.075000 ;
-      RECT 2.300000 1.920000 4.550000 2.100000 ;
-      RECT 2.300000 2.100000 2.520000 3.075000 ;
-      RECT 3.260000 2.100000 3.590000 3.075000 ;
-      RECT 4.220000 0.255000 4.550000 0.995000 ;
-      RECT 4.290000 2.100000 4.550000 3.075000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.145000  0.085000 0.430000 1.255000 ;
+      RECT 0.145000  1.815000 0.430000 3.245000 ;
+      RECT 1.005000  0.085000 1.335000 1.175000 ;
+      RECT 1.005000  1.845000 1.335000 3.245000 ;
+      RECT 1.025000  1.345000 1.835000 1.675000 ;
+      RECT 1.505000  0.255000 2.080000 0.995000 ;
+      RECT 1.505000  0.995000 4.550000 1.165000 ;
+      RECT 1.505000  1.165000 1.835000 1.345000 ;
+      RECT 1.665000  1.675000 1.835000 1.920000 ;
+      RECT 1.665000  1.920000 2.080000 2.100000 ;
+      RECT 1.810000  2.100000 2.080000 3.075000 ;
+      RECT 2.295000  0.085000 2.625000 0.825000 ;
+      RECT 2.300000  1.920000 4.550000 2.100000 ;
+      RECT 2.300000  2.100000 2.520000 3.075000 ;
+      RECT 2.690000  2.270000 3.020000 3.245000 ;
+      RECT 3.260000  2.100000 3.590000 3.075000 ;
+      RECT 3.790000  2.270000 4.120000 3.245000 ;
+      RECT 4.220000  0.255000 4.550000 0.995000 ;
+      RECT 4.290000  2.100000 4.550000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a41o_2
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef
index be7e24a..f1e792b 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_4.magic.lef
@@ -94,30 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.195000  0.085000 0.525000 0.885000 ;
-        RECT 1.055000  0.085000 1.385000 0.885000 ;
-        RECT 1.950000  0.085000 2.210000 1.105000 ;
-        RECT 2.775000  0.085000 3.105000 0.515000 ;
-        RECT 6.825000  0.085000 7.155000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -126,60 +102,81 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.195000 2.095000 0.525000 3.245000 ;
-        RECT 1.055000 2.095000 1.385000 3.245000 ;
-        RECT 1.950000 1.815000 2.235000 3.245000 ;
-        RECT 3.725000 2.095000 4.055000 3.245000 ;
-        RECT 4.605000 2.095000 4.935000 3.245000 ;
-        RECT 5.490000 2.095000 5.820000 3.245000 ;
-        RECT 6.350000 2.095000 6.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 ;
-        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.590000 1.405000 2.595000 1.575000 ;
-      RECT 2.380000 0.255000 2.605000 0.685000 ;
-      RECT 2.380000 0.685000 3.985000 1.015000 ;
-      RECT 2.380000 1.015000 2.595000 1.405000 ;
-      RECT 2.405000 1.575000 2.595000 1.705000 ;
-      RECT 2.405000 1.705000 3.195000 1.875000 ;
-      RECT 2.435000 2.045000 2.695000 2.905000 ;
-      RECT 2.435000 2.905000 3.555000 3.075000 ;
-      RECT 2.865000 1.875000 3.195000 2.735000 ;
-      RECT 3.295000 0.255000 4.425000 0.505000 ;
-      RECT 3.365000 1.755000 7.110000 1.925000 ;
-      RECT 3.365000 1.925000 3.555000 2.905000 ;
-      RECT 4.155000 0.505000 4.425000 0.765000 ;
-      RECT 4.155000 0.765000 5.345000 1.015000 ;
-      RECT 4.225000 1.925000 4.415000 3.075000 ;
-      RECT 4.595000 0.265000 6.235000 0.595000 ;
-      RECT 5.110000 1.925000 5.320000 3.075000 ;
-      RECT 5.535000 0.765000 6.655000 0.870000 ;
-      RECT 5.535000 0.870000 7.585000 1.040000 ;
-      RECT 5.990000 1.925000 6.180000 3.075000 ;
-      RECT 6.405000 0.255000 6.655000 0.765000 ;
-      RECT 6.850000 1.925000 7.110000 3.075000 ;
-      RECT 7.325000 0.255000 7.585000 0.870000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.195000  0.085000 0.525000 0.885000 ;
+      RECT 0.195000  2.095000 0.525000 3.245000 ;
+      RECT 0.590000  1.405000 2.595000 1.575000 ;
+      RECT 1.055000  0.085000 1.385000 0.885000 ;
+      RECT 1.055000  2.095000 1.385000 3.245000 ;
+      RECT 1.950000  0.085000 2.210000 1.105000 ;
+      RECT 1.950000  1.815000 2.235000 3.245000 ;
+      RECT 2.380000  0.255000 2.605000 0.685000 ;
+      RECT 2.380000  0.685000 3.985000 1.015000 ;
+      RECT 2.380000  1.015000 2.595000 1.405000 ;
+      RECT 2.405000  1.575000 2.595000 1.705000 ;
+      RECT 2.405000  1.705000 3.195000 1.875000 ;
+      RECT 2.435000  2.045000 2.695000 2.905000 ;
+      RECT 2.435000  2.905000 3.555000 3.075000 ;
+      RECT 2.775000  0.085000 3.105000 0.515000 ;
+      RECT 2.865000  1.875000 3.195000 2.735000 ;
+      RECT 3.295000  0.255000 4.425000 0.505000 ;
+      RECT 3.365000  1.755000 7.110000 1.925000 ;
+      RECT 3.365000  1.925000 3.555000 2.905000 ;
+      RECT 3.725000  2.095000 4.055000 3.245000 ;
+      RECT 4.155000  0.505000 4.425000 0.765000 ;
+      RECT 4.155000  0.765000 5.345000 1.015000 ;
+      RECT 4.225000  1.925000 4.415000 3.075000 ;
+      RECT 4.595000  0.265000 6.235000 0.595000 ;
+      RECT 4.605000  2.095000 4.935000 3.245000 ;
+      RECT 5.110000  1.925000 5.320000 3.075000 ;
+      RECT 5.490000  2.095000 5.820000 3.245000 ;
+      RECT 5.535000  0.765000 6.655000 0.870000 ;
+      RECT 5.535000  0.870000 7.585000 1.040000 ;
+      RECT 5.990000  1.925000 6.180000 3.075000 ;
+      RECT 6.350000  2.095000 6.680000 3.245000 ;
+      RECT 6.405000  0.255000 6.655000 0.765000 ;
+      RECT 6.825000  0.085000 7.155000 0.700000 ;
+      RECT 6.850000  1.925000 7.110000 3.075000 ;
+      RECT 7.325000  0.255000 7.585000 0.870000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a41o_4
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef
index b3f85b3..1b26179 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_lp.magic.lef
@@ -89,20 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.185000  0.085000 0.435000 0.645000 ;
-        RECT 3.045000  0.085000 3.375000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,37 +97,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.645000 2.025000 0.975000 3.245000 ;
-        RECT 1.705000 2.275000 2.035000 3.245000 ;
-        RECT 3.345000 2.275000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.675000 1.505000 1.845000 ;
-      RECT 0.115000 1.845000 0.445000 3.065000 ;
-      RECT 1.175000 1.845000 1.505000 1.925000 ;
-      RECT 1.175000 1.925000 2.585000 2.095000 ;
-      RECT 1.175000 2.095000 1.505000 3.065000 ;
-      RECT 2.255000 0.265000 2.585000 0.725000 ;
-      RECT 2.255000 0.725000 3.655000 0.895000 ;
-      RECT 2.255000 2.095000 2.585000 3.065000 ;
-      RECT 2.785000 1.925000 3.655000 2.095000 ;
-      RECT 2.785000 2.095000 3.115000 3.065000 ;
-      RECT 3.325000 0.895000 3.655000 1.925000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  1.675000 1.505000 1.845000 ;
+      RECT 0.115000  1.845000 0.445000 3.065000 ;
+      RECT 0.185000  0.085000 0.435000 0.645000 ;
+      RECT 0.645000  2.025000 0.975000 3.245000 ;
+      RECT 1.175000  1.845000 1.505000 1.925000 ;
+      RECT 1.175000  1.925000 2.585000 2.095000 ;
+      RECT 1.175000  2.095000 1.505000 3.065000 ;
+      RECT 1.705000  2.275000 2.035000 3.245000 ;
+      RECT 2.255000  0.265000 2.585000 0.725000 ;
+      RECT 2.255000  0.725000 3.655000 0.895000 ;
+      RECT 2.255000  2.095000 2.585000 3.065000 ;
+      RECT 2.785000  1.925000 3.655000 2.095000 ;
+      RECT 2.785000  2.095000 3.115000 3.065000 ;
+      RECT 3.045000  0.085000 3.375000 0.545000 ;
+      RECT 3.325000  0.895000 3.655000 1.925000 ;
+      RECT 3.345000  2.275000 3.675000 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_lp__a41o_lp
diff --git a/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef b/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef
index 9639afd..667fa16 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_m.magic.lef
@@ -89,19 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.795000  0.085000 1.005000 0.545000 ;
-        RECT 3.090000  0.085000 3.420000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -110,34 +97,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.525000 2.845000 0.855000 3.245000 ;
-        RECT 1.905000 2.710000 2.235000 3.245000 ;
-        RECT 2.825000 2.650000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 0.775000 1.415000 0.945000 ;
-      RECT 0.525000 0.945000 0.695000 2.395000 ;
-      RECT 0.525000 2.395000 1.315000 2.565000 ;
-      RECT 1.105000 2.565000 1.315000 2.850000 ;
-      RECT 1.225000 0.345000 1.415000 0.775000 ;
-      RECT 1.535000 2.300000 3.465000 2.470000 ;
-      RECT 1.535000 2.470000 1.725000 2.850000 ;
-      RECT 2.415000 2.470000 2.605000 2.850000 ;
-      RECT 3.255000 2.470000 3.465000 2.850000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.525000  0.775000 1.415000 0.945000 ;
+      RECT 0.525000  0.945000 0.695000 2.395000 ;
+      RECT 0.525000  2.395000 1.315000 2.565000 ;
+      RECT 0.525000  2.845000 0.855000 3.245000 ;
+      RECT 0.795000  0.085000 1.005000 0.545000 ;
+      RECT 1.105000  2.565000 1.315000 2.850000 ;
+      RECT 1.225000  0.345000 1.415000 0.775000 ;
+      RECT 1.535000  2.300000 3.465000 2.470000 ;
+      RECT 1.535000  2.470000 1.725000 2.850000 ;
+      RECT 1.905000  2.710000 2.235000 3.245000 ;
+      RECT 2.415000  2.470000 2.605000 2.850000 ;
+      RECT 2.825000  2.650000 3.035000 3.245000 ;
+      RECT 3.090000  0.085000 3.420000 0.485000 ;
+      RECT 3.255000  2.470000 3.465000 2.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 ;
   END
 END sky130_fd_sc_lp__a41o_m
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef
index 6337e0e..39236a5 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.magic.lef
@@ -91,18 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.245000  0.085000 0.450000 0.610000 ;
-        RECT 2.715000  0.085000 3.045000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -111,27 +99,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.320000 2.375000 1.575000 3.245000 ;
-        RECT 2.175000 2.375000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.890000 2.025000 2.905000 2.205000 ;
-      RECT 0.890000 2.205000 1.150000 3.055000 ;
-      RECT 1.745000 2.205000 2.005000 3.055000 ;
-      RECT 2.615000 2.205000 2.905000 3.055000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.245000  0.085000 0.450000 0.610000 ;
+      RECT 0.890000  2.025000 2.905000 2.205000 ;
+      RECT 0.890000  2.205000 1.150000 3.055000 ;
+      RECT 1.320000  2.375000 1.575000 3.245000 ;
+      RECT 1.745000  2.205000 2.005000 3.055000 ;
+      RECT 2.175000  2.375000 2.445000 3.245000 ;
+      RECT 2.615000  2.205000 2.905000 3.055000 ;
+      RECT 2.715000  0.085000 3.045000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a41oi_0
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef
index 5e26d92..22f0bc6 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.magic.lef
@@ -94,17 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.615000  0.085000 1.395000 0.665000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,32 +102,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.075000 2.375000 1.935000 3.245000 ;
-        RECT 1.455000 2.265000 1.935000 2.375000 ;
-        RECT 2.485000 2.260000 2.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.615000 2.035000 3.265000 2.090000 ;
-      RECT 0.615000 2.090000 2.315000 2.095000 ;
-      RECT 0.615000 2.095000 1.285000 2.205000 ;
-      RECT 0.615000 2.205000 0.905000 3.075000 ;
-      RECT 1.115000 1.925000 3.265000 2.035000 ;
-      RECT 1.635000 1.920000 3.265000 1.925000 ;
-      RECT 2.105000 2.095000 2.315000 3.075000 ;
-      RECT 2.985000 2.090000 3.265000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.615000  0.085000 1.395000 0.665000 ;
+      RECT 0.615000  2.035000 3.265000 2.090000 ;
+      RECT 0.615000  2.090000 2.315000 2.095000 ;
+      RECT 0.615000  2.095000 1.285000 2.205000 ;
+      RECT 0.615000  2.205000 0.905000 3.075000 ;
+      RECT 1.075000  2.375000 1.935000 3.245000 ;
+      RECT 1.115000  1.925000 3.265000 2.035000 ;
+      RECT 1.455000  2.265000 1.935000 2.375000 ;
+      RECT 1.635000  1.920000 3.265000 1.925000 ;
+      RECT 2.105000  2.095000 2.315000 3.075000 ;
+      RECT 2.485000  2.260000 2.815000 3.245000 ;
+      RECT 2.985000  2.090000 3.265000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a41oi_1
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef
index 19478cd..3772fbf 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.magic.lef
@@ -96,25 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.170000  0.085000 0.500000 1.040000 ;
-        RECT 1.030000  0.085000 1.360000 0.700000 ;
-        RECT 5.260000  0.085000 5.590000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.240000 0.245000 ;
     END
@@ -123,60 +104,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 1.845000 2.460000 2.175000 3.245000 ;
-        RECT 2.860000 2.505000 3.700000 3.245000 ;
-        RECT 4.315000 2.055000 4.645000 3.245000 ;
-        RECT 5.260000 2.265000 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.475000 1.920000 0.735000 2.895000 ;
-      RECT 0.475000 2.895000 1.665000 3.075000 ;
-      RECT 1.335000 2.885000 1.665000 2.895000 ;
-      RECT 1.405000 2.120000 4.130000 2.290000 ;
-      RECT 1.405000 2.290000 1.665000 2.885000 ;
-      RECT 1.550000 0.255000 2.690000 0.425000 ;
-      RECT 1.550000 0.425000 1.830000 0.700000 ;
-      RECT 2.360000 2.290000 4.130000 2.325000 ;
-      RECT 2.360000 2.325000 2.690000 3.075000 ;
-      RECT 2.500000 0.425000 2.690000 1.085000 ;
-      RECT 2.500000 1.085000 3.690000 1.255000 ;
-      RECT 2.860000 0.255000 4.730000 0.425000 ;
-      RECT 2.860000 0.425000 3.190000 0.915000 ;
-      RECT 3.360000 0.595000 3.690000 1.085000 ;
-      RECT 3.855000 1.715000 5.080000 1.885000 ;
-      RECT 3.855000 1.885000 4.130000 2.120000 ;
-      RECT 3.870000 2.325000 4.130000 3.075000 ;
-      RECT 3.900000 0.595000 4.230000 0.870000 ;
-      RECT 3.900000 0.870000 5.090000 1.040000 ;
-      RECT 3.900000 1.040000 4.230000 1.205000 ;
-      RECT 4.400000 0.425000 4.730000 0.700000 ;
-      RECT 4.830000 1.885000 5.080000 1.925000 ;
-      RECT 4.830000 1.925000 6.020000 2.095000 ;
-      RECT 4.830000 2.095000 5.090000 3.075000 ;
-      RECT 4.900000 0.325000 5.090000 0.870000 ;
-      RECT 4.910000 1.040000 5.090000 1.085000 ;
-      RECT 4.910000 1.085000 6.020000 1.255000 ;
-      RECT 5.760000 0.325000 6.020000 1.085000 ;
-      RECT 5.760000 2.095000 6.020000 3.075000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.170000  0.085000 0.500000 1.040000 ;
+      RECT 0.475000  1.920000 0.735000 2.895000 ;
+      RECT 0.475000  2.895000 1.665000 3.075000 ;
+      RECT 1.030000  0.085000 1.360000 0.700000 ;
+      RECT 1.335000  2.885000 1.665000 2.895000 ;
+      RECT 1.405000  2.120000 4.130000 2.290000 ;
+      RECT 1.405000  2.290000 1.665000 2.885000 ;
+      RECT 1.550000  0.255000 2.690000 0.425000 ;
+      RECT 1.550000  0.425000 1.830000 0.700000 ;
+      RECT 1.845000  2.460000 2.175000 3.245000 ;
+      RECT 2.360000  2.290000 4.130000 2.325000 ;
+      RECT 2.360000  2.325000 2.690000 3.075000 ;
+      RECT 2.500000  0.425000 2.690000 1.085000 ;
+      RECT 2.500000  1.085000 3.690000 1.255000 ;
+      RECT 2.860000  0.255000 4.730000 0.425000 ;
+      RECT 2.860000  0.425000 3.190000 0.915000 ;
+      RECT 2.860000  2.505000 3.700000 3.245000 ;
+      RECT 3.360000  0.595000 3.690000 1.085000 ;
+      RECT 3.855000  1.715000 5.080000 1.885000 ;
+      RECT 3.855000  1.885000 4.130000 2.120000 ;
+      RECT 3.870000  2.325000 4.130000 3.075000 ;
+      RECT 3.900000  0.595000 4.230000 0.870000 ;
+      RECT 3.900000  0.870000 5.090000 1.040000 ;
+      RECT 3.900000  1.040000 4.230000 1.205000 ;
+      RECT 4.315000  2.055000 4.645000 3.245000 ;
+      RECT 4.400000  0.425000 4.730000 0.700000 ;
+      RECT 4.830000  1.885000 5.080000 1.925000 ;
+      RECT 4.830000  1.925000 6.020000 2.095000 ;
+      RECT 4.830000  2.095000 5.090000 3.075000 ;
+      RECT 4.900000  0.325000 5.090000 0.870000 ;
+      RECT 4.910000  1.040000 5.090000 1.085000 ;
+      RECT 4.910000  1.085000 6.020000 1.255000 ;
+      RECT 5.260000  0.085000 5.590000 0.915000 ;
+      RECT 5.260000  2.265000 5.590000 3.245000 ;
+      RECT 5.760000  0.325000 6.020000 1.085000 ;
+      RECT 5.760000  2.095000 6.020000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__a41oi_2
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef
index 9f4a57b..33636d9 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.magic.lef
@@ -103,36 +103,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.095000  0.085000  0.425000 1.040000 ;
-        RECT 0.955000  0.085000  1.285000 0.685000 ;
-        RECT 1.815000  0.085000  2.145000 0.645000 ;
-        RECT 8.565000  0.085000  8.895000 0.690000 ;
-        RECT 9.425000  0.085000  9.755000 0.690000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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,77 +111,104 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 2.280000 2.455000  2.610000 3.245000 ;
-        RECT 3.160000 2.465000  3.830000 3.245000 ;
-        RECT 4.500000 2.455000  4.720000 3.245000 ;
-        RECT 5.370000 2.105000  5.700000 3.245000 ;
-        RECT 6.310000 2.105000  6.640000 3.245000 ;
-        RECT 7.170000 2.105000  8.020000 3.245000 ;
-        RECT 8.550000 2.105000  8.880000 3.245000 ;
-        RECT 9.410000 2.105000  9.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 ;
-        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.110000 1.825000  0.370000 2.905000 ;
-      RECT 0.110000 2.905000  2.110000 3.075000 ;
-      RECT 1.040000 1.960000  1.230000 2.905000 ;
-      RECT 1.900000 2.105000  5.130000 2.285000 ;
-      RECT 1.900000 2.285000  2.110000 2.905000 ;
-      RECT 2.350000 0.255000  6.140000 0.425000 ;
-      RECT 2.350000 0.425000  3.470000 0.645000 ;
-      RECT 2.780000 2.285000  2.990000 3.075000 ;
-      RECT 4.000000 2.285000  4.330000 3.075000 ;
-      RECT 4.150000 0.425000  4.480000 0.895000 ;
-      RECT 4.650000 0.595000  4.900000 0.815000 ;
-      RECT 4.650000 0.815000  8.035000 0.985000 ;
-      RECT 4.650000 0.985000  7.175000 1.025000 ;
-      RECT 4.860000 1.755000 10.170000 1.925000 ;
-      RECT 4.860000 1.925000  5.130000 2.105000 ;
-      RECT 4.890000 2.285000  5.130000 3.075000 ;
-      RECT 5.070000 0.425000  6.140000 0.645000 ;
-      RECT 5.880000 1.925000  6.140000 3.075000 ;
-      RECT 6.475000 0.255000  8.395000 0.425000 ;
-      RECT 6.475000 0.425000  6.675000 0.645000 ;
-      RECT 6.810000 1.925000  7.000000 3.075000 ;
-      RECT 6.845000 0.615000  7.175000 0.815000 ;
-      RECT 6.845000 1.025000  7.175000 1.145000 ;
-      RECT 7.345000 0.425000  7.535000 0.645000 ;
-      RECT 7.705000 0.615000  8.035000 0.815000 ;
-      RECT 7.705000 0.985000  8.035000 1.145000 ;
-      RECT 8.190000 1.925000  8.380000 3.075000 ;
-      RECT 8.215000 0.425000  8.395000 0.860000 ;
-      RECT 8.215000 0.860000 10.185000 1.030000 ;
-      RECT 9.050000 1.925000  9.240000 3.075000 ;
-      RECT 9.065000 0.315000  9.255000 0.860000 ;
-      RECT 9.910000 1.925000 10.170000 3.075000 ;
-      RECT 9.925000 0.315000 10.185000 0.860000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.095000  0.085000  0.425000 1.040000 ;
+      RECT 0.110000  1.825000  0.370000 2.905000 ;
+      RECT 0.110000  2.905000  2.110000 3.075000 ;
+      RECT 0.955000  0.085000  1.285000 0.685000 ;
+      RECT 1.040000  1.960000  1.230000 2.905000 ;
+      RECT 1.815000  0.085000  2.145000 0.645000 ;
+      RECT 1.900000  2.105000  5.130000 2.285000 ;
+      RECT 1.900000  2.285000  2.110000 2.905000 ;
+      RECT 2.280000  2.455000  2.610000 3.245000 ;
+      RECT 2.350000  0.255000  6.140000 0.425000 ;
+      RECT 2.350000  0.425000  3.470000 0.645000 ;
+      RECT 2.780000  2.285000  2.990000 3.075000 ;
+      RECT 3.160000  2.465000  3.830000 3.245000 ;
+      RECT 4.000000  2.285000  4.330000 3.075000 ;
+      RECT 4.150000  0.425000  4.480000 0.895000 ;
+      RECT 4.500000  2.455000  4.720000 3.245000 ;
+      RECT 4.650000  0.595000  4.900000 0.815000 ;
+      RECT 4.650000  0.815000  8.035000 0.985000 ;
+      RECT 4.650000  0.985000  7.175000 1.025000 ;
+      RECT 4.860000  1.755000 10.170000 1.925000 ;
+      RECT 4.860000  1.925000  5.130000 2.105000 ;
+      RECT 4.890000  2.285000  5.130000 3.075000 ;
+      RECT 5.070000  0.425000  6.140000 0.645000 ;
+      RECT 5.370000  2.105000  5.700000 3.245000 ;
+      RECT 5.880000  1.925000  6.140000 3.075000 ;
+      RECT 6.310000  2.105000  6.640000 3.245000 ;
+      RECT 6.475000  0.255000  8.395000 0.425000 ;
+      RECT 6.475000  0.425000  6.675000 0.645000 ;
+      RECT 6.810000  1.925000  7.000000 3.075000 ;
+      RECT 6.845000  0.615000  7.175000 0.815000 ;
+      RECT 6.845000  1.025000  7.175000 1.145000 ;
+      RECT 7.170000  2.105000  8.020000 3.245000 ;
+      RECT 7.345000  0.425000  7.535000 0.645000 ;
+      RECT 7.705000  0.615000  8.035000 0.815000 ;
+      RECT 7.705000  0.985000  8.035000 1.145000 ;
+      RECT 8.190000  1.925000  8.380000 3.075000 ;
+      RECT 8.215000  0.425000  8.395000 0.860000 ;
+      RECT 8.215000  0.860000 10.185000 1.030000 ;
+      RECT 8.550000  2.105000  8.880000 3.245000 ;
+      RECT 8.565000  0.085000  8.895000 0.690000 ;
+      RECT 9.050000  1.925000  9.240000 3.075000 ;
+      RECT 9.065000  0.315000  9.255000 0.860000 ;
+      RECT 9.410000  2.105000  9.740000 3.245000 ;
+      RECT 9.425000  0.085000  9.755000 0.690000 ;
+      RECT 9.910000  1.925000 10.170000 3.075000 ;
+      RECT 9.925000  0.315000 10.185000 0.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 ;
+      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_lp__a41oi_4
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef
index 622c422..8a7ab5c 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.magic.lef
@@ -91,18 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.395000  0.085000 0.725000 0.630000 ;
-        RECT 2.905000  0.085000 3.235000 0.590000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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 +99,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.645000 2.320000 0.975000 3.245000 ;
-        RECT 1.705000 2.320000 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 ;
-        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.970000 2.585000 2.140000 ;
-      RECT 0.115000 2.140000 0.445000 3.065000 ;
-      RECT 1.175000 2.140000 1.505000 3.065000 ;
-      RECT 2.255000 2.140000 2.585000 3.065000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  1.970000 2.585000 2.140000 ;
+      RECT 0.115000  2.140000 0.445000 3.065000 ;
+      RECT 0.395000  0.085000 0.725000 0.630000 ;
+      RECT 0.645000  2.320000 0.975000 3.245000 ;
+      RECT 1.175000  2.140000 1.505000 3.065000 ;
+      RECT 1.705000  2.320000 2.035000 3.245000 ;
+      RECT 2.255000  2.140000 2.585000 3.065000 ;
+      RECT 2.905000  0.085000 3.235000 0.590000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a41oi_lp
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef
index 2804ec1..0f58bda 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.magic.lef
@@ -90,18 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.675000  0.085000 0.885000 0.545000 ;
-        RECT 2.665000  0.085000 2.995000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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 1.395000 2.785000 1.605000 3.245000 ;
-        RECT 2.255000 2.785000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 2.435000 2.795000 2.605000 ;
-      RECT 0.985000 2.605000 1.175000 2.945000 ;
-      RECT 1.825000 2.605000 2.035000 2.965000 ;
-      RECT 2.625000 2.605000 2.795000 2.695000 ;
-      RECT 2.625000 2.695000 2.955000 2.905000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.675000  0.085000 0.885000 0.545000 ;
+      RECT 0.985000  2.435000 2.795000 2.605000 ;
+      RECT 0.985000  2.605000 1.175000 2.945000 ;
+      RECT 1.395000  2.785000 1.605000 3.245000 ;
+      RECT 1.825000  2.605000 2.035000 2.965000 ;
+      RECT 2.255000  2.785000 2.445000 3.245000 ;
+      RECT 2.625000  2.605000 2.795000 2.695000 ;
+      RECT 2.625000  2.695000 2.955000 2.905000 ;
+      RECT 2.665000  0.085000 2.995000 0.485000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__a41oi_m
diff --git a/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef
index 726a9d4..45abc7d 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_0.magic.lef
@@ -63,15 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.065000  0.085000 1.350000 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 ;
       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.275000 2.440000 0.545000 3.245000 ;
-        RECT 1.150000 2.385000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.300000 0.280000 0.605000 0.845000 ;
-      RECT 0.300000 0.845000 1.895000 1.015000 ;
-      RECT 0.715000 1.015000 0.895000 2.440000 ;
-      RECT 0.715000 2.440000 0.980000 2.770000 ;
-      RECT 1.565000 1.015000 1.895000 1.435000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.275000  2.440000 0.545000 3.245000 ;
+      RECT 0.300000  0.280000 0.605000 0.845000 ;
+      RECT 0.300000  0.845000 1.895000 1.015000 ;
+      RECT 0.715000  1.015000 0.895000 2.440000 ;
+      RECT 0.715000  2.440000 0.980000 2.770000 ;
+      RECT 1.065000  0.085000 1.350000 0.610000 ;
+      RECT 1.150000  2.385000 1.765000 3.245000 ;
+      RECT 1.565000  1.015000 1.895000 1.435000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__and2_0
diff --git a/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef
index 87f2054..88c8866 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_1.magic.lef
@@ -62,15 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.210000  0.085000 1.580000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -79,26 +70,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.420000 1.955000 0.750000 3.245000 ;
-        RECT 1.545000 2.260000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.420000 0.700000 0.750000 1.150000 ;
-      RECT 0.420000 1.150000 1.875000 1.320000 ;
-      RECT 0.920000 1.920000 1.875000 2.090000 ;
-      RECT 0.920000 2.090000 1.250000 2.285000 ;
-      RECT 1.625000 1.320000 1.875000 1.920000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.420000  0.700000 0.750000 1.150000 ;
+      RECT 0.420000  1.150000 1.875000 1.320000 ;
+      RECT 0.420000  1.955000 0.750000 3.245000 ;
+      RECT 0.920000  1.920000 1.875000 2.090000 ;
+      RECT 0.920000  2.090000 1.250000 2.285000 ;
+      RECT 1.210000  0.085000 1.580000 0.980000 ;
+      RECT 1.545000  2.260000 1.875000 3.245000 ;
+      RECT 1.625000  1.320000 1.875000 1.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 ;
   END
 END sky130_fd_sc_lp__and2_1
diff --git a/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef
index 91a1bf3..427f324 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_2.magic.lef
@@ -63,16 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.030000  0.085000 1.360000 0.525000 ;
-        RECT 1.985000  0.085000 2.265000 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 ;
       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 0.120000 2.030000 0.450000 3.245000 ;
-        RECT 1.015000 1.945000 1.360000 3.245000 ;
-        RECT 1.985000 1.815000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.190000 0.280000 0.520000 0.695000 ;
-      RECT 0.190000 0.695000 1.405000 0.865000 ;
-      RECT 0.620000 1.600000 1.465000 1.770000 ;
-      RECT 0.620000 1.770000 0.845000 2.360000 ;
-      RECT 1.235000 0.865000 1.405000 1.270000 ;
-      RECT 1.235000 1.270000 1.465000 1.600000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.120000  2.030000 0.450000 3.245000 ;
+      RECT 0.190000  0.280000 0.520000 0.695000 ;
+      RECT 0.190000  0.695000 1.405000 0.865000 ;
+      RECT 0.620000  1.600000 1.465000 1.770000 ;
+      RECT 0.620000  1.770000 0.845000 2.360000 ;
+      RECT 1.015000  1.945000 1.360000 3.245000 ;
+      RECT 1.030000  0.085000 1.360000 0.525000 ;
+      RECT 1.235000  0.865000 1.405000 1.270000 ;
+      RECT 1.235000  1.270000 1.465000 1.600000 ;
+      RECT 1.985000  0.085000 2.265000 1.090000 ;
+      RECT 1.985000  1.815000 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 ;
   END
 END sky130_fd_sc_lp__and2_2
diff --git a/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef
index f13dde8..884f007 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_4.magic.lef
@@ -67,19 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.955000  0.085000 1.285000 0.815000 ;
-        RECT 1.890000  0.085000 2.220000 0.885000 ;
-        RECT 2.750000  0.085000 3.080000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -88,32 +75,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.095000 1.920000 0.425000 3.245000 ;
-        RECT 0.990000 2.270000 1.320000 3.245000 ;
-        RECT 1.890000 2.115000 2.220000 3.245000 ;
-        RECT 2.750000 2.115000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.425000 0.985000 ;
-      RECT 0.095000 0.985000 1.360000 1.155000 ;
-      RECT 0.595000 1.930000 1.360000 2.100000 ;
-      RECT 0.595000 2.100000 0.785000 3.075000 ;
-      RECT 1.190000 1.155000 1.360000 1.405000 ;
-      RECT 1.190000 1.405000 2.685000 1.605000 ;
-      RECT 1.190000 1.605000 1.360000 1.930000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.255000 0.425000 0.985000 ;
+      RECT 0.095000  0.985000 1.360000 1.155000 ;
+      RECT 0.095000  1.920000 0.425000 3.245000 ;
+      RECT 0.595000  1.930000 1.360000 2.100000 ;
+      RECT 0.595000  2.100000 0.785000 3.075000 ;
+      RECT 0.955000  0.085000 1.285000 0.815000 ;
+      RECT 0.990000  2.270000 1.320000 3.245000 ;
+      RECT 1.190000  1.155000 1.360000 1.405000 ;
+      RECT 1.190000  1.405000 2.685000 1.605000 ;
+      RECT 1.190000  1.605000 1.360000 1.930000 ;
+      RECT 1.890000  0.085000 2.220000 0.885000 ;
+      RECT 1.890000  2.115000 2.220000 3.245000 ;
+      RECT 2.750000  0.085000 3.080000 0.885000 ;
+      RECT 2.750000  2.115000 3.080000 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_lp__and2_4
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef
index c717c28..4172336 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp.magic.lef
@@ -61,18 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.430000  0.085000 0.760000 1.310000 ;
-        RECT 2.015000  0.085000 2.345000 0.900000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,29 +69,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.250000 2.320000 0.580000 3.245000 ;
-        RECT 1.830000 2.320000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.040000 2.320000 1.655000 2.780000 ;
-      RECT 1.250000 0.850000 1.655000 1.140000 ;
-      RECT 1.250000 1.140000 2.355000 1.310000 ;
-      RECT 1.485000 1.310000 1.655000 2.320000 ;
-      RECT 2.025000 1.070000 2.355000 1.140000 ;
-      RECT 2.025000 1.310000 2.355000 1.740000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.250000  2.320000 0.580000 3.245000 ;
+      RECT 0.430000  0.085000 0.760000 1.310000 ;
+      RECT 1.040000  2.320000 1.655000 2.780000 ;
+      RECT 1.250000  0.850000 1.655000 1.140000 ;
+      RECT 1.250000  1.140000 2.355000 1.310000 ;
+      RECT 1.485000  1.310000 1.655000 2.320000 ;
+      RECT 1.830000  2.320000 2.160000 3.245000 ;
+      RECT 2.015000  0.085000 2.345000 0.900000 ;
+      RECT 2.025000  1.070000 2.355000 1.140000 ;
+      RECT 2.025000  1.310000 2.355000 1.740000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__and2_lp
diff --git a/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef
index 4de36cc..bdf1f1b 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp2.magic.lef
@@ -63,15 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.980000  0.085000 1.310000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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.810000 2.025000 1.140000 3.245000 ;
-        RECT 1.900000 2.025000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 0.815000 2.130000 0.985000 ;
-      RECT 0.535000 0.985000 0.865000 1.675000 ;
-      RECT 0.535000 1.675000 1.670000 1.845000 ;
-      RECT 1.340000 1.845000 1.670000 3.065000 ;
-      RECT 1.800000 0.265000 2.130000 0.815000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.535000  0.815000 2.130000 0.985000 ;
+      RECT 0.535000  0.985000 0.865000 1.675000 ;
+      RECT 0.535000  1.675000 1.670000 1.845000 ;
+      RECT 0.810000  2.025000 1.140000 3.245000 ;
+      RECT 0.980000  0.085000 1.310000 0.635000 ;
+      RECT 1.340000  1.845000 1.670000 3.065000 ;
+      RECT 1.800000  0.265000 2.130000 0.815000 ;
+      RECT 1.900000  2.025000 2.230000 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_lp__and2_lp2
diff --git a/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef b/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef
index 9ae22cb..51fba5d 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef
+++ b/cells/and2/sky130_fd_sc_lp__and2_m.magic.lef
@@ -61,15 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 1.125000  0.820000 1.395000 1.150000 ;
-        RECT 1.225000  0.085000 1.395000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -78,22 +69,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.170000 2.095000 0.380000 3.245000 ;
-        RECT 1.125000 2.095000 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.130000 0.820000 0.945000 1.030000 ;
-      RECT 0.615000 1.030000 0.945000 3.025000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.130000  0.820000 0.945000 1.030000 ;
+      RECT 0.170000  2.095000 0.380000 3.245000 ;
+      RECT 0.615000  1.030000 0.945000 3.025000 ;
+      RECT 1.125000  0.820000 1.395000 1.150000 ;
+      RECT 1.125000  2.095000 1.335000 3.245000 ;
+      RECT 1.225000  0.085000 1.395000 0.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 ;
   END
 END sky130_fd_sc_lp__and2_m
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef
index 5009aa8..9f2c4eb 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_1.magic.lef
@@ -62,17 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.555000  0.085000 0.855000 0.595000 ;
-        RECT 1.835000  0.085000 2.320000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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
@@ -81,31 +70,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.710000 1.870000 1.095000 2.150000 ;
-        RECT 0.710000 2.150000 0.885000 3.245000 ;
-        RECT 1.865000 1.765000 2.285000 2.150000 ;
-        RECT 2.015000 2.150000 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 ;
-        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.280000 0.385000 1.335000 ;
-      RECT 0.095000 1.335000 1.225000 1.665000 ;
-      RECT 0.095000 1.665000 0.540000 2.210000 ;
-      RECT 1.045000 0.695000 1.575000 1.025000 ;
-      RECT 1.395000 1.025000 1.575000 1.185000 ;
-      RECT 1.395000 1.185000 2.320000 1.515000 ;
-      RECT 1.395000 1.515000 1.695000 2.150000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.280000 0.385000 1.335000 ;
+      RECT 0.095000  1.335000 1.225000 1.665000 ;
+      RECT 0.095000  1.665000 0.540000 2.210000 ;
+      RECT 0.555000  0.085000 0.855000 0.595000 ;
+      RECT 0.710000  1.870000 1.095000 2.150000 ;
+      RECT 0.710000  2.150000 0.885000 3.245000 ;
+      RECT 1.045000  0.695000 1.575000 1.025000 ;
+      RECT 1.395000  1.025000 1.575000 1.185000 ;
+      RECT 1.395000  1.185000 2.320000 1.515000 ;
+      RECT 1.395000  1.515000 1.695000 2.150000 ;
+      RECT 1.835000  0.085000 2.320000 1.015000 ;
+      RECT 1.865000  1.765000 2.285000 2.150000 ;
+      RECT 2.015000  2.150000 2.285000 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_lp__and2b_1
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef
index 31efe15..6a8381e 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_2.magic.lef
@@ -62,18 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.720000  0.085000 1.050000 0.365000 ;
-        RECT 1.740000  0.085000 2.070000 0.365000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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 0.600000 1.920000 0.920000 3.245000 ;
-        RECT 1.485000 1.965000 2.080000 3.245000 ;
-        RECT 2.610000 1.965000 2.940000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.090000 0.535000 2.815000 0.555000 ;
-      RECT 0.090000 0.555000 2.430000 0.705000 ;
-      RECT 0.090000 0.705000 0.520000 1.015000 ;
-      RECT 0.090000 1.015000 0.260000 1.920000 ;
-      RECT 0.090000 1.920000 0.430000 2.210000 ;
-      RECT 1.485000 1.345000 1.735000 1.625000 ;
-      RECT 1.485000 1.625000 3.160000 1.795000 ;
-      RECT 2.250000 1.795000 2.440000 2.210000 ;
-      RECT 2.260000 0.255000 2.815000 0.535000 ;
-      RECT 2.610000 0.725000 3.160000 1.030000 ;
-      RECT 2.905000 1.030000 3.160000 1.625000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.090000  0.535000 2.815000 0.555000 ;
+      RECT 0.090000  0.555000 2.430000 0.705000 ;
+      RECT 0.090000  0.705000 0.520000 1.015000 ;
+      RECT 0.090000  1.015000 0.260000 1.920000 ;
+      RECT 0.090000  1.920000 0.430000 2.210000 ;
+      RECT 0.600000  1.920000 0.920000 3.245000 ;
+      RECT 0.720000  0.085000 1.050000 0.365000 ;
+      RECT 1.485000  1.345000 1.735000 1.625000 ;
+      RECT 1.485000  1.625000 3.160000 1.795000 ;
+      RECT 1.485000  1.965000 2.080000 3.245000 ;
+      RECT 1.740000  0.085000 2.070000 0.365000 ;
+      RECT 2.250000  1.795000 2.440000 2.210000 ;
+      RECT 2.260000  0.255000 2.815000 0.535000 ;
+      RECT 2.610000  0.725000 3.160000 1.030000 ;
+      RECT 2.610000  1.965000 2.940000 3.245000 ;
+      RECT 2.905000  1.030000 3.160000 1.625000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__and2b_2
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef
index daddb3f..1f4f885 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_4.magic.lef
@@ -65,20 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.760000  0.085000 1.060000 0.905000 ;
-        RECT 1.620000  0.085000 1.950000 0.895000 ;
-        RECT 2.550000  0.085000 2.880000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -87,37 +73,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.760000 2.780000 1.090000 3.245000 ;
-        RECT 1.620000 2.780000 1.950000 3.245000 ;
-        RECT 2.515000 2.780000 2.845000 3.245000 ;
-        RECT 3.415000 2.780000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.720000 0.565000 1.020000 ;
-      RECT 0.175000 1.020000 0.425000 2.430000 ;
-      RECT 0.175000 2.430000 3.715000 2.610000 ;
-      RECT 1.495000 1.415000 2.660000 1.645000 ;
-      RECT 2.480000 0.995000 3.745000 1.165000 ;
-      RECT 2.480000 1.165000 2.660000 1.415000 ;
-      RECT 2.480000 1.645000 2.660000 1.930000 ;
-      RECT 2.480000 1.930000 3.255000 2.260000 ;
-      RECT 3.385000 1.375000 3.715000 1.545000 ;
-      RECT 3.415000 0.255000 3.745000 0.995000 ;
-      RECT 3.545000 1.545000 3.715000 2.430000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.175000  0.720000 0.565000 1.020000 ;
+      RECT 0.175000  1.020000 0.425000 2.430000 ;
+      RECT 0.175000  2.430000 3.715000 2.610000 ;
+      RECT 0.760000  0.085000 1.060000 0.905000 ;
+      RECT 0.760000  2.780000 1.090000 3.245000 ;
+      RECT 1.495000  1.415000 2.660000 1.645000 ;
+      RECT 1.620000  0.085000 1.950000 0.895000 ;
+      RECT 1.620000  2.780000 1.950000 3.245000 ;
+      RECT 2.480000  0.995000 3.745000 1.165000 ;
+      RECT 2.480000  1.165000 2.660000 1.415000 ;
+      RECT 2.480000  1.645000 2.660000 1.930000 ;
+      RECT 2.480000  1.930000 3.255000 2.260000 ;
+      RECT 2.515000  2.780000 2.845000 3.245000 ;
+      RECT 2.550000  0.085000 2.880000 0.815000 ;
+      RECT 3.385000  1.375000 3.715000 1.545000 ;
+      RECT 3.415000  0.255000 3.745000 0.995000 ;
+      RECT 3.415000  2.780000 3.745000 3.245000 ;
+      RECT 3.545000  1.545000 3.715000 2.430000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and2b_4
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef
index 66bf960..febe8a0 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_lp.magic.lef
@@ -61,18 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.055000  0.085000 1.385000 1.075000 ;
-        RECT 2.095000  0.085000 2.425000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -81,32 +69,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.850000 2.680000 1.180000 3.245000 ;
-        RECT 2.115000 2.115000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.750000 1.255000 2.345000 1.425000 ;
-      RECT 0.750000 1.425000 1.080000 2.330000 ;
-      RECT 0.750000 2.330000 1.915000 2.500000 ;
-      RECT 1.585000 2.500000 1.915000 3.065000 ;
-      RECT 1.975000 1.605000 3.245000 1.935000 ;
-      RECT 2.015000 0.905000 2.345000 1.255000 ;
-      RECT 2.770000 1.935000 3.100000 3.065000 ;
-      RECT 2.915000 0.295000 3.245000 0.675000 ;
-      RECT 3.075000 0.675000 3.245000 1.605000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.750000  1.255000 2.345000 1.425000 ;
+      RECT 0.750000  1.425000 1.080000 2.330000 ;
+      RECT 0.750000  2.330000 1.915000 2.500000 ;
+      RECT 0.850000  2.680000 1.180000 3.245000 ;
+      RECT 1.055000  0.085000 1.385000 1.075000 ;
+      RECT 1.585000  2.500000 1.915000 3.065000 ;
+      RECT 1.975000  1.605000 3.245000 1.935000 ;
+      RECT 2.015000  0.905000 2.345000 1.255000 ;
+      RECT 2.095000  0.085000 2.425000 0.675000 ;
+      RECT 2.115000  2.115000 2.445000 3.245000 ;
+      RECT 2.770000  1.935000 3.100000 3.065000 ;
+      RECT 2.915000  0.295000 3.245000 0.675000 ;
+      RECT 3.075000  0.675000 3.245000 1.605000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__and2b_lp
diff --git a/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef b/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef
index 51e64e3..b929650 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_m.magic.lef
@@ -61,17 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.600000 ;
-        RECT 2.085000  0.085000 2.275000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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
@@ -80,32 +69,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.855000 2.095000 1.065000 3.245000 ;
-        RECT 2.005000 2.155000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.330000 0.385000 0.660000 ;
-      RECT 0.170000 0.660000 0.340000 1.575000 ;
-      RECT 0.170000 1.575000 1.340000 1.745000 ;
-      RECT 0.170000 1.745000 0.340000 2.025000 ;
-      RECT 0.170000 2.025000 0.675000 2.235000 ;
-      RECT 1.235000 0.405000 1.690000 0.615000 ;
-      RECT 1.315000 2.155000 1.690000 2.365000 ;
-      RECT 1.495000 2.365000 1.690000 2.855000 ;
-      RECT 1.495000 2.855000 1.825000 3.025000 ;
-      RECT 1.520000 0.615000 1.690000 2.155000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.170000  0.330000 0.385000 0.660000 ;
+      RECT 0.170000  0.660000 0.340000 1.575000 ;
+      RECT 0.170000  1.575000 1.340000 1.745000 ;
+      RECT 0.170000  1.745000 0.340000 2.025000 ;
+      RECT 0.170000  2.025000 0.675000 2.235000 ;
+      RECT 0.565000  0.085000 0.895000 0.600000 ;
+      RECT 0.855000  2.095000 1.065000 3.245000 ;
+      RECT 1.235000  0.405000 1.690000 0.615000 ;
+      RECT 1.315000  2.155000 1.690000 2.365000 ;
+      RECT 1.495000  2.365000 1.690000 2.855000 ;
+      RECT 1.495000  2.855000 1.825000 3.025000 ;
+      RECT 1.520000  0.615000 1.690000 2.155000 ;
+      RECT 2.005000  2.155000 2.335000 3.245000 ;
+      RECT 2.085000  0.085000 2.275000 0.545000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__and2b_m
diff --git a/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef
index 2f63683..0b89ac8 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_0.magic.lef
@@ -72,16 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.480000  0.085000 2.355000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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 +80,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.795000 2.460000 1.055000 3.245000 ;
-        RECT 1.655000 2.395000 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 ;
-        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.155000 0.370000 1.260000 0.670000 ;
-      RECT 0.155000 0.670000 0.325000 2.095000 ;
-      RECT 0.155000 2.095000 1.415000 2.265000 ;
-      RECT 0.155000 2.265000 0.625000 2.790000 ;
-      RECT 1.090000 0.670000 1.260000 0.830000 ;
-      RECT 1.090000 0.830000 2.355000 1.000000 ;
-      RECT 1.225000 2.265000 1.415000 2.460000 ;
-      RECT 1.225000 2.460000 1.485000 2.790000 ;
-      RECT 2.105000 1.000000 2.355000 1.625000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.155000  0.370000 1.260000 0.670000 ;
+      RECT 0.155000  0.670000 0.325000 2.095000 ;
+      RECT 0.155000  2.095000 1.415000 2.265000 ;
+      RECT 0.155000  2.265000 0.625000 2.790000 ;
+      RECT 0.795000  2.460000 1.055000 3.245000 ;
+      RECT 1.090000  0.670000 1.260000 0.830000 ;
+      RECT 1.090000  0.830000 2.355000 1.000000 ;
+      RECT 1.225000  2.265000 1.415000 2.460000 ;
+      RECT 1.225000  2.460000 1.485000 2.790000 ;
+      RECT 1.480000  0.085000 2.355000 0.660000 ;
+      RECT 1.655000  2.395000 2.260000 3.245000 ;
+      RECT 2.105000  1.000000 2.355000 1.625000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__and3_0
diff --git a/cells/and3/sky130_fd_sc_lp__and3_1.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_1.magic.lef
index bbd3e3d..7fe8553 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__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.740000  0.085000 2.070000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,30 +82,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.735000 1.945000 1.015000 3.245000 ;
-        RECT 1.945000 1.810000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 0.310000 0.620000 0.765000 ;
-      RECT 0.145000 0.765000 2.125000 0.935000 ;
-      RECT 0.145000 0.935000 0.315000 1.605000 ;
-      RECT 0.145000 1.605000 1.425000 1.775000 ;
-      RECT 0.145000 1.775000 0.565000 2.210000 ;
-      RECT 1.185000 1.775000 1.425000 2.210000 ;
-      RECT 1.945000 0.935000 2.125000 1.305000 ;
-      RECT 1.945000 1.305000 2.325000 1.635000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.145000  0.310000 0.620000 0.765000 ;
+      RECT 0.145000  0.765000 2.125000 0.935000 ;
+      RECT 0.145000  0.935000 0.315000 1.605000 ;
+      RECT 0.145000  1.605000 1.425000 1.775000 ;
+      RECT 0.145000  1.775000 0.565000 2.210000 ;
+      RECT 0.735000  1.945000 1.015000 3.245000 ;
+      RECT 1.185000  1.775000 1.425000 2.210000 ;
+      RECT 1.740000  0.085000 2.070000 0.595000 ;
+      RECT 1.945000  0.935000 2.125000 1.305000 ;
+      RECT 1.945000  1.305000 2.325000 1.635000 ;
+      RECT 1.945000  1.810000 2.325000 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_lp__and3_1
diff --git a/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef
index 36fca34..5fa0d99 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_2.magic.lef
@@ -72,17 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.445000  0.085000 1.775000 0.505000 ;
-        RECT 2.500000  0.085000 2.760000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -91,31 +80,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.560000 2.045000 0.820000 3.245000 ;
-        RECT 1.460000 2.045000 1.855000 3.245000 ;
-        RECT 2.500000 1.815000 2.760000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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 1.705000 1.865000 1.875000 ;
-      RECT 0.095000 1.875000 0.390000 2.300000 ;
-      RECT 0.165000 0.255000 0.495000 0.675000 ;
-      RECT 0.165000 0.675000 1.865000 0.845000 ;
-      RECT 0.990000 1.875000 1.290000 2.300000 ;
-      RECT 1.695000 0.845000 1.865000 1.275000 ;
-      RECT 1.695000 1.275000 1.980000 1.605000 ;
-      RECT 1.695000 1.605000 1.865000 1.705000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  1.705000 1.865000 1.875000 ;
+      RECT 0.095000  1.875000 0.390000 2.300000 ;
+      RECT 0.165000  0.255000 0.495000 0.675000 ;
+      RECT 0.165000  0.675000 1.865000 0.845000 ;
+      RECT 0.560000  2.045000 0.820000 3.245000 ;
+      RECT 0.990000  1.875000 1.290000 2.300000 ;
+      RECT 1.445000  0.085000 1.775000 0.505000 ;
+      RECT 1.460000  2.045000 1.855000 3.245000 ;
+      RECT 1.695000  0.845000 1.865000 1.275000 ;
+      RECT 1.695000  1.275000 1.980000 1.605000 ;
+      RECT 1.695000  1.605000 1.865000 1.705000 ;
+      RECT 2.500000  0.085000 2.760000 1.085000 ;
+      RECT 2.500000  1.815000 2.760000 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_lp__and3_2
diff --git a/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef
index a8b3346..0d0e25d 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_4.magic.lef
@@ -77,21 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.745000  0.085000 2.075000 0.700000 ;
-        RECT 2.680000  0.085000 3.010000 0.895000 ;
-        RECT 3.540000  0.085000 3.825000 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 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -100,36 +85,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.815000 2.105000 1.145000 3.245000 ;
-        RECT 1.765000 2.050000 2.095000 3.245000 ;
-        RECT 2.680000 2.095000 3.010000 3.245000 ;
-        RECT 3.540000 2.095000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.345000 0.255000 0.675000 0.870000 ;
-      RECT 0.345000 0.870000 2.150000 1.040000 ;
-      RECT 0.345000 1.710000 2.150000 1.880000 ;
-      RECT 0.345000 1.880000 1.595000 1.925000 ;
-      RECT 0.345000 1.925000 0.615000 3.075000 ;
-      RECT 1.350000 1.925000 1.595000 3.075000 ;
-      RECT 1.980000 1.040000 2.150000 1.415000 ;
-      RECT 1.980000 1.415000 3.815000 1.585000 ;
-      RECT 1.980000 1.585000 2.150000 1.710000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.345000  0.255000 0.675000 0.870000 ;
+      RECT 0.345000  0.870000 2.150000 1.040000 ;
+      RECT 0.345000  1.710000 2.150000 1.880000 ;
+      RECT 0.345000  1.880000 1.595000 1.925000 ;
+      RECT 0.345000  1.925000 0.615000 3.075000 ;
+      RECT 0.815000  2.105000 1.145000 3.245000 ;
+      RECT 1.350000  1.925000 1.595000 3.075000 ;
+      RECT 1.745000  0.085000 2.075000 0.700000 ;
+      RECT 1.765000  2.050000 2.095000 3.245000 ;
+      RECT 1.980000  1.040000 2.150000 1.415000 ;
+      RECT 1.980000  1.415000 3.815000 1.585000 ;
+      RECT 1.980000  1.585000 2.150000 1.710000 ;
+      RECT 2.680000  0.085000 3.010000 0.895000 ;
+      RECT 2.680000  2.095000 3.010000 3.245000 ;
+      RECT 3.540000  0.085000 3.825000 0.895000 ;
+      RECT 3.540000  2.095000 3.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 ;
   END
 END sky130_fd_sc_lp__and3_4
diff --git a/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef
index 79ddf12..9a7f3be 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_lp.magic.lef
@@ -72,16 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.535000  0.085000 1.865000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -90,30 +80,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.700000 2.400000 1.030000 3.245000 ;
-        RECT 1.760000 2.060000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 2.050000 1.560000 2.220000 ;
-      RECT 0.170000 2.220000 0.500000 3.065000 ;
-      RECT 0.325000 0.265000 0.785000 0.675000 ;
-      RECT 0.615000 0.675000 0.785000 0.850000 ;
-      RECT 0.615000 0.850000 2.435000 1.020000 ;
-      RECT 0.615000 1.020000 0.785000 2.050000 ;
-      RECT 1.230000 2.220000 1.560000 3.065000 ;
-      RECT 2.105000 1.020000 2.435000 1.520000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.170000  2.050000 1.560000 2.220000 ;
+      RECT 0.170000  2.220000 0.500000 3.065000 ;
+      RECT 0.325000  0.265000 0.785000 0.675000 ;
+      RECT 0.615000  0.675000 0.785000 0.850000 ;
+      RECT 0.615000  0.850000 2.435000 1.020000 ;
+      RECT 0.615000  1.020000 0.785000 2.050000 ;
+      RECT 0.700000  2.400000 1.030000 3.245000 ;
+      RECT 1.230000  2.220000 1.560000 3.065000 ;
+      RECT 1.535000  0.085000 1.865000 0.670000 ;
+      RECT 1.760000  2.060000 2.090000 3.245000 ;
+      RECT 2.105000  1.020000 2.435000 1.520000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__and3_lp
diff --git a/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef b/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef
index 97c506c..2ab0037 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef
+++ b/cells/and3/sky130_fd_sc_lp__and3_m.magic.lef
@@ -70,15 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.605000  0.085000 1.815000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -87,29 +78,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.725000 2.065000 0.915000 3.245000 ;
-        RECT 1.565000 2.065000 1.815000 2.395000 ;
-        RECT 1.645000 2.395000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.215000 1.715000 1.305000 1.885000 ;
-      RECT 0.215000 1.885000 0.545000 2.205000 ;
-      RECT 0.275000 0.330000 0.780000 0.660000 ;
-      RECT 0.610000 0.660000 0.780000 1.715000 ;
-      RECT 1.135000 1.885000 1.305000 1.935000 ;
-      RECT 1.135000 1.935000 1.345000 2.825000 ;
-      RECT 1.135000 2.825000 1.465000 2.995000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.215000  1.715000 1.305000 1.885000 ;
+      RECT 0.215000  1.885000 0.545000 2.205000 ;
+      RECT 0.275000  0.330000 0.780000 0.660000 ;
+      RECT 0.610000  0.660000 0.780000 1.715000 ;
+      RECT 0.725000  2.065000 0.915000 3.245000 ;
+      RECT 1.135000  1.885000 1.305000 1.935000 ;
+      RECT 1.135000  1.935000 1.345000 2.825000 ;
+      RECT 1.135000  2.825000 1.465000 2.995000 ;
+      RECT 1.565000  2.065000 1.815000 2.395000 ;
+      RECT 1.605000  0.085000 1.815000 0.545000 ;
+      RECT 1.645000  2.395000 1.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 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__and3_m
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef
index 5f4f7c5..aec0d0d 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_1.magic.lef
@@ -72,18 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.395000 0.610000 ;
-        RECT 2.510000  0.085000 2.820000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -92,35 +80,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.095000 2.605000 0.395000 3.245000 ;
-        RECT 1.355000 2.015000 1.685000 3.245000 ;
-        RECT 2.295000 2.015000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 0.280000 0.855000 0.765000 ;
-      RECT 0.565000 0.765000 1.050000 1.435000 ;
-      RECT 0.565000 1.435000 0.755000 2.605000 ;
-      RECT 0.565000 2.605000 0.855000 2.935000 ;
-      RECT 0.925000 1.675000 2.700000 1.845000 ;
-      RECT 0.925000 1.845000 1.185000 2.210000 ;
-      RECT 1.065000 0.280000 1.395000 0.585000 ;
-      RECT 1.220000 0.585000 1.395000 1.675000 ;
-      RECT 1.855000 1.845000 2.125000 2.210000 ;
-      RECT 2.530000 1.340000 2.890000 1.670000 ;
-      RECT 2.530000 1.670000 2.700000 1.675000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.085000 0.395000 0.610000 ;
+      RECT 0.095000  2.605000 0.395000 3.245000 ;
+      RECT 0.565000  0.280000 0.855000 0.765000 ;
+      RECT 0.565000  0.765000 1.050000 1.435000 ;
+      RECT 0.565000  1.435000 0.755000 2.605000 ;
+      RECT 0.565000  2.605000 0.855000 2.935000 ;
+      RECT 0.925000  1.675000 2.700000 1.845000 ;
+      RECT 0.925000  1.845000 1.185000 2.210000 ;
+      RECT 1.065000  0.280000 1.395000 0.585000 ;
+      RECT 1.220000  0.585000 1.395000 1.675000 ;
+      RECT 1.355000  2.015000 1.685000 3.245000 ;
+      RECT 1.855000  1.845000 2.125000 2.210000 ;
+      RECT 2.295000  2.015000 2.660000 3.245000 ;
+      RECT 2.510000  0.085000 2.820000 1.095000 ;
+      RECT 2.530000  1.340000 2.890000 1.670000 ;
+      RECT 2.530000  1.670000 2.700000 1.675000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__and3b_1
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef
index afd5e12..7ab3286 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_2.magic.lef
@@ -70,19 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.620000  0.085000 0.950000 0.375000 ;
-        RECT 1.690000  0.085000 2.020000 0.375000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -91,39 +78,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.655000 1.930000 0.945000 3.245000 ;
-        RECT 1.645000 2.095000 1.925000 3.245000 ;
-        RECT 2.895000 1.995000 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.095000 0.545000 3.375000 0.560000 ;
-      RECT 0.095000 0.560000 3.230000 0.715000 ;
-      RECT 0.095000 0.715000 0.425000 1.040000 ;
-      RECT 0.095000 1.040000 0.325000 1.930000 ;
-      RECT 0.095000 1.930000 0.485000 2.200000 ;
-      RECT 1.645000 0.715000 3.230000 0.870000 ;
-      RECT 1.645000 1.295000 1.855000 1.715000 ;
-      RECT 1.645000 1.715000 3.670000 1.825000 ;
-      RECT 1.645000 1.825000 2.715000 1.925000 ;
-      RECT 2.405000 1.925000 2.715000 2.200000 ;
-      RECT 2.545000 1.655000 3.670000 1.715000 ;
-      RECT 3.045000 0.255000 3.375000 0.545000 ;
-      RECT 3.400000 0.730000 3.670000 1.655000 ;
-      RECT 3.410000 1.825000 3.670000 2.200000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.545000 3.375000 0.560000 ;
+      RECT 0.095000  0.560000 3.230000 0.715000 ;
+      RECT 0.095000  0.715000 0.425000 1.040000 ;
+      RECT 0.095000  1.040000 0.325000 1.930000 ;
+      RECT 0.095000  1.930000 0.485000 2.200000 ;
+      RECT 0.620000  0.085000 0.950000 0.375000 ;
+      RECT 0.655000  1.930000 0.945000 3.245000 ;
+      RECT 1.645000  0.715000 3.230000 0.870000 ;
+      RECT 1.645000  1.295000 1.855000 1.715000 ;
+      RECT 1.645000  1.715000 3.670000 1.825000 ;
+      RECT 1.645000  1.825000 2.715000 1.925000 ;
+      RECT 1.645000  2.095000 1.925000 3.245000 ;
+      RECT 1.690000  0.085000 2.020000 0.375000 ;
+      RECT 2.405000  1.925000 2.715000 2.200000 ;
+      RECT 2.545000  1.655000 3.670000 1.715000 ;
+      RECT 2.895000  1.995000 3.225000 3.245000 ;
+      RECT 3.045000  0.255000 3.375000 0.545000 ;
+      RECT 3.400000  0.730000 3.670000 1.655000 ;
+      RECT 3.410000  1.825000 3.670000 2.200000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and3b_2
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef
index 82daa3e..b766b84 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_4.magic.lef
@@ -74,22 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.975000  0.085000 1.195000 0.905000 ;
-        RECT 1.765000  0.085000 2.095000 0.895000 ;
-        RECT 2.695000  0.085000 3.025000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,42 +82,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.905000 2.655000 1.235000 3.245000 ;
-        RECT 1.765000 2.655000 2.095000 3.245000 ;
-        RECT 2.625000 2.780000 2.955000 3.245000 ;
-        RECT 3.560000 2.780000 3.890000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.205000 0.700000 0.455000 2.315000 ;
-      RECT 0.205000 2.315000 2.455000 2.430000 ;
-      RECT 0.205000 2.430000 4.035000 2.485000 ;
-      RECT 1.335000 1.425000 2.795000 1.595000 ;
-      RECT 2.265000 2.485000 4.035000 2.610000 ;
-      RECT 2.625000 0.995000 4.690000 1.165000 ;
-      RECT 2.625000 1.165000 2.795000 1.425000 ;
-      RECT 2.625000 1.595000 2.795000 1.930000 ;
-      RECT 2.625000 1.930000 3.400000 2.260000 ;
-      RECT 3.330000 0.255000 4.690000 0.995000 ;
-      RECT 3.865000 1.335000 4.340000 1.645000 ;
-      RECT 3.865000 1.645000 4.035000 2.430000 ;
-      RECT 4.205000 1.815000 4.690000 3.075000 ;
-      RECT 4.520000 1.165000 4.690000 1.815000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.205000  0.700000 0.455000 2.315000 ;
+      RECT 0.205000  2.315000 2.455000 2.430000 ;
+      RECT 0.205000  2.430000 4.035000 2.485000 ;
+      RECT 0.905000  2.655000 1.235000 3.245000 ;
+      RECT 0.975000  0.085000 1.195000 0.905000 ;
+      RECT 1.335000  1.425000 2.795000 1.595000 ;
+      RECT 1.765000  0.085000 2.095000 0.895000 ;
+      RECT 1.765000  2.655000 2.095000 3.245000 ;
+      RECT 2.265000  2.485000 4.035000 2.610000 ;
+      RECT 2.625000  0.995000 4.690000 1.165000 ;
+      RECT 2.625000  1.165000 2.795000 1.425000 ;
+      RECT 2.625000  1.595000 2.795000 1.930000 ;
+      RECT 2.625000  1.930000 3.400000 2.260000 ;
+      RECT 2.625000  2.780000 2.955000 3.245000 ;
+      RECT 2.695000  0.085000 3.025000 0.825000 ;
+      RECT 3.330000  0.255000 4.690000 0.995000 ;
+      RECT 3.560000  2.780000 3.890000 3.245000 ;
+      RECT 3.865000  1.335000 4.340000 1.645000 ;
+      RECT 3.865000  1.645000 4.035000 2.430000 ;
+      RECT 4.205000  1.815000 4.690000 3.075000 ;
+      RECT 4.520000  1.165000 4.690000 1.815000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and3b_4
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef
index d83517e..2615650 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_lp.magic.lef
@@ -72,20 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.115000  0.085000 0.445000 0.725000 ;
-        RECT 2.710000  0.085000 3.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 ;
-        RECT 3.035000 -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
@@ -94,37 +80,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.130000 2.020000 0.460000 3.245000 ;
-        RECT 1.750000 2.370000 2.080000 3.245000 ;
-        RECT 2.810000 2.370000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.660000 2.020000 0.990000 3.060000 ;
-      RECT 0.820000 0.265000 1.265000 1.170000 ;
-      RECT 0.820000 1.170000 1.385000 1.840000 ;
-      RECT 0.820000 1.840000 0.990000 2.020000 ;
-      RECT 1.220000 2.020000 3.265000 2.190000 ;
-      RECT 1.220000 2.190000 1.550000 3.065000 ;
-      RECT 1.500000 0.265000 1.830000 0.820000 ;
-      RECT 1.500000 0.820000 3.485000 0.990000 ;
-      RECT 2.280000 2.190000 2.610000 3.065000 ;
-      RECT 3.095000 0.990000 3.485000 1.490000 ;
-      RECT 3.095000 1.490000 3.265000 2.020000 ;
+      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 0.725000 ;
+      RECT 0.130000  2.020000 0.460000 3.245000 ;
+      RECT 0.660000  2.020000 0.990000 3.060000 ;
+      RECT 0.820000  0.265000 1.265000 1.170000 ;
+      RECT 0.820000  1.170000 1.385000 1.840000 ;
+      RECT 0.820000  1.840000 0.990000 2.020000 ;
+      RECT 1.220000  2.020000 3.265000 2.190000 ;
+      RECT 1.220000  2.190000 1.550000 3.065000 ;
+      RECT 1.500000  0.265000 1.830000 0.820000 ;
+      RECT 1.500000  0.820000 3.485000 0.990000 ;
+      RECT 1.750000  2.370000 2.080000 3.245000 ;
+      RECT 2.280000  2.190000 2.610000 3.065000 ;
+      RECT 2.710000  0.085000 3.040000 0.640000 ;
+      RECT 2.810000  2.370000 3.140000 3.245000 ;
+      RECT 3.095000  0.990000 3.485000 1.490000 ;
+      RECT 3.095000  1.490000 3.265000 2.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 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and3b_lp
diff --git a/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef b/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef
index c3e8297..7ef33b2 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_m.magic.lef
@@ -70,18 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.155000  0.085000 0.365000 0.575000 ;
-        RECT 2.395000  0.085000 2.725000 0.515000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -90,33 +78,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.155000 2.670000 0.345000 3.245000 ;
-        RECT 1.570000 2.125000 1.760000 3.245000 ;
-        RECT 2.490000 2.125000 2.700000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.585000 0.330000 0.795000 0.795000 ;
-      RECT 0.585000 0.795000 1.040000 1.465000 ;
-      RECT 0.585000 1.465000 0.795000 3.000000 ;
-      RECT 1.060000 0.405000 1.390000 0.615000 ;
-      RECT 1.120000 1.945000 1.390000 2.325000 ;
-      RECT 1.220000 0.615000 1.390000 1.775000 ;
-      RECT 1.220000 1.775000 2.170000 1.945000 ;
-      RECT 1.980000 1.945000 2.170000 2.855000 ;
-      RECT 1.980000 2.855000 2.310000 3.025000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.155000  0.085000 0.365000 0.575000 ;
+      RECT 0.155000  2.670000 0.345000 3.245000 ;
+      RECT 0.585000  0.330000 0.795000 0.795000 ;
+      RECT 0.585000  0.795000 1.040000 1.465000 ;
+      RECT 0.585000  1.465000 0.795000 3.000000 ;
+      RECT 1.060000  0.405000 1.390000 0.615000 ;
+      RECT 1.120000  1.945000 1.390000 2.325000 ;
+      RECT 1.220000  0.615000 1.390000 1.775000 ;
+      RECT 1.220000  1.775000 2.170000 1.945000 ;
+      RECT 1.570000  2.125000 1.760000 3.245000 ;
+      RECT 1.980000  1.945000 2.170000 2.855000 ;
+      RECT 1.980000  2.855000 2.310000 3.025000 ;
+      RECT 2.395000  0.085000 2.725000 0.515000 ;
+      RECT 2.490000  2.125000 2.700000 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_lp__and3b_m
diff --git a/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef
index 66013bf..9cfdd97 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_0.magic.lef
@@ -81,17 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.890000  0.085000 2.525000 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
@@ -100,32 +89,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.190000 2.435000 0.485000 3.245000 ;
-        RECT 1.085000 2.435000 1.385000 3.245000 ;
-        RECT 1.995000 2.380000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.380000 0.330000 0.785000 0.660000 ;
-      RECT 0.605000 0.660000 0.785000 0.820000 ;
-      RECT 0.605000 0.820000 2.815000 0.990000 ;
-      RECT 0.605000 0.990000 0.775000 2.060000 ;
-      RECT 0.605000 2.060000 1.825000 2.265000 ;
-      RECT 0.655000 2.265000 0.915000 2.765000 ;
-      RECT 1.555000 2.265000 1.825000 2.740000 ;
-      RECT 2.565000 0.990000 2.815000 1.490000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.190000  2.435000 0.485000 3.245000 ;
+      RECT 0.380000  0.330000 0.785000 0.660000 ;
+      RECT 0.605000  0.660000 0.785000 0.820000 ;
+      RECT 0.605000  0.820000 2.815000 0.990000 ;
+      RECT 0.605000  0.990000 0.775000 2.060000 ;
+      RECT 0.605000  2.060000 1.825000 2.265000 ;
+      RECT 0.655000  2.265000 0.915000 2.765000 ;
+      RECT 1.085000  2.435000 1.385000 3.245000 ;
+      RECT 1.555000  2.265000 1.825000 2.740000 ;
+      RECT 1.890000  0.085000 2.525000 0.650000 ;
+      RECT 1.995000  2.380000 2.670000 3.245000 ;
+      RECT 2.565000  0.990000 2.815000 1.490000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__and4_0
diff --git a/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef
index 5e37d56..42fc04a 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_1.magic.lef
@@ -80,17 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.250000  0.085000 2.520000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -99,31 +88,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.160000 1.920000 0.490000 3.245000 ;
-        RECT 1.130000 1.995000 1.460000 3.245000 ;
-        RECT 2.505000 2.310000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 0.280000 0.835000 0.610000 ;
-      RECT 0.665000 0.610000 0.835000 1.655000 ;
-      RECT 0.665000 1.655000 1.855000 1.825000 ;
-      RECT 0.665000 1.825000 0.960000 2.210000 ;
-      RECT 1.630000 1.825000 1.855000 1.930000 ;
-      RECT 1.630000 1.930000 2.835000 2.140000 ;
-      RECT 2.565000 1.185000 2.835000 1.930000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.160000  0.280000 0.835000 0.610000 ;
+      RECT 0.160000  1.920000 0.490000 3.245000 ;
+      RECT 0.665000  0.610000 0.835000 1.655000 ;
+      RECT 0.665000  1.655000 1.855000 1.825000 ;
+      RECT 0.665000  1.825000 0.960000 2.210000 ;
+      RECT 1.130000  1.995000 1.460000 3.245000 ;
+      RECT 1.630000  1.825000 1.855000 1.930000 ;
+      RECT 1.630000  1.930000 2.835000 2.140000 ;
+      RECT 2.250000  0.085000 2.520000 1.020000 ;
+      RECT 2.505000  2.310000 2.835000 3.245000 ;
+      RECT 2.565000  1.185000 2.835000 1.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 ;
   END
 END sky130_fd_sc_lp__and4_1
diff --git a/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef
index a80c58a..e0d38fd 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_2.magic.lef
@@ -79,19 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 2.360000  0.085000 2.690000 0.495000 ;
-        RECT 3.425000  0.085000 3.715000 1.105000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -100,33 +87,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.320000 1.920000 0.650000 3.245000 ;
-        RECT 1.280000 2.025000 1.610000 3.245000 ;
-        RECT 2.260000 2.025000 2.855000 3.245000 ;
-        RECT 3.425000 1.815000 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.320000 0.290000 0.650000 0.665000 ;
-      RECT 0.320000 0.665000 2.855000 0.835000 ;
-      RECT 0.820000 1.920000 1.080000 2.260000 ;
-      RECT 0.840000 1.685000 2.855000 1.855000 ;
-      RECT 0.840000 1.855000 1.080000 1.920000 ;
-      RECT 1.830000 1.855000 2.090000 2.210000 ;
-      RECT 2.605000 0.835000 2.855000 1.685000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.320000  0.290000 0.650000 0.665000 ;
+      RECT 0.320000  0.665000 2.855000 0.835000 ;
+      RECT 0.320000  1.920000 0.650000 3.245000 ;
+      RECT 0.820000  1.920000 1.080000 2.260000 ;
+      RECT 0.840000  1.685000 2.855000 1.855000 ;
+      RECT 0.840000  1.855000 1.080000 1.920000 ;
+      RECT 1.280000  2.025000 1.610000 3.245000 ;
+      RECT 1.830000  1.855000 2.090000 2.210000 ;
+      RECT 2.260000  2.025000 2.855000 3.245000 ;
+      RECT 2.360000  0.085000 2.690000 0.495000 ;
+      RECT 2.605000  0.835000 2.855000 1.685000 ;
+      RECT 3.425000  0.085000 3.715000 1.105000 ;
+      RECT 3.425000  1.815000 3.715000 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_lp__and4_2
diff --git a/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef
index d122004..6ab9048 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_4.magic.lef
@@ -86,22 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 2.180000  0.085000 2.510000 0.690000 ;
-        RECT 3.125000  0.085000 3.455000 0.895000 ;
-        RECT 4.035000  0.085000 4.265000 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 ;
-        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,37 +94,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.250000 1.920000 0.580000 3.245000 ;
-        RECT 1.185000 2.105000 1.515000 3.245000 ;
-        RECT 2.180000 2.105000 2.510000 3.245000 ;
-        RECT 3.125000 2.115000 3.455000 3.245000 ;
-        RECT 3.985000 2.115000 4.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 ;
-        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.310000 0.360000 0.500000 0.860000 ;
-      RECT 0.310000 0.860000 2.595000 1.030000 ;
-      RECT 0.750000 1.755000 2.595000 1.925000 ;
-      RECT 0.750000 1.925000 1.015000 3.075000 ;
-      RECT 1.685000 1.925000 2.010000 3.075000 ;
-      RECT 2.425000 1.030000 2.595000 1.415000 ;
-      RECT 2.425000 1.415000 4.260000 1.585000 ;
-      RECT 2.425000 1.585000 2.595000 1.755000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.250000  1.920000 0.580000 3.245000 ;
+      RECT 0.310000  0.360000 0.500000 0.860000 ;
+      RECT 0.310000  0.860000 2.595000 1.030000 ;
+      RECT 0.750000  1.755000 2.595000 1.925000 ;
+      RECT 0.750000  1.925000 1.015000 3.075000 ;
+      RECT 1.185000  2.105000 1.515000 3.245000 ;
+      RECT 1.685000  1.925000 2.010000 3.075000 ;
+      RECT 2.180000  0.085000 2.510000 0.690000 ;
+      RECT 2.180000  2.105000 2.510000 3.245000 ;
+      RECT 2.425000  1.030000 2.595000 1.415000 ;
+      RECT 2.425000  1.415000 4.260000 1.585000 ;
+      RECT 2.425000  1.585000 2.595000 1.755000 ;
+      RECT 3.125000  0.085000 3.455000 0.895000 ;
+      RECT 3.125000  2.115000 3.455000 3.245000 ;
+      RECT 3.985000  2.115000 4.315000 3.245000 ;
+      RECT 4.035000  0.085000 4.265000 0.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4_4
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef
index 635e1f3..e294aed 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp.magic.lef
@@ -80,21 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.715000 ;
-        RECT 3.145000  0.085000 3.475000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -103,35 +88,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.115000 2.405000 0.445000 3.245000 ;
-        RECT 1.695000 2.405000 2.025000 3.245000 ;
-        RECT 3.275000 2.405000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.905000 2.405000 1.235000 2.865000 ;
-      RECT 1.065000 2.065000 3.575000 2.235000 ;
-      RECT 1.065000 2.235000 1.235000 2.405000 ;
-      RECT 2.475000 0.255000 2.805000 0.885000 ;
-      RECT 2.475000 0.885000 3.780000 1.055000 ;
-      RECT 2.485000 2.235000 2.815000 2.865000 ;
-      RECT 3.405000 1.055000 3.780000 1.555000 ;
-      RECT 3.405000 1.555000 3.575000 2.065000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.115000  2.405000 0.445000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.715000 ;
+      RECT 0.905000  2.405000 1.235000 2.865000 ;
+      RECT 1.065000  2.065000 3.575000 2.235000 ;
+      RECT 1.065000  2.235000 1.235000 2.405000 ;
+      RECT 1.695000  2.405000 2.025000 3.245000 ;
+      RECT 2.475000  0.255000 2.805000 0.885000 ;
+      RECT 2.475000  0.885000 3.780000 1.055000 ;
+      RECT 2.485000  2.235000 2.815000 2.865000 ;
+      RECT 3.145000  0.085000 3.475000 0.715000 ;
+      RECT 3.275000  2.405000 3.605000 3.245000 ;
+      RECT 3.405000  1.055000 3.780000 1.555000 ;
+      RECT 3.405000  1.555000 3.575000 2.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4_lp
diff --git a/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef
index e945bd2..9cfb9ab 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp2.magic.lef
@@ -81,17 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.590000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,31 +89,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.660000 2.320000 0.990000 3.245000 ;
-        RECT 1.755000 2.320000 2.085000 3.245000 ;
-        RECT 2.895000 2.025000 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.450000 0.940000 0.810000 1.610000 ;
-      RECT 0.640000 0.770000 2.945000 0.940000 ;
-      RECT 0.640000 1.610000 0.810000 1.970000 ;
-      RECT 0.640000 1.970000 2.695000 2.140000 ;
-      RECT 1.225000 2.140000 1.555000 3.065000 ;
-      RECT 2.365000 2.140000 2.695000 3.065000 ;
-      RECT 2.615000 0.265000 2.945000 0.770000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.450000  0.940000 0.810000 1.610000 ;
+      RECT 0.640000  0.770000 2.945000 0.940000 ;
+      RECT 0.640000  1.610000 0.810000 1.970000 ;
+      RECT 0.640000  1.970000 2.695000 2.140000 ;
+      RECT 0.660000  2.320000 0.990000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.590000 ;
+      RECT 1.225000  2.140000 1.555000 3.065000 ;
+      RECT 1.755000  2.320000 2.085000 3.245000 ;
+      RECT 2.365000  2.140000 2.695000 3.065000 ;
+      RECT 2.615000  0.265000 2.945000 0.770000 ;
+      RECT 2.895000  2.025000 3.225000 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_lp__and4_lp2
diff --git a/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef b/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef
index 529ddb8..426fc0e 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef
+++ b/cells/and4/sky130_fd_sc_lp__and4_m.magic.lef
@@ -79,16 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.945000  0.085000 2.275000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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
@@ -97,28 +87,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.365000 2.065000 0.575000 3.245000 ;
-        RECT 1.225000 2.065000 1.435000 3.245000 ;
-        RECT 2.085000 2.065000 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 ;
-        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.285000 0.330000 0.790000 0.660000 ;
-      RECT 0.620000 0.660000 0.790000 1.715000 ;
-      RECT 0.620000 1.715000 1.865000 1.885000 ;
-      RECT 0.790000 1.885000 1.005000 2.265000 ;
-      RECT 1.655000 1.885000 1.865000 3.045000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.285000  0.330000 0.790000 0.660000 ;
+      RECT 0.365000  2.065000 0.575000 3.245000 ;
+      RECT 0.620000  0.660000 0.790000 1.715000 ;
+      RECT 0.620000  1.715000 1.865000 1.885000 ;
+      RECT 0.790000  1.885000 1.005000 2.265000 ;
+      RECT 1.225000  2.065000 1.435000 3.245000 ;
+      RECT 1.655000  1.885000 1.865000 3.045000 ;
+      RECT 1.945000  0.085000 2.275000 0.485000 ;
+      RECT 2.085000  2.065000 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 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_lp__and4_m
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef
index 8b0b1d7..7d88118 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_1.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.485000 ;
-        RECT 2.555000  0.085000 3.190000 0.610000 ;
-        RECT 2.930000  0.610000 3.190000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,40 +89,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.600000 2.035000 0.930000 3.245000 ;
-        RECT 1.585000 1.935000 2.320000 3.245000 ;
-        RECT 2.900000 1.815000 3.265000 2.125000 ;
-        RECT 2.945000 2.125000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.290000 0.355000 0.655000 ;
-      RECT 0.095000 0.655000 1.065000 0.825000 ;
-      RECT 0.150000 1.695000 0.930000 1.865000 ;
-      RECT 0.150000 1.865000 0.430000 2.210000 ;
-      RECT 0.760000 0.825000 1.065000 1.445000 ;
-      RECT 0.760000 1.445000 0.930000 1.695000 ;
-      RECT 1.045000 0.255000 1.515000 0.485000 ;
-      RECT 1.110000 1.795000 1.405000 2.125000 ;
-      RECT 1.235000 0.485000 1.515000 0.860000 ;
-      RECT 1.235000 0.860000 2.670000 1.030000 ;
-      RECT 1.235000 1.030000 1.405000 1.795000 ;
-      RECT 2.490000 1.030000 2.670000 1.185000 ;
-      RECT 2.490000 1.185000 3.335000 1.515000 ;
-      RECT 2.490000 1.515000 2.730000 2.125000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.290000 0.355000 0.655000 ;
+      RECT 0.095000  0.655000 1.065000 0.825000 ;
+      RECT 0.150000  1.695000 0.930000 1.865000 ;
+      RECT 0.150000  1.865000 0.430000 2.210000 ;
+      RECT 0.525000  0.085000 0.855000 0.485000 ;
+      RECT 0.600000  2.035000 0.930000 3.245000 ;
+      RECT 0.760000  0.825000 1.065000 1.445000 ;
+      RECT 0.760000  1.445000 0.930000 1.695000 ;
+      RECT 1.045000  0.255000 1.515000 0.485000 ;
+      RECT 1.110000  1.795000 1.405000 2.125000 ;
+      RECT 1.235000  0.485000 1.515000 0.860000 ;
+      RECT 1.235000  0.860000 2.670000 1.030000 ;
+      RECT 1.235000  1.030000 1.405000 1.795000 ;
+      RECT 1.585000  1.935000 2.320000 3.245000 ;
+      RECT 2.490000  1.030000 2.670000 1.185000 ;
+      RECT 2.490000  1.185000 3.335000 1.515000 ;
+      RECT 2.490000  1.515000 2.730000 2.125000 ;
+      RECT 2.555000  0.085000 3.190000 0.610000 ;
+      RECT 2.900000  1.815000 3.265000 2.125000 ;
+      RECT 2.930000  0.610000 3.190000 1.015000 ;
+      RECT 2.945000  2.125000 3.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 ;
   END
 END sky130_fd_sc_lp__and4b_1
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef
index a579401..b107a54 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_2.magic.lef
@@ -83,22 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.645000 ;
-        RECT 2.910000  0.085000 3.240000 0.625000 ;
-        RECT 3.830000  0.085000 4.200000 0.690000 ;
-        RECT 3.950000  0.690000 4.200000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,39 +91,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.655000 2.035000 0.985000 3.245000 ;
-        RECT 1.575000 1.920000 2.305000 3.245000 ;
-        RECT 2.880000 2.050000 3.305000 3.245000 ;
-        RECT 3.885000 2.050000 4.200000 3.245000 ;
-        RECT 3.950000 1.815000 4.200000 2.050000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.695000 0.795000 1.865000 ;
-      RECT 0.225000 1.865000 0.475000 2.250000 ;
-      RECT 0.595000 0.255000 1.255000 0.595000 ;
-      RECT 0.595000 0.595000 0.795000 1.695000 ;
-      RECT 1.075000 0.795000 3.240000 1.005000 ;
-      RECT 1.155000 1.005000 1.405000 2.250000 ;
-      RECT 2.520000 1.710000 3.240000 1.880000 ;
-      RECT 2.520000 1.880000 2.710000 2.250000 ;
-      RECT 3.070000 1.005000 3.240000 1.210000 ;
-      RECT 3.070000 1.210000 3.430000 1.540000 ;
-      RECT 3.070000 1.540000 3.240000 1.710000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.645000 ;
+      RECT 0.225000  1.695000 0.795000 1.865000 ;
+      RECT 0.225000  1.865000 0.475000 2.250000 ;
+      RECT 0.595000  0.255000 1.255000 0.595000 ;
+      RECT 0.595000  0.595000 0.795000 1.695000 ;
+      RECT 0.655000  2.035000 0.985000 3.245000 ;
+      RECT 1.075000  0.795000 3.240000 1.005000 ;
+      RECT 1.155000  1.005000 1.405000 2.250000 ;
+      RECT 1.575000  1.920000 2.305000 3.245000 ;
+      RECT 2.520000  1.710000 3.240000 1.880000 ;
+      RECT 2.520000  1.880000 2.710000 2.250000 ;
+      RECT 2.880000  2.050000 3.305000 3.245000 ;
+      RECT 2.910000  0.085000 3.240000 0.625000 ;
+      RECT 3.070000  1.005000 3.240000 1.210000 ;
+      RECT 3.070000  1.210000 3.430000 1.540000 ;
+      RECT 3.070000  1.540000 3.240000 1.710000 ;
+      RECT 3.830000  0.085000 4.200000 0.690000 ;
+      RECT 3.885000  2.050000 4.200000 3.245000 ;
+      RECT 3.950000  0.690000 4.200000 1.095000 ;
+      RECT 3.950000  1.815000 4.200000 2.050000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4b_2
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef
index 31a2877..545b088 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_4.magic.lef
@@ -83,23 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.985000  0.085000 1.195000 0.895000 ;
-        RECT 1.765000  0.085000 2.095000 0.905000 ;
-        RECT 2.700000  0.085000 3.030000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -108,39 +91,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.905000 2.780000 1.235000 3.245000 ;
-        RECT 1.765000 2.780000 2.095000 3.245000 ;
-        RECT 2.625000 2.780000 2.955000 3.245000 ;
-        RECT 3.560000 2.780000 3.890000 3.245000 ;
-        RECT 4.640000 2.780000 4.970000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.205000 0.695000 0.455000 2.430000 ;
-      RECT 0.205000 2.430000 5.155000 2.610000 ;
-      RECT 1.335000 1.415000 2.795000 1.675000 ;
-      RECT 2.625000 0.995000 4.970000 1.165000 ;
-      RECT 2.625000 1.165000 2.795000 1.415000 ;
-      RECT 2.625000 1.675000 2.795000 1.930000 ;
-      RECT 2.625000 1.930000 4.480000 2.260000 ;
-      RECT 3.295000 0.255000 4.970000 0.995000 ;
-      RECT 4.825000 1.335000 5.155000 2.430000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.205000  0.695000 0.455000 2.430000 ;
+      RECT 0.205000  2.430000 5.155000 2.610000 ;
+      RECT 0.905000  2.780000 1.235000 3.245000 ;
+      RECT 0.985000  0.085000 1.195000 0.895000 ;
+      RECT 1.335000  1.415000 2.795000 1.675000 ;
+      RECT 1.765000  0.085000 2.095000 0.905000 ;
+      RECT 1.765000  2.780000 2.095000 3.245000 ;
+      RECT 2.625000  0.995000 4.970000 1.165000 ;
+      RECT 2.625000  1.165000 2.795000 1.415000 ;
+      RECT 2.625000  1.675000 2.795000 1.930000 ;
+      RECT 2.625000  1.930000 4.480000 2.260000 ;
+      RECT 2.625000  2.780000 2.955000 3.245000 ;
+      RECT 2.700000  0.085000 3.030000 0.825000 ;
+      RECT 3.295000  0.255000 4.970000 0.995000 ;
+      RECT 3.560000  2.780000 3.890000 3.245000 ;
+      RECT 4.640000  2.780000 4.970000 3.245000 ;
+      RECT 4.825000  1.335000 5.155000 2.430000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4b_4
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef
index 0235d73..9b88fa6 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_lp.magic.lef
@@ -82,20 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.675000 ;
-        RECT 3.085000  0.085000 3.415000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -104,37 +90,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.695000 2.320000 1.025000 3.245000 ;
-        RECT 1.755000 2.320000 2.085000 3.245000 ;
-        RECT 2.875000 2.025000 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 ;
-        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.440000 1.165000 0.750000 1.970000 ;
-      RECT 0.440000 1.970000 2.695000 2.140000 ;
-      RECT 1.225000 2.140000 1.555000 3.065000 ;
-      RECT 2.305000 2.140000 2.695000 3.065000 ;
-      RECT 2.525000 0.265000 2.855000 0.630000 ;
-      RECT 2.525000 0.630000 2.695000 1.970000 ;
-      RECT 2.875000 1.365000 4.205000 1.535000 ;
-      RECT 2.875000 1.535000 3.975000 1.695000 ;
-      RECT 3.645000 1.695000 3.975000 3.065000 ;
-      RECT 3.875000 0.265000 4.205000 0.675000 ;
-      RECT 4.035000 0.675000 4.205000 1.365000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.440000  1.165000 0.750000 1.970000 ;
+      RECT 0.440000  1.970000 2.695000 2.140000 ;
+      RECT 0.695000  2.320000 1.025000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.675000 ;
+      RECT 1.225000  2.140000 1.555000 3.065000 ;
+      RECT 1.755000  2.320000 2.085000 3.245000 ;
+      RECT 2.305000  2.140000 2.695000 3.065000 ;
+      RECT 2.525000  0.265000 2.855000 0.630000 ;
+      RECT 2.525000  0.630000 2.695000 1.970000 ;
+      RECT 2.875000  1.365000 4.205000 1.535000 ;
+      RECT 2.875000  1.535000 3.975000 1.695000 ;
+      RECT 2.875000  2.025000 3.205000 3.245000 ;
+      RECT 3.085000  0.085000 3.415000 0.630000 ;
+      RECT 3.645000  1.695000 3.975000 3.065000 ;
+      RECT 3.875000  0.265000 4.205000 0.675000 ;
+      RECT 4.035000  0.675000 4.205000 1.365000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4b_lp
diff --git a/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef b/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef
index fa8121c..4f6ab43 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_m.magic.lef
@@ -79,19 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.525000 ;
-        RECT 2.850000  0.085000 3.180000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -100,35 +87,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.110000 2.095000 1.320000 3.245000 ;
-        RECT 1.960000 2.155000 2.290000 3.245000 ;
-        RECT 2.990000 2.095000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.385000 0.345000 0.705000 ;
-      RECT 0.155000 0.705000 1.010000 0.875000 ;
-      RECT 0.680000 1.745000 1.010000 1.915000 ;
-      RECT 0.680000 1.915000 0.890000 2.295000 ;
-      RECT 0.840000 0.875000 1.010000 1.745000 ;
-      RECT 1.220000 0.475000 1.410000 1.745000 ;
-      RECT 1.220000 1.745000 2.690000 1.915000 ;
-      RECT 1.570000 1.915000 1.780000 2.295000 ;
-      RECT 2.480000 1.915000 2.690000 2.855000 ;
-      RECT 2.480000 2.855000 2.810000 3.025000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.155000  0.385000 0.345000 0.705000 ;
+      RECT 0.155000  0.705000 1.010000 0.875000 ;
+      RECT 0.525000  0.085000 0.855000 0.525000 ;
+      RECT 0.680000  1.745000 1.010000 1.915000 ;
+      RECT 0.680000  1.915000 0.890000 2.295000 ;
+      RECT 0.840000  0.875000 1.010000 1.745000 ;
+      RECT 1.110000  2.095000 1.320000 3.245000 ;
+      RECT 1.220000  0.475000 1.410000 1.745000 ;
+      RECT 1.220000  1.745000 2.690000 1.915000 ;
+      RECT 1.570000  1.915000 1.780000 2.295000 ;
+      RECT 1.960000  2.155000 2.290000 3.245000 ;
+      RECT 2.480000  1.915000 2.690000 2.855000 ;
+      RECT 2.480000  2.855000 2.810000 3.025000 ;
+      RECT 2.850000  0.085000 3.180000 0.615000 ;
+      RECT 2.990000  2.095000 3.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 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4b_m
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.magic.lef
index 593b600..fbcea67 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_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.560000  0.085000 0.820000 0.615000 ;
-        RECT 3.435000  0.085000 3.755000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,47 +90,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.625000 2.700000 0.955000 3.245000 ;
-        RECT 1.610000 2.125000 1.940000 3.245000 ;
-        RECT 2.485000 2.045000 2.815000 3.245000 ;
-        RECT 3.410000 2.045000 3.755000 2.375000 ;
-        RECT 3.515000 2.375000 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.090000 0.285000 0.390000 1.330000 ;
-      RECT 0.090000 1.330000 1.095000 1.425000 ;
-      RECT 0.090000 1.425000 1.590000 1.500000 ;
-      RECT 0.090000 1.500000 0.260000 2.700000 ;
-      RECT 0.090000 2.700000 0.455000 3.030000 ;
-      RECT 0.925000 1.500000 1.590000 1.615000 ;
-      RECT 0.990000 0.255000 2.675000 0.505000 ;
-      RECT 0.990000 0.505000 1.500000 0.615000 ;
-      RECT 1.125000 1.785000 1.940000 1.955000 ;
-      RECT 1.125000 1.955000 1.385000 3.030000 ;
-      RECT 1.330000 0.615000 1.500000 1.085000 ;
-      RECT 1.330000 1.085000 1.940000 1.255000 ;
-      RECT 1.680000 0.675000 2.310000 0.915000 ;
-      RECT 1.770000 1.255000 1.940000 1.785000 ;
-      RECT 2.110000 0.915000 2.310000 1.705000 ;
-      RECT 2.110000 1.705000 3.855000 1.875000 ;
-      RECT 2.110000 1.875000 2.315000 2.340000 ;
-      RECT 2.985000 1.875000 3.240000 2.340000 ;
-      RECT 3.605000 1.345000 3.855000 1.705000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.090000  0.285000 0.390000 1.330000 ;
+      RECT 0.090000  1.330000 1.095000 1.425000 ;
+      RECT 0.090000  1.425000 1.590000 1.500000 ;
+      RECT 0.090000  1.500000 0.260000 2.700000 ;
+      RECT 0.090000  2.700000 0.455000 3.030000 ;
+      RECT 0.560000  0.085000 0.820000 0.615000 ;
+      RECT 0.625000  2.700000 0.955000 3.245000 ;
+      RECT 0.925000  1.500000 1.590000 1.615000 ;
+      RECT 0.990000  0.255000 2.675000 0.505000 ;
+      RECT 0.990000  0.505000 1.500000 0.615000 ;
+      RECT 1.125000  1.785000 1.940000 1.955000 ;
+      RECT 1.125000  1.955000 1.385000 3.030000 ;
+      RECT 1.330000  0.615000 1.500000 1.085000 ;
+      RECT 1.330000  1.085000 1.940000 1.255000 ;
+      RECT 1.610000  2.125000 1.940000 3.245000 ;
+      RECT 1.680000  0.675000 2.310000 0.915000 ;
+      RECT 1.770000  1.255000 1.940000 1.785000 ;
+      RECT 2.110000  0.915000 2.310000 1.705000 ;
+      RECT 2.110000  1.705000 3.855000 1.875000 ;
+      RECT 2.110000  1.875000 2.315000 2.340000 ;
+      RECT 2.485000  2.045000 2.815000 3.245000 ;
+      RECT 2.985000  1.875000 3.240000 2.340000 ;
+      RECT 3.410000  2.045000 3.755000 2.375000 ;
+      RECT 3.435000  0.085000 3.755000 1.095000 ;
+      RECT 3.515000  2.375000 3.755000 3.245000 ;
+      RECT 3.605000  1.345000 3.855000 1.705000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4bb_1
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef
index 3142ba2..7e7ce10 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.magic.lef
@@ -80,23 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.525000  0.085000 0.910000 0.905000 ;
-        RECT 1.480000  0.085000 1.810000 0.825000 ;
-        RECT 3.435000  0.085000 3.775000 0.820000 ;
-        RECT 3.435000  0.820000 4.145000 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
@@ -105,49 +88,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.685000 2.725000 1.015000 3.245000 ;
-        RECT 1.545000 2.725000 2.220000 3.245000 ;
-        RECT 1.955000 2.135000 2.220000 2.725000 ;
-        RECT 2.985000 2.275000 3.315000 2.520000 ;
-        RECT 2.985000 2.520000 3.155000 3.245000 ;
-        RECT 3.905000 2.120000 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.095000 0.710000 0.355000 1.075000 ;
-      RECT 0.095000 1.075000 0.900000 1.245000 ;
-      RECT 0.160000 1.920000 0.900000 2.385000 ;
-      RECT 0.730000 1.245000 0.900000 1.920000 ;
-      RECT 0.730000 2.385000 1.785000 2.555000 ;
-      RECT 1.480000 0.995000 2.560000 1.175000 ;
-      RECT 1.480000 1.175000 1.750000 1.615000 ;
-      RECT 1.615000 1.795000 2.220000 1.965000 ;
-      RECT 1.615000 1.965000 1.785000 2.385000 ;
-      RECT 1.960000 1.345000 2.220000 1.795000 ;
-      RECT 2.125000 0.670000 2.560000 0.995000 ;
-      RECT 2.390000 1.175000 2.560000 1.935000 ;
-      RECT 2.390000 1.935000 3.735000 2.105000 ;
-      RECT 2.390000 2.105000 2.815000 2.450000 ;
-      RECT 2.790000 1.245000 3.120000 1.585000 ;
-      RECT 2.790000 1.585000 4.685000 1.765000 ;
-      RECT 3.485000 2.105000 3.735000 2.450000 ;
-      RECT 4.355000 0.820000 4.685000 1.585000 ;
-      RECT 4.355000 1.765000 4.685000 2.450000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.095000  0.710000 0.355000 1.075000 ;
+      RECT 0.095000  1.075000 0.900000 1.245000 ;
+      RECT 0.160000  1.920000 0.900000 2.385000 ;
+      RECT 0.525000  0.085000 0.910000 0.905000 ;
+      RECT 0.685000  2.725000 1.015000 3.245000 ;
+      RECT 0.730000  1.245000 0.900000 1.920000 ;
+      RECT 0.730000  2.385000 1.785000 2.555000 ;
+      RECT 1.480000  0.085000 1.810000 0.825000 ;
+      RECT 1.480000  0.995000 2.560000 1.175000 ;
+      RECT 1.480000  1.175000 1.750000 1.615000 ;
+      RECT 1.545000  2.725000 2.220000 3.245000 ;
+      RECT 1.615000  1.795000 2.220000 1.965000 ;
+      RECT 1.615000  1.965000 1.785000 2.385000 ;
+      RECT 1.955000  2.135000 2.220000 2.725000 ;
+      RECT 1.960000  1.345000 2.220000 1.795000 ;
+      RECT 2.125000  0.670000 2.560000 0.995000 ;
+      RECT 2.390000  1.175000 2.560000 1.935000 ;
+      RECT 2.390000  1.935000 3.735000 2.105000 ;
+      RECT 2.390000  2.105000 2.815000 2.450000 ;
+      RECT 2.790000  1.245000 3.120000 1.585000 ;
+      RECT 2.790000  1.585000 4.685000 1.765000 ;
+      RECT 2.985000  2.275000 3.315000 2.520000 ;
+      RECT 2.985000  2.520000 3.155000 3.245000 ;
+      RECT 3.435000  0.085000 3.775000 0.820000 ;
+      RECT 3.435000  0.820000 4.145000 1.010000 ;
+      RECT 3.485000  2.105000 3.735000 2.450000 ;
+      RECT 3.905000  2.120000 4.185000 3.245000 ;
+      RECT 4.355000  0.820000 4.685000 1.585000 ;
+      RECT 4.355000  1.765000 4.685000 2.450000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4bb_2
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef
index 2e42d28..4dff53d 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.magic.lef
@@ -83,26 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 1.025000  0.085000 1.255000 0.905000 ;
-        RECT 1.825000  0.085000 2.155000 0.905000 ;
-        RECT 2.790000  0.085000 3.120000 0.700000 ;
-        RECT 5.385000  0.085000 5.715000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -111,49 +91,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.965000 2.815000 1.295000 3.245000 ;
-        RECT 1.825000 2.815000 2.155000 3.245000 ;
-        RECT 2.765000 2.815000 3.095000 3.245000 ;
-        RECT 3.750000 2.815000 4.080000 3.245000 ;
-        RECT 4.770000 2.815000 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 ;
-        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.205000 0.700000 0.455000 2.465000 ;
-      RECT 0.205000 2.465000 4.960000 2.645000 ;
-      RECT 1.465000 1.415000 2.855000 1.645000 ;
-      RECT 2.685000 0.870000 5.100000 0.905000 ;
-      RECT 2.685000 0.905000 4.405000 1.040000 ;
-      RECT 2.685000 1.040000 2.855000 1.415000 ;
-      RECT 2.685000 1.645000 2.855000 1.965000 ;
-      RECT 2.685000 1.965000 4.610000 2.295000 ;
-      RECT 3.460000 0.255000 5.100000 0.870000 ;
-      RECT 4.105000 1.345000 4.445000 1.615000 ;
-      RECT 4.105000 1.615000 4.960000 1.785000 ;
-      RECT 4.645000 1.075000 6.145000 1.245000 ;
-      RECT 4.645000 1.245000 4.975000 1.445000 ;
-      RECT 4.790000 1.785000 4.960000 2.465000 ;
-      RECT 5.340000 1.245000 5.510000 1.930000 ;
-      RECT 5.340000 1.930000 5.640000 2.260000 ;
-      RECT 5.885000 0.695000 6.145000 1.075000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.205000  0.700000 0.455000 2.465000 ;
+      RECT 0.205000  2.465000 4.960000 2.645000 ;
+      RECT 0.965000  2.815000 1.295000 3.245000 ;
+      RECT 1.025000  0.085000 1.255000 0.905000 ;
+      RECT 1.465000  1.415000 2.855000 1.645000 ;
+      RECT 1.825000  0.085000 2.155000 0.905000 ;
+      RECT 1.825000  2.815000 2.155000 3.245000 ;
+      RECT 2.685000  0.870000 5.100000 0.905000 ;
+      RECT 2.685000  0.905000 4.405000 1.040000 ;
+      RECT 2.685000  1.040000 2.855000 1.415000 ;
+      RECT 2.685000  1.645000 2.855000 1.965000 ;
+      RECT 2.685000  1.965000 4.610000 2.295000 ;
+      RECT 2.765000  2.815000 3.095000 3.245000 ;
+      RECT 2.790000  0.085000 3.120000 0.700000 ;
+      RECT 3.460000  0.255000 5.100000 0.870000 ;
+      RECT 3.750000  2.815000 4.080000 3.245000 ;
+      RECT 4.105000  1.345000 4.445000 1.615000 ;
+      RECT 4.105000  1.615000 4.960000 1.785000 ;
+      RECT 4.645000  1.075000 6.145000 1.245000 ;
+      RECT 4.645000  1.245000 4.975000 1.445000 ;
+      RECT 4.770000  2.815000 5.100000 3.245000 ;
+      RECT 4.790000  1.785000 4.960000 2.465000 ;
+      RECT 5.340000  1.245000 5.510000 1.930000 ;
+      RECT 5.340000  1.930000 5.640000 2.260000 ;
+      RECT 5.385000  0.085000 5.715000 0.905000 ;
+      RECT 5.885000  0.695000 6.145000 1.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__and4bb_4
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef
index 23fdac6..8e82eac 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.magic.lef
@@ -81,22 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.605000 ;
-        RECT 3.885000  0.085000 4.215000 0.590000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,50 +89,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.645000 1.985000 0.975000 3.245000 ;
-        RECT 1.965000 2.335000 2.295000 3.245000 ;
-        RECT 3.025000 2.685000 3.355000 3.245000 ;
-        RECT 4.165000 2.320000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.265000 0.445000 1.635000 ;
-      RECT 0.115000 1.635000 2.560000 1.805000 ;
-      RECT 0.115000 1.805000 0.445000 3.025000 ;
-      RECT 1.435000 1.985000 2.970000 2.155000 ;
-      RECT 1.435000 2.155000 1.765000 3.065000 ;
-      RECT 1.725000 0.265000 2.055000 0.775000 ;
-      RECT 1.725000 0.775000 2.970000 0.945000 ;
-      RECT 2.230000 1.135000 2.560000 1.635000 ;
-      RECT 2.285000 0.265000 3.480000 0.595000 ;
-      RECT 2.495000 2.335000 3.965000 2.505000 ;
-      RECT 2.495000 2.505000 2.825000 3.065000 ;
-      RECT 2.800000 0.945000 2.970000 1.215000 ;
-      RECT 2.800000 1.215000 3.130000 1.885000 ;
-      RECT 2.800000 1.885000 2.970000 1.985000 ;
-      RECT 3.310000 0.595000 3.480000 0.770000 ;
-      RECT 3.310000 0.770000 4.620000 0.940000 ;
-      RECT 3.635000 1.970000 4.620000 2.140000 ;
-      RECT 3.635000 2.140000 3.965000 2.335000 ;
-      RECT 3.635000 2.505000 3.965000 3.065000 ;
-      RECT 4.450000 0.940000 4.840000 1.610000 ;
-      RECT 4.450000 1.610000 4.620000 1.970000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.115000  0.265000 0.445000 1.635000 ;
+      RECT 0.115000  1.635000 2.560000 1.805000 ;
+      RECT 0.115000  1.805000 0.445000 3.025000 ;
+      RECT 0.645000  1.985000 0.975000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.605000 ;
+      RECT 1.435000  1.985000 2.970000 2.155000 ;
+      RECT 1.435000  2.155000 1.765000 3.065000 ;
+      RECT 1.725000  0.265000 2.055000 0.775000 ;
+      RECT 1.725000  0.775000 2.970000 0.945000 ;
+      RECT 1.965000  2.335000 2.295000 3.245000 ;
+      RECT 2.230000  1.135000 2.560000 1.635000 ;
+      RECT 2.285000  0.265000 3.480000 0.595000 ;
+      RECT 2.495000  2.335000 3.965000 2.505000 ;
+      RECT 2.495000  2.505000 2.825000 3.065000 ;
+      RECT 2.800000  0.945000 2.970000 1.215000 ;
+      RECT 2.800000  1.215000 3.130000 1.885000 ;
+      RECT 2.800000  1.885000 2.970000 1.985000 ;
+      RECT 3.025000  2.685000 3.355000 3.245000 ;
+      RECT 3.310000  0.595000 3.480000 0.770000 ;
+      RECT 3.310000  0.770000 4.620000 0.940000 ;
+      RECT 3.635000  1.970000 4.620000 2.140000 ;
+      RECT 3.635000  2.140000 3.965000 2.335000 ;
+      RECT 3.635000  2.505000 3.965000 3.065000 ;
+      RECT 3.885000  0.085000 4.215000 0.590000 ;
+      RECT 4.165000  2.320000 4.495000 3.245000 ;
+      RECT 4.450000  0.940000 4.840000 1.610000 ;
+      RECT 4.450000  1.610000 4.620000 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 ;
+      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_lp__and4bb_lp
diff --git a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef
index a7b20fe..f68a045 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.magic.lef
@@ -80,20 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.720000  0.085000 0.930000 0.585000 ;
-        RECT 3.505000  0.085000 3.715000 0.935000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -102,45 +88,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.720000 2.095000 0.930000 3.245000 ;
-        RECT 1.540000 2.785000 1.750000 3.245000 ;
-        RECT 2.400000 2.785000 2.610000 3.245000 ;
-        RECT 3.220000 2.845000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 0.295000 0.500000 0.625000 ;
-      RECT 0.125000 0.625000 0.295000 1.655000 ;
-      RECT 0.125000 1.655000 1.785000 1.825000 ;
-      RECT 0.125000 1.825000 0.500000 2.295000 ;
-      RECT 1.150000 0.265000 2.615000 0.435000 ;
-      RECT 1.150000 0.435000 1.360000 0.595000 ;
-      RECT 1.150000 2.005000 2.435000 2.175000 ;
-      RECT 1.150000 2.175000 1.360000 2.335000 ;
-      RECT 1.615000 1.155000 1.785000 1.655000 ;
-      RECT 1.680000 0.645000 3.325000 0.975000 ;
-      RECT 1.970000 2.435000 3.040000 2.605000 ;
-      RECT 1.970000 2.605000 2.180000 2.985000 ;
-      RECT 2.105000 1.615000 2.435000 2.005000 ;
-      RECT 2.655000 1.585000 3.795000 1.755000 ;
-      RECT 2.655000 1.755000 2.825000 2.435000 ;
-      RECT 2.830000 2.605000 3.040000 2.985000 ;
-      RECT 3.155000 0.975000 3.325000 1.585000 ;
-      RECT 3.625000 1.755000 3.795000 2.255000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.125000  0.295000 0.500000 0.625000 ;
+      RECT 0.125000  0.625000 0.295000 1.655000 ;
+      RECT 0.125000  1.655000 1.785000 1.825000 ;
+      RECT 0.125000  1.825000 0.500000 2.295000 ;
+      RECT 0.720000  0.085000 0.930000 0.585000 ;
+      RECT 0.720000  2.095000 0.930000 3.245000 ;
+      RECT 1.150000  0.265000 2.615000 0.435000 ;
+      RECT 1.150000  0.435000 1.360000 0.595000 ;
+      RECT 1.150000  2.005000 2.435000 2.175000 ;
+      RECT 1.150000  2.175000 1.360000 2.335000 ;
+      RECT 1.540000  2.785000 1.750000 3.245000 ;
+      RECT 1.615000  1.155000 1.785000 1.655000 ;
+      RECT 1.680000  0.645000 3.325000 0.975000 ;
+      RECT 1.970000  2.435000 3.040000 2.605000 ;
+      RECT 1.970000  2.605000 2.180000 2.985000 ;
+      RECT 2.105000  1.615000 2.435000 2.005000 ;
+      RECT 2.400000  2.785000 2.610000 3.245000 ;
+      RECT 2.655000  1.585000 3.795000 1.755000 ;
+      RECT 2.655000  1.755000 2.825000 2.435000 ;
+      RECT 2.830000  2.605000 3.040000 2.985000 ;
+      RECT 3.155000  0.975000 3.325000 1.585000 ;
+      RECT 3.220000  2.845000 3.550000 3.245000 ;
+      RECT 3.505000  0.085000 3.715000 0.935000 ;
+      RECT 3.625000  1.755000 3.795000 2.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_lp__and4bb_m
diff --git a/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef
index 8af6afe..c6efafa 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_0.magic.lef
@@ -55,13 +55,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.560000  0.085000 0.890000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -70,24 +63,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.570000 2.395000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.785000 1.345000 0.970000 ;
-      RECT 0.430000 0.970000 0.680000 1.455000 ;
-      RECT 0.510000 1.455000 0.680000 2.055000 ;
-      RECT 0.510000 2.055000 1.345000 2.225000 ;
-      RECT 0.995000 2.225000 1.345000 3.075000 ;
-      RECT 1.060000 0.300000 1.345000 0.785000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.430000  0.785000 1.345000 0.970000 ;
+      RECT 0.430000  0.970000 0.680000 1.455000 ;
+      RECT 0.510000  1.455000 0.680000 2.055000 ;
+      RECT 0.510000  2.055000 1.345000 2.225000 ;
+      RECT 0.560000  0.085000 0.890000 0.615000 ;
+      RECT 0.570000  2.395000 0.825000 3.245000 ;
+      RECT 0.995000  2.225000 1.345000 3.075000 ;
+      RECT 1.060000  0.300000 1.345000 0.785000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__buf_0
diff --git a/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef
index 8038ec7..508595e 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_1.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -69,25 +62,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.525000 1.945000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 1.185000 0.695000 1.605000 ;
-      RECT 0.430000 1.605000 1.345000 1.705000 ;
-      RECT 0.505000 1.705000 1.345000 1.775000 ;
-      RECT 0.525000 0.850000 1.345000 1.020000 ;
-      RECT 0.525000 1.020000 0.695000 1.185000 ;
-      RECT 1.025000 0.690000 1.345000 0.850000 ;
-      RECT 1.025000 1.775000 1.345000 2.485000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.430000  1.185000 0.695000 1.605000 ;
+      RECT 0.430000  1.605000 1.345000 1.705000 ;
+      RECT 0.505000  1.705000 1.345000 1.775000 ;
+      RECT 0.525000  0.085000 0.855000 0.680000 ;
+      RECT 0.525000  0.850000 1.345000 1.020000 ;
+      RECT 0.525000  1.020000 0.695000 1.185000 ;
+      RECT 0.525000  1.945000 0.855000 3.245000 ;
+      RECT 1.025000  0.690000 1.345000 0.850000 ;
+      RECT 1.025000  1.775000 1.345000 2.485000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__buf_1
diff --git a/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef
index 88226cb..6ab1b00 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_16.magic.lef
@@ -45,24 +45,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.265000 0.255000 3.500000 3.075000 ;
-        RECT 4.100000 0.255000 4.360000 3.075000 ;
-        RECT 4.960000 0.255000 5.220000 3.075000 ;
-        RECT 5.820000 0.255000 6.080000 3.075000 ;
-        RECT 6.680000 0.255000 6.940000 3.075000 ;
-        RECT 7.540000 0.255000 7.800000 3.075000 ;
-        RECT 8.400000 0.255000 8.660000 3.075000 ;
-        RECT 9.260000 0.255000 9.520000 3.075000 ;
-      LAYER mcon ;
-        RECT 3.285000 1.950000 3.455000 2.120000 ;
-        RECT 4.145000 1.950000 4.315000 2.120000 ;
-        RECT 5.005000 1.950000 5.175000 2.120000 ;
-        RECT 5.865000 1.950000 6.035000 2.120000 ;
-        RECT 6.725000 1.950000 6.895000 2.120000 ;
-        RECT 7.585000 1.950000 7.755000 2.120000 ;
-        RECT 8.445000 1.950000 8.615000 2.120000 ;
-        RECT 9.305000 1.950000 9.475000 2.120000 ;
       LAYER met1 ;
         RECT 3.225000 1.920000 9.535000 2.150000 ;
     END
@@ -71,42 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.195000  0.085000  0.490000 1.075000 ;
-        RECT 1.090000  0.085000  1.360000 0.875000 ;
-        RECT 1.915000  0.085000  2.245000 0.695000 ;
-        RECT 2.810000  0.085000  3.095000 0.875000 ;
-        RECT 3.670000  0.085000  3.930000 1.075000 ;
-        RECT 4.530000  0.085000  4.790000 1.075000 ;
-        RECT 5.390000  0.085000  5.650000 1.075000 ;
-        RECT 6.250000  0.085000  6.510000 1.075000 ;
-        RECT 7.110000  0.085000  7.370000 1.075000 ;
-        RECT 7.970000  0.085000  8.230000 1.075000 ;
-        RECT 8.830000  0.085000  9.090000 1.075000 ;
-        RECT 9.690000  0.085000  9.985000 1.075000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,77 +61,125 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.195000 1.815000  0.490000 3.245000 ;
-        RECT 1.090000 2.095000  1.350000 3.245000 ;
-        RECT 1.950000 2.095000  2.210000 3.245000 ;
-        RECT 2.810000 2.095000  3.095000 3.245000 ;
-        RECT 3.670000 1.920000  3.930000 3.245000 ;
-        RECT 4.530000 1.920000  4.790000 3.245000 ;
-        RECT 5.390000 1.920000  5.650000 3.245000 ;
-        RECT 6.250000 1.920000  6.510000 3.245000 ;
-        RECT 7.110000 1.920000  7.370000 3.245000 ;
-        RECT 7.970000 1.920000  8.230000 3.245000 ;
-        RECT 8.830000 1.920000  9.090000 3.245000 ;
-        RECT 9.690000 1.920000  9.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 ;
-        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.660000 0.425000 0.920000 1.045000 ;
-      RECT 0.660000 1.045000 1.735000 1.215000 ;
-      RECT 0.660000 1.755000 3.095000 1.925000 ;
-      RECT 0.660000 1.925000 0.920000 3.075000 ;
-      RECT 1.520000 1.925000 1.780000 3.075000 ;
-      RECT 1.530000 0.425000 1.745000 0.865000 ;
-      RECT 1.530000 0.865000 2.640000 1.035000 ;
-      RECT 1.530000 1.035000 1.735000 1.045000 ;
-      RECT 2.380000 1.925000 2.640000 3.075000 ;
-      RECT 2.415000 0.425000 2.640000 0.865000 ;
-      RECT 2.425000 1.035000 2.640000 1.045000 ;
-      RECT 2.425000 1.045000 3.095000 1.215000 ;
-      RECT 2.905000 1.215000 3.095000 1.755000 ;
-      RECT 3.670000 1.325000 3.930000 1.750000 ;
-      RECT 4.530000 1.325000 4.790000 1.750000 ;
-      RECT 5.390000 1.325000 5.650000 1.750000 ;
-      RECT 6.250000 1.325000 6.510000 1.750000 ;
-      RECT 7.110000 1.325000 7.370000 1.750000 ;
-      RECT 7.970000 1.325000 8.230000 1.750000 ;
-      RECT 8.830000 1.325000 9.090000 1.750000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.195000  0.085000  0.490000 1.075000 ;
+      RECT 0.195000  1.815000  0.490000 3.245000 ;
+      RECT 0.660000  0.425000  0.920000 1.045000 ;
+      RECT 0.660000  1.045000  1.735000 1.215000 ;
+      RECT 0.660000  1.755000  3.095000 1.925000 ;
+      RECT 0.660000  1.925000  0.920000 3.075000 ;
+      RECT 1.090000  0.085000  1.360000 0.875000 ;
+      RECT 1.090000  2.095000  1.350000 3.245000 ;
+      RECT 1.520000  1.925000  1.780000 3.075000 ;
+      RECT 1.530000  0.425000  1.745000 0.865000 ;
+      RECT 1.530000  0.865000  2.640000 1.035000 ;
+      RECT 1.530000  1.035000  1.735000 1.045000 ;
+      RECT 1.915000  0.085000  2.245000 0.695000 ;
+      RECT 1.950000  2.095000  2.210000 3.245000 ;
+      RECT 2.380000  1.925000  2.640000 3.075000 ;
+      RECT 2.415000  0.425000  2.640000 0.865000 ;
+      RECT 2.425000  1.035000  2.640000 1.045000 ;
+      RECT 2.425000  1.045000  3.095000 1.215000 ;
+      RECT 2.810000  0.085000  3.095000 0.875000 ;
+      RECT 2.810000  2.095000  3.095000 3.245000 ;
+      RECT 2.905000  1.215000  3.095000 1.755000 ;
+      RECT 3.265000  0.255000  3.500000 3.075000 ;
+      RECT 3.670000  0.085000  3.930000 1.075000 ;
+      RECT 3.670000  1.325000  3.930000 1.750000 ;
+      RECT 3.670000  1.920000  3.930000 3.245000 ;
+      RECT 4.100000  0.255000  4.360000 3.075000 ;
+      RECT 4.530000  0.085000  4.790000 1.075000 ;
+      RECT 4.530000  1.325000  4.790000 1.750000 ;
+      RECT 4.530000  1.920000  4.790000 3.245000 ;
+      RECT 4.960000  0.255000  5.220000 3.075000 ;
+      RECT 5.390000  0.085000  5.650000 1.075000 ;
+      RECT 5.390000  1.325000  5.650000 1.750000 ;
+      RECT 5.390000  1.920000  5.650000 3.245000 ;
+      RECT 5.820000  0.255000  6.080000 3.075000 ;
+      RECT 6.250000  0.085000  6.510000 1.075000 ;
+      RECT 6.250000  1.325000  6.510000 1.750000 ;
+      RECT 6.250000  1.920000  6.510000 3.245000 ;
+      RECT 6.680000  0.255000  6.940000 3.075000 ;
+      RECT 7.110000  0.085000  7.370000 1.075000 ;
+      RECT 7.110000  1.325000  7.370000 1.750000 ;
+      RECT 7.110000  1.920000  7.370000 3.245000 ;
+      RECT 7.540000  0.255000  7.800000 3.075000 ;
+      RECT 7.970000  0.085000  8.230000 1.075000 ;
+      RECT 7.970000  1.325000  8.230000 1.750000 ;
+      RECT 7.970000  1.920000  8.230000 3.245000 ;
+      RECT 8.400000  0.255000  8.660000 3.075000 ;
+      RECT 8.830000  0.085000  9.090000 1.075000 ;
+      RECT 8.830000  1.325000  9.090000 1.750000 ;
+      RECT 8.830000  1.920000  9.090000 3.245000 ;
+      RECT 9.260000  0.255000  9.520000 3.075000 ;
+      RECT 9.690000  0.085000  9.985000 1.075000 ;
+      RECT 9.690000  1.920000  9.985000 3.245000 ;
     LAYER mcon ;
-      RECT 2.915000 1.580000 3.085000 1.750000 ;
-      RECT 3.715000 1.580000 3.885000 1.750000 ;
-      RECT 4.575000 1.580000 4.745000 1.750000 ;
-      RECT 5.435000 1.580000 5.605000 1.750000 ;
-      RECT 6.295000 1.580000 6.465000 1.750000 ;
-      RECT 7.155000 1.580000 7.325000 1.750000 ;
-      RECT 8.015000 1.580000 8.185000 1.750000 ;
-      RECT 8.875000 1.580000 9.045000 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 2.915000  1.580000 3.085000 1.750000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.285000  1.950000 3.455000 2.120000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.715000  1.580000 3.885000 1.750000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.145000  1.950000 4.315000 2.120000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.575000  1.580000 4.745000 1.750000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.005000  1.950000 5.175000 2.120000 ;
+      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.865000  1.950000 6.035000 2.120000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.295000  1.580000 6.465000 1.750000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.725000  1.950000 6.895000 2.120000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.155000  1.580000 7.325000 1.750000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.585000  1.950000 7.755000 2.120000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.015000  1.580000 8.185000 1.750000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.445000  1.950000 8.615000 2.120000 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
+      RECT 8.875000  1.580000 9.045000 1.750000 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
+      RECT 9.305000  1.950000 9.475000 2.120000 ;
+      RECT 9.755000 -0.085000 9.925000 0.085000 ;
+      RECT 9.755000  3.245000 9.925000 3.415000 ;
     LAYER met1 ;
       RECT 2.855000 1.550000 9.105000 1.780000 ;
   END
diff --git a/cells/buf/sky130_fd_sc_lp__buf_2.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_2.magic.lef
index bb0d403..fd50058 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__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.145000  0.085000 0.440000 1.095000 ;
-        RECT 1.005000  0.085000 1.785000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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,25 +61,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.245000 2.105000 0.440000 3.245000 ;
-        RECT 1.045000 2.025000 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 1.005000 1.345000 1.275000 1.685000 ;
-      RECT 1.005000 1.685000 2.215000 1.855000 ;
-      RECT 1.955000 0.700000 2.215000 1.685000 ;
-      RECT 1.955000 1.855000 2.215000 2.485000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.145000  0.085000 0.440000 1.095000 ;
+      RECT 0.245000  2.105000 0.440000 3.245000 ;
+      RECT 1.005000  0.085000 1.785000 1.015000 ;
+      RECT 1.005000  1.345000 1.275000 1.685000 ;
+      RECT 1.005000  1.685000 2.215000 1.855000 ;
+      RECT 1.045000  2.025000 1.785000 3.245000 ;
+      RECT 1.955000  0.700000 2.215000 1.685000 ;
+      RECT 1.955000  1.855000 2.215000 2.485000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__buf_2
diff --git a/cells/buf/sky130_fd_sc_lp__buf_4.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_4.magic.lef
index 5ba103a..d90f914 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_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.305000  0.085000 0.635000 0.905000 ;
-        RECT 1.165000  0.085000 1.495000 0.905000 ;
-        RECT 2.025000  0.085000 2.355000 0.690000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,30 +66,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.305000 2.115000 0.635000 3.245000 ;
-        RECT 1.165000 2.115000 1.495000 3.245000 ;
-        RECT 2.025000 2.095000 2.355000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.700000 1.415000 2.220000 1.605000 ;
-      RECT 2.025000 0.860000 2.785000 1.030000 ;
-      RECT 2.025000 1.030000 2.220000 1.415000 ;
-      RECT 2.025000 1.605000 2.220000 1.755000 ;
-      RECT 2.025000 1.755000 2.785000 1.925000 ;
-      RECT 2.525000 0.255000 2.785000 0.860000 ;
-      RECT 2.525000 1.925000 2.785000 3.075000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.305000  0.085000 0.635000 0.905000 ;
+      RECT 0.305000  2.115000 0.635000 3.245000 ;
+      RECT 0.700000  1.415000 2.220000 1.605000 ;
+      RECT 1.165000  0.085000 1.495000 0.905000 ;
+      RECT 1.165000  2.115000 1.495000 3.245000 ;
+      RECT 2.025000  0.085000 2.355000 0.690000 ;
+      RECT 2.025000  0.860000 2.785000 1.030000 ;
+      RECT 2.025000  1.030000 2.220000 1.415000 ;
+      RECT 2.025000  1.605000 2.220000 1.755000 ;
+      RECT 2.025000  1.755000 2.785000 1.925000 ;
+      RECT 2.025000  2.095000 2.355000 3.245000 ;
+      RECT 2.525000  0.255000 2.785000 0.860000 ;
+      RECT 2.525000  1.925000 2.785000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__buf_4
diff --git a/cells/buf/sky130_fd_sc_lp__buf_8.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_8.magic.lef
index 125809f..db42fcc 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_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.560000  0.085000 0.820000 0.670000 ;
-        RECT 1.420000  0.085000 1.695000 0.875000 ;
-        RECT 2.280000  0.085000 2.540000 0.875000 ;
-        RECT 3.135000  0.085000 3.400000 0.875000 ;
-        RECT 4.000000  0.085000 4.260000 0.875000 ;
-        RECT 4.855000  0.085000 5.155000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,42 +71,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.560000 2.095000 0.820000 3.245000 ;
-        RECT 1.420000 2.095000 1.695000 3.245000 ;
-        RECT 2.275000 2.095000 2.535000 3.245000 ;
-        RECT 3.145000 2.095000 3.400000 3.245000 ;
-        RECT 4.000000 2.095000 4.260000 3.245000 ;
-        RECT 4.860000 2.095000 5.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 ;
-        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.390000 0.840000 ;
-      RECT 0.095000 0.840000 1.250000 1.010000 ;
-      RECT 0.095000 1.745000 1.695000 1.925000 ;
-      RECT 0.095000 1.925000 0.390000 2.980000 ;
-      RECT 0.990000 0.305000 1.250000 0.840000 ;
-      RECT 0.990000 1.925000 1.250000 2.980000 ;
-      RECT 1.050000 1.010000 1.250000 1.045000 ;
-      RECT 1.050000 1.045000 1.695000 1.215000 ;
-      RECT 1.525000 1.215000 1.695000 1.395000 ;
-      RECT 1.525000 1.395000 4.740000 1.575000 ;
-      RECT 1.525000 1.575000 1.695000 1.745000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  0.305000 0.390000 0.840000 ;
+      RECT 0.095000  0.840000 1.250000 1.010000 ;
+      RECT 0.095000  1.745000 1.695000 1.925000 ;
+      RECT 0.095000  1.925000 0.390000 2.980000 ;
+      RECT 0.560000  0.085000 0.820000 0.670000 ;
+      RECT 0.560000  2.095000 0.820000 3.245000 ;
+      RECT 0.990000  0.305000 1.250000 0.840000 ;
+      RECT 0.990000  1.925000 1.250000 2.980000 ;
+      RECT 1.050000  1.010000 1.250000 1.045000 ;
+      RECT 1.050000  1.045000 1.695000 1.215000 ;
+      RECT 1.420000  0.085000 1.695000 0.875000 ;
+      RECT 1.420000  2.095000 1.695000 3.245000 ;
+      RECT 1.525000  1.215000 1.695000 1.395000 ;
+      RECT 1.525000  1.395000 4.740000 1.575000 ;
+      RECT 1.525000  1.575000 1.695000 1.745000 ;
+      RECT 2.275000  2.095000 2.535000 3.245000 ;
+      RECT 2.280000  0.085000 2.540000 0.875000 ;
+      RECT 3.135000  0.085000 3.400000 0.875000 ;
+      RECT 3.145000  2.095000 3.400000 3.245000 ;
+      RECT 4.000000  0.085000 4.260000 0.875000 ;
+      RECT 4.000000  2.095000 4.260000 3.245000 ;
+      RECT 4.855000  0.085000 5.155000 0.875000 ;
+      RECT 4.860000  2.095000 5.095000 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_lp__buf_8
diff --git a/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef
index 0aa6b54..b322927 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_lp.magic.lef
@@ -54,15 +54,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.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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,24 +62,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.760000 2.015000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.740000 1.165000 1.070000 1.665000 ;
-      RECT 0.740000 1.665000 2.225000 1.835000 ;
-      RECT 1.535000 1.835000 1.865000 3.055000 ;
-      RECT 1.975000 0.265000 2.225000 1.665000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.740000  1.165000 1.070000 1.665000 ;
+      RECT 0.740000  1.665000 2.225000 1.835000 ;
+      RECT 0.760000  2.015000 1.090000 3.245000 ;
+      RECT 0.955000  0.085000 1.285000 0.725000 ;
+      RECT 1.535000  1.835000 1.865000 3.055000 ;
+      RECT 1.975000  0.265000 2.225000 1.665000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__buf_lp
diff --git a/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef b/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef
index 7bae0fa..6c92046 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef
+++ b/cells/buf/sky130_fd_sc_lp__buf_m.magic.lef
@@ -52,13 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.585000  0.085000 0.795000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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,22 +60,26 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.585000 2.760000 0.795000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 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.545000 1.930000 1.225000 2.100000 ;
-      RECT 1.015000 0.330000 1.225000 0.660000 ;
-      RECT 1.015000 2.100000 1.225000 2.960000 ;
-      RECT 1.055000 0.660000 1.225000 1.930000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.545000  1.930000 1.225000 2.100000 ;
+      RECT 0.585000  0.085000 0.795000 0.660000 ;
+      RECT 0.585000  2.760000 0.795000 3.245000 ;
+      RECT 1.015000  0.330000 1.225000 0.660000 ;
+      RECT 1.015000  2.100000 1.225000 2.960000 ;
+      RECT 1.055000  0.660000 1.225000 1.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 ;
   END
 END sky130_fd_sc_lp__buf_m
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef
index 36c531e..512dd37 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.magic.lef
@@ -44,24 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  5.665000 0.255000  5.900000 3.075000 ;
-        RECT  6.500000 0.255000  6.760000 3.075000 ;
-        RECT  7.360000 0.255000  7.620000 3.075000 ;
-        RECT  8.220000 0.255000  8.480000 3.075000 ;
-        RECT  9.080000 0.255000  9.340000 3.075000 ;
-        RECT  9.940000 0.255000 10.200000 3.075000 ;
-        RECT 10.800000 0.255000 11.060000 3.075000 ;
-        RECT 11.660000 0.255000 11.920000 3.075000 ;
-      LAYER mcon ;
-        RECT  5.685000 1.950000  5.855000 2.120000 ;
-        RECT  6.545000 1.950000  6.715000 2.120000 ;
-        RECT  7.405000 1.950000  7.575000 2.120000 ;
-        RECT  8.265000 1.950000  8.435000 2.120000 ;
-        RECT  9.125000 1.950000  9.295000 2.120000 ;
-        RECT  9.985000 1.950000 10.155000 2.120000 ;
-        RECT 10.845000 1.950000 11.015000 2.120000 ;
-        RECT 11.705000 1.950000 11.875000 2.120000 ;
       LAYER met1 ;
         RECT 5.625000 1.920000 11.935000 2.150000 ;
     END
@@ -70,49 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.480000 0.085000 ;
-        RECT  0.525000  0.085000  0.855000 0.845000 ;
-        RECT  1.385000  0.085000  1.715000 0.895000 ;
-        RECT  2.595000  0.085000  2.885000 0.895000 ;
-        RECT  3.455000  0.085000  3.750000 0.875000 ;
-        RECT  4.350000  0.085000  4.610000 0.875000 ;
-        RECT  5.210000  0.085000  5.470000 0.875000 ;
-        RECT  6.070000  0.085000  6.330000 1.075000 ;
-        RECT  6.930000  0.085000  7.190000 1.075000 ;
-        RECT  7.790000  0.085000  8.050000 1.075000 ;
-        RECT  8.650000  0.085000  8.910000 1.075000 ;
-        RECT  9.510000  0.085000  9.770000 1.075000 ;
-        RECT 10.370000  0.085000 10.630000 1.075000 ;
-        RECT 11.230000  0.085000 11.490000 1.075000 ;
-        RECT 12.090000  0.085000 12.385000 1.075000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -121,97 +60,152 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.480000 3.415000 ;
-        RECT  0.560000 2.260000  0.820000 3.245000 ;
-        RECT  1.385000 2.115000  1.715000 3.245000 ;
-        RECT  2.595000 2.100000  2.925000 3.245000 ;
-        RECT  3.490000 2.095000  3.750000 3.245000 ;
-        RECT  4.350000 2.095000  4.610000 3.245000 ;
-        RECT  5.210000 2.095000  5.470000 3.245000 ;
-        RECT  6.070000 1.925000  6.330000 3.245000 ;
-        RECT  6.930000 1.925000  7.190000 3.245000 ;
-        RECT  7.790000 1.925000  8.050000 3.245000 ;
-        RECT  8.650000 1.925000  8.910000 3.245000 ;
-        RECT  9.510000 1.925000  9.770000 3.245000 ;
-        RECT 10.370000 1.925000 10.630000 3.245000 ;
-        RECT 11.230000 1.925000 11.490000 3.245000 ;
-        RECT 12.090000 1.925000 12.385000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.095000 0.255000  0.355000 1.015000 ;
-      RECT  0.095000 1.015000  0.835000 1.185000 ;
-      RECT  0.095000 1.920000  0.835000 2.090000 ;
-      RECT  0.095000 2.090000  0.390000 3.075000 ;
-      RECT  0.665000 1.185000  0.835000 1.405000 ;
-      RECT  0.665000 1.405000  2.180000 1.590000 ;
-      RECT  0.665000 1.590000  0.835000 1.920000 ;
-      RECT  1.005000 1.760000  2.520000 1.930000 ;
-      RECT  1.005000 1.930000  2.145000 1.945000 ;
-      RECT  1.005000 1.945000  1.215000 3.075000 ;
-      RECT  1.025000 0.255000  1.215000 1.065000 ;
-      RECT  1.025000 1.065000  2.855000 1.235000 ;
-      RECT  1.885000 0.255000  2.145000 1.065000 ;
-      RECT  1.885000 1.945000  2.145000 3.075000 ;
-      RECT  2.350000 1.235000  2.855000 1.385000 ;
-      RECT  2.350000 1.385000  5.135000 1.575000 ;
-      RECT  2.350000 1.575000  2.520000 1.760000 ;
-      RECT  3.055000 0.255000  3.285000 1.045000 ;
-      RECT  3.055000 1.045000  5.495000 1.215000 ;
-      RECT  3.095000 1.745000  5.495000 1.925000 ;
-      RECT  3.095000 1.925000  3.320000 3.075000 ;
-      RECT  3.920000 0.255000  4.180000 1.045000 ;
-      RECT  3.920000 1.925000  4.180000 3.075000 ;
-      RECT  4.780000 0.255000  5.040000 1.045000 ;
-      RECT  4.780000 1.925000  5.040000 3.075000 ;
-      RECT  5.305000 1.215000  5.495000 1.745000 ;
-      RECT  6.070000 1.315000  6.330000 1.755000 ;
-      RECT  6.930000 1.315000  7.190000 1.755000 ;
-      RECT  7.790000 1.315000  8.050000 1.755000 ;
-      RECT  8.650000 1.315000  8.910000 1.755000 ;
-      RECT  9.510000 1.315000  9.770000 1.755000 ;
-      RECT 10.370000 1.315000 10.630000 1.755000 ;
-      RECT 11.230000 1.315000 11.490000 1.755000 ;
+      RECT  0.000000 -0.085000 12.480000 0.085000 ;
+      RECT  0.000000  3.245000 12.480000 3.415000 ;
+      RECT  0.095000  0.255000  0.355000 1.015000 ;
+      RECT  0.095000  1.015000  0.835000 1.185000 ;
+      RECT  0.095000  1.920000  0.835000 2.090000 ;
+      RECT  0.095000  2.090000  0.390000 3.075000 ;
+      RECT  0.525000  0.085000  0.855000 0.845000 ;
+      RECT  0.560000  2.260000  0.820000 3.245000 ;
+      RECT  0.665000  1.185000  0.835000 1.405000 ;
+      RECT  0.665000  1.405000  2.180000 1.590000 ;
+      RECT  0.665000  1.590000  0.835000 1.920000 ;
+      RECT  1.005000  1.760000  2.520000 1.930000 ;
+      RECT  1.005000  1.930000  2.145000 1.945000 ;
+      RECT  1.005000  1.945000  1.215000 3.075000 ;
+      RECT  1.025000  0.255000  1.215000 1.065000 ;
+      RECT  1.025000  1.065000  2.855000 1.235000 ;
+      RECT  1.385000  0.085000  1.715000 0.895000 ;
+      RECT  1.385000  2.115000  1.715000 3.245000 ;
+      RECT  1.885000  0.255000  2.145000 1.065000 ;
+      RECT  1.885000  1.945000  2.145000 3.075000 ;
+      RECT  2.350000  1.235000  2.855000 1.385000 ;
+      RECT  2.350000  1.385000  5.135000 1.575000 ;
+      RECT  2.350000  1.575000  2.520000 1.760000 ;
+      RECT  2.595000  0.085000  2.885000 0.895000 ;
+      RECT  2.595000  2.100000  2.925000 3.245000 ;
+      RECT  3.055000  0.255000  3.285000 1.045000 ;
+      RECT  3.055000  1.045000  5.495000 1.215000 ;
+      RECT  3.095000  1.745000  5.495000 1.925000 ;
+      RECT  3.095000  1.925000  3.320000 3.075000 ;
+      RECT  3.455000  0.085000  3.750000 0.875000 ;
+      RECT  3.490000  2.095000  3.750000 3.245000 ;
+      RECT  3.920000  0.255000  4.180000 1.045000 ;
+      RECT  3.920000  1.925000  4.180000 3.075000 ;
+      RECT  4.350000  0.085000  4.610000 0.875000 ;
+      RECT  4.350000  2.095000  4.610000 3.245000 ;
+      RECT  4.780000  0.255000  5.040000 1.045000 ;
+      RECT  4.780000  1.925000  5.040000 3.075000 ;
+      RECT  5.210000  0.085000  5.470000 0.875000 ;
+      RECT  5.210000  2.095000  5.470000 3.245000 ;
+      RECT  5.305000  1.215000  5.495000 1.745000 ;
+      RECT  5.665000  0.255000  5.900000 3.075000 ;
+      RECT  6.070000  0.085000  6.330000 1.075000 ;
+      RECT  6.070000  1.315000  6.330000 1.755000 ;
+      RECT  6.070000  1.925000  6.330000 3.245000 ;
+      RECT  6.500000  0.255000  6.760000 3.075000 ;
+      RECT  6.930000  0.085000  7.190000 1.075000 ;
+      RECT  6.930000  1.315000  7.190000 1.755000 ;
+      RECT  6.930000  1.925000  7.190000 3.245000 ;
+      RECT  7.360000  0.255000  7.620000 3.075000 ;
+      RECT  7.790000  0.085000  8.050000 1.075000 ;
+      RECT  7.790000  1.315000  8.050000 1.755000 ;
+      RECT  7.790000  1.925000  8.050000 3.245000 ;
+      RECT  8.220000  0.255000  8.480000 3.075000 ;
+      RECT  8.650000  0.085000  8.910000 1.075000 ;
+      RECT  8.650000  1.315000  8.910000 1.755000 ;
+      RECT  8.650000  1.925000  8.910000 3.245000 ;
+      RECT  9.080000  0.255000  9.340000 3.075000 ;
+      RECT  9.510000  0.085000  9.770000 1.075000 ;
+      RECT  9.510000  1.315000  9.770000 1.755000 ;
+      RECT  9.510000  1.925000  9.770000 3.245000 ;
+      RECT  9.940000  0.255000 10.200000 3.075000 ;
+      RECT 10.370000  0.085000 10.630000 1.075000 ;
+      RECT 10.370000  1.315000 10.630000 1.755000 ;
+      RECT 10.370000  1.925000 10.630000 3.245000 ;
+      RECT 10.800000  0.255000 11.060000 3.075000 ;
+      RECT 11.230000  0.085000 11.490000 1.075000 ;
+      RECT 11.230000  1.315000 11.490000 1.755000 ;
+      RECT 11.230000  1.925000 11.490000 3.245000 ;
+      RECT 11.660000  0.255000 11.920000 3.075000 ;
+      RECT 12.090000  0.085000 12.385000 1.075000 ;
+      RECT 12.090000  1.925000 12.385000 3.245000 ;
     LAYER mcon ;
-      RECT  5.315000 1.580000  5.485000 1.750000 ;
-      RECT  6.115000 1.580000  6.285000 1.750000 ;
-      RECT  6.975000 1.580000  7.145000 1.750000 ;
-      RECT  7.835000 1.580000  8.005000 1.750000 ;
-      RECT  8.695000 1.580000  8.865000 1.750000 ;
-      RECT  9.555000 1.580000  9.725000 1.750000 ;
-      RECT 10.415000 1.580000 10.585000 1.750000 ;
-      RECT 11.275000 1.580000 11.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  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.315000  1.580000  5.485000 1.750000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.685000  1.950000  5.855000 2.120000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  6.115000  1.580000  6.285000 1.750000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.545000  1.950000  6.715000 2.120000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  6.975000  1.580000  7.145000 1.750000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.405000  1.950000  7.575000 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.265000  1.950000  8.435000 2.120000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.695000  1.580000  8.865000 1.750000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.125000  1.950000  9.295000 2.120000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.555000  1.580000  9.725000 1.750000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT  9.985000  1.950000 10.155000 2.120000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.415000  1.580000 10.585000 1.750000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 10.845000  1.950000 11.015000 2.120000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.275000  1.580000 11.445000 1.750000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 11.705000  1.950000 11.875000 2.120000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
     LAYER met1 ;
       RECT 5.255000 1.550000 11.505000 1.780000 ;
   END
diff --git a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.magic.lef
index 866f956..2a948d4 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_lp__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.395000  0.085000 0.725000 0.885000 ;
-        RECT 1.255000  0.085000 1.585000 0.885000 ;
-        RECT 2.115000  0.085000 2.445000 0.885000 ;
-        RECT 2.975000  0.085000 3.305000 0.885000 ;
-        RECT 3.835000  0.085000 4.190000 0.885000 ;
-        RECT 4.740000  0.085000 5.070000 0.885000 ;
-        RECT 6.210000  0.085000 6.540000 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 ;
-        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,54 +70,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.395000 2.105000 0.690000 3.245000 ;
-        RECT 1.290000 2.105000 1.550000 3.245000 ;
-        RECT 2.150000 2.105000 2.410000 3.245000 ;
-        RECT 3.010000 2.105000 3.270000 3.245000 ;
-        RECT 3.835000 2.095000 4.165000 3.245000 ;
-        RECT 4.780000 2.095000 5.040000 3.245000 ;
-        RECT 6.250000 2.370000 6.580000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.585000 1.395000 4.005000 1.585000 ;
-      RECT 3.835000 1.055000 5.500000 1.225000 ;
-      RECT 3.835000 1.225000 4.005000 1.395000 ;
-      RECT 3.835000 1.585000 4.005000 1.755000 ;
-      RECT 3.835000 1.755000 5.500000 1.925000 ;
-      RECT 4.185000 1.395000 6.020000 1.585000 ;
-      RECT 4.335000 1.925000 4.610000 3.075000 ;
-      RECT 4.360000 0.290000 4.570000 1.055000 ;
-      RECT 5.210000 1.925000 5.500000 3.075000 ;
-      RECT 5.240000 0.290000 5.500000 1.055000 ;
-      RECT 5.760000 0.435000 6.020000 1.395000 ;
-      RECT 5.840000 1.585000 6.020000 1.815000 ;
-      RECT 5.840000 1.815000 6.070000 2.825000 ;
-      RECT 6.190000 1.065000 7.105000 1.235000 ;
-      RECT 6.190000 1.235000 6.440000 1.525000 ;
-      RECT 6.240000 1.525000 6.440000 1.925000 ;
-      RECT 6.240000 1.925000 7.105000 2.200000 ;
-      RECT 6.775000 0.665000 7.105000 1.065000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.395000  0.085000 0.725000 0.885000 ;
+      RECT 0.395000  2.105000 0.690000 3.245000 ;
+      RECT 0.585000  1.395000 4.005000 1.585000 ;
+      RECT 1.255000  0.085000 1.585000 0.885000 ;
+      RECT 1.290000  2.105000 1.550000 3.245000 ;
+      RECT 2.115000  0.085000 2.445000 0.885000 ;
+      RECT 2.150000  2.105000 2.410000 3.245000 ;
+      RECT 2.975000  0.085000 3.305000 0.885000 ;
+      RECT 3.010000  2.105000 3.270000 3.245000 ;
+      RECT 3.835000  0.085000 4.190000 0.885000 ;
+      RECT 3.835000  1.055000 5.500000 1.225000 ;
+      RECT 3.835000  1.225000 4.005000 1.395000 ;
+      RECT 3.835000  1.585000 4.005000 1.755000 ;
+      RECT 3.835000  1.755000 5.500000 1.925000 ;
+      RECT 3.835000  2.095000 4.165000 3.245000 ;
+      RECT 4.185000  1.395000 6.020000 1.585000 ;
+      RECT 4.335000  1.925000 4.610000 3.075000 ;
+      RECT 4.360000  0.290000 4.570000 1.055000 ;
+      RECT 4.740000  0.085000 5.070000 0.885000 ;
+      RECT 4.780000  2.095000 5.040000 3.245000 ;
+      RECT 5.210000  1.925000 5.500000 3.075000 ;
+      RECT 5.240000  0.290000 5.500000 1.055000 ;
+      RECT 5.760000  0.435000 6.020000 1.395000 ;
+      RECT 5.840000  1.585000 6.020000 1.815000 ;
+      RECT 5.840000  1.815000 6.070000 2.825000 ;
+      RECT 6.190000  1.065000 7.105000 1.235000 ;
+      RECT 6.190000  1.235000 6.440000 1.525000 ;
+      RECT 6.210000  0.085000 6.540000 0.895000 ;
+      RECT 6.240000  1.525000 6.440000 1.925000 ;
+      RECT 6.240000  1.925000 7.105000 2.200000 ;
+      RECT 6.250000  2.370000 6.580000 3.245000 ;
+      RECT 6.775000  0.665000 7.105000 1.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__bufbuf_8
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef
index 7791e62..4ac48da 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.magic.lef
@@ -44,24 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  4.690000 0.315000  4.915000 3.025000 ;
-        RECT  5.515000 0.315000  5.775000 3.025000 ;
-        RECT  6.375000 0.315000  6.635000 3.025000 ;
-        RECT  7.235000 0.315000  7.495000 3.025000 ;
-        RECT  8.095000 0.315000  8.355000 3.025000 ;
-        RECT  8.955000 0.315000  9.215000 3.025000 ;
-        RECT  9.815000 0.315000 10.075000 3.025000 ;
-        RECT 10.675000 0.315000 10.935000 3.025000 ;
-      LAYER mcon ;
-        RECT  4.700000 1.950000  4.870000 2.120000 ;
-        RECT  5.560000 1.950000  5.730000 2.120000 ;
-        RECT  6.420000 1.950000  6.590000 2.120000 ;
-        RECT  7.280000 1.950000  7.450000 2.120000 ;
-        RECT  8.140000 1.950000  8.310000 2.120000 ;
-        RECT  9.000000 1.950000  9.170000 2.120000 ;
-        RECT  9.860000 1.950000 10.030000 2.120000 ;
-        RECT 10.720000 1.950000 10.890000 2.120000 ;
       LAYER met1 ;
         RECT 4.640000 1.920000 10.950000 2.150000 ;
     END
@@ -70,46 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.520000 0.085000 ;
-        RECT  0.740000  0.085000  1.000000 0.905000 ;
-        RECT  1.600000  0.085000  1.870000 0.905000 ;
-        RECT  2.505000  0.085000  2.765000 0.885000 ;
-        RECT  3.365000  0.085000  3.625000 0.885000 ;
-        RECT  4.225000  0.085000  4.485000 0.885000 ;
-        RECT  5.085000  0.085000  5.345000 1.080000 ;
-        RECT  5.945000  0.085000  6.205000 1.080000 ;
-        RECT  6.805000  0.085000  7.065000 1.080000 ;
-        RECT  7.665000  0.085000  7.925000 1.080000 ;
-        RECT  8.525000  0.085000  8.785000 1.080000 ;
-        RECT  9.385000  0.085000  9.645000 1.080000 ;
-        RECT 10.245000  0.085000 10.505000 1.080000 ;
-        RECT 11.105000  0.085000 11.400000 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 ;
-        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
@@ -118,86 +60,138 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.520000 3.415000 ;
-        RECT  0.740000 2.270000  1.000000 3.245000 ;
-        RECT  1.600000 2.270000  1.905000 3.245000 ;
-        RECT  2.505000 2.105000  2.765000 3.245000 ;
-        RECT  3.365000 2.105000  3.625000 3.245000 ;
-        RECT  4.225000 2.105000  4.485000 3.245000 ;
-        RECT  5.085000 1.955000  5.345000 3.245000 ;
-        RECT  5.945000 1.955000  6.205000 3.245000 ;
-        RECT  6.805000 1.955000  7.065000 3.245000 ;
-        RECT  7.665000 1.955000  7.925000 3.245000 ;
-        RECT  8.525000 1.955000  8.785000 3.245000 ;
-        RECT  9.385000 1.955000  9.645000 3.245000 ;
-        RECT 10.245000 1.955000 10.505000 3.245000 ;
-        RECT 11.105000 1.955000 11.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 ;
-        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.275000 0.315000  0.570000 1.075000 ;
-      RECT  0.275000 1.075000  1.920000 1.245000 ;
-      RECT  0.275000 1.930000  1.920000 2.100000 ;
-      RECT  0.275000 2.100000  0.570000 3.025000 ;
-      RECT  1.170000 0.315000  1.430000 1.075000 ;
-      RECT  1.170000 2.100000  1.430000 3.025000 ;
-      RECT  1.750000 1.245000  1.920000 1.395000 ;
-      RECT  1.750000 1.395000  4.170000 1.585000 ;
-      RECT  1.750000 1.585000  1.920000 1.930000 ;
-      RECT  2.090000 0.315000  2.335000 1.055000 ;
-      RECT  2.090000 1.055000  4.520000 1.225000 ;
-      RECT  2.090000 1.755000  4.520000 1.925000 ;
-      RECT  2.090000 1.925000  2.335000 3.025000 ;
-      RECT  2.935000 0.315000  3.195000 1.055000 ;
-      RECT  2.935000 1.925000  3.195000 3.025000 ;
-      RECT  3.795000 0.315000  4.055000 1.055000 ;
-      RECT  3.795000 1.925000  4.055000 3.025000 ;
-      RECT  4.340000 1.225000  4.520000 1.755000 ;
-      RECT  5.085000 1.345000  5.345000 1.785000 ;
-      RECT  5.945000 1.345000  6.205000 1.785000 ;
-      RECT  6.805000 1.345000  7.065000 1.785000 ;
-      RECT  7.665000 1.345000  7.925000 1.785000 ;
-      RECT  8.525000 1.345000  8.785000 1.785000 ;
-      RECT  9.385000 1.345000  9.645000 1.785000 ;
-      RECT 10.245000 1.345000 10.505000 1.785000 ;
+      RECT  0.000000 -0.085000 11.520000 0.085000 ;
+      RECT  0.000000  3.245000 11.520000 3.415000 ;
+      RECT  0.275000  0.315000  0.570000 1.075000 ;
+      RECT  0.275000  1.075000  1.920000 1.245000 ;
+      RECT  0.275000  1.930000  1.920000 2.100000 ;
+      RECT  0.275000  2.100000  0.570000 3.025000 ;
+      RECT  0.740000  0.085000  1.000000 0.905000 ;
+      RECT  0.740000  2.270000  1.000000 3.245000 ;
+      RECT  1.170000  0.315000  1.430000 1.075000 ;
+      RECT  1.170000  2.100000  1.430000 3.025000 ;
+      RECT  1.600000  0.085000  1.870000 0.905000 ;
+      RECT  1.600000  2.270000  1.905000 3.245000 ;
+      RECT  1.750000  1.245000  1.920000 1.395000 ;
+      RECT  1.750000  1.395000  4.170000 1.585000 ;
+      RECT  1.750000  1.585000  1.920000 1.930000 ;
+      RECT  2.090000  0.315000  2.335000 1.055000 ;
+      RECT  2.090000  1.055000  4.520000 1.225000 ;
+      RECT  2.090000  1.755000  4.520000 1.925000 ;
+      RECT  2.090000  1.925000  2.335000 3.025000 ;
+      RECT  2.505000  0.085000  2.765000 0.885000 ;
+      RECT  2.505000  2.105000  2.765000 3.245000 ;
+      RECT  2.935000  0.315000  3.195000 1.055000 ;
+      RECT  2.935000  1.925000  3.195000 3.025000 ;
+      RECT  3.365000  0.085000  3.625000 0.885000 ;
+      RECT  3.365000  2.105000  3.625000 3.245000 ;
+      RECT  3.795000  0.315000  4.055000 1.055000 ;
+      RECT  3.795000  1.925000  4.055000 3.025000 ;
+      RECT  4.225000  0.085000  4.485000 0.885000 ;
+      RECT  4.225000  2.105000  4.485000 3.245000 ;
+      RECT  4.340000  1.225000  4.520000 1.755000 ;
+      RECT  4.690000  0.315000  4.915000 3.025000 ;
+      RECT  5.085000  0.085000  5.345000 1.080000 ;
+      RECT  5.085000  1.345000  5.345000 1.785000 ;
+      RECT  5.085000  1.955000  5.345000 3.245000 ;
+      RECT  5.515000  0.315000  5.775000 3.025000 ;
+      RECT  5.945000  0.085000  6.205000 1.080000 ;
+      RECT  5.945000  1.345000  6.205000 1.785000 ;
+      RECT  5.945000  1.955000  6.205000 3.245000 ;
+      RECT  6.375000  0.315000  6.635000 3.025000 ;
+      RECT  6.805000  0.085000  7.065000 1.080000 ;
+      RECT  6.805000  1.345000  7.065000 1.785000 ;
+      RECT  6.805000  1.955000  7.065000 3.245000 ;
+      RECT  7.235000  0.315000  7.495000 3.025000 ;
+      RECT  7.665000  0.085000  7.925000 1.080000 ;
+      RECT  7.665000  1.345000  7.925000 1.785000 ;
+      RECT  7.665000  1.955000  7.925000 3.245000 ;
+      RECT  8.095000  0.315000  8.355000 3.025000 ;
+      RECT  8.525000  0.085000  8.785000 1.080000 ;
+      RECT  8.525000  1.345000  8.785000 1.785000 ;
+      RECT  8.525000  1.955000  8.785000 3.245000 ;
+      RECT  8.955000  0.315000  9.215000 3.025000 ;
+      RECT  9.385000  0.085000  9.645000 1.080000 ;
+      RECT  9.385000  1.345000  9.645000 1.785000 ;
+      RECT  9.385000  1.955000  9.645000 3.245000 ;
+      RECT  9.815000  0.315000 10.075000 3.025000 ;
+      RECT 10.245000  0.085000 10.505000 1.080000 ;
+      RECT 10.245000  1.345000 10.505000 1.785000 ;
+      RECT 10.245000  1.955000 10.505000 3.245000 ;
+      RECT 10.675000  0.315000 10.935000 3.025000 ;
+      RECT 11.105000  0.085000 11.400000 1.080000 ;
+      RECT 11.105000  1.955000 11.400000 3.245000 ;
     LAYER mcon ;
-      RECT  4.350000 1.580000  4.520000 1.750000 ;
-      RECT  5.130000 1.580000  5.300000 1.750000 ;
-      RECT  5.990000 1.580000  6.160000 1.750000 ;
-      RECT  6.850000 1.580000  7.020000 1.750000 ;
-      RECT  7.710000 1.580000  7.880000 1.750000 ;
-      RECT  8.570000 1.580000  8.740000 1.750000 ;
-      RECT  9.430000 1.580000  9.600000 1.750000 ;
-      RECT 10.290000 1.580000 10.460000 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.350000  1.580000  4.520000 1.750000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.700000  1.950000  4.870000 2.120000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.130000  1.580000  5.300000 1.750000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.560000  1.950000  5.730000 2.120000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  5.990000  1.580000  6.160000 1.750000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.420000  1.950000  6.590000 2.120000 ;
+      RECT  6.850000  1.580000  7.020000 1.750000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.280000  1.950000  7.450000 2.120000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.710000  1.580000  7.880000 1.750000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.140000  1.950000  8.310000 2.120000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.570000  1.580000  8.740000 1.750000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.000000  1.950000  9.170000 2.120000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.430000  1.580000  9.600000 1.750000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT  9.860000  1.950000 10.030000 2.120000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.290000  1.580000 10.460000 1.750000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 10.720000  1.950000 10.890000 2.120000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
     LAYER met1 ;
       RECT 4.290000 1.550000 10.520000 1.780000 ;
   END
diff --git a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef
index 87d0e39..c517d1d 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.magic.lef
@@ -63,29 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.105000  0.085000 0.400000 0.990000 ;
-        RECT 1.000000  0.085000 1.260000 0.885000 ;
-        RECT 1.860000  0.085000 2.120000 0.885000 ;
-        RECT 2.720000  0.085000 2.980000 0.885000 ;
-        RECT 3.580000  0.085000 3.860000 1.070000 ;
-        RECT 4.505000  0.085000 4.835000 0.885000 ;
-        RECT 5.365000  0.085000 5.695000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,50 +71,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.105000 2.095000 0.400000 3.245000 ;
-        RECT 1.000000 2.095000 1.260000 3.245000 ;
-        RECT 1.860000 2.095000 2.120000 3.245000 ;
-        RECT 2.720000 2.095000 2.980000 3.245000 ;
-        RECT 3.580000 1.840000 3.870000 3.245000 ;
-        RECT 4.545000 2.095000 4.800000 3.245000 ;
-        RECT 5.365000 2.310000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.395000 4.210000 1.585000 ;
-      RECT 4.030000 0.255000 4.335000 1.055000 ;
-      RECT 4.030000 1.055000 5.195000 1.225000 ;
-      RECT 4.030000 1.225000 4.210000 1.395000 ;
-      RECT 4.040000 1.585000 4.210000 1.755000 ;
-      RECT 4.040000 1.755000 5.195000 1.925000 ;
-      RECT 4.040000 1.925000 4.375000 3.055000 ;
-      RECT 4.380000 1.395000 5.555000 1.585000 ;
-      RECT 4.970000 1.925000 5.195000 3.055000 ;
-      RECT 5.005000 0.255000 5.195000 1.055000 ;
-      RECT 5.385000 0.870000 6.145000 1.040000 ;
-      RECT 5.385000 1.040000 5.555000 1.395000 ;
-      RECT 5.385000 1.585000 5.555000 1.970000 ;
-      RECT 5.385000 1.970000 6.125000 2.140000 ;
-      RECT 5.865000 0.255000 6.145000 0.870000 ;
-      RECT 5.865000 2.140000 6.125000 3.055000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.105000  0.085000 0.400000 0.990000 ;
+      RECT 0.105000  2.095000 0.400000 3.245000 ;
+      RECT 0.985000  1.395000 4.210000 1.585000 ;
+      RECT 1.000000  0.085000 1.260000 0.885000 ;
+      RECT 1.000000  2.095000 1.260000 3.245000 ;
+      RECT 1.860000  0.085000 2.120000 0.885000 ;
+      RECT 1.860000  2.095000 2.120000 3.245000 ;
+      RECT 2.720000  0.085000 2.980000 0.885000 ;
+      RECT 2.720000  2.095000 2.980000 3.245000 ;
+      RECT 3.580000  0.085000 3.860000 1.070000 ;
+      RECT 3.580000  1.840000 3.870000 3.245000 ;
+      RECT 4.030000  0.255000 4.335000 1.055000 ;
+      RECT 4.030000  1.055000 5.195000 1.225000 ;
+      RECT 4.030000  1.225000 4.210000 1.395000 ;
+      RECT 4.040000  1.585000 4.210000 1.755000 ;
+      RECT 4.040000  1.755000 5.195000 1.925000 ;
+      RECT 4.040000  1.925000 4.375000 3.055000 ;
+      RECT 4.380000  1.395000 5.555000 1.585000 ;
+      RECT 4.505000  0.085000 4.835000 0.885000 ;
+      RECT 4.545000  2.095000 4.800000 3.245000 ;
+      RECT 4.970000  1.925000 5.195000 3.055000 ;
+      RECT 5.005000  0.255000 5.195000 1.055000 ;
+      RECT 5.365000  0.085000 5.695000 0.700000 ;
+      RECT 5.365000  2.310000 5.695000 3.245000 ;
+      RECT 5.385000  0.870000 6.145000 1.040000 ;
+      RECT 5.385000  1.040000 5.555000 1.395000 ;
+      RECT 5.385000  1.585000 5.555000 1.970000 ;
+      RECT 5.385000  1.970000 6.125000 2.140000 ;
+      RECT 5.865000  0.255000 6.145000 0.870000 ;
+      RECT 5.865000  2.140000 6.125000 3.055000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__bufinv_8
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef
index 9e78bfd..39c6a73 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.magic.lef
@@ -54,10 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.565000 1.920000 0.825000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.615000 2.725000 0.785000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 1.370000 2.945000 ;
     END
@@ -66,13 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.600000  0.085000 0.875000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -81,21 +70,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 0.805000 1.355000 1.135000 ;
-      RECT 0.995000 1.920000 1.355000 3.075000 ;
-      RECT 1.045000 0.300000 1.355000 0.805000 ;
-      RECT 1.185000 1.135000 1.355000 1.920000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.425000  0.805000 1.355000 1.135000 ;
+      RECT 0.565000  1.920000 0.825000 3.075000 ;
+      RECT 0.600000  0.085000 0.875000 0.635000 ;
+      RECT 0.995000  1.920000 1.355000 3.075000 ;
+      RECT 1.045000  0.300000 1.355000 0.805000 ;
+      RECT 1.185000  1.135000 1.355000 1.920000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.615000  2.725000 0.785000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__bufkapwr_1
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef
index d9c4239..6553fc7 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.magic.lef
@@ -56,12 +56,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.565000 1.875000 0.875000 3.045000 ;
-        RECT 1.475000 2.065000 1.730000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.625000 2.725000 0.795000 2.895000 ;
-        RECT 1.510000 2.725000 1.680000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 1.850000 2.945000 ;
     END
@@ -70,15 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.555000  0.085000 0.830000 0.605000 ;
-        RECT 1.475000  0.085000 1.730000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -87,22 +72,32 @@
     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.085000 0.265000 0.385000 0.605000 ;
-      RECT 0.085000 0.605000 0.255000 1.275000 ;
-      RECT 0.085000 1.275000 1.215000 1.535000 ;
-      RECT 0.085000 1.535000 0.395000 3.045000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.085000  0.265000 0.385000 0.605000 ;
+      RECT 0.085000  0.605000 0.255000 1.275000 ;
+      RECT 0.085000  1.275000 1.215000 1.535000 ;
+      RECT 0.085000  1.535000 0.395000 3.045000 ;
+      RECT 0.555000  0.085000 0.830000 0.605000 ;
+      RECT 0.565000  1.875000 0.875000 3.045000 ;
+      RECT 1.475000  0.085000 1.730000 0.610000 ;
+      RECT 1.475000  2.065000 1.730000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.625000  2.725000 0.795000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.510000  2.725000 1.680000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
   END
 END sky130_fd_sc_lp__bufkapwr_2
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef
index 1701a43..9fdf807 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.magic.lef
@@ -58,14 +58,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.565000 1.875000 0.875000 3.060000 ;
-        RECT 1.475000 2.065000 1.730000 3.075000 ;
-        RECT 2.335000 2.065000 2.620000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.630000 2.725000 0.800000 2.895000 ;
-        RECT 1.520000 2.725000 1.690000 2.895000 ;
-        RECT 2.390000 2.725000 2.560000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 2.810000 2.945000 ;
     END
@@ -74,18 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.555000  0.085000 0.830000 0.605000 ;
-        RECT 1.475000  0.085000 1.730000 0.605000 ;
-        RECT 2.335000  0.085000 2.615000 0.605000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,25 +74,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.275000 0.385000 0.605000 ;
-      RECT 0.085000 0.605000 0.255000 1.275000 ;
-      RECT 0.085000 1.275000 2.085000 1.535000 ;
-      RECT 0.085000 1.535000 0.395000 3.060000 ;
-      RECT 1.075000 1.205000 2.085000 1.275000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.085000  0.275000 0.385000 0.605000 ;
+      RECT 0.085000  0.605000 0.255000 1.275000 ;
+      RECT 0.085000  1.275000 2.085000 1.535000 ;
+      RECT 0.085000  1.535000 0.395000 3.060000 ;
+      RECT 0.555000  0.085000 0.830000 0.605000 ;
+      RECT 0.565000  1.875000 0.875000 3.060000 ;
+      RECT 1.075000  1.205000 2.085000 1.275000 ;
+      RECT 1.475000  0.085000 1.730000 0.605000 ;
+      RECT 1.475000  2.065000 1.730000 3.075000 ;
+      RECT 2.335000  0.085000 2.615000 0.605000 ;
+      RECT 2.335000  2.065000 2.620000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.630000  2.725000 0.800000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.520000  2.725000 1.690000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.390000  2.725000 2.560000 2.895000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
   END
 END sky130_fd_sc_lp__bufkapwr_4
diff --git a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef
index 4680c3e..dc7e87e 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.magic.lef
@@ -62,20 +62,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.095000 1.875000 0.390000 3.055000 ;
-        RECT 0.990000 1.875000 1.250000 3.055000 ;
-        RECT 1.850000 2.065000 2.110000 3.075000 ;
-        RECT 2.710000 2.065000 2.970000 3.075000 ;
-        RECT 3.570000 2.065000 3.830000 3.075000 ;
-        RECT 4.430000 2.065000 4.725000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.165000 2.725000 0.335000 2.895000 ;
-        RECT 1.040000 2.725000 1.210000 2.895000 ;
-        RECT 1.890000 2.725000 2.060000 2.895000 ;
-        RECT 2.750000 2.725000 2.920000 2.895000 ;
-        RECT 3.605000 2.725000 3.775000 2.895000 ;
-        RECT 4.490000 2.725000 4.660000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 5.210000 2.945000 ;
     END
@@ -84,26 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.145000  0.085000 0.390000 0.610000 ;
-        RECT 0.990000  0.085000 1.250000 0.610000 ;
-        RECT 1.850000  0.085000 2.110000 0.565000 ;
-        RECT 2.710000  0.085000 2.970000 0.565000 ;
-        RECT 3.570000  0.085000 3.830000 0.565000 ;
-        RECT 4.430000  0.085000 4.730000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -112,28 +78,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 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 ;
-        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.570000 0.265000 0.820000 1.155000 ;
-      RECT 0.570000 1.155000 3.590000 1.485000 ;
-      RECT 0.570000 1.485000 0.820000 3.075000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  1.875000 0.390000 3.055000 ;
+      RECT 0.145000  0.085000 0.390000 0.610000 ;
+      RECT 0.570000  0.265000 0.820000 1.155000 ;
+      RECT 0.570000  1.155000 3.590000 1.485000 ;
+      RECT 0.570000  1.485000 0.820000 3.075000 ;
+      RECT 0.990000  0.085000 1.250000 0.610000 ;
+      RECT 0.990000  1.875000 1.250000 3.055000 ;
+      RECT 1.850000  0.085000 2.110000 0.565000 ;
+      RECT 1.850000  2.065000 2.110000 3.075000 ;
+      RECT 2.710000  0.085000 2.970000 0.565000 ;
+      RECT 2.710000  2.065000 2.970000 3.075000 ;
+      RECT 3.570000  0.085000 3.830000 0.565000 ;
+      RECT 3.570000  2.065000 3.830000 3.075000 ;
+      RECT 4.430000  0.085000 4.730000 0.565000 ;
+      RECT 4.430000  2.065000 4.725000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.165000  2.725000 0.335000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.040000  2.725000 1.210000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.890000  2.725000 2.060000 2.895000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.750000  2.725000 2.920000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.605000  2.725000 3.775000 2.895000 ;
+      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.490000  2.725000 4.660000 2.895000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
   END
 END sky130_fd_sc_lp__bufkapwr_8
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef
index e7d56dd..c30a6c3 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_0.magic.lef
@@ -52,15 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.980000  0.085000 1.310000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -69,24 +60,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.120000 2.210000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 0.580000 0.490000 1.210000 ;
-      RECT 0.160000 1.210000 1.575000 1.380000 ;
-      RECT 0.160000 1.380000 0.435000 2.890000 ;
-      RECT 1.245000 1.380000 1.575000 1.880000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.160000  0.580000 0.490000 1.210000 ;
+      RECT 0.160000  1.210000 1.575000 1.380000 ;
+      RECT 0.160000  1.380000 0.435000 2.890000 ;
+      RECT 0.980000  0.085000 1.310000 1.040000 ;
+      RECT 1.120000  2.210000 1.450000 3.245000 ;
+      RECT 1.245000  1.380000 1.575000 1.880000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__buflp_0
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef
index 05b2fef..3ced0d6 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_1.magic.lef
@@ -52,15 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.945000  0.085000 1.275000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -69,24 +60,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.945000 1.815000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.820000 0.845000 2.235000 1.015000 ;
-      RECT 0.820000 1.015000 1.150000 1.515000 ;
-      RECT 1.905000 0.635000 2.235000 0.845000 ;
-      RECT 1.985000 1.015000 2.235000 2.675000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.820000  0.845000 2.235000 1.015000 ;
+      RECT 0.820000  1.015000 1.150000 1.515000 ;
+      RECT 0.945000  0.085000 1.275000 0.675000 ;
+      RECT 0.945000  1.815000 1.275000 3.245000 ;
+      RECT 1.905000  0.635000 2.235000 0.845000 ;
+      RECT 1.985000  1.015000 2.235000 2.675000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__buflp_1
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef
index 9489b44..afbc9a4 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_2.magic.lef
@@ -54,18 +54,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.095000 ;
-        RECT 2.115000  0.085000 2.445000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -74,34 +62,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 1.815000 0.445000 3.245000 ;
-        RECT 1.975000 1.815000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.615000 0.255000 1.945000 0.425000 ;
-      RECT 0.615000 0.425000 0.945000 1.095000 ;
-      RECT 0.615000 1.815000 0.865000 2.905000 ;
-      RECT 0.615000 2.905000 1.805000 3.075000 ;
-      RECT 1.555000 1.815000 1.805000 2.905000 ;
-      RECT 1.615000 0.425000 1.945000 1.095000 ;
-      RECT 1.825000 1.265000 2.285000 1.595000 ;
-      RECT 2.115000 0.715000 3.245000 0.885000 ;
-      RECT 2.115000 0.885000 2.285000 1.265000 ;
-      RECT 2.915000 0.255000 3.245000 0.715000 ;
-      RECT 2.990000 0.885000 3.245000 2.545000 ;
+      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.095000 ;
+      RECT 0.115000  1.815000 0.445000 3.245000 ;
+      RECT 0.615000  0.255000 1.945000 0.425000 ;
+      RECT 0.615000  0.425000 0.945000 1.095000 ;
+      RECT 0.615000  1.815000 0.865000 2.905000 ;
+      RECT 0.615000  2.905000 1.805000 3.075000 ;
+      RECT 1.555000  1.815000 1.805000 2.905000 ;
+      RECT 1.615000  0.425000 1.945000 1.095000 ;
+      RECT 1.825000  1.265000 2.285000 1.595000 ;
+      RECT 1.975000  1.815000 2.305000 3.245000 ;
+      RECT 2.115000  0.085000 2.445000 0.545000 ;
+      RECT 2.115000  0.715000 3.245000 0.885000 ;
+      RECT 2.115000  0.885000 2.285000 1.265000 ;
+      RECT 2.915000  0.255000 3.245000 0.715000 ;
+      RECT 2.990000  0.885000 3.245000 2.545000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__buflp_2
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef
index 4eb0382..471a7b8 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_4.magic.lef
@@ -59,23 +59,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 0.805000 ;
-        RECT 0.975000  0.085000 1.305000 0.465000 ;
-        RECT 3.625000  0.085000 3.955000 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
@@ -84,45 +67,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.115000 2.155000 0.365000 3.245000 ;
-        RECT 1.055000 2.495000 1.225000 3.245000 ;
-        RECT 3.905000 1.815000 4.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 ;
-        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.255000 0.795000 0.635000 ;
-      RECT 0.545000 0.635000 1.655000 0.805000 ;
-      RECT 0.545000 2.155000 1.735000 2.325000 ;
-      RECT 0.545000 2.325000 0.875000 3.075000 ;
-      RECT 0.745000 1.315000 3.795000 1.645000 ;
-      RECT 1.405000 2.325000 1.735000 2.905000 ;
-      RECT 1.405000 2.905000 3.735000 3.075000 ;
-      RECT 1.485000 0.255000 3.455000 0.425000 ;
-      RECT 1.485000 0.425000 1.655000 0.635000 ;
-      RECT 2.265000 0.425000 2.595000 0.805000 ;
-      RECT 2.405000 2.155000 2.735000 2.905000 ;
-      RECT 3.125000 0.425000 3.455000 1.095000 ;
-      RECT 3.405000 1.815000 3.735000 2.905000 ;
-      RECT 3.625000 0.840000 5.125000 1.010000 ;
-      RECT 3.625000 1.010000 3.795000 1.315000 ;
-      RECT 4.795000 0.255000 5.125000 0.840000 ;
-      RECT 4.795000 1.010000 5.125000 3.075000 ;
+      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 0.805000 ;
+      RECT 0.115000  2.155000 0.365000 3.245000 ;
+      RECT 0.545000  0.255000 0.795000 0.635000 ;
+      RECT 0.545000  0.635000 1.655000 0.805000 ;
+      RECT 0.545000  2.155000 1.735000 2.325000 ;
+      RECT 0.545000  2.325000 0.875000 3.075000 ;
+      RECT 0.745000  1.315000 3.795000 1.645000 ;
+      RECT 0.975000  0.085000 1.305000 0.465000 ;
+      RECT 1.055000  2.495000 1.225000 3.245000 ;
+      RECT 1.405000  2.325000 1.735000 2.905000 ;
+      RECT 1.405000  2.905000 3.735000 3.075000 ;
+      RECT 1.485000  0.255000 3.455000 0.425000 ;
+      RECT 1.485000  0.425000 1.655000 0.635000 ;
+      RECT 2.265000  0.425000 2.595000 0.805000 ;
+      RECT 2.405000  2.155000 2.735000 2.905000 ;
+      RECT 3.125000  0.425000 3.455000 1.095000 ;
+      RECT 3.405000  1.815000 3.735000 2.905000 ;
+      RECT 3.625000  0.085000 3.955000 0.670000 ;
+      RECT 3.625000  0.840000 5.125000 1.010000 ;
+      RECT 3.625000  1.010000 3.795000 1.315000 ;
+      RECT 3.905000  1.815000 4.235000 3.245000 ;
+      RECT 4.795000  0.255000 5.125000 0.840000 ;
+      RECT 4.795000  1.010000 5.125000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__buflp_4
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef
index 071f66f..e92cc05 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_8.magic.lef
@@ -63,37 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.560000 0.085000 ;
-        RECT  1.905000  0.085000  2.155000 0.605000 ;
-        RECT  2.845000  0.085000  3.015000 1.095000 ;
-        RECT  3.625000  0.085000  3.875000 0.755000 ;
-        RECT  4.485000  0.085000  4.815000 0.755000 ;
-        RECT  5.465000  0.085000  5.715000 0.755000 ;
-        RECT 10.115000  0.085000 10.445000 0.755000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -102,83 +71,111 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 10.560000 3.415000 ;
-        RECT  1.915000 2.365000  2.085000 3.245000 ;
-        RECT  2.775000 2.025000  2.945000 3.245000 ;
-        RECT  3.665000 2.105000  3.835000 3.245000 ;
-        RECT  4.525000 2.105000  4.695000 3.245000 ;
-        RECT  5.385000 2.105000  5.555000 3.245000 ;
-        RECT 10.095000 2.105000 10.425000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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 0.365000 0.840000 ;
-      RECT 0.115000 0.840000 1.375000 1.010000 ;
-      RECT 0.115000 1.010000 0.365000 1.095000 ;
-      RECT 0.115000 1.685000 2.985000 1.855000 ;
-      RECT 0.115000 1.855000 0.365000 3.075000 ;
-      RECT 0.195000 1.095000 0.365000 1.685000 ;
-      RECT 0.545000 0.255000 1.725000 0.425000 ;
-      RECT 0.545000 0.425000 0.875000 0.670000 ;
-      RECT 0.545000 2.025000 0.875000 2.905000 ;
-      RECT 0.545000 2.905000 1.735000 3.075000 ;
-      RECT 1.045000 0.595000 1.375000 0.840000 ;
-      RECT 1.055000 1.855000 1.225000 2.735000 ;
-      RECT 1.405000 2.025000 2.595000 2.195000 ;
-      RECT 1.405000 2.195000 1.735000 2.905000 ;
-      RECT 1.555000 0.425000 1.725000 0.775000 ;
-      RECT 1.555000 0.775000 2.665000 1.010000 ;
-      RECT 2.265000 2.195000 2.595000 3.075000 ;
-      RECT 2.335000 0.255000 2.665000 0.775000 ;
-      RECT 2.335000 1.010000 2.665000 1.015000 ;
-      RECT 2.815000 1.265000 9.820000 1.595000 ;
-      RECT 2.815000 1.595000 2.985000 1.685000 ;
-      RECT 3.155000 1.765000 6.065000 1.935000 ;
-      RECT 3.155000 1.935000 3.485000 3.075000 ;
-      RECT 3.195000 0.255000 3.445000 0.925000 ;
-      RECT 3.195000 0.925000 6.225000 1.095000 ;
-      RECT 4.015000 1.935000 4.345000 3.075000 ;
-      RECT 4.055000 0.255000 4.305000 0.925000 ;
-      RECT 4.875000 1.935000 5.205000 3.075000 ;
-      RECT 5.035000 0.255000 5.285000 0.925000 ;
-      RECT 5.735000 1.935000 6.065000 2.905000 ;
-      RECT 5.735000 2.905000 9.915000 3.075000 ;
-      RECT 5.895000 0.255000 9.945000 0.425000 ;
-      RECT 5.895000 0.425000 6.225000 0.925000 ;
-      RECT 6.735000 2.105000 7.065000 2.905000 ;
-      RECT 6.755000 0.425000 7.085000 0.755000 ;
-      RECT 7.685000 0.425000 8.015000 0.755000 ;
-      RECT 7.735000 2.105000 8.065000 2.905000 ;
-      RECT 8.685000 0.425000 9.015000 0.755000 ;
-      RECT 8.735000 2.105000 9.065000 2.905000 ;
-      RECT 9.695000 0.425000 9.945000 0.755000 ;
-      RECT 9.745000 2.105000 9.915000 2.905000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.115000  0.255000  0.365000 0.840000 ;
+      RECT  0.115000  0.840000  1.375000 1.010000 ;
+      RECT  0.115000  1.010000  0.365000 1.095000 ;
+      RECT  0.115000  1.685000  2.985000 1.855000 ;
+      RECT  0.115000  1.855000  0.365000 3.075000 ;
+      RECT  0.195000  1.095000  0.365000 1.685000 ;
+      RECT  0.545000  0.255000  1.725000 0.425000 ;
+      RECT  0.545000  0.425000  0.875000 0.670000 ;
+      RECT  0.545000  2.025000  0.875000 2.905000 ;
+      RECT  0.545000  2.905000  1.735000 3.075000 ;
+      RECT  1.045000  0.595000  1.375000 0.840000 ;
+      RECT  1.055000  1.855000  1.225000 2.735000 ;
+      RECT  1.405000  2.025000  2.595000 2.195000 ;
+      RECT  1.405000  2.195000  1.735000 2.905000 ;
+      RECT  1.555000  0.425000  1.725000 0.775000 ;
+      RECT  1.555000  0.775000  2.665000 1.010000 ;
+      RECT  1.905000  0.085000  2.155000 0.605000 ;
+      RECT  1.915000  2.365000  2.085000 3.245000 ;
+      RECT  2.265000  2.195000  2.595000 3.075000 ;
+      RECT  2.335000  0.255000  2.665000 0.775000 ;
+      RECT  2.335000  1.010000  2.665000 1.015000 ;
+      RECT  2.775000  2.025000  2.945000 3.245000 ;
+      RECT  2.815000  1.265000  9.820000 1.595000 ;
+      RECT  2.815000  1.595000  2.985000 1.685000 ;
+      RECT  2.845000  0.085000  3.015000 1.095000 ;
+      RECT  3.155000  1.765000  6.065000 1.935000 ;
+      RECT  3.155000  1.935000  3.485000 3.075000 ;
+      RECT  3.195000  0.255000  3.445000 0.925000 ;
+      RECT  3.195000  0.925000  6.225000 1.095000 ;
+      RECT  3.625000  0.085000  3.875000 0.755000 ;
+      RECT  3.665000  2.105000  3.835000 3.245000 ;
+      RECT  4.015000  1.935000  4.345000 3.075000 ;
+      RECT  4.055000  0.255000  4.305000 0.925000 ;
+      RECT  4.485000  0.085000  4.815000 0.755000 ;
+      RECT  4.525000  2.105000  4.695000 3.245000 ;
+      RECT  4.875000  1.935000  5.205000 3.075000 ;
+      RECT  5.035000  0.255000  5.285000 0.925000 ;
+      RECT  5.385000  2.105000  5.555000 3.245000 ;
+      RECT  5.465000  0.085000  5.715000 0.755000 ;
+      RECT  5.735000  1.935000  6.065000 2.905000 ;
+      RECT  5.735000  2.905000  9.915000 3.075000 ;
+      RECT  5.895000  0.255000  9.945000 0.425000 ;
+      RECT  5.895000  0.425000  6.225000 0.925000 ;
+      RECT  6.735000  2.105000  7.065000 2.905000 ;
+      RECT  6.755000  0.425000  7.085000 0.755000 ;
+      RECT  7.685000  0.425000  8.015000 0.755000 ;
+      RECT  7.735000  2.105000  8.065000 2.905000 ;
+      RECT  8.685000  0.425000  9.015000 0.755000 ;
+      RECT  8.735000  2.105000  9.065000 2.905000 ;
+      RECT  9.695000  0.425000  9.945000 0.755000 ;
+      RECT  9.745000  2.105000  9.915000 2.905000 ;
+      RECT 10.095000  2.105000 10.425000 3.245000 ;
+      RECT 10.115000  0.085000 10.445000 0.755000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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_lp__buflp_8
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef b/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef
index 2f84393..296a383 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_m.magic.lef
@@ -52,15 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.935000  0.085000 1.265000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -69,24 +60,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.965000 2.430000 1.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.660000 1.210000 2.215000 1.380000 ;
-      RECT 0.660000 1.380000 0.990000 1.880000 ;
-      RECT 1.755000 0.580000 2.215000 1.210000 ;
-      RECT 1.965000 1.380000 2.215000 2.890000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.660000  1.210000 2.215000 1.380000 ;
+      RECT 0.660000  1.380000 0.990000 1.880000 ;
+      RECT 0.935000  0.085000 1.265000 1.040000 ;
+      RECT 0.965000  2.430000 1.295000 3.245000 ;
+      RECT 1.755000  0.580000 2.215000 1.210000 ;
+      RECT 1.965000  1.380000 2.215000 2.890000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__buflp_m
diff --git a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
index 8e6ea73..22a2632 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.magic.lef
@@ -73,74 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 24.960000 0.085000 ;
-        RECT  0.115000  0.085000  0.445000 1.000000 ;
-        RECT  1.055000  0.085000  1.385000 0.445000 ;
-        RECT  2.340000  0.085000  2.670000 0.445000 ;
-        RECT  3.410000  0.085000  3.740000 0.475000 ;
-        RECT  4.270000  0.085000  4.600000 0.475000 ;
-        RECT  5.130000  0.085000  5.460000 0.475000 ;
-        RECT  6.150000  0.085000  6.480000 0.475000 ;
-        RECT  7.170000  0.085000  7.340000 0.815000 ;
-        RECT  8.030000  0.085000  8.200000 0.815000 ;
-        RECT  8.890000  0.085000  9.060000 0.815000 ;
-        RECT 21.520000  0.085000 21.850000 0.650000 ;
-        RECT 22.540000  0.085000 22.870000 0.650000 ;
-        RECT 23.560000  0.085000 23.890000 1.000000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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 ;
-        RECT 18.395000 -0.085000 18.565000 0.085000 ;
-        RECT 18.875000 -0.085000 19.045000 0.085000 ;
-        RECT 19.355000 -0.085000 19.525000 0.085000 ;
-        RECT 19.835000 -0.085000 20.005000 0.085000 ;
-        RECT 20.315000 -0.085000 20.485000 0.085000 ;
-        RECT 20.795000 -0.085000 20.965000 0.085000 ;
-        RECT 21.275000 -0.085000 21.445000 0.085000 ;
-        RECT 21.755000 -0.085000 21.925000 0.085000 ;
-        RECT 22.235000 -0.085000 22.405000 0.085000 ;
-        RECT 22.715000 -0.085000 22.885000 0.085000 ;
-        RECT 23.195000 -0.085000 23.365000 0.085000 ;
-        RECT 23.675000 -0.085000 23.845000 0.085000 ;
-        RECT 24.155000 -0.085000 24.325000 0.085000 ;
-        RECT 24.635000 -0.085000 24.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 24.960000 0.245000 ;
     END
@@ -149,149 +81,214 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 24.960000 3.415000 ;
-        RECT  0.115000 1.815000  0.445000 3.245000 ;
-        RECT  0.975000 1.815000  1.225000 3.245000 ;
-        RECT  1.915000 2.165000  2.085000 3.245000 ;
-        RECT  2.775000 1.855000  2.945000 3.245000 ;
-        RECT  3.625000 2.205000  3.815000 3.245000 ;
-        RECT  4.485000 2.205000  4.675000 3.245000 ;
-        RECT  5.345000 2.205000  5.535000 3.245000 ;
-        RECT  6.205000 2.205000  6.395000 3.245000 ;
-        RECT  7.065000 2.205000  7.255000 3.245000 ;
-        RECT  7.925000 2.205000  8.115000 3.245000 ;
-        RECT  8.805000 2.205000  8.995000 3.245000 ;
-        RECT  9.665000 2.205000  9.855000 3.245000 ;
-        RECT 10.535000 1.815000 10.705000 3.245000 ;
-        RECT 11.315000 2.365000 11.645000 3.245000 ;
-        RECT 21.050000 1.815000 21.300000 3.245000 ;
-        RECT 21.990000 2.165000 22.160000 3.245000 ;
-        RECT 22.850000 2.045000 23.020000 3.245000 ;
-        RECT 23.710000 2.045000 23.880000 3.245000 ;
-        RECT 24.595000 1.815000 24.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 ;
-        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 ;
-        RECT 18.395000 3.245000 18.565000 3.415000 ;
-        RECT 18.875000 3.245000 19.045000 3.415000 ;
-        RECT 19.355000 3.245000 19.525000 3.415000 ;
-        RECT 19.835000 3.245000 20.005000 3.415000 ;
-        RECT 20.315000 3.245000 20.485000 3.415000 ;
-        RECT 20.795000 3.245000 20.965000 3.415000 ;
-        RECT 21.275000 3.245000 21.445000 3.415000 ;
-        RECT 21.755000 3.245000 21.925000 3.415000 ;
-        RECT 22.235000 3.245000 22.405000 3.415000 ;
-        RECT 22.715000 3.245000 22.885000 3.415000 ;
-        RECT 23.195000 3.245000 23.365000 3.415000 ;
-        RECT 23.675000 3.245000 23.845000 3.415000 ;
-        RECT 24.155000 3.245000 24.325000 3.415000 ;
-        RECT 24.635000 3.245000 24.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 24.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.625000 0.265000  0.795000 0.625000 ;
-      RECT  0.625000 0.625000  2.360000 0.795000 ;
-      RECT  0.625000 0.795000  0.795000 3.065000 ;
-      RECT  1.405000 1.815000  2.595000 1.985000 ;
-      RECT  1.405000 1.985000  1.735000 3.065000 ;
-      RECT  1.680000 0.975000  2.010000 1.815000 ;
-      RECT  2.190000 0.795000  2.360000 1.005000 ;
-      RECT  2.190000 1.005000  6.150000 1.335000 ;
-      RECT  2.265000 1.515000  9.780000 1.685000 ;
-      RECT  2.265000 1.685000  2.595000 1.815000 ;
-      RECT  2.265000 1.985000  2.595000 3.065000 ;
-      RECT  2.900000 0.265000  3.230000 0.655000 ;
-      RECT  2.900000 0.655000  6.990000 0.825000 ;
-      RECT  3.125000 1.865000 10.355000 2.035000 ;
-      RECT  3.125000 2.035000  3.455000 2.765000 ;
-      RECT  3.920000 0.265000  4.090000 0.655000 ;
-      RECT  3.985000 2.035000  4.315000 2.765000 ;
-      RECT  4.780000 0.265000  4.950000 0.655000 ;
-      RECT  4.845000 2.035000  5.175000 2.765000 ;
-      RECT  5.640000 0.265000  5.970000 0.655000 ;
-      RECT  5.705000 2.035000  6.035000 2.765000 ;
-      RECT  6.390000 1.345000  9.780000 1.515000 ;
-      RECT  6.565000 2.035000  6.895000 2.765000 ;
-      RECT  6.660000 0.265000  6.990000 0.655000 ;
-      RECT  6.660000 0.825000  6.990000 0.995000 ;
-      RECT  6.660000 0.995000  9.570000 1.165000 ;
-      RECT  7.425000 2.035000  7.755000 2.765000 ;
-      RECT  7.520000 0.265000  7.850000 0.995000 ;
-      RECT  8.305000 2.035000  8.635000 2.765000 ;
-      RECT  8.380000 0.265000  8.710000 0.995000 ;
-      RECT  9.165000 2.035000  9.495000 2.765000 ;
-      RECT  9.240000 0.265000 15.910000 0.475000 ;
-      RECT  9.240000 0.475000  9.570000 0.995000 ;
-      RECT 10.025000 1.465000 11.135000 1.635000 ;
-      RECT 10.025000 1.635000 10.355000 1.865000 ;
-      RECT 10.025000 2.035000 10.355000 3.065000 ;
-      RECT 10.885000 1.635000 11.135000 1.960000 ;
-      RECT 10.885000 1.960000 12.650000 2.185000 ;
-      RECT 10.885000 2.185000 11.135000 3.065000 ;
-      RECT 12.320000 2.185000 12.650000 2.895000 ;
-      RECT 12.320000 2.895000 20.390000 3.065000 ;
-      RECT 12.405000 1.075000 21.650000 1.315000 ;
-      RECT 12.405000 1.315000 15.455000 1.325000 ;
-      RECT 13.180000 1.855000 13.510000 2.895000 ;
-      RECT 14.040000 1.855000 14.370000 2.895000 ;
-      RECT 14.900000 1.855000 15.230000 2.895000 ;
-      RECT 15.580000 0.475000 15.910000 0.805000 ;
-      RECT 15.660000 0.985000 23.380000 1.000000 ;
-      RECT 15.660000 1.000000 21.650000 1.075000 ;
-      RECT 15.760000 1.855000 16.090000 2.895000 ;
-      RECT 16.620000 1.845000 16.950000 2.895000 ;
-      RECT 17.480000 1.845000 17.810000 2.895000 ;
-      RECT 18.340000 1.845000 18.670000 2.895000 ;
-      RECT 19.200000 1.845000 19.530000 2.895000 ;
-      RECT 20.060000 1.845000 20.390000 2.895000 ;
-      RECT 21.480000 0.830000 23.380000 0.985000 ;
-      RECT 21.480000 1.315000 21.650000 1.695000 ;
-      RECT 21.480000 1.695000 24.415000 1.865000 ;
-      RECT 21.480000 1.865000 21.810000 3.065000 ;
-      RECT 22.030000 0.295000 22.360000 0.830000 ;
-      RECT 22.340000 1.865000 22.670000 3.065000 ;
-      RECT 23.050000 0.265000 23.380000 0.830000 ;
-      RECT 23.200000 1.865000 23.530000 3.065000 ;
-      RECT 24.085000 1.865000 24.415000 3.065000 ;
+      RECT  0.000000 -0.085000 24.960000 0.085000 ;
+      RECT  0.000000  3.245000 24.960000 3.415000 ;
+      RECT  0.115000  0.085000  0.445000 1.000000 ;
+      RECT  0.115000  1.815000  0.445000 3.245000 ;
+      RECT  0.625000  0.265000  0.795000 0.625000 ;
+      RECT  0.625000  0.625000  2.360000 0.795000 ;
+      RECT  0.625000  0.795000  0.795000 3.065000 ;
+      RECT  0.975000  1.815000  1.225000 3.245000 ;
+      RECT  1.055000  0.085000  1.385000 0.445000 ;
+      RECT  1.405000  1.815000  2.595000 1.985000 ;
+      RECT  1.405000  1.985000  1.735000 3.065000 ;
+      RECT  1.680000  0.975000  2.010000 1.815000 ;
+      RECT  1.915000  2.165000  2.085000 3.245000 ;
+      RECT  2.190000  0.795000  2.360000 1.005000 ;
+      RECT  2.190000  1.005000  6.150000 1.335000 ;
+      RECT  2.265000  1.515000  9.780000 1.685000 ;
+      RECT  2.265000  1.685000  2.595000 1.815000 ;
+      RECT  2.265000  1.985000  2.595000 3.065000 ;
+      RECT  2.340000  0.085000  2.670000 0.445000 ;
+      RECT  2.775000  1.855000  2.945000 3.245000 ;
+      RECT  2.900000  0.265000  3.230000 0.655000 ;
+      RECT  2.900000  0.655000  6.990000 0.825000 ;
+      RECT  3.125000  1.865000 10.355000 2.035000 ;
+      RECT  3.125000  2.035000  3.455000 2.765000 ;
+      RECT  3.410000  0.085000  3.740000 0.475000 ;
+      RECT  3.625000  2.205000  3.815000 3.245000 ;
+      RECT  3.920000  0.265000  4.090000 0.655000 ;
+      RECT  3.985000  2.035000  4.315000 2.765000 ;
+      RECT  4.270000  0.085000  4.600000 0.475000 ;
+      RECT  4.485000  2.205000  4.675000 3.245000 ;
+      RECT  4.780000  0.265000  4.950000 0.655000 ;
+      RECT  4.845000  2.035000  5.175000 2.765000 ;
+      RECT  5.130000  0.085000  5.460000 0.475000 ;
+      RECT  5.345000  2.205000  5.535000 3.245000 ;
+      RECT  5.640000  0.265000  5.970000 0.655000 ;
+      RECT  5.705000  2.035000  6.035000 2.765000 ;
+      RECT  6.150000  0.085000  6.480000 0.475000 ;
+      RECT  6.205000  2.205000  6.395000 3.245000 ;
+      RECT  6.390000  1.345000  9.780000 1.515000 ;
+      RECT  6.565000  2.035000  6.895000 2.765000 ;
+      RECT  6.660000  0.265000  6.990000 0.655000 ;
+      RECT  6.660000  0.825000  6.990000 0.995000 ;
+      RECT  6.660000  0.995000  9.570000 1.165000 ;
+      RECT  7.065000  2.205000  7.255000 3.245000 ;
+      RECT  7.170000  0.085000  7.340000 0.815000 ;
+      RECT  7.425000  2.035000  7.755000 2.765000 ;
+      RECT  7.520000  0.265000  7.850000 0.995000 ;
+      RECT  7.925000  2.205000  8.115000 3.245000 ;
+      RECT  8.030000  0.085000  8.200000 0.815000 ;
+      RECT  8.305000  2.035000  8.635000 2.765000 ;
+      RECT  8.380000  0.265000  8.710000 0.995000 ;
+      RECT  8.805000  2.205000  8.995000 3.245000 ;
+      RECT  8.890000  0.085000  9.060000 0.815000 ;
+      RECT  9.165000  2.035000  9.495000 2.765000 ;
+      RECT  9.240000  0.265000 15.910000 0.475000 ;
+      RECT  9.240000  0.475000  9.570000 0.995000 ;
+      RECT  9.665000  2.205000  9.855000 3.245000 ;
+      RECT 10.025000  1.465000 11.135000 1.635000 ;
+      RECT 10.025000  1.635000 10.355000 1.865000 ;
+      RECT 10.025000  2.035000 10.355000 3.065000 ;
+      RECT 10.535000  1.815000 10.705000 3.245000 ;
+      RECT 10.885000  1.635000 11.135000 1.960000 ;
+      RECT 10.885000  1.960000 12.650000 2.185000 ;
+      RECT 10.885000  2.185000 11.135000 3.065000 ;
+      RECT 11.315000  2.365000 11.645000 3.245000 ;
+      RECT 12.320000  2.185000 12.650000 2.895000 ;
+      RECT 12.320000  2.895000 20.390000 3.065000 ;
+      RECT 12.405000  1.075000 21.650000 1.315000 ;
+      RECT 12.405000  1.315000 15.455000 1.325000 ;
+      RECT 13.180000  1.855000 13.510000 2.895000 ;
+      RECT 14.040000  1.855000 14.370000 2.895000 ;
+      RECT 14.900000  1.855000 15.230000 2.895000 ;
+      RECT 15.580000  0.475000 15.910000 0.805000 ;
+      RECT 15.660000  0.985000 23.380000 1.000000 ;
+      RECT 15.660000  1.000000 21.650000 1.075000 ;
+      RECT 15.760000  1.855000 16.090000 2.895000 ;
+      RECT 16.620000  1.845000 16.950000 2.895000 ;
+      RECT 17.480000  1.845000 17.810000 2.895000 ;
+      RECT 18.340000  1.845000 18.670000 2.895000 ;
+      RECT 19.200000  1.845000 19.530000 2.895000 ;
+      RECT 20.060000  1.845000 20.390000 2.895000 ;
+      RECT 21.050000  1.815000 21.300000 3.245000 ;
+      RECT 21.480000  0.830000 23.380000 0.985000 ;
+      RECT 21.480000  1.315000 21.650000 1.695000 ;
+      RECT 21.480000  1.695000 24.415000 1.865000 ;
+      RECT 21.480000  1.865000 21.810000 3.065000 ;
+      RECT 21.520000  0.085000 21.850000 0.650000 ;
+      RECT 21.990000  2.165000 22.160000 3.245000 ;
+      RECT 22.030000  0.295000 22.360000 0.830000 ;
+      RECT 22.340000  1.865000 22.670000 3.065000 ;
+      RECT 22.540000  0.085000 22.870000 0.650000 ;
+      RECT 22.850000  2.045000 23.020000 3.245000 ;
+      RECT 23.050000  0.265000 23.380000 0.830000 ;
+      RECT 23.200000  1.865000 23.530000 3.065000 ;
+      RECT 23.560000  0.085000 23.890000 1.000000 ;
+      RECT 23.710000  2.045000 23.880000 3.245000 ;
+      RECT 24.085000  1.865000 24.415000 3.065000 ;
+      RECT 24.595000  1.815000 24.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  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  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 ;
+      RECT 18.395000 -0.085000 18.565000 0.085000 ;
+      RECT 18.395000  3.245000 18.565000 3.415000 ;
+      RECT 18.875000 -0.085000 19.045000 0.085000 ;
+      RECT 18.875000  3.245000 19.045000 3.415000 ;
+      RECT 19.355000 -0.085000 19.525000 0.085000 ;
+      RECT 19.355000  3.245000 19.525000 3.415000 ;
+      RECT 19.835000 -0.085000 20.005000 0.085000 ;
+      RECT 19.835000  3.245000 20.005000 3.415000 ;
+      RECT 20.315000 -0.085000 20.485000 0.085000 ;
+      RECT 20.315000  3.245000 20.485000 3.415000 ;
+      RECT 20.795000 -0.085000 20.965000 0.085000 ;
+      RECT 20.795000  3.245000 20.965000 3.415000 ;
+      RECT 21.275000 -0.085000 21.445000 0.085000 ;
+      RECT 21.275000  3.245000 21.445000 3.415000 ;
+      RECT 21.755000 -0.085000 21.925000 0.085000 ;
+      RECT 21.755000  3.245000 21.925000 3.415000 ;
+      RECT 22.235000 -0.085000 22.405000 0.085000 ;
+      RECT 22.235000  3.245000 22.405000 3.415000 ;
+      RECT 22.715000 -0.085000 22.885000 0.085000 ;
+      RECT 22.715000  3.245000 22.885000 3.415000 ;
+      RECT 23.195000 -0.085000 23.365000 0.085000 ;
+      RECT 23.195000  3.245000 23.365000 3.415000 ;
+      RECT 23.675000 -0.085000 23.845000 0.085000 ;
+      RECT 23.675000  3.245000 23.845000 3.415000 ;
+      RECT 24.155000 -0.085000 24.325000 0.085000 ;
+      RECT 24.155000  3.245000 24.325000 3.415000 ;
+      RECT 24.635000 -0.085000 24.805000 0.085000 ;
+      RECT 24.635000  3.245000 24.805000 3.415000 ;
   END
 END sky130_fd_sc_lp__busdriver_20
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
index 0566441..5dd62ca 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.magic.lef
@@ -72,74 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 24.960000 0.085000 ;
-        RECT  0.115000  0.085000  0.445000 1.000000 ;
-        RECT  1.055000  0.085000  1.385000 0.445000 ;
-        RECT  2.340000  0.085000  2.670000 0.445000 ;
-        RECT  3.410000  0.085000  3.740000 0.475000 ;
-        RECT  4.270000  0.085000  4.600000 0.475000 ;
-        RECT  5.130000  0.085000  5.460000 0.475000 ;
-        RECT  6.150000  0.085000  6.480000 0.475000 ;
-        RECT  7.170000  0.085000  7.340000 0.815000 ;
-        RECT  8.030000  0.085000  8.200000 0.815000 ;
-        RECT  8.890000  0.085000  9.060000 0.815000 ;
-        RECT 21.520000  0.085000 21.850000 0.650000 ;
-        RECT 22.540000  0.085000 22.870000 0.650000 ;
-        RECT 23.560000  0.085000 23.890000 1.000000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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 ;
-        RECT 18.395000 -0.085000 18.565000 0.085000 ;
-        RECT 18.875000 -0.085000 19.045000 0.085000 ;
-        RECT 19.355000 -0.085000 19.525000 0.085000 ;
-        RECT 19.835000 -0.085000 20.005000 0.085000 ;
-        RECT 20.315000 -0.085000 20.485000 0.085000 ;
-        RECT 20.795000 -0.085000 20.965000 0.085000 ;
-        RECT 21.275000 -0.085000 21.445000 0.085000 ;
-        RECT 21.755000 -0.085000 21.925000 0.085000 ;
-        RECT 22.235000 -0.085000 22.405000 0.085000 ;
-        RECT 22.715000 -0.085000 22.885000 0.085000 ;
-        RECT 23.195000 -0.085000 23.365000 0.085000 ;
-        RECT 23.675000 -0.085000 23.845000 0.085000 ;
-        RECT 24.155000 -0.085000 24.325000 0.085000 ;
-        RECT 24.635000 -0.085000 24.805000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 24.960000 0.245000 ;
     END
@@ -148,149 +80,214 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 24.960000 3.415000 ;
-        RECT  0.115000 1.815000  0.445000 3.245000 ;
-        RECT  0.975000 1.815000  1.225000 3.245000 ;
-        RECT  1.915000 2.165000  2.085000 3.245000 ;
-        RECT  2.775000 1.855000  2.945000 3.245000 ;
-        RECT  3.625000 2.205000  3.815000 3.245000 ;
-        RECT  4.485000 2.205000  4.675000 3.245000 ;
-        RECT  5.345000 2.205000  5.535000 3.245000 ;
-        RECT  6.205000 2.205000  6.395000 3.245000 ;
-        RECT  7.065000 2.205000  7.255000 3.245000 ;
-        RECT  7.925000 2.205000  8.115000 3.245000 ;
-        RECT  8.805000 2.205000  8.995000 3.245000 ;
-        RECT  9.665000 2.205000  9.855000 3.245000 ;
-        RECT 10.535000 1.815000 10.705000 3.245000 ;
-        RECT 11.315000 2.365000 11.645000 3.245000 ;
-        RECT 21.050000 1.815000 21.300000 3.245000 ;
-        RECT 21.990000 2.165000 22.160000 3.245000 ;
-        RECT 22.850000 2.045000 23.020000 3.245000 ;
-        RECT 23.710000 2.045000 23.880000 3.245000 ;
-        RECT 24.595000 1.815000 24.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 ;
-        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 ;
-        RECT 18.395000 3.245000 18.565000 3.415000 ;
-        RECT 18.875000 3.245000 19.045000 3.415000 ;
-        RECT 19.355000 3.245000 19.525000 3.415000 ;
-        RECT 19.835000 3.245000 20.005000 3.415000 ;
-        RECT 20.315000 3.245000 20.485000 3.415000 ;
-        RECT 20.795000 3.245000 20.965000 3.415000 ;
-        RECT 21.275000 3.245000 21.445000 3.415000 ;
-        RECT 21.755000 3.245000 21.925000 3.415000 ;
-        RECT 22.235000 3.245000 22.405000 3.415000 ;
-        RECT 22.715000 3.245000 22.885000 3.415000 ;
-        RECT 23.195000 3.245000 23.365000 3.415000 ;
-        RECT 23.675000 3.245000 23.845000 3.415000 ;
-        RECT 24.155000 3.245000 24.325000 3.415000 ;
-        RECT 24.635000 3.245000 24.805000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 24.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.625000 0.265000  0.795000 0.625000 ;
-      RECT  0.625000 0.625000  2.360000 0.795000 ;
-      RECT  0.625000 0.795000  0.795000 3.065000 ;
-      RECT  1.405000 1.815000  2.595000 1.985000 ;
-      RECT  1.405000 1.985000  1.735000 3.065000 ;
-      RECT  1.680000 0.975000  2.010000 1.815000 ;
-      RECT  2.190000 0.795000  2.360000 1.005000 ;
-      RECT  2.190000 1.005000  6.150000 1.335000 ;
-      RECT  2.265000 1.515000  9.780000 1.685000 ;
-      RECT  2.265000 1.685000  2.595000 1.815000 ;
-      RECT  2.265000 1.985000  2.595000 3.065000 ;
-      RECT  2.900000 0.265000  3.230000 0.655000 ;
-      RECT  2.900000 0.655000  6.990000 0.825000 ;
-      RECT  3.125000 1.865000 10.355000 2.035000 ;
-      RECT  3.125000 2.035000  3.455000 2.765000 ;
-      RECT  3.920000 0.265000  4.090000 0.655000 ;
-      RECT  3.985000 2.035000  4.315000 2.765000 ;
-      RECT  4.780000 0.265000  4.950000 0.655000 ;
-      RECT  4.845000 2.035000  5.175000 2.765000 ;
-      RECT  5.640000 0.265000  5.970000 0.655000 ;
-      RECT  5.705000 2.035000  6.035000 2.765000 ;
-      RECT  6.390000 1.345000  9.780000 1.515000 ;
-      RECT  6.565000 2.035000  6.895000 2.765000 ;
-      RECT  6.660000 0.265000  6.990000 0.655000 ;
-      RECT  6.660000 0.825000  6.990000 0.995000 ;
-      RECT  6.660000 0.995000  9.570000 1.165000 ;
-      RECT  7.425000 2.035000  7.755000 2.765000 ;
-      RECT  7.520000 0.265000  7.850000 0.995000 ;
-      RECT  8.305000 2.035000  8.635000 2.765000 ;
-      RECT  8.380000 0.265000  8.710000 0.995000 ;
-      RECT  9.165000 2.035000  9.495000 2.765000 ;
-      RECT  9.240000 0.265000 15.910000 0.475000 ;
-      RECT  9.240000 0.475000  9.570000 0.995000 ;
-      RECT 10.025000 1.465000 11.135000 1.635000 ;
-      RECT 10.025000 1.635000 10.355000 1.865000 ;
-      RECT 10.025000 2.035000 10.355000 3.065000 ;
-      RECT 10.885000 1.635000 11.135000 1.960000 ;
-      RECT 10.885000 1.960000 12.650000 2.185000 ;
-      RECT 10.885000 2.185000 11.135000 3.065000 ;
-      RECT 12.320000 2.185000 12.650000 2.885000 ;
-      RECT 12.320000 2.885000 20.390000 3.065000 ;
-      RECT 12.405000 1.075000 21.650000 1.315000 ;
-      RECT 12.405000 1.315000 15.455000 1.325000 ;
-      RECT 13.180000 1.895000 13.510000 2.885000 ;
-      RECT 14.040000 1.895000 14.370000 2.885000 ;
-      RECT 14.900000 1.895000 15.230000 2.885000 ;
-      RECT 15.580000 0.475000 15.910000 0.805000 ;
-      RECT 15.660000 0.985000 23.380000 1.000000 ;
-      RECT 15.660000 1.000000 21.650000 1.075000 ;
-      RECT 15.760000 1.895000 16.090000 2.885000 ;
-      RECT 16.620000 1.895000 16.950000 2.885000 ;
-      RECT 17.480000 1.895000 17.810000 2.885000 ;
-      RECT 18.340000 1.895000 18.670000 2.885000 ;
-      RECT 19.200000 1.895000 19.530000 2.885000 ;
-      RECT 20.060000 1.895000 20.390000 2.885000 ;
-      RECT 21.480000 0.830000 23.380000 0.985000 ;
-      RECT 21.480000 1.315000 21.650000 1.695000 ;
-      RECT 21.480000 1.695000 24.415000 1.865000 ;
-      RECT 21.480000 1.865000 21.810000 3.065000 ;
-      RECT 22.030000 0.295000 22.360000 0.830000 ;
-      RECT 22.340000 1.865000 22.670000 3.065000 ;
-      RECT 23.050000 0.265000 23.380000 0.830000 ;
-      RECT 23.200000 1.865000 23.530000 3.065000 ;
-      RECT 24.085000 1.865000 24.415000 3.065000 ;
+      RECT  0.000000 -0.085000 24.960000 0.085000 ;
+      RECT  0.000000  3.245000 24.960000 3.415000 ;
+      RECT  0.115000  0.085000  0.445000 1.000000 ;
+      RECT  0.115000  1.815000  0.445000 3.245000 ;
+      RECT  0.625000  0.265000  0.795000 0.625000 ;
+      RECT  0.625000  0.625000  2.360000 0.795000 ;
+      RECT  0.625000  0.795000  0.795000 3.065000 ;
+      RECT  0.975000  1.815000  1.225000 3.245000 ;
+      RECT  1.055000  0.085000  1.385000 0.445000 ;
+      RECT  1.405000  1.815000  2.595000 1.985000 ;
+      RECT  1.405000  1.985000  1.735000 3.065000 ;
+      RECT  1.680000  0.975000  2.010000 1.815000 ;
+      RECT  1.915000  2.165000  2.085000 3.245000 ;
+      RECT  2.190000  0.795000  2.360000 1.005000 ;
+      RECT  2.190000  1.005000  6.150000 1.335000 ;
+      RECT  2.265000  1.515000  9.780000 1.685000 ;
+      RECT  2.265000  1.685000  2.595000 1.815000 ;
+      RECT  2.265000  1.985000  2.595000 3.065000 ;
+      RECT  2.340000  0.085000  2.670000 0.445000 ;
+      RECT  2.775000  1.855000  2.945000 3.245000 ;
+      RECT  2.900000  0.265000  3.230000 0.655000 ;
+      RECT  2.900000  0.655000  6.990000 0.825000 ;
+      RECT  3.125000  1.865000 10.355000 2.035000 ;
+      RECT  3.125000  2.035000  3.455000 2.765000 ;
+      RECT  3.410000  0.085000  3.740000 0.475000 ;
+      RECT  3.625000  2.205000  3.815000 3.245000 ;
+      RECT  3.920000  0.265000  4.090000 0.655000 ;
+      RECT  3.985000  2.035000  4.315000 2.765000 ;
+      RECT  4.270000  0.085000  4.600000 0.475000 ;
+      RECT  4.485000  2.205000  4.675000 3.245000 ;
+      RECT  4.780000  0.265000  4.950000 0.655000 ;
+      RECT  4.845000  2.035000  5.175000 2.765000 ;
+      RECT  5.130000  0.085000  5.460000 0.475000 ;
+      RECT  5.345000  2.205000  5.535000 3.245000 ;
+      RECT  5.640000  0.265000  5.970000 0.655000 ;
+      RECT  5.705000  2.035000  6.035000 2.765000 ;
+      RECT  6.150000  0.085000  6.480000 0.475000 ;
+      RECT  6.205000  2.205000  6.395000 3.245000 ;
+      RECT  6.390000  1.345000  9.780000 1.515000 ;
+      RECT  6.565000  2.035000  6.895000 2.765000 ;
+      RECT  6.660000  0.265000  6.990000 0.655000 ;
+      RECT  6.660000  0.825000  6.990000 0.995000 ;
+      RECT  6.660000  0.995000  9.570000 1.165000 ;
+      RECT  7.065000  2.205000  7.255000 3.245000 ;
+      RECT  7.170000  0.085000  7.340000 0.815000 ;
+      RECT  7.425000  2.035000  7.755000 2.765000 ;
+      RECT  7.520000  0.265000  7.850000 0.995000 ;
+      RECT  7.925000  2.205000  8.115000 3.245000 ;
+      RECT  8.030000  0.085000  8.200000 0.815000 ;
+      RECT  8.305000  2.035000  8.635000 2.765000 ;
+      RECT  8.380000  0.265000  8.710000 0.995000 ;
+      RECT  8.805000  2.205000  8.995000 3.245000 ;
+      RECT  8.890000  0.085000  9.060000 0.815000 ;
+      RECT  9.165000  2.035000  9.495000 2.765000 ;
+      RECT  9.240000  0.265000 15.910000 0.475000 ;
+      RECT  9.240000  0.475000  9.570000 0.995000 ;
+      RECT  9.665000  2.205000  9.855000 3.245000 ;
+      RECT 10.025000  1.465000 11.135000 1.635000 ;
+      RECT 10.025000  1.635000 10.355000 1.865000 ;
+      RECT 10.025000  2.035000 10.355000 3.065000 ;
+      RECT 10.535000  1.815000 10.705000 3.245000 ;
+      RECT 10.885000  1.635000 11.135000 1.960000 ;
+      RECT 10.885000  1.960000 12.650000 2.185000 ;
+      RECT 10.885000  2.185000 11.135000 3.065000 ;
+      RECT 11.315000  2.365000 11.645000 3.245000 ;
+      RECT 12.320000  2.185000 12.650000 2.885000 ;
+      RECT 12.320000  2.885000 20.390000 3.065000 ;
+      RECT 12.405000  1.075000 21.650000 1.315000 ;
+      RECT 12.405000  1.315000 15.455000 1.325000 ;
+      RECT 13.180000  1.895000 13.510000 2.885000 ;
+      RECT 14.040000  1.895000 14.370000 2.885000 ;
+      RECT 14.900000  1.895000 15.230000 2.885000 ;
+      RECT 15.580000  0.475000 15.910000 0.805000 ;
+      RECT 15.660000  0.985000 23.380000 1.000000 ;
+      RECT 15.660000  1.000000 21.650000 1.075000 ;
+      RECT 15.760000  1.895000 16.090000 2.885000 ;
+      RECT 16.620000  1.895000 16.950000 2.885000 ;
+      RECT 17.480000  1.895000 17.810000 2.885000 ;
+      RECT 18.340000  1.895000 18.670000 2.885000 ;
+      RECT 19.200000  1.895000 19.530000 2.885000 ;
+      RECT 20.060000  1.895000 20.390000 2.885000 ;
+      RECT 21.050000  1.815000 21.300000 3.245000 ;
+      RECT 21.480000  0.830000 23.380000 0.985000 ;
+      RECT 21.480000  1.315000 21.650000 1.695000 ;
+      RECT 21.480000  1.695000 24.415000 1.865000 ;
+      RECT 21.480000  1.865000 21.810000 3.065000 ;
+      RECT 21.520000  0.085000 21.850000 0.650000 ;
+      RECT 21.990000  2.165000 22.160000 3.245000 ;
+      RECT 22.030000  0.295000 22.360000 0.830000 ;
+      RECT 22.340000  1.865000 22.670000 3.065000 ;
+      RECT 22.540000  0.085000 22.870000 0.650000 ;
+      RECT 22.850000  2.045000 23.020000 3.245000 ;
+      RECT 23.050000  0.265000 23.380000 0.830000 ;
+      RECT 23.200000  1.865000 23.530000 3.065000 ;
+      RECT 23.560000  0.085000 23.890000 1.000000 ;
+      RECT 23.710000  2.045000 23.880000 3.245000 ;
+      RECT 24.085000  1.865000 24.415000 3.065000 ;
+      RECT 24.595000  1.815000 24.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  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  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 ;
+      RECT 18.395000 -0.085000 18.565000 0.085000 ;
+      RECT 18.395000  3.245000 18.565000 3.415000 ;
+      RECT 18.875000 -0.085000 19.045000 0.085000 ;
+      RECT 18.875000  3.245000 19.045000 3.415000 ;
+      RECT 19.355000 -0.085000 19.525000 0.085000 ;
+      RECT 19.355000  3.245000 19.525000 3.415000 ;
+      RECT 19.835000 -0.085000 20.005000 0.085000 ;
+      RECT 19.835000  3.245000 20.005000 3.415000 ;
+      RECT 20.315000 -0.085000 20.485000 0.085000 ;
+      RECT 20.315000  3.245000 20.485000 3.415000 ;
+      RECT 20.795000 -0.085000 20.965000 0.085000 ;
+      RECT 20.795000  3.245000 20.965000 3.415000 ;
+      RECT 21.275000 -0.085000 21.445000 0.085000 ;
+      RECT 21.275000  3.245000 21.445000 3.415000 ;
+      RECT 21.755000 -0.085000 21.925000 0.085000 ;
+      RECT 21.755000  3.245000 21.925000 3.415000 ;
+      RECT 22.235000 -0.085000 22.405000 0.085000 ;
+      RECT 22.235000  3.245000 22.405000 3.415000 ;
+      RECT 22.715000 -0.085000 22.885000 0.085000 ;
+      RECT 22.715000  3.245000 22.885000 3.415000 ;
+      RECT 23.195000 -0.085000 23.365000 0.085000 ;
+      RECT 23.195000  3.245000 23.365000 3.415000 ;
+      RECT 23.675000 -0.085000 23.845000 0.085000 ;
+      RECT 23.675000  3.245000 23.845000 3.415000 ;
+      RECT 24.155000 -0.085000 24.325000 0.085000 ;
+      RECT 24.155000  3.245000 24.325000 3.415000 ;
+      RECT 24.635000 -0.085000 24.805000 0.085000 ;
+      RECT 24.635000  3.245000 24.805000 3.415000 ;
   END
 END sky130_fd_sc_lp__busdriver2_20
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef
index 89ed69a..251bc81 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.magic.lef
@@ -65,29 +65,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  9.220000 1.950000 10.330000 2.130000 ;
-        RECT  9.220000 2.130000  9.390000 3.065000 ;
-        RECT 10.000000 0.255000 10.330000 1.950000 ;
-        RECT 10.000000 2.130000 10.330000 3.065000 ;
-        RECT 10.860000 0.255000 11.190000 3.065000 ;
-        RECT 11.720000 0.255000 12.050000 3.065000 ;
-        RECT 12.580000 0.255000 12.910000 3.065000 ;
-        RECT 13.440000 0.255000 13.770000 3.065000 ;
-        RECT 14.300000 0.255000 14.630000 3.065000 ;
-        RECT 15.160000 0.260000 15.490000 3.065000 ;
-        RECT 16.020000 0.255000 16.350000 3.065000 ;
-        RECT 16.880000 1.940000 17.210000 3.065000 ;
-      LAYER mcon ;
-        RECT 10.080000 1.950000 10.250000 2.120000 ;
-        RECT 10.940000 1.950000 11.110000 2.120000 ;
-        RECT 11.800000 1.950000 11.970000 2.120000 ;
-        RECT 12.660000 1.950000 12.830000 2.120000 ;
-        RECT 13.520000 1.950000 13.690000 2.120000 ;
-        RECT 14.380000 1.950000 14.550000 2.120000 ;
-        RECT 15.240000 1.950000 15.410000 2.120000 ;
-        RECT 16.100000 1.950000 16.270000 2.120000 ;
-        RECT 16.960000 1.950000 17.130000 2.120000 ;
       LAYER met1 ;
         RECT 9.160000 1.920000 17.190000 2.150000 ;
     END
@@ -96,59 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.760000 0.085000 ;
-        RECT  1.060000  0.085000  1.390000 0.815000 ;
-        RECT  2.985000  0.085000  3.155000 0.670000 ;
-        RECT  4.385000  0.085000  4.715000 0.465000 ;
-        RECT  5.545000  0.085000  5.875000 0.465000 ;
-        RECT  6.675000  0.085000  7.005000 0.465000 ;
-        RECT  7.745000  0.085000  7.995000 0.745000 ;
-        RECT 10.510000  0.085000 10.680000 0.865000 ;
-        RECT 11.370000  0.085000 11.540000 0.865000 ;
-        RECT 12.230000  0.085000 12.400000 0.865000 ;
-        RECT 13.090000  0.085000 13.260000 0.865000 ;
-        RECT 13.950000  0.085000 14.120000 0.865000 ;
-        RECT 14.810000  0.085000 14.980000 0.865000 ;
-        RECT 15.670000  0.085000 15.840000 0.865000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -157,142 +81,212 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 17.760000 3.415000 ;
-        RECT  0.630000 1.940000  0.880000 3.245000 ;
-        RECT  1.570000 2.290000  1.820000 3.245000 ;
-        RECT  2.510000 2.435000  2.760000 3.245000 ;
-        RECT  4.665000 2.680000  4.995000 3.245000 ;
-        RECT  5.845000 1.845000  6.175000 3.245000 ;
-        RECT  7.265000 2.185000  7.515000 3.245000 ;
-        RECT  8.205000 2.135000  8.875000 3.245000 ;
-        RECT  9.570000 2.310000  9.820000 3.245000 ;
-        RECT 10.510000 2.290000 10.680000 3.245000 ;
-        RECT 11.370000 2.290000 11.540000 3.245000 ;
-        RECT 12.230000 2.290000 12.400000 3.245000 ;
-        RECT 13.090000 2.290000 13.260000 3.245000 ;
-        RECT 13.950000 2.290000 14.120000 3.245000 ;
-        RECT 14.810000 2.290000 14.980000 3.245000 ;
-        RECT 15.670000 2.290000 15.840000 3.245000 ;
-        RECT 16.530000 2.290000 16.700000 3.245000 ;
-        RECT 17.390000 2.290000 17.640000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.100000 0.645000  0.880000 0.815000 ;
-      RECT  0.100000 0.815000  0.270000 1.590000 ;
-      RECT  0.100000 1.590000  1.415000 1.760000 ;
-      RECT  0.100000 1.760000  0.430000 2.695000 ;
-      RECT  0.550000 0.405000  0.880000 0.645000 ;
-      RECT  1.060000 1.940000  1.765000 2.110000 ;
-      RECT  1.060000 2.110000  1.390000 3.065000 ;
-      RECT  1.085000 1.345000  1.415000 1.590000 ;
-      RECT  1.595000 1.550000  2.565000 1.720000 ;
-      RECT  1.595000 1.720000  1.765000 1.940000 ;
-      RECT  1.995000 0.615000  2.245000 1.200000 ;
-      RECT  1.995000 1.200000  2.970000 1.370000 ;
-      RECT  2.000000 2.085000  3.130000 2.255000 ;
-      RECT  2.000000 2.255000  2.330000 3.065000 ;
-      RECT  2.045000 1.720000  2.565000 1.905000 ;
-      RECT  2.800000 1.370000  2.970000 1.575000 ;
-      RECT  2.800000 1.575000  3.130000 2.085000 ;
-      RECT  3.335000 1.815000  3.505000 2.895000 ;
-      RECT  3.335000 2.895000  4.485000 3.065000 ;
-      RECT  3.685000 0.615000  3.855000 0.995000 ;
-      RECT  3.685000 0.995000  5.635000 1.165000 ;
-      RECT  3.685000 1.165000  3.855000 1.815000 ;
-      RECT  3.685000 1.815000  3.975000 2.715000 ;
-      RECT  4.155000 1.815000  4.485000 2.330000 ;
-      RECT  4.155000 2.330000  5.585000 2.500000 ;
-      RECT  4.155000 2.500000  4.485000 2.895000 ;
-      RECT  5.335000 1.855000  5.585000 2.330000 ;
-      RECT  5.335000 2.500000  5.585000 3.065000 ;
-      RECT  5.435000 1.165000  5.635000 1.410000 ;
-      RECT  6.165000 0.265000  6.495000 0.645000 ;
-      RECT  6.165000 0.645000  7.190000 0.815000 ;
-      RECT  6.395000 0.995000  6.840000 1.665000 ;
-      RECT  6.665000 1.845000  7.190000 2.015000 ;
-      RECT  6.665000 2.015000  6.995000 2.725000 ;
-      RECT  7.020000 0.815000  7.190000 1.275000 ;
-      RECT  7.020000 1.275000  8.690000 1.605000 ;
-      RECT  7.020000 1.605000  7.190000 1.845000 ;
-      RECT  7.235000 0.295000  7.565000 0.465000 ;
-      RECT  7.360000 0.465000  7.565000 0.925000 ;
-      RECT  7.360000 0.925000  8.505000 1.095000 ;
-      RECT  7.695000 1.785000  9.040000 1.955000 ;
-      RECT  7.695000 1.955000  8.025000 3.065000 ;
-      RECT  8.175000 0.265000  9.470000 0.435000 ;
-      RECT  8.175000 0.435000  8.505000 0.925000 ;
-      RECT  8.685000 0.615000  9.040000 1.095000 ;
-      RECT  8.870000 1.095000  9.040000 1.550000 ;
-      RECT  8.870000 1.550000  9.475000 1.780000 ;
-      RECT  8.870000 1.780000  9.040000 1.785000 ;
-      RECT  9.220000 0.435000  9.470000 1.095000 ;
-      RECT  9.640000 1.035000  9.830000 1.410000 ;
-      RECT 10.500000 1.035000 10.690000 1.410000 ;
-      RECT 11.360000 1.035000 11.550000 1.410000 ;
-      RECT 12.220000 1.035000 12.410000 1.410000 ;
-      RECT 13.080000 1.035000 13.270000 1.410000 ;
-      RECT 13.940000 1.345000 14.130000 1.760000 ;
-      RECT 14.800000 1.345000 14.990000 1.760000 ;
-      RECT 15.660000 1.345000 15.850000 1.760000 ;
-      RECT 16.520000 1.345000 17.110000 1.760000 ;
+      RECT  0.000000 -0.085000 17.760000 0.085000 ;
+      RECT  0.000000  3.245000 17.760000 3.415000 ;
+      RECT  0.100000  0.645000  0.880000 0.815000 ;
+      RECT  0.100000  0.815000  0.270000 1.590000 ;
+      RECT  0.100000  1.590000  1.415000 1.760000 ;
+      RECT  0.100000  1.760000  0.430000 2.695000 ;
+      RECT  0.550000  0.405000  0.880000 0.645000 ;
+      RECT  0.630000  1.940000  0.880000 3.245000 ;
+      RECT  1.060000  0.085000  1.390000 0.815000 ;
+      RECT  1.060000  1.940000  1.765000 2.110000 ;
+      RECT  1.060000  2.110000  1.390000 3.065000 ;
+      RECT  1.085000  1.345000  1.415000 1.590000 ;
+      RECT  1.570000  2.290000  1.820000 3.245000 ;
+      RECT  1.595000  1.550000  2.565000 1.720000 ;
+      RECT  1.595000  1.720000  1.765000 1.940000 ;
+      RECT  1.995000  0.615000  2.245000 1.200000 ;
+      RECT  1.995000  1.200000  2.970000 1.370000 ;
+      RECT  2.000000  2.085000  3.130000 2.255000 ;
+      RECT  2.000000  2.255000  2.330000 3.065000 ;
+      RECT  2.045000  1.720000  2.565000 1.905000 ;
+      RECT  2.510000  2.435000  2.760000 3.245000 ;
+      RECT  2.800000  1.370000  2.970000 1.575000 ;
+      RECT  2.800000  1.575000  3.130000 2.085000 ;
+      RECT  2.985000  0.085000  3.155000 0.670000 ;
+      RECT  3.335000  1.815000  3.505000 2.895000 ;
+      RECT  3.335000  2.895000  4.485000 3.065000 ;
+      RECT  3.685000  0.615000  3.855000 0.995000 ;
+      RECT  3.685000  0.995000  5.635000 1.165000 ;
+      RECT  3.685000  1.165000  3.855000 1.815000 ;
+      RECT  3.685000  1.815000  3.975000 2.715000 ;
+      RECT  4.155000  1.815000  4.485000 2.330000 ;
+      RECT  4.155000  2.330000  5.585000 2.500000 ;
+      RECT  4.155000  2.500000  4.485000 2.895000 ;
+      RECT  4.385000  0.085000  4.715000 0.465000 ;
+      RECT  4.665000  2.680000  4.995000 3.245000 ;
+      RECT  5.335000  1.855000  5.585000 2.330000 ;
+      RECT  5.335000  2.500000  5.585000 3.065000 ;
+      RECT  5.435000  1.165000  5.635000 1.410000 ;
+      RECT  5.545000  0.085000  5.875000 0.465000 ;
+      RECT  5.845000  1.845000  6.175000 3.245000 ;
+      RECT  6.165000  0.265000  6.495000 0.645000 ;
+      RECT  6.165000  0.645000  7.190000 0.815000 ;
+      RECT  6.395000  0.995000  6.840000 1.665000 ;
+      RECT  6.665000  1.845000  7.190000 2.015000 ;
+      RECT  6.665000  2.015000  6.995000 2.725000 ;
+      RECT  6.675000  0.085000  7.005000 0.465000 ;
+      RECT  7.020000  0.815000  7.190000 1.275000 ;
+      RECT  7.020000  1.275000  8.690000 1.605000 ;
+      RECT  7.020000  1.605000  7.190000 1.845000 ;
+      RECT  7.235000  0.295000  7.565000 0.465000 ;
+      RECT  7.265000  2.185000  7.515000 3.245000 ;
+      RECT  7.360000  0.465000  7.565000 0.925000 ;
+      RECT  7.360000  0.925000  8.505000 1.095000 ;
+      RECT  7.695000  1.785000  9.040000 1.955000 ;
+      RECT  7.695000  1.955000  8.025000 3.065000 ;
+      RECT  7.745000  0.085000  7.995000 0.745000 ;
+      RECT  8.175000  0.265000  9.470000 0.435000 ;
+      RECT  8.175000  0.435000  8.505000 0.925000 ;
+      RECT  8.205000  2.135000  8.875000 3.245000 ;
+      RECT  8.685000  0.615000  9.040000 1.095000 ;
+      RECT  8.870000  1.095000  9.040000 1.550000 ;
+      RECT  8.870000  1.550000  9.475000 1.780000 ;
+      RECT  8.870000  1.780000  9.040000 1.785000 ;
+      RECT  9.220000  0.435000  9.470000 1.095000 ;
+      RECT  9.220000  1.950000 10.330000 2.130000 ;
+      RECT  9.220000  2.130000  9.390000 3.065000 ;
+      RECT  9.570000  2.310000  9.820000 3.245000 ;
+      RECT  9.640000  1.035000  9.830000 1.410000 ;
+      RECT 10.000000  0.255000 10.330000 1.950000 ;
+      RECT 10.000000  2.130000 10.330000 3.065000 ;
+      RECT 10.500000  1.035000 10.690000 1.410000 ;
+      RECT 10.510000  0.085000 10.680000 0.865000 ;
+      RECT 10.510000  2.290000 10.680000 3.245000 ;
+      RECT 10.860000  0.255000 11.190000 3.065000 ;
+      RECT 11.360000  1.035000 11.550000 1.410000 ;
+      RECT 11.370000  0.085000 11.540000 0.865000 ;
+      RECT 11.370000  2.290000 11.540000 3.245000 ;
+      RECT 11.720000  0.255000 12.050000 3.065000 ;
+      RECT 12.220000  1.035000 12.410000 1.410000 ;
+      RECT 12.230000  0.085000 12.400000 0.865000 ;
+      RECT 12.230000  2.290000 12.400000 3.245000 ;
+      RECT 12.580000  0.255000 12.910000 3.065000 ;
+      RECT 13.080000  1.035000 13.270000 1.410000 ;
+      RECT 13.090000  0.085000 13.260000 0.865000 ;
+      RECT 13.090000  2.290000 13.260000 3.245000 ;
+      RECT 13.440000  0.255000 13.770000 3.065000 ;
+      RECT 13.940000  1.345000 14.130000 1.760000 ;
+      RECT 13.950000  0.085000 14.120000 0.865000 ;
+      RECT 13.950000  2.290000 14.120000 3.245000 ;
+      RECT 14.300000  0.255000 14.630000 3.065000 ;
+      RECT 14.800000  1.345000 14.990000 1.760000 ;
+      RECT 14.810000  0.085000 14.980000 0.865000 ;
+      RECT 14.810000  2.290000 14.980000 3.245000 ;
+      RECT 15.160000  0.260000 15.490000 3.065000 ;
+      RECT 15.660000  1.345000 15.850000 1.760000 ;
+      RECT 15.670000  0.085000 15.840000 0.865000 ;
+      RECT 15.670000  2.290000 15.840000 3.245000 ;
+      RECT 16.020000  0.255000 16.350000 3.065000 ;
+      RECT 16.520000  1.345000 17.110000 1.760000 ;
+      RECT 16.530000  2.290000 16.700000 3.245000 ;
+      RECT 16.880000  1.940000 17.210000 3.065000 ;
+      RECT 17.390000  2.290000 17.640000 3.245000 ;
     LAYER mcon ;
-      RECT  2.075000 1.580000  2.245000 1.750000 ;
-      RECT  5.435000 1.210000  5.605000 1.380000 ;
-      RECT  6.395000 1.210000  6.565000 1.380000 ;
-      RECT  9.275000 1.580000  9.445000 1.750000 ;
-      RECT  9.660000 1.210000  9.830000 1.380000 ;
-      RECT 10.520000 1.210000 10.690000 1.380000 ;
-      RECT 11.380000 1.210000 11.550000 1.380000 ;
-      RECT 12.240000 1.210000 12.410000 1.380000 ;
-      RECT 13.100000 1.210000 13.270000 1.380000 ;
-      RECT 13.940000 1.580000 14.110000 1.750000 ;
-      RECT 14.800000 1.580000 14.970000 1.750000 ;
-      RECT 15.660000 1.580000 15.830000 1.750000 ;
-      RECT 16.520000 1.580000 16.690000 1.750000 ;
-      RECT 16.880000 1.580000 17.050000 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  1.580000  2.245000 1.750000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  1.210000  6.565000 1.380000 ;
+      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.660000  1.210000  9.830000 1.380000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.080000  1.950000 10.250000 2.120000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.520000  1.210000 10.690000 1.380000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 10.940000  1.950000 11.110000 2.120000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.380000  1.210000 11.550000 1.380000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 11.800000  1.950000 11.970000 2.120000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.240000  1.210000 12.410000 1.380000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 12.660000  1.950000 12.830000 2.120000 ;
+      RECT 13.100000  1.210000 13.270000 1.380000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.520000  1.950000 13.690000 2.120000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 13.940000  1.580000 14.110000 1.750000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.380000  1.950000 14.550000 2.120000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 14.800000  1.580000 14.970000 1.750000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.240000  1.950000 15.410000 2.120000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.660000  1.580000 15.830000 1.750000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.100000  1.950000 16.270000 2.120000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
+      RECT 16.520000  1.580000 16.690000 1.750000 ;
+      RECT 16.880000  1.580000 17.050000 1.750000 ;
+      RECT 16.955000 -0.085000 17.125000 0.085000 ;
+      RECT 16.955000  3.245000 17.125000 3.415000 ;
+      RECT 16.960000  1.950000 17.130000 2.120000 ;
+      RECT 17.435000 -0.085000 17.605000 0.085000 ;
+      RECT 17.435000  3.245000 17.605000 3.415000 ;
     LAYER met1 ;
       RECT 2.015000 1.550000  2.305000 1.595000 ;
       RECT 2.015000 1.595000 17.110000 1.735000 ;
diff --git a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
index 218681d..2ed6f03 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.magic.lef
@@ -62,29 +62,6 @@
     ANTENNADIFFAREA  4.968000 ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  9.220000 1.950000 10.330000 2.130000 ;
-        RECT  9.220000 2.130000  9.390000 3.065000 ;
-        RECT 10.000000 0.255000 10.330000 1.950000 ;
-        RECT 10.000000 2.130000 10.330000 3.065000 ;
-        RECT 10.860000 0.255000 11.190000 3.065000 ;
-        RECT 11.720000 0.255000 12.050000 3.065000 ;
-        RECT 12.580000 0.255000 12.910000 3.065000 ;
-        RECT 13.440000 0.255000 13.770000 3.065000 ;
-        RECT 14.300000 0.255000 14.630000 3.065000 ;
-        RECT 15.160000 0.260000 15.490000 3.065000 ;
-        RECT 16.020000 0.255000 16.350000 3.065000 ;
-        RECT 16.880000 1.940000 17.210000 3.065000 ;
-      LAYER mcon ;
-        RECT 10.080000 1.950000 10.250000 2.120000 ;
-        RECT 10.940000 1.950000 11.110000 2.120000 ;
-        RECT 11.800000 1.950000 11.970000 2.120000 ;
-        RECT 12.660000 1.950000 12.830000 2.120000 ;
-        RECT 13.520000 1.950000 13.690000 2.120000 ;
-        RECT 14.380000 1.950000 14.550000 2.120000 ;
-        RECT 15.240000 1.950000 15.410000 2.120000 ;
-        RECT 16.100000 1.950000 16.270000 2.120000 ;
-        RECT 16.960000 1.950000 17.130000 2.120000 ;
       LAYER met1 ;
         RECT 9.160000 1.920000 17.190000 2.150000 ;
     END
@@ -93,59 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.760000 0.085000 ;
-        RECT  1.060000  0.085000  1.390000 0.815000 ;
-        RECT  2.985000  0.085000  3.155000 0.670000 ;
-        RECT  4.385000  0.085000  4.715000 0.465000 ;
-        RECT  5.545000  0.085000  5.875000 0.465000 ;
-        RECT  6.675000  0.085000  7.005000 0.465000 ;
-        RECT  7.745000  0.085000  7.995000 0.745000 ;
-        RECT 10.510000  0.085000 10.680000 0.865000 ;
-        RECT 11.370000  0.085000 11.540000 0.865000 ;
-        RECT 12.230000  0.085000 12.400000 0.865000 ;
-        RECT 13.090000  0.085000 13.260000 0.865000 ;
-        RECT 13.950000  0.085000 14.120000 0.865000 ;
-        RECT 14.810000  0.085000 14.980000 0.865000 ;
-        RECT 15.670000  0.085000 15.840000 0.865000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -154,142 +78,212 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 17.760000 3.415000 ;
-        RECT  0.630000 1.940000  0.880000 3.245000 ;
-        RECT  1.570000 2.290000  1.820000 3.245000 ;
-        RECT  2.510000 2.435000  2.760000 3.245000 ;
-        RECT  4.665000 2.680000  4.995000 3.245000 ;
-        RECT  5.845000 1.845000  6.175000 3.245000 ;
-        RECT  7.265000 2.185000  7.515000 3.245000 ;
-        RECT  8.205000 2.135000  8.875000 3.245000 ;
-        RECT  9.570000 2.310000  9.820000 3.245000 ;
-        RECT 10.510000 2.290000 10.680000 3.245000 ;
-        RECT 11.370000 2.290000 11.540000 3.245000 ;
-        RECT 12.230000 2.290000 12.400000 3.245000 ;
-        RECT 13.090000 2.290000 13.260000 3.245000 ;
-        RECT 13.950000 2.290000 14.120000 3.245000 ;
-        RECT 14.810000 2.290000 14.980000 3.245000 ;
-        RECT 15.670000 2.290000 15.840000 3.245000 ;
-        RECT 16.530000 2.290000 16.700000 3.245000 ;
-        RECT 17.390000 2.290000 17.640000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.100000 0.645000  0.880000 0.815000 ;
-      RECT  0.100000 0.815000  0.270000 1.590000 ;
-      RECT  0.100000 1.590000  1.415000 1.760000 ;
-      RECT  0.100000 1.760000  0.430000 2.695000 ;
-      RECT  0.550000 0.405000  0.880000 0.645000 ;
-      RECT  1.060000 1.940000  1.765000 2.110000 ;
-      RECT  1.060000 2.110000  1.390000 3.065000 ;
-      RECT  1.085000 1.345000  1.415000 1.590000 ;
-      RECT  1.595000 1.550000  2.565000 1.720000 ;
-      RECT  1.595000 1.720000  1.765000 1.940000 ;
-      RECT  1.995000 0.615000  2.245000 1.200000 ;
-      RECT  1.995000 1.200000  2.970000 1.370000 ;
-      RECT  2.000000 2.085000  3.130000 2.255000 ;
-      RECT  2.000000 2.255000  2.330000 3.065000 ;
-      RECT  2.045000 1.720000  2.565000 1.905000 ;
-      RECT  2.800000 1.370000  2.970000 1.575000 ;
-      RECT  2.800000 1.575000  3.130000 2.085000 ;
-      RECT  3.335000 1.815000  3.505000 2.895000 ;
-      RECT  3.335000 2.895000  4.485000 3.065000 ;
-      RECT  3.685000 0.615000  3.855000 0.995000 ;
-      RECT  3.685000 0.995000  5.635000 1.165000 ;
-      RECT  3.685000 1.165000  3.855000 1.815000 ;
-      RECT  3.685000 1.815000  3.975000 2.715000 ;
-      RECT  4.155000 1.815000  4.485000 2.330000 ;
-      RECT  4.155000 2.330000  5.585000 2.500000 ;
-      RECT  4.155000 2.500000  4.485000 2.895000 ;
-      RECT  5.335000 1.855000  5.585000 2.330000 ;
-      RECT  5.335000 2.500000  5.585000 3.065000 ;
-      RECT  5.435000 1.165000  5.635000 1.410000 ;
-      RECT  6.165000 0.265000  6.495000 0.645000 ;
-      RECT  6.165000 0.645000  7.190000 0.815000 ;
-      RECT  6.395000 0.995000  6.840000 1.665000 ;
-      RECT  6.665000 1.845000  7.190000 2.015000 ;
-      RECT  6.665000 2.015000  6.995000 2.725000 ;
-      RECT  7.020000 0.815000  7.190000 1.275000 ;
-      RECT  7.020000 1.275000  8.690000 1.605000 ;
-      RECT  7.020000 1.605000  7.190000 1.845000 ;
-      RECT  7.235000 0.295000  7.565000 0.465000 ;
-      RECT  7.360000 0.465000  7.565000 0.925000 ;
-      RECT  7.360000 0.925000  8.505000 1.095000 ;
-      RECT  7.695000 1.785000  9.040000 1.955000 ;
-      RECT  7.695000 1.955000  8.025000 3.065000 ;
-      RECT  8.175000 0.265000  9.470000 0.435000 ;
-      RECT  8.175000 0.435000  8.505000 0.925000 ;
-      RECT  8.685000 0.615000  9.040000 1.095000 ;
-      RECT  8.870000 1.095000  9.040000 1.550000 ;
-      RECT  8.870000 1.550000  9.475000 1.780000 ;
-      RECT  8.870000 1.780000  9.040000 1.785000 ;
-      RECT  9.220000 0.435000  9.470000 1.095000 ;
-      RECT  9.640000 1.035000  9.830000 1.410000 ;
-      RECT 10.500000 1.035000 10.690000 1.410000 ;
-      RECT 11.360000 1.035000 11.550000 1.410000 ;
-      RECT 12.220000 1.035000 12.410000 1.410000 ;
-      RECT 13.080000 1.035000 13.270000 1.410000 ;
-      RECT 13.940000 1.345000 14.130000 1.760000 ;
-      RECT 14.800000 1.345000 14.990000 1.760000 ;
-      RECT 15.660000 1.345000 15.850000 1.760000 ;
-      RECT 16.520000 1.345000 17.110000 1.760000 ;
+      RECT  0.000000 -0.085000 17.760000 0.085000 ;
+      RECT  0.000000  3.245000 17.760000 3.415000 ;
+      RECT  0.100000  0.645000  0.880000 0.815000 ;
+      RECT  0.100000  0.815000  0.270000 1.590000 ;
+      RECT  0.100000  1.590000  1.415000 1.760000 ;
+      RECT  0.100000  1.760000  0.430000 2.695000 ;
+      RECT  0.550000  0.405000  0.880000 0.645000 ;
+      RECT  0.630000  1.940000  0.880000 3.245000 ;
+      RECT  1.060000  0.085000  1.390000 0.815000 ;
+      RECT  1.060000  1.940000  1.765000 2.110000 ;
+      RECT  1.060000  2.110000  1.390000 3.065000 ;
+      RECT  1.085000  1.345000  1.415000 1.590000 ;
+      RECT  1.570000  2.290000  1.820000 3.245000 ;
+      RECT  1.595000  1.550000  2.565000 1.720000 ;
+      RECT  1.595000  1.720000  1.765000 1.940000 ;
+      RECT  1.995000  0.615000  2.245000 1.200000 ;
+      RECT  1.995000  1.200000  2.970000 1.370000 ;
+      RECT  2.000000  2.085000  3.130000 2.255000 ;
+      RECT  2.000000  2.255000  2.330000 3.065000 ;
+      RECT  2.045000  1.720000  2.565000 1.905000 ;
+      RECT  2.510000  2.435000  2.760000 3.245000 ;
+      RECT  2.800000  1.370000  2.970000 1.575000 ;
+      RECT  2.800000  1.575000  3.130000 2.085000 ;
+      RECT  2.985000  0.085000  3.155000 0.670000 ;
+      RECT  3.335000  1.815000  3.505000 2.895000 ;
+      RECT  3.335000  2.895000  4.485000 3.065000 ;
+      RECT  3.685000  0.615000  3.855000 0.995000 ;
+      RECT  3.685000  0.995000  5.635000 1.165000 ;
+      RECT  3.685000  1.165000  3.855000 1.815000 ;
+      RECT  3.685000  1.815000  3.975000 2.715000 ;
+      RECT  4.155000  1.815000  4.485000 2.330000 ;
+      RECT  4.155000  2.330000  5.585000 2.500000 ;
+      RECT  4.155000  2.500000  4.485000 2.895000 ;
+      RECT  4.385000  0.085000  4.715000 0.465000 ;
+      RECT  4.665000  2.680000  4.995000 3.245000 ;
+      RECT  5.335000  1.855000  5.585000 2.330000 ;
+      RECT  5.335000  2.500000  5.585000 3.065000 ;
+      RECT  5.435000  1.165000  5.635000 1.410000 ;
+      RECT  5.545000  0.085000  5.875000 0.465000 ;
+      RECT  5.845000  1.845000  6.175000 3.245000 ;
+      RECT  6.165000  0.265000  6.495000 0.645000 ;
+      RECT  6.165000  0.645000  7.190000 0.815000 ;
+      RECT  6.395000  0.995000  6.840000 1.665000 ;
+      RECT  6.665000  1.845000  7.190000 2.015000 ;
+      RECT  6.665000  2.015000  6.995000 2.725000 ;
+      RECT  6.675000  0.085000  7.005000 0.465000 ;
+      RECT  7.020000  0.815000  7.190000 1.275000 ;
+      RECT  7.020000  1.275000  8.690000 1.605000 ;
+      RECT  7.020000  1.605000  7.190000 1.845000 ;
+      RECT  7.235000  0.295000  7.565000 0.465000 ;
+      RECT  7.265000  2.185000  7.515000 3.245000 ;
+      RECT  7.360000  0.465000  7.565000 0.925000 ;
+      RECT  7.360000  0.925000  8.505000 1.095000 ;
+      RECT  7.695000  1.785000  9.040000 1.955000 ;
+      RECT  7.695000  1.955000  8.025000 3.065000 ;
+      RECT  7.745000  0.085000  7.995000 0.745000 ;
+      RECT  8.175000  0.265000  9.470000 0.435000 ;
+      RECT  8.175000  0.435000  8.505000 0.925000 ;
+      RECT  8.205000  2.135000  8.875000 3.245000 ;
+      RECT  8.685000  0.615000  9.040000 1.095000 ;
+      RECT  8.870000  1.095000  9.040000 1.550000 ;
+      RECT  8.870000  1.550000  9.475000 1.780000 ;
+      RECT  8.870000  1.780000  9.040000 1.785000 ;
+      RECT  9.220000  0.435000  9.470000 1.095000 ;
+      RECT  9.220000  1.950000 10.330000 2.130000 ;
+      RECT  9.220000  2.130000  9.390000 3.065000 ;
+      RECT  9.570000  2.310000  9.820000 3.245000 ;
+      RECT  9.640000  1.035000  9.830000 1.410000 ;
+      RECT 10.000000  0.255000 10.330000 1.950000 ;
+      RECT 10.000000  2.130000 10.330000 3.065000 ;
+      RECT 10.500000  1.035000 10.690000 1.410000 ;
+      RECT 10.510000  0.085000 10.680000 0.865000 ;
+      RECT 10.510000  2.290000 10.680000 3.245000 ;
+      RECT 10.860000  0.255000 11.190000 3.065000 ;
+      RECT 11.360000  1.035000 11.550000 1.410000 ;
+      RECT 11.370000  0.085000 11.540000 0.865000 ;
+      RECT 11.370000  2.290000 11.540000 3.245000 ;
+      RECT 11.720000  0.255000 12.050000 3.065000 ;
+      RECT 12.220000  1.035000 12.410000 1.410000 ;
+      RECT 12.230000  0.085000 12.400000 0.865000 ;
+      RECT 12.230000  2.290000 12.400000 3.245000 ;
+      RECT 12.580000  0.255000 12.910000 3.065000 ;
+      RECT 13.080000  1.035000 13.270000 1.410000 ;
+      RECT 13.090000  0.085000 13.260000 0.865000 ;
+      RECT 13.090000  2.290000 13.260000 3.245000 ;
+      RECT 13.440000  0.255000 13.770000 3.065000 ;
+      RECT 13.940000  1.345000 14.130000 1.760000 ;
+      RECT 13.950000  0.085000 14.120000 0.865000 ;
+      RECT 13.950000  2.290000 14.120000 3.245000 ;
+      RECT 14.300000  0.255000 14.630000 3.065000 ;
+      RECT 14.800000  1.345000 14.990000 1.760000 ;
+      RECT 14.810000  0.085000 14.980000 0.865000 ;
+      RECT 14.810000  2.290000 14.980000 3.245000 ;
+      RECT 15.160000  0.260000 15.490000 3.065000 ;
+      RECT 15.660000  1.345000 15.850000 1.760000 ;
+      RECT 15.670000  0.085000 15.840000 0.865000 ;
+      RECT 15.670000  2.290000 15.840000 3.245000 ;
+      RECT 16.020000  0.255000 16.350000 3.065000 ;
+      RECT 16.520000  1.345000 17.110000 1.760000 ;
+      RECT 16.530000  2.290000 16.700000 3.245000 ;
+      RECT 16.880000  1.940000 17.210000 3.065000 ;
+      RECT 17.390000  2.290000 17.640000 3.245000 ;
     LAYER mcon ;
-      RECT  2.075000 1.580000  2.245000 1.750000 ;
-      RECT  5.435000 1.210000  5.605000 1.380000 ;
-      RECT  6.395000 1.210000  6.565000 1.380000 ;
-      RECT  9.275000 1.580000  9.445000 1.750000 ;
-      RECT  9.660000 1.210000  9.830000 1.380000 ;
-      RECT 10.520000 1.210000 10.690000 1.380000 ;
-      RECT 11.380000 1.210000 11.550000 1.380000 ;
-      RECT 12.240000 1.210000 12.410000 1.380000 ;
-      RECT 13.100000 1.210000 13.270000 1.380000 ;
-      RECT 13.940000 1.580000 14.110000 1.750000 ;
-      RECT 14.800000 1.580000 14.970000 1.750000 ;
-      RECT 15.660000 1.580000 15.830000 1.750000 ;
-      RECT 16.520000 1.580000 16.690000 1.750000 ;
-      RECT 16.880000 1.580000 17.050000 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  1.580000  2.245000 1.750000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  1.210000  6.565000 1.380000 ;
+      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.660000  1.210000  9.830000 1.380000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT 10.080000  1.950000 10.250000 2.120000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.520000  1.210000 10.690000 1.380000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+      RECT 10.940000  1.950000 11.110000 2.120000 ;
+      RECT 11.195000 -0.085000 11.365000 0.085000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.380000  1.210000 11.550000 1.380000 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
+      RECT 11.800000  1.950000 11.970000 2.120000 ;
+      RECT 12.155000 -0.085000 12.325000 0.085000 ;
+      RECT 12.155000  3.245000 12.325000 3.415000 ;
+      RECT 12.240000  1.210000 12.410000 1.380000 ;
+      RECT 12.635000 -0.085000 12.805000 0.085000 ;
+      RECT 12.635000  3.245000 12.805000 3.415000 ;
+      RECT 12.660000  1.950000 12.830000 2.120000 ;
+      RECT 13.100000  1.210000 13.270000 1.380000 ;
+      RECT 13.115000 -0.085000 13.285000 0.085000 ;
+      RECT 13.115000  3.245000 13.285000 3.415000 ;
+      RECT 13.520000  1.950000 13.690000 2.120000 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
+      RECT 13.940000  1.580000 14.110000 1.750000 ;
+      RECT 14.075000 -0.085000 14.245000 0.085000 ;
+      RECT 14.075000  3.245000 14.245000 3.415000 ;
+      RECT 14.380000  1.950000 14.550000 2.120000 ;
+      RECT 14.555000 -0.085000 14.725000 0.085000 ;
+      RECT 14.555000  3.245000 14.725000 3.415000 ;
+      RECT 14.800000  1.580000 14.970000 1.750000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.240000  1.950000 15.410000 2.120000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.660000  1.580000 15.830000 1.750000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.100000  1.950000 16.270000 2.120000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
+      RECT 16.520000  1.580000 16.690000 1.750000 ;
+      RECT 16.880000  1.580000 17.050000 1.750000 ;
+      RECT 16.955000 -0.085000 17.125000 0.085000 ;
+      RECT 16.955000  3.245000 17.125000 3.415000 ;
+      RECT 16.960000  1.950000 17.130000 2.120000 ;
+      RECT 17.435000 -0.085000 17.605000 0.085000 ;
+      RECT 17.435000  3.245000 17.605000 3.415000 ;
     LAYER met1 ;
       RECT 2.015000 1.550000  2.305000 1.595000 ;
       RECT 2.015000 1.595000 17.110000 1.735000 ;
diff --git a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef
index 34abca3..0bacf58 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.magic.lef
@@ -44,15 +44,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  0.595000 1.200000  0.925000 2.150000 ;
-        RECT  5.270000 1.765000  5.675000 2.155000 ;
-        RECT 11.445000 1.325000 12.115000 1.615000 ;
-        RECT 11.710000 1.615000 12.055000 2.150000 ;
-      LAYER mcon ;
-        RECT  0.685000 1.950000  0.855000 2.120000 ;
-        RECT  5.415000 1.950000  5.585000 2.120000 ;
-        RECT 11.780000 1.950000 11.950000 2.120000 ;
       LAYER met1 ;
         RECT  0.625000 1.920000  0.915000 1.950000 ;
         RECT  0.625000 1.950000 12.010000 2.120000 ;
@@ -77,29 +68,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 14.540000 1.950000 15.650000 2.130000 ;
-        RECT 14.540000 2.130000 14.710000 3.065000 ;
-        RECT 15.320000 0.255000 15.650000 1.950000 ;
-        RECT 15.320000 2.130000 15.650000 3.065000 ;
-        RECT 16.180000 0.255000 16.510000 3.065000 ;
-        RECT 17.040000 0.255000 17.370000 3.065000 ;
-        RECT 17.900000 0.255000 18.230000 3.065000 ;
-        RECT 18.760000 0.255000 19.090000 3.065000 ;
-        RECT 19.620000 0.255000 19.950000 3.065000 ;
-        RECT 20.480000 0.260000 20.810000 3.065000 ;
-        RECT 21.340000 0.255000 21.670000 3.065000 ;
-        RECT 22.200000 1.940000 22.530000 3.065000 ;
-      LAYER mcon ;
-        RECT 15.400000 1.950000 15.570000 2.120000 ;
-        RECT 16.260000 1.950000 16.430000 2.120000 ;
-        RECT 17.120000 1.950000 17.290000 2.120000 ;
-        RECT 17.980000 1.950000 18.150000 2.120000 ;
-        RECT 18.840000 1.950000 19.010000 2.120000 ;
-        RECT 19.700000 1.950000 19.870000 2.120000 ;
-        RECT 20.560000 1.950000 20.730000 2.120000 ;
-        RECT 21.420000 1.950000 21.590000 2.120000 ;
-        RECT 22.280000 1.950000 22.450000 2.120000 ;
       LAYER met1 ;
         RECT 14.480000 1.920000 22.510000 2.150000 ;
     END
@@ -108,16 +76,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 2.495000 2.440000 3.400000 3.075000 ;
-        RECT 4.065000 1.850000 4.315000 3.045000 ;
-        RECT 4.885000 2.665000 5.215000 3.015000 ;
-      LAYER mcon ;
-        RECT 2.500000 2.715000 2.670000 2.885000 ;
-        RECT 2.860000 2.715000 3.030000 2.885000 ;
-        RECT 3.220000 2.715000 3.390000 2.885000 ;
-        RECT 4.105000 2.715000 4.275000 2.885000 ;
-        RECT 4.955000 2.715000 5.125000 2.885000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 23.450000 2.945000 ;
     END
@@ -126,74 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 23.520000 0.085000 ;
-        RECT  0.945000  0.085000  1.250000 1.020000 ;
-        RECT  1.805000  0.085000  2.135000 0.690000 ;
-        RECT  2.720000  0.085000  2.995000 1.040000 ;
-        RECT  3.675000  0.085000  5.110000 0.475000 ;
-        RECT  6.975000  0.085000  7.225000 0.680000 ;
-        RECT  8.415000  0.085000  8.785000 0.465000 ;
-        RECT  9.455000  0.085000 10.190000 0.485000 ;
-        RECT 10.720000  0.085000 11.050000 0.465000 ;
-        RECT 13.055000  0.085000 13.365000 0.755000 ;
-        RECT 15.830000  0.085000 16.000000 0.865000 ;
-        RECT 16.690000  0.085000 16.860000 0.865000 ;
-        RECT 17.550000  0.085000 17.720000 0.865000 ;
-        RECT 18.410000  0.085000 18.580000 0.865000 ;
-        RECT 19.270000  0.085000 19.440000 0.865000 ;
-        RECT 20.130000  0.085000 20.300000 0.865000 ;
-        RECT 20.990000  0.085000 21.160000 0.865000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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 ;
-        RECT 18.395000 -0.085000 18.565000 0.085000 ;
-        RECT 18.875000 -0.085000 19.045000 0.085000 ;
-        RECT 19.355000 -0.085000 19.525000 0.085000 ;
-        RECT 19.835000 -0.085000 20.005000 0.085000 ;
-        RECT 20.315000 -0.085000 20.485000 0.085000 ;
-        RECT 20.795000 -0.085000 20.965000 0.085000 ;
-        RECT 21.275000 -0.085000 21.445000 0.085000 ;
-        RECT 21.755000 -0.085000 21.925000 0.085000 ;
-        RECT 22.235000 -0.085000 22.405000 0.085000 ;
-        RECT 22.715000 -0.085000 22.885000 0.085000 ;
-        RECT 23.195000 -0.085000 23.365000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 23.520000 0.245000 ;
     END
@@ -202,187 +92,287 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 23.520000 3.415000 ;
-        RECT  0.625000 2.320000  0.955000 3.245000 ;
-        RECT  5.405000 2.665000  5.735000 3.245000 ;
-        RECT  6.705000 2.435000  6.955000 3.245000 ;
-        RECT  8.780000 2.670000  9.040000 3.245000 ;
-        RECT  9.710000 1.845000 10.040000 3.245000 ;
-        RECT 11.270000 2.320000 11.530000 3.245000 ;
-        RECT 12.200000 2.735000 12.460000 3.245000 ;
-        RECT 14.025000 2.135000 14.360000 3.245000 ;
-        RECT 14.890000 2.310000 15.140000 3.245000 ;
-        RECT 15.830000 2.290000 16.000000 3.245000 ;
-        RECT 16.690000 2.290000 16.860000 3.245000 ;
-        RECT 17.550000 2.290000 17.720000 3.245000 ;
-        RECT 18.410000 2.290000 18.580000 3.245000 ;
-        RECT 19.270000 2.290000 19.440000 3.245000 ;
-        RECT 20.130000 2.290000 20.300000 3.245000 ;
-        RECT 20.990000 2.290000 21.160000 3.245000 ;
-        RECT 21.850000 2.290000 22.020000 3.245000 ;
-        RECT 22.710000 2.290000 22.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 ;
-        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 ;
-        RECT 18.395000 3.245000 18.565000 3.415000 ;
-        RECT 18.875000 3.245000 19.045000 3.415000 ;
-        RECT 19.355000 3.245000 19.525000 3.415000 ;
-        RECT 19.835000 3.245000 20.005000 3.415000 ;
-        RECT 20.315000 3.245000 20.485000 3.415000 ;
-        RECT 20.795000 3.245000 20.965000 3.415000 ;
-        RECT 21.275000 3.245000 21.445000 3.415000 ;
-        RECT 21.755000 3.245000 21.925000 3.415000 ;
-        RECT 22.235000 3.245000 22.405000 3.415000 ;
-        RECT 22.715000 3.245000 22.885000 3.415000 ;
-        RECT 23.195000 3.245000 23.365000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 23.520000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.095000 0.255000  0.425000 3.075000 ;
-      RECT  1.420000 0.255000  1.635000 0.860000 ;
-      RECT  1.420000 0.860000  2.550000 1.030000 ;
-      RECT  1.420000 1.030000  1.625000 1.760000 ;
-      RECT  1.420000 1.760000  3.165000 1.930000 ;
-      RECT  1.475000 1.930000  1.805000 3.065000 ;
-      RECT  1.995000 2.100000  3.505000 2.270000 ;
-      RECT  1.995000 2.270000  2.325000 3.075000 ;
-      RECT  2.305000 0.255000  2.550000 0.860000 ;
-      RECT  2.900000 1.345000  3.165000 1.760000 ;
-      RECT  3.185000 0.275000  3.505000 0.605000 ;
-      RECT  3.335000 0.605000  3.505000 0.645000 ;
-      RECT  3.335000 0.645000  5.455000 0.815000 ;
-      RECT  3.335000 0.815000  3.505000 2.100000 ;
-      RECT  3.675000 0.985000  6.015000 1.155000 ;
-      RECT  3.675000 1.155000  3.895000 3.065000 ;
-      RECT  4.485000 1.325000  4.815000 1.815000 ;
-      RECT  4.485000 2.060000  4.715000 2.325000 ;
-      RECT  4.485000 2.325000  6.525000 2.495000 ;
-      RECT  4.485000 2.495000  4.715000 3.070000 ;
-      RECT  5.285000 0.265000  6.695000 0.435000 ;
-      RECT  5.285000 0.435000  5.455000 0.645000 ;
-      RECT  5.660000 0.605000  6.355000 0.815000 ;
-      RECT  5.845000 1.155000  6.015000 1.550000 ;
-      RECT  5.845000 1.550000  6.760000 1.720000 ;
-      RECT  6.185000 0.815000  6.355000 1.200000 ;
-      RECT  6.185000 1.200000  7.230000 1.370000 ;
-      RECT  6.195000 2.085000  7.230000 2.255000 ;
-      RECT  6.195000 2.255000  6.525000 2.325000 ;
-      RECT  6.195000 2.495000  6.525000 3.065000 ;
-      RECT  6.335000 1.720000  6.760000 1.905000 ;
-      RECT  6.525000 0.435000  6.695000 0.850000 ;
-      RECT  6.525000 0.850000  7.565000 1.020000 ;
-      RECT  6.970000 1.370000  7.230000 2.085000 ;
-      RECT  7.395000 0.265000  8.245000 0.435000 ;
-      RECT  7.395000 0.435000  7.565000 0.850000 ;
-      RECT  7.500000 1.815000  7.750000 2.895000 ;
-      RECT  7.500000 2.895000  8.610000 3.065000 ;
-      RECT  7.735000 0.605000  7.905000 0.995000 ;
-      RECT  7.735000 0.995000  9.745000 1.165000 ;
-      RECT  7.735000 1.165000  8.110000 1.225000 ;
-      RECT  7.920000 1.225000  8.110000 2.715000 ;
-      RECT  8.075000 0.435000  8.245000 0.655000 ;
-      RECT  8.075000 0.655000 10.155000 0.825000 ;
-      RECT  8.280000 1.815000  8.610000 2.320000 ;
-      RECT  8.280000 2.320000  9.470000 2.500000 ;
-      RECT  8.280000 2.500000  8.610000 2.895000 ;
-      RECT  9.210000 2.500000  9.470000 3.065000 ;
-      RECT  9.455000 1.165000  9.745000 1.505000 ;
-      RECT  9.985000 0.825000 10.155000 0.995000 ;
-      RECT  9.985000 0.995000 10.315000 1.325000 ;
-      RECT 10.360000 0.265000 10.550000 0.645000 ;
-      RECT 10.360000 0.645000 11.140000 0.815000 ;
-      RECT 10.485000 0.995000 10.800000 1.665000 ;
-      RECT 10.500000 1.845000 11.140000 2.015000 ;
-      RECT 10.500000 2.015000 10.830000 2.725000 ;
-      RECT 10.970000 0.815000 11.140000 0.955000 ;
-      RECT 10.970000 0.955000 12.455000 1.130000 ;
-      RECT 10.970000 1.130000 11.140000 1.845000 ;
-      RECT 11.700000 2.320000 12.980000 2.490000 ;
-      RECT 11.700000 2.490000 12.030000 3.035000 ;
-      RECT 12.285000 1.130000 12.455000 1.275000 ;
-      RECT 12.285000 1.275000 14.030000 1.605000 ;
-      RECT 12.555000 0.295000 12.885000 0.465000 ;
-      RECT 12.650000 2.185000 12.980000 2.320000 ;
-      RECT 12.650000 2.490000 12.980000 2.775000 ;
-      RECT 12.650000 2.775000 13.840000 3.075000 ;
-      RECT 12.680000 0.465000 12.885000 0.925000 ;
-      RECT 12.680000 0.925000 13.905000 1.095000 ;
-      RECT 13.150000 1.785000 14.370000 1.955000 ;
-      RECT 13.150000 1.955000 13.410000 2.605000 ;
-      RECT 13.575000 0.265000 14.790000 0.435000 ;
-      RECT 13.575000 0.435000 13.905000 0.925000 ;
-      RECT 13.590000 2.185000 13.840000 2.775000 ;
-      RECT 14.075000 0.615000 14.370000 1.095000 ;
-      RECT 14.200000 1.095000 14.370000 1.550000 ;
-      RECT 14.200000 1.550000 14.860000 1.780000 ;
-      RECT 14.200000 1.780000 14.370000 1.785000 ;
-      RECT 14.540000 0.435000 14.790000 1.095000 ;
-      RECT 14.960000 1.035000 15.150000 1.410000 ;
-      RECT 15.820000 1.035000 16.010000 1.410000 ;
-      RECT 16.680000 1.035000 16.870000 1.410000 ;
-      RECT 17.540000 1.035000 17.730000 1.410000 ;
-      RECT 18.400000 1.035000 18.590000 1.410000 ;
-      RECT 19.260000 1.345000 19.450000 1.760000 ;
-      RECT 20.120000 1.345000 20.310000 1.760000 ;
-      RECT 20.980000 1.345000 21.170000 1.760000 ;
-      RECT 21.840000 1.345000 22.430000 1.760000 ;
+      RECT  0.000000 -0.085000 23.520000 0.085000 ;
+      RECT  0.000000  3.245000 23.520000 3.415000 ;
+      RECT  0.095000  0.255000  0.425000 3.075000 ;
+      RECT  0.595000  1.200000  0.925000 2.150000 ;
+      RECT  0.625000  2.320000  0.955000 3.245000 ;
+      RECT  0.945000  0.085000  1.250000 1.020000 ;
+      RECT  1.420000  0.255000  1.635000 0.860000 ;
+      RECT  1.420000  0.860000  2.550000 1.030000 ;
+      RECT  1.420000  1.030000  1.625000 1.760000 ;
+      RECT  1.420000  1.760000  3.165000 1.930000 ;
+      RECT  1.475000  1.930000  1.805000 3.065000 ;
+      RECT  1.805000  0.085000  2.135000 0.690000 ;
+      RECT  1.995000  2.100000  3.505000 2.270000 ;
+      RECT  1.995000  2.270000  2.325000 3.075000 ;
+      RECT  2.305000  0.255000  2.550000 0.860000 ;
+      RECT  2.495000  2.440000  3.400000 3.075000 ;
+      RECT  2.720000  0.085000  2.995000 1.040000 ;
+      RECT  2.900000  1.345000  3.165000 1.760000 ;
+      RECT  3.185000  0.275000  3.505000 0.605000 ;
+      RECT  3.335000  0.605000  3.505000 0.645000 ;
+      RECT  3.335000  0.645000  5.455000 0.815000 ;
+      RECT  3.335000  0.815000  3.505000 2.100000 ;
+      RECT  3.675000  0.085000  5.110000 0.475000 ;
+      RECT  3.675000  0.985000  6.015000 1.155000 ;
+      RECT  3.675000  1.155000  3.895000 3.065000 ;
+      RECT  4.065000  1.850000  4.315000 3.045000 ;
+      RECT  4.485000  1.325000  4.815000 1.815000 ;
+      RECT  4.485000  2.060000  4.715000 2.325000 ;
+      RECT  4.485000  2.325000  6.525000 2.495000 ;
+      RECT  4.485000  2.495000  4.715000 3.070000 ;
+      RECT  4.885000  2.665000  5.215000 3.015000 ;
+      RECT  5.270000  1.765000  5.675000 2.155000 ;
+      RECT  5.285000  0.265000  6.695000 0.435000 ;
+      RECT  5.285000  0.435000  5.455000 0.645000 ;
+      RECT  5.405000  2.665000  5.735000 3.245000 ;
+      RECT  5.660000  0.605000  6.355000 0.815000 ;
+      RECT  5.845000  1.155000  6.015000 1.550000 ;
+      RECT  5.845000  1.550000  6.760000 1.720000 ;
+      RECT  6.185000  0.815000  6.355000 1.200000 ;
+      RECT  6.185000  1.200000  7.230000 1.370000 ;
+      RECT  6.195000  2.085000  7.230000 2.255000 ;
+      RECT  6.195000  2.255000  6.525000 2.325000 ;
+      RECT  6.195000  2.495000  6.525000 3.065000 ;
+      RECT  6.335000  1.720000  6.760000 1.905000 ;
+      RECT  6.525000  0.435000  6.695000 0.850000 ;
+      RECT  6.525000  0.850000  7.565000 1.020000 ;
+      RECT  6.705000  2.435000  6.955000 3.245000 ;
+      RECT  6.970000  1.370000  7.230000 2.085000 ;
+      RECT  6.975000  0.085000  7.225000 0.680000 ;
+      RECT  7.395000  0.265000  8.245000 0.435000 ;
+      RECT  7.395000  0.435000  7.565000 0.850000 ;
+      RECT  7.500000  1.815000  7.750000 2.895000 ;
+      RECT  7.500000  2.895000  8.610000 3.065000 ;
+      RECT  7.735000  0.605000  7.905000 0.995000 ;
+      RECT  7.735000  0.995000  9.745000 1.165000 ;
+      RECT  7.735000  1.165000  8.110000 1.225000 ;
+      RECT  7.920000  1.225000  8.110000 2.715000 ;
+      RECT  8.075000  0.435000  8.245000 0.655000 ;
+      RECT  8.075000  0.655000 10.155000 0.825000 ;
+      RECT  8.280000  1.815000  8.610000 2.320000 ;
+      RECT  8.280000  2.320000  9.470000 2.500000 ;
+      RECT  8.280000  2.500000  8.610000 2.895000 ;
+      RECT  8.415000  0.085000  8.785000 0.465000 ;
+      RECT  8.780000  2.670000  9.040000 3.245000 ;
+      RECT  9.210000  2.500000  9.470000 3.065000 ;
+      RECT  9.455000  0.085000 10.190000 0.485000 ;
+      RECT  9.455000  1.165000  9.745000 1.505000 ;
+      RECT  9.710000  1.845000 10.040000 3.245000 ;
+      RECT  9.985000  0.825000 10.155000 0.995000 ;
+      RECT  9.985000  0.995000 10.315000 1.325000 ;
+      RECT 10.360000  0.265000 10.550000 0.645000 ;
+      RECT 10.360000  0.645000 11.140000 0.815000 ;
+      RECT 10.485000  0.995000 10.800000 1.665000 ;
+      RECT 10.500000  1.845000 11.140000 2.015000 ;
+      RECT 10.500000  2.015000 10.830000 2.725000 ;
+      RECT 10.720000  0.085000 11.050000 0.465000 ;
+      RECT 10.970000  0.815000 11.140000 0.955000 ;
+      RECT 10.970000  0.955000 12.455000 1.130000 ;
+      RECT 10.970000  1.130000 11.140000 1.845000 ;
+      RECT 11.270000  2.320000 11.530000 3.245000 ;
+      RECT 11.445000  1.325000 12.115000 1.615000 ;
+      RECT 11.700000  2.320000 12.980000 2.490000 ;
+      RECT 11.700000  2.490000 12.030000 3.035000 ;
+      RECT 11.710000  1.615000 12.055000 2.150000 ;
+      RECT 12.200000  2.735000 12.460000 3.245000 ;
+      RECT 12.285000  1.130000 12.455000 1.275000 ;
+      RECT 12.285000  1.275000 14.030000 1.605000 ;
+      RECT 12.555000  0.295000 12.885000 0.465000 ;
+      RECT 12.650000  2.185000 12.980000 2.320000 ;
+      RECT 12.650000  2.490000 12.980000 2.775000 ;
+      RECT 12.650000  2.775000 13.840000 3.075000 ;
+      RECT 12.680000  0.465000 12.885000 0.925000 ;
+      RECT 12.680000  0.925000 13.905000 1.095000 ;
+      RECT 13.055000  0.085000 13.365000 0.755000 ;
+      RECT 13.150000  1.785000 14.370000 1.955000 ;
+      RECT 13.150000  1.955000 13.410000 2.605000 ;
+      RECT 13.575000  0.265000 14.790000 0.435000 ;
+      RECT 13.575000  0.435000 13.905000 0.925000 ;
+      RECT 13.590000  2.185000 13.840000 2.775000 ;
+      RECT 14.025000  2.135000 14.360000 3.245000 ;
+      RECT 14.075000  0.615000 14.370000 1.095000 ;
+      RECT 14.200000  1.095000 14.370000 1.550000 ;
+      RECT 14.200000  1.550000 14.860000 1.780000 ;
+      RECT 14.200000  1.780000 14.370000 1.785000 ;
+      RECT 14.540000  0.435000 14.790000 1.095000 ;
+      RECT 14.540000  1.950000 15.650000 2.130000 ;
+      RECT 14.540000  2.130000 14.710000 3.065000 ;
+      RECT 14.890000  2.310000 15.140000 3.245000 ;
+      RECT 14.960000  1.035000 15.150000 1.410000 ;
+      RECT 15.320000  0.255000 15.650000 1.950000 ;
+      RECT 15.320000  2.130000 15.650000 3.065000 ;
+      RECT 15.820000  1.035000 16.010000 1.410000 ;
+      RECT 15.830000  0.085000 16.000000 0.865000 ;
+      RECT 15.830000  2.290000 16.000000 3.245000 ;
+      RECT 16.180000  0.255000 16.510000 3.065000 ;
+      RECT 16.680000  1.035000 16.870000 1.410000 ;
+      RECT 16.690000  0.085000 16.860000 0.865000 ;
+      RECT 16.690000  2.290000 16.860000 3.245000 ;
+      RECT 17.040000  0.255000 17.370000 3.065000 ;
+      RECT 17.540000  1.035000 17.730000 1.410000 ;
+      RECT 17.550000  0.085000 17.720000 0.865000 ;
+      RECT 17.550000  2.290000 17.720000 3.245000 ;
+      RECT 17.900000  0.255000 18.230000 3.065000 ;
+      RECT 18.400000  1.035000 18.590000 1.410000 ;
+      RECT 18.410000  0.085000 18.580000 0.865000 ;
+      RECT 18.410000  2.290000 18.580000 3.245000 ;
+      RECT 18.760000  0.255000 19.090000 3.065000 ;
+      RECT 19.260000  1.345000 19.450000 1.760000 ;
+      RECT 19.270000  0.085000 19.440000 0.865000 ;
+      RECT 19.270000  2.290000 19.440000 3.245000 ;
+      RECT 19.620000  0.255000 19.950000 3.065000 ;
+      RECT 20.120000  1.345000 20.310000 1.760000 ;
+      RECT 20.130000  0.085000 20.300000 0.865000 ;
+      RECT 20.130000  2.290000 20.300000 3.245000 ;
+      RECT 20.480000  0.260000 20.810000 3.065000 ;
+      RECT 20.980000  1.345000 21.170000 1.760000 ;
+      RECT 20.990000  0.085000 21.160000 0.865000 ;
+      RECT 20.990000  2.290000 21.160000 3.245000 ;
+      RECT 21.340000  0.255000 21.670000 3.065000 ;
+      RECT 21.840000  1.345000 22.430000 1.760000 ;
+      RECT 21.850000  2.290000 22.020000 3.245000 ;
+      RECT 22.200000  1.940000 22.530000 3.065000 ;
+      RECT 22.710000  2.290000 22.960000 3.245000 ;
     LAYER mcon ;
-      RECT  0.155000 1.580000  0.325000 1.750000 ;
-      RECT  4.565000 1.580000  4.735000 1.750000 ;
-      RECT  6.395000 1.580000  6.565000 1.750000 ;
-      RECT  9.515000 1.210000  9.685000 1.380000 ;
-      RECT 10.485000 1.210000 10.655000 1.380000 ;
-      RECT 14.595000 1.580000 14.765000 1.750000 ;
-      RECT 14.980000 1.210000 15.150000 1.380000 ;
-      RECT 15.840000 1.210000 16.010000 1.380000 ;
-      RECT 16.700000 1.210000 16.870000 1.380000 ;
-      RECT 17.560000 1.210000 17.730000 1.380000 ;
-      RECT 18.420000 1.210000 18.590000 1.380000 ;
-      RECT 19.260000 1.580000 19.430000 1.750000 ;
-      RECT 20.120000 1.580000 20.290000 1.750000 ;
-      RECT 20.980000 1.580000 21.150000 1.750000 ;
-      RECT 21.840000 1.580000 22.010000 1.750000 ;
-      RECT 22.200000 1.580000 22.370000 1.750000 ;
+      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  0.685000  1.950000  0.855000 2.120000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.500000  2.715000  2.670000 2.885000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  2.860000  2.715000  3.030000 2.885000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  3.245000  3.205000 3.415000 ;
+      RECT  3.220000  2.715000  3.390000 2.885000 ;
+      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.105000  2.715000  4.275000 2.885000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.565000  1.580000  4.735000 1.750000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  2.715000  5.125000 2.885000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.415000  1.950000  5.585000 2.120000 ;
+      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 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.515000  1.210000  9.685000 1.380000 ;
+      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.485000  1.210000 10.655000 1.380000 ;
+      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 11.780000  1.950000 11.950000 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 ;
+      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 14.595000  1.580000 14.765000 1.750000 ;
+      RECT 14.980000  1.210000 15.150000 1.380000 ;
+      RECT 15.035000 -0.085000 15.205000 0.085000 ;
+      RECT 15.035000  3.245000 15.205000 3.415000 ;
+      RECT 15.400000  1.950000 15.570000 2.120000 ;
+      RECT 15.515000 -0.085000 15.685000 0.085000 ;
+      RECT 15.515000  3.245000 15.685000 3.415000 ;
+      RECT 15.840000  1.210000 16.010000 1.380000 ;
+      RECT 15.995000 -0.085000 16.165000 0.085000 ;
+      RECT 15.995000  3.245000 16.165000 3.415000 ;
+      RECT 16.260000  1.950000 16.430000 2.120000 ;
+      RECT 16.475000 -0.085000 16.645000 0.085000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
+      RECT 16.700000  1.210000 16.870000 1.380000 ;
+      RECT 16.955000 -0.085000 17.125000 0.085000 ;
+      RECT 16.955000  3.245000 17.125000 3.415000 ;
+      RECT 17.120000  1.950000 17.290000 2.120000 ;
+      RECT 17.435000 -0.085000 17.605000 0.085000 ;
+      RECT 17.435000  3.245000 17.605000 3.415000 ;
+      RECT 17.560000  1.210000 17.730000 1.380000 ;
+      RECT 17.915000 -0.085000 18.085000 0.085000 ;
+      RECT 17.915000  3.245000 18.085000 3.415000 ;
+      RECT 17.980000  1.950000 18.150000 2.120000 ;
+      RECT 18.395000 -0.085000 18.565000 0.085000 ;
+      RECT 18.395000  3.245000 18.565000 3.415000 ;
+      RECT 18.420000  1.210000 18.590000 1.380000 ;
+      RECT 18.840000  1.950000 19.010000 2.120000 ;
+      RECT 18.875000 -0.085000 19.045000 0.085000 ;
+      RECT 18.875000  3.245000 19.045000 3.415000 ;
+      RECT 19.260000  1.580000 19.430000 1.750000 ;
+      RECT 19.355000 -0.085000 19.525000 0.085000 ;
+      RECT 19.355000  3.245000 19.525000 3.415000 ;
+      RECT 19.700000  1.950000 19.870000 2.120000 ;
+      RECT 19.835000 -0.085000 20.005000 0.085000 ;
+      RECT 19.835000  3.245000 20.005000 3.415000 ;
+      RECT 20.120000  1.580000 20.290000 1.750000 ;
+      RECT 20.315000 -0.085000 20.485000 0.085000 ;
+      RECT 20.315000  3.245000 20.485000 3.415000 ;
+      RECT 20.560000  1.950000 20.730000 2.120000 ;
+      RECT 20.795000 -0.085000 20.965000 0.085000 ;
+      RECT 20.795000  3.245000 20.965000 3.415000 ;
+      RECT 20.980000  1.580000 21.150000 1.750000 ;
+      RECT 21.275000 -0.085000 21.445000 0.085000 ;
+      RECT 21.275000  3.245000 21.445000 3.415000 ;
+      RECT 21.420000  1.950000 21.590000 2.120000 ;
+      RECT 21.755000 -0.085000 21.925000 0.085000 ;
+      RECT 21.755000  3.245000 21.925000 3.415000 ;
+      RECT 21.840000  1.580000 22.010000 1.750000 ;
+      RECT 22.200000  1.580000 22.370000 1.750000 ;
+      RECT 22.235000 -0.085000 22.405000 0.085000 ;
+      RECT 22.235000  3.245000 22.405000 3.415000 ;
+      RECT 22.280000  1.950000 22.450000 2.120000 ;
+      RECT 22.715000 -0.085000 22.885000 0.085000 ;
+      RECT 22.715000  3.245000 22.885000 3.415000 ;
+      RECT 23.195000 -0.085000 23.365000 0.085000 ;
+      RECT 23.195000  3.245000 23.365000 3.415000 ;
     LAYER met1 ;
       RECT  0.095000 1.550000  0.385000 1.595000 ;
       RECT  0.095000 1.595000  4.795000 1.735000 ;
diff --git a/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef b/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef
index 2d0b452..78a8751 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef
+++ b/cells/bushold/sky130_fd_sc_lp__bushold_1.magic.lef
@@ -56,16 +56,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.335000  0.085000 0.625000 0.545000 ;
-        RECT 1.225000  0.085000 1.525000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -74,25 +64,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.195000 2.720000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.715000 1.855000 0.965000 ;
-      RECT 0.085000 0.965000 0.315000 2.720000 ;
-      RECT 0.085000 2.720000 0.735000 3.050000 ;
-      RECT 0.795000 0.265000 1.055000 0.715000 ;
-      RECT 1.605000 0.965000 1.855000 2.195000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.085000  0.715000 1.855000 0.965000 ;
+      RECT 0.085000  0.965000 0.315000 2.720000 ;
+      RECT 0.085000  2.720000 0.735000 3.050000 ;
+      RECT 0.335000  0.085000 0.625000 0.545000 ;
+      RECT 0.795000  0.265000 1.055000 0.715000 ;
+      RECT 1.195000  2.720000 1.525000 3.245000 ;
+      RECT 1.225000  0.085000 1.525000 0.545000 ;
+      RECT 1.605000  0.965000 1.855000 2.195000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__bushold_1
diff --git a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef
index b5f7ef9..309519a 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.magic.lef
@@ -58,16 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.795000  0.085000 1.055000 0.610000 ;
-        RECT 1.975000  0.085000 2.305000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -76,26 +66,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.835000 2.720000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.055000 0.625000 1.185000 ;
-      RECT 0.085000 1.185000 1.855000 1.355000 ;
-      RECT 0.085000 1.355000 0.315000 2.720000 ;
-      RECT 0.085000 2.720000 0.425000 3.050000 ;
-      RECT 0.335000 0.255000 0.625000 1.055000 ;
-      RECT 1.605000 1.355000 1.855000 2.195000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.085000  1.055000 0.625000 1.185000 ;
+      RECT 0.085000  1.185000 1.855000 1.355000 ;
+      RECT 0.085000  1.355000 0.315000 2.720000 ;
+      RECT 0.085000  2.720000 0.425000 3.050000 ;
+      RECT 0.335000  0.255000 0.625000 1.055000 ;
+      RECT 0.795000  0.085000 1.055000 0.610000 ;
+      RECT 0.835000  2.720000 1.165000 3.245000 ;
+      RECT 1.605000  1.355000 1.855000 2.195000 ;
+      RECT 1.975000  0.085000 2.305000 0.610000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__bushold0_1
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef
index 2ae856d..c688cf6 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.magic.lef
@@ -55,13 +55,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.560000  0.085000 0.890000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -70,24 +63,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.570000 2.395000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.785000 1.345000 0.970000 ;
-      RECT 0.430000 0.970000 0.680000 1.455000 ;
-      RECT 0.510000 1.455000 0.680000 2.055000 ;
-      RECT 0.510000 2.055000 1.345000 2.225000 ;
-      RECT 0.995000 2.225000 1.345000 3.075000 ;
-      RECT 1.060000 0.300000 1.345000 0.785000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.430000  0.785000 1.345000 0.970000 ;
+      RECT 0.430000  0.970000 0.680000 1.455000 ;
+      RECT 0.510000  1.455000 0.680000 2.055000 ;
+      RECT 0.510000  2.055000 1.345000 2.225000 ;
+      RECT 0.560000  0.085000 0.890000 0.615000 ;
+      RECT 0.570000  2.395000 0.825000 3.245000 ;
+      RECT 0.995000  2.225000 1.345000 3.075000 ;
+      RECT 1.060000  0.300000 1.345000 0.785000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__busreceiver_0
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef
index 9e3f97b..ae9d209 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -69,25 +62,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.525000 1.945000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 1.185000 0.695000 1.605000 ;
-      RECT 0.430000 1.605000 1.345000 1.705000 ;
-      RECT 0.505000 1.705000 1.345000 1.775000 ;
-      RECT 0.525000 0.850000 1.345000 1.020000 ;
-      RECT 0.525000 1.020000 0.695000 1.185000 ;
-      RECT 1.025000 0.690000 1.345000 0.850000 ;
-      RECT 1.025000 1.775000 1.345000 2.485000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.430000  1.185000 0.695000 1.605000 ;
+      RECT 0.430000  1.605000 1.345000 1.705000 ;
+      RECT 0.505000  1.705000 1.345000 1.775000 ;
+      RECT 0.525000  0.085000 0.855000 0.680000 ;
+      RECT 0.525000  0.850000 1.345000 1.020000 ;
+      RECT 0.525000  1.020000 0.695000 1.185000 ;
+      RECT 0.525000  1.945000 0.855000 3.245000 ;
+      RECT 1.025000  0.690000 1.345000 0.850000 ;
+      RECT 1.025000  1.775000 1.345000 2.485000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__busreceiver_1
diff --git a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
index 89d3d4a..8928bd7 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.magic.lef
@@ -50,13 +50,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.585000  0.085000 0.795000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -65,22 +58,26 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.585000 2.760000 0.795000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 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.545000 1.930000 1.225000 2.100000 ;
-      RECT 1.015000 0.330000 1.225000 0.660000 ;
-      RECT 1.015000 2.100000 1.225000 2.960000 ;
-      RECT 1.055000 0.660000 1.225000 1.930000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.545000  1.930000 1.225000 2.100000 ;
+      RECT 0.585000  0.085000 0.795000 0.660000 ;
+      RECT 0.585000  2.760000 0.795000 3.245000 ;
+      RECT 1.015000  0.330000 1.225000 0.660000 ;
+      RECT 1.015000  2.100000 1.225000 2.960000 ;
+      RECT 1.055000  0.660000 1.225000 1.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 ;
   END
 END sky130_fd_sc_lp__busreceiver_m
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef
index e791153..2baf48d 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.magic.lef
@@ -55,13 +55,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.560000  0.085000 0.890000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -70,24 +63,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.570000 2.395000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.785000 1.345000 0.970000 ;
-      RECT 0.430000 0.970000 0.680000 1.455000 ;
-      RECT 0.510000 1.455000 0.680000 2.055000 ;
-      RECT 0.510000 2.055000 1.285000 2.225000 ;
-      RECT 0.995000 2.225000 1.285000 3.075000 ;
-      RECT 1.060000 0.300000 1.345000 0.785000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.430000  0.785000 1.345000 0.970000 ;
+      RECT 0.430000  0.970000 0.680000 1.455000 ;
+      RECT 0.510000  1.455000 0.680000 2.055000 ;
+      RECT 0.510000  2.055000 1.285000 2.225000 ;
+      RECT 0.560000  0.085000 0.890000 0.615000 ;
+      RECT 0.570000  2.395000 0.825000 3.245000 ;
+      RECT 0.995000  2.225000 1.285000 3.075000 ;
+      RECT 1.060000  0.300000 1.345000 0.785000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__clkbuf_0
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef
index d805c01..19e00d7 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.600000  0.085000 0.875000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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,22 +62,26 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.565000 1.920000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.440000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 0.805000 1.355000 1.135000 ;
-      RECT 0.995000 1.920000 1.355000 3.075000 ;
-      RECT 1.045000 0.300000 1.355000 0.805000 ;
-      RECT 1.185000 1.135000 1.355000 1.920000 ;
+      RECT 0.000000 -0.085000 1.440000 0.085000 ;
+      RECT 0.000000  3.245000 1.440000 3.415000 ;
+      RECT 0.425000  0.805000 1.355000 1.135000 ;
+      RECT 0.565000  1.920000 0.825000 3.245000 ;
+      RECT 0.600000  0.085000 0.875000 0.635000 ;
+      RECT 0.995000  1.920000 1.355000 3.075000 ;
+      RECT 1.045000  0.300000 1.355000 0.805000 ;
+      RECT 1.185000  1.135000 1.355000 1.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 ;
   END
 END sky130_fd_sc_lp__clkbuf_1
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef
index e65f84c..7bc0259 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.magic.lef
@@ -44,24 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 2.720000 0.275000 2.935000 3.055000 ;
-        RECT 3.585000 0.275000 3.795000 3.055000 ;
-        RECT 4.445000 0.275000 4.655000 3.055000 ;
-        RECT 5.305000 0.275000 5.515000 3.055000 ;
-        RECT 6.165000 0.275000 6.375000 3.055000 ;
-        RECT 7.020000 0.275000 7.235000 3.055000 ;
-        RECT 7.885000 0.275000 8.095000 3.055000 ;
-        RECT 8.745000 0.275000 8.955000 3.055000 ;
-      LAYER mcon ;
-        RECT 2.745000 1.950000 2.915000 2.120000 ;
-        RECT 3.605000 1.950000 3.775000 2.120000 ;
-        RECT 4.465000 1.950000 4.635000 2.120000 ;
-        RECT 5.325000 1.950000 5.495000 2.120000 ;
-        RECT 6.185000 1.950000 6.355000 2.120000 ;
-        RECT 7.045000 1.950000 7.215000 2.120000 ;
-        RECT 7.905000 1.950000 8.075000 2.120000 ;
-        RECT 8.765000 1.950000 8.935000 2.120000 ;
       LAYER met1 ;
         RECT 2.685000 1.920000 9.035000 2.150000 ;
     END
@@ -70,40 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.125000  0.085000 0.420000 0.610000 ;
-        RECT 1.010000  0.085000 1.290000 0.605000 ;
-        RECT 1.875000  0.085000 2.550000 0.605000 ;
-        RECT 3.105000  0.085000 3.415000 0.605000 ;
-        RECT 3.965000  0.085000 4.275000 0.605000 ;
-        RECT 4.825000  0.085000 5.135000 0.605000 ;
-        RECT 5.685000  0.085000 5.995000 0.605000 ;
-        RECT 6.545000  0.085000 6.850000 0.605000 ;
-        RECT 7.405000  0.085000 7.715000 0.605000 ;
-        RECT 8.265000  0.085000 8.575000 0.605000 ;
-        RECT 9.125000  0.085000 9.445000 0.605000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -112,71 +60,117 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.125000 1.875000 0.420000 3.245000 ;
-        RECT 1.025000 2.025000 1.290000 3.245000 ;
-        RECT 1.880000 2.025000 2.550000 3.245000 ;
-        RECT 3.105000 1.875000 3.415000 3.245000 ;
-        RECT 3.965000 1.875000 4.275000 3.245000 ;
-        RECT 4.825000 1.875000 5.135000 3.245000 ;
-        RECT 5.685000 1.875000 5.995000 3.245000 ;
-        RECT 6.545000 1.875000 6.850000 3.245000 ;
-        RECT 7.405000 1.875000 7.715000 3.245000 ;
-        RECT 8.265000 1.875000 8.575000 3.245000 ;
-        RECT 9.125000 1.875000 9.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.600000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.590000 0.280000 0.840000 0.775000 ;
-      RECT 0.590000 0.775000 2.550000 0.945000 ;
-      RECT 0.590000 1.685000 2.200000 1.855000 ;
-      RECT 0.590000 1.855000 0.855000 3.075000 ;
-      RECT 1.460000 0.280000 1.705000 0.775000 ;
-      RECT 1.460000 1.855000 1.710000 3.075000 ;
-      RECT 1.985000 0.945000 2.550000 1.535000 ;
-      RECT 1.985000 1.535000 2.200000 1.685000 ;
-      RECT 3.105000 1.205000 3.415000 1.535000 ;
-      RECT 3.965000 1.205000 4.275000 1.535000 ;
-      RECT 4.825000 1.205000 5.135000 1.535000 ;
-      RECT 5.685000 1.205000 5.995000 1.535000 ;
-      RECT 6.545000 1.205000 6.850000 1.535000 ;
-      RECT 7.405000 1.205000 7.715000 1.535000 ;
-      RECT 8.265000 1.205000 8.575000 1.535000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.125000  0.085000 0.420000 0.610000 ;
+      RECT 0.125000  1.875000 0.420000 3.245000 ;
+      RECT 0.590000  0.280000 0.840000 0.775000 ;
+      RECT 0.590000  0.775000 2.550000 0.945000 ;
+      RECT 0.590000  1.685000 2.200000 1.855000 ;
+      RECT 0.590000  1.855000 0.855000 3.075000 ;
+      RECT 1.010000  0.085000 1.290000 0.605000 ;
+      RECT 1.025000  2.025000 1.290000 3.245000 ;
+      RECT 1.460000  0.280000 1.705000 0.775000 ;
+      RECT 1.460000  1.855000 1.710000 3.075000 ;
+      RECT 1.875000  0.085000 2.550000 0.605000 ;
+      RECT 1.880000  2.025000 2.550000 3.245000 ;
+      RECT 1.985000  0.945000 2.550000 1.535000 ;
+      RECT 1.985000  1.535000 2.200000 1.685000 ;
+      RECT 2.720000  0.275000 2.935000 3.055000 ;
+      RECT 3.105000  0.085000 3.415000 0.605000 ;
+      RECT 3.105000  1.205000 3.415000 1.535000 ;
+      RECT 3.105000  1.875000 3.415000 3.245000 ;
+      RECT 3.585000  0.275000 3.795000 3.055000 ;
+      RECT 3.965000  0.085000 4.275000 0.605000 ;
+      RECT 3.965000  1.205000 4.275000 1.535000 ;
+      RECT 3.965000  1.875000 4.275000 3.245000 ;
+      RECT 4.445000  0.275000 4.655000 3.055000 ;
+      RECT 4.825000  0.085000 5.135000 0.605000 ;
+      RECT 4.825000  1.205000 5.135000 1.535000 ;
+      RECT 4.825000  1.875000 5.135000 3.245000 ;
+      RECT 5.305000  0.275000 5.515000 3.055000 ;
+      RECT 5.685000  0.085000 5.995000 0.605000 ;
+      RECT 5.685000  1.205000 5.995000 1.535000 ;
+      RECT 5.685000  1.875000 5.995000 3.245000 ;
+      RECT 6.165000  0.275000 6.375000 3.055000 ;
+      RECT 6.545000  0.085000 6.850000 0.605000 ;
+      RECT 6.545000  1.205000 6.850000 1.535000 ;
+      RECT 6.545000  1.875000 6.850000 3.245000 ;
+      RECT 7.020000  0.275000 7.235000 3.055000 ;
+      RECT 7.405000  0.085000 7.715000 0.605000 ;
+      RECT 7.405000  1.205000 7.715000 1.535000 ;
+      RECT 7.405000  1.875000 7.715000 3.245000 ;
+      RECT 7.885000  0.275000 8.095000 3.055000 ;
+      RECT 8.265000  0.085000 8.575000 0.605000 ;
+      RECT 8.265000  1.205000 8.575000 1.535000 ;
+      RECT 8.265000  1.875000 8.575000 3.245000 ;
+      RECT 8.745000  0.275000 8.955000 3.055000 ;
+      RECT 9.125000  0.085000 9.445000 0.605000 ;
+      RECT 9.125000  1.875000 9.445000 3.245000 ;
     LAYER mcon ;
-      RECT 2.020000 1.210000 2.190000 1.380000 ;
-      RECT 2.380000 1.210000 2.550000 1.380000 ;
-      RECT 3.180000 1.210000 3.350000 1.380000 ;
-      RECT 4.040000 1.210000 4.210000 1.380000 ;
-      RECT 4.900000 1.210000 5.070000 1.380000 ;
-      RECT 5.760000 1.210000 5.930000 1.380000 ;
-      RECT 6.615000 1.210000 6.785000 1.380000 ;
-      RECT 7.480000 1.210000 7.650000 1.380000 ;
-      RECT 8.340000 1.210000 8.510000 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.020000  1.210000 2.190000 1.380000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.380000  1.210000 2.550000 1.380000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.745000  1.950000 2.915000 2.120000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.180000  1.210000 3.350000 1.380000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.605000  1.950000 3.775000 2.120000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.040000  1.210000 4.210000 1.380000 ;
+      RECT 4.465000  1.950000 4.635000 2.120000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.900000  1.210000 5.070000 1.380000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.325000  1.950000 5.495000 2.120000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.760000  1.210000 5.930000 1.380000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 6.185000  1.950000 6.355000 2.120000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.615000  1.210000 6.785000 1.380000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  3.245000 7.045000 3.415000 ;
+      RECT 7.045000  1.950000 7.215000 2.120000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+      RECT 7.355000  3.245000 7.525000 3.415000 ;
+      RECT 7.480000  1.210000 7.650000 1.380000 ;
+      RECT 7.835000 -0.085000 8.005000 0.085000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 7.905000  1.950000 8.075000 2.120000 ;
+      RECT 8.315000 -0.085000 8.485000 0.085000 ;
+      RECT 8.315000  3.245000 8.485000 3.415000 ;
+      RECT 8.340000  1.210000 8.510000 1.380000 ;
+      RECT 8.765000  1.950000 8.935000 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.960000 1.180000 8.610000 1.410000 ;
   END
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef
index 229a796..d1c3ed4 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.magic.lef
@@ -56,15 +56,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.555000  0.085000 0.830000 0.605000 ;
-        RECT 1.475000  0.085000 1.730000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -73,24 +64,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.565000 1.875000 0.875000 3.245000 ;
-        RECT 1.475000 2.065000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.265000 0.385000 0.605000 ;
-      RECT 0.085000 0.605000 0.255000 1.275000 ;
-      RECT 0.085000 1.275000 1.215000 1.535000 ;
-      RECT 0.085000 1.535000 0.395000 3.045000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.085000  0.265000 0.385000 0.605000 ;
+      RECT 0.085000  0.605000 0.255000 1.275000 ;
+      RECT 0.085000  1.275000 1.215000 1.535000 ;
+      RECT 0.085000  1.535000 0.395000 3.045000 ;
+      RECT 0.555000  0.085000 0.830000 0.605000 ;
+      RECT 0.565000  1.875000 0.875000 3.245000 ;
+      RECT 1.475000  0.085000 1.730000 0.610000 ;
+      RECT 1.475000  2.065000 1.730000 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_lp__clkbuf_2
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.magic.lef
index 3818600..fb215e4 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__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.555000  0.085000 0.830000 0.605000 ;
-        RECT 1.475000  0.085000 1.730000 0.605000 ;
-        RECT 2.335000  0.085000 2.615000 0.605000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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.565000 1.875000 0.875000 3.245000 ;
-        RECT 1.475000 2.065000 1.730000 3.245000 ;
-        RECT 2.335000 2.065000 2.620000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.085000 0.275000 0.385000 0.605000 ;
-      RECT 0.085000 0.605000 0.255000 1.275000 ;
-      RECT 0.085000 1.275000 2.085000 1.535000 ;
-      RECT 0.085000 1.535000 0.395000 3.060000 ;
-      RECT 1.075000 1.205000 2.085000 1.275000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.085000  0.275000 0.385000 0.605000 ;
+      RECT 0.085000  0.605000 0.255000 1.275000 ;
+      RECT 0.085000  1.275000 2.085000 1.535000 ;
+      RECT 0.085000  1.535000 0.395000 3.060000 ;
+      RECT 0.555000  0.085000 0.830000 0.605000 ;
+      RECT 0.565000  1.875000 0.875000 3.245000 ;
+      RECT 1.075000  1.205000 2.085000 1.275000 ;
+      RECT 1.475000  0.085000 1.730000 0.605000 ;
+      RECT 1.475000  2.065000 1.730000 3.245000 ;
+      RECT 2.335000  0.085000 2.615000 0.605000 ;
+      RECT 2.335000  2.065000 2.620000 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_lp__clkbuf_4
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef
index c42495d..4ed06b7 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.magic.lef
@@ -62,26 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.145000  0.085000 0.390000 0.610000 ;
-        RECT 0.990000  0.085000 1.250000 0.610000 ;
-        RECT 1.850000  0.085000 2.110000 0.565000 ;
-        RECT 2.710000  0.085000 2.970000 0.565000 ;
-        RECT 3.570000  0.085000 3.830000 0.565000 ;
-        RECT 4.430000  0.085000 4.730000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -90,34 +70,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.095000 1.875000 0.390000 3.245000 ;
-        RECT 0.990000 1.875000 1.250000 3.245000 ;
-        RECT 1.850000 2.065000 2.110000 3.245000 ;
-        RECT 2.710000 2.065000 2.970000 3.245000 ;
-        RECT 3.570000 2.065000 3.830000 3.245000 ;
-        RECT 4.430000 2.065000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 0.265000 0.820000 1.155000 ;
-      RECT 0.570000 1.155000 3.590000 1.485000 ;
-      RECT 0.570000 1.485000 0.820000 3.075000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  1.875000 0.390000 3.245000 ;
+      RECT 0.145000  0.085000 0.390000 0.610000 ;
+      RECT 0.570000  0.265000 0.820000 1.155000 ;
+      RECT 0.570000  1.155000 3.590000 1.485000 ;
+      RECT 0.570000  1.485000 0.820000 3.075000 ;
+      RECT 0.990000  0.085000 1.250000 0.610000 ;
+      RECT 0.990000  1.875000 1.250000 3.245000 ;
+      RECT 1.850000  0.085000 2.110000 0.565000 ;
+      RECT 1.850000  2.065000 2.110000 3.245000 ;
+      RECT 2.710000  0.085000 2.970000 0.565000 ;
+      RECT 2.710000  2.065000 2.970000 3.245000 ;
+      RECT 3.570000  0.085000 3.830000 0.565000 ;
+      RECT 3.570000  2.065000 3.830000 3.245000 ;
+      RECT 4.430000  0.085000 4.730000 0.565000 ;
+      RECT 4.430000  2.065000 4.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 ;
   END
 END sky130_fd_sc_lp__clkbuf_8
diff --git a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef
index c4c9274..db9c2a9 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.magic.lef
@@ -54,15 +54,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.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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,24 +62,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.760000 2.015000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.740000 1.165000 1.070000 1.665000 ;
-      RECT 0.740000 1.665000 2.225000 1.835000 ;
-      RECT 1.535000 1.835000 1.865000 3.055000 ;
-      RECT 1.975000 0.265000 2.225000 1.665000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.740000  1.165000 1.070000 1.665000 ;
+      RECT 0.740000  1.665000 2.225000 1.835000 ;
+      RECT 0.760000  2.015000 1.090000 3.245000 ;
+      RECT 0.955000  0.085000 1.285000 0.725000 ;
+      RECT 1.535000  1.835000 1.865000 3.055000 ;
+      RECT 1.975000  0.265000 2.225000 1.665000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__clkbuf_lp
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef
index 1e45798..1f9d93d 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.magic.lef
@@ -45,35 +45,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.805000 1.705000  4.395000 1.875000 ;
-        RECT  3.805000 1.875000  4.135000 3.075000 ;
-        RECT  4.065000 0.265000  4.395000 1.035000 ;
-        RECT  4.080000 1.035000  4.395000 1.705000 ;
-        RECT  4.865000 1.920000  5.195000 3.075000 ;
-        RECT  5.645000 0.265000  5.975000 1.170000 ;
-        RECT  5.645000 1.170000  6.255000 1.790000 ;
-        RECT  5.925000 1.790000  6.255000 3.075000 ;
-        RECT  6.985000 1.170000  7.555000 1.790000 ;
-        RECT  6.985000 1.790000  7.315000 3.075000 ;
-        RECT  7.225000 0.265000  7.555000 1.170000 ;
-        RECT  8.045000 1.920000  8.375000 3.075000 ;
-        RECT  8.805000 0.265000  9.135000 1.170000 ;
-        RECT  8.805000 1.170000  9.435000 1.790000 ;
-        RECT  9.105000 1.790000  9.435000 3.075000 ;
-        RECT 10.165000 1.170000 10.715000 1.790000 ;
-        RECT 10.165000 1.790000 10.495000 3.075000 ;
-        RECT 10.385000 0.265000 10.715000 1.170000 ;
-        RECT 11.225000 1.920000 11.555000 3.075000 ;
-      LAYER mcon ;
-        RECT  3.885000 1.950000  4.055000 2.120000 ;
-        RECT  4.955000 1.950000  5.125000 2.120000 ;
-        RECT  6.005000 1.950000  6.175000 2.120000 ;
-        RECT  7.070000 1.950000  7.240000 2.120000 ;
-        RECT  8.130000 1.950000  8.300000 2.120000 ;
-        RECT  9.190000 1.950000  9.360000 2.120000 ;
-        RECT 10.235000 1.950000 10.405000 2.120000 ;
-        RECT 11.305000 1.950000 11.475000 2.120000 ;
       LAYER met1 ;
         RECT 3.805000 1.920000 11.555000 2.150000 ;
     END
@@ -82,43 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.480000 0.085000 ;
-        RECT  0.125000  0.085000  0.425000 0.605000 ;
-        RECT  1.675000  0.085000  2.005000 0.605000 ;
-        RECT  3.255000  0.085000  3.585000 0.605000 ;
-        RECT  4.855000  0.085000  5.185000 0.605000 ;
-        RECT  6.435000  0.085000  6.765000 0.605000 ;
-        RECT  8.015000  0.085000  8.345000 0.605000 ;
-        RECT  9.595000  0.085000  9.925000 0.605000 ;
-        RECT 11.175000  0.085000 11.505000 0.605000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -127,76 +61,136 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.480000 3.415000 ;
-        RECT  0.095000 2.065000  0.425000 3.245000 ;
-        RECT  1.225000 2.065000  1.485000 3.245000 ;
-        RECT  2.215000 2.085000  2.545000 3.245000 ;
-        RECT  3.275000 2.085000  3.605000 3.245000 ;
-        RECT  4.335000 2.085000  4.665000 3.245000 ;
-        RECT  5.395000 2.085000  5.725000 3.245000 ;
-        RECT  6.455000 2.085000  6.785000 3.245000 ;
-        RECT  7.515000 2.085000  7.845000 3.245000 ;
-        RECT  8.575000 2.085000  8.905000 3.245000 ;
-        RECT  9.635000 2.085000  9.965000 3.245000 ;
-        RECT 10.695000 2.085000 11.025000 3.245000 ;
-        RECT 11.755000 2.085000 12.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 ;
-        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.595000 2.015000  1.055000 3.075000 ;
-      RECT  0.885000 0.265000  1.230000 1.205000 ;
-      RECT  0.885000 1.205000  3.910000 1.535000 ;
-      RECT  0.885000 1.535000  1.055000 2.015000 ;
-      RECT  1.685000 1.535000  2.015000 3.075000 ;
-      RECT  2.450000 0.265000  2.795000 1.180000 ;
-      RECT  2.450000 1.180000  3.910000 1.205000 ;
-      RECT  2.745000 1.535000  3.075000 3.075000 ;
-      RECT  4.585000 1.180000  5.390000 1.510000 ;
-      RECT  6.470000 1.180000  6.800000 1.510000 ;
-      RECT  7.750000 1.180000  8.555000 1.510000 ;
-      RECT  9.650000 1.180000  9.980000 1.510000 ;
-      RECT 10.910000 1.180000 11.920000 1.510000 ;
+      RECT  0.000000 -0.085000 12.480000 0.085000 ;
+      RECT  0.000000  3.245000 12.480000 3.415000 ;
+      RECT  0.095000  2.065000  0.425000 3.245000 ;
+      RECT  0.125000  0.085000  0.425000 0.605000 ;
+      RECT  0.595000  2.015000  1.055000 3.075000 ;
+      RECT  0.885000  0.265000  1.230000 1.205000 ;
+      RECT  0.885000  1.205000  3.910000 1.535000 ;
+      RECT  0.885000  1.535000  1.055000 2.015000 ;
+      RECT  1.225000  2.065000  1.485000 3.245000 ;
+      RECT  1.675000  0.085000  2.005000 0.605000 ;
+      RECT  1.685000  1.535000  2.015000 3.075000 ;
+      RECT  2.215000  2.085000  2.545000 3.245000 ;
+      RECT  2.450000  0.265000  2.795000 1.180000 ;
+      RECT  2.450000  1.180000  3.910000 1.205000 ;
+      RECT  2.745000  1.535000  3.075000 3.075000 ;
+      RECT  3.255000  0.085000  3.585000 0.605000 ;
+      RECT  3.275000  2.085000  3.605000 3.245000 ;
+      RECT  3.805000  1.705000  4.395000 1.875000 ;
+      RECT  3.805000  1.875000  4.135000 3.075000 ;
+      RECT  4.065000  0.265000  4.395000 1.035000 ;
+      RECT  4.080000  1.035000  4.395000 1.705000 ;
+      RECT  4.335000  2.085000  4.665000 3.245000 ;
+      RECT  4.585000  1.180000  5.390000 1.510000 ;
+      RECT  4.855000  0.085000  5.185000 0.605000 ;
+      RECT  4.865000  1.920000  5.195000 3.075000 ;
+      RECT  5.395000  2.085000  5.725000 3.245000 ;
+      RECT  5.645000  0.265000  5.975000 1.170000 ;
+      RECT  5.645000  1.170000  6.255000 1.790000 ;
+      RECT  5.925000  1.790000  6.255000 3.075000 ;
+      RECT  6.435000  0.085000  6.765000 0.605000 ;
+      RECT  6.455000  2.085000  6.785000 3.245000 ;
+      RECT  6.470000  1.180000  6.800000 1.510000 ;
+      RECT  6.985000  1.170000  7.555000 1.790000 ;
+      RECT  6.985000  1.790000  7.315000 3.075000 ;
+      RECT  7.225000  0.265000  7.555000 1.170000 ;
+      RECT  7.515000  2.085000  7.845000 3.245000 ;
+      RECT  7.750000  1.180000  8.555000 1.510000 ;
+      RECT  8.015000  0.085000  8.345000 0.605000 ;
+      RECT  8.045000  1.920000  8.375000 3.075000 ;
+      RECT  8.575000  2.085000  8.905000 3.245000 ;
+      RECT  8.805000  0.265000  9.135000 1.170000 ;
+      RECT  8.805000  1.170000  9.435000 1.790000 ;
+      RECT  9.105000  1.790000  9.435000 3.075000 ;
+      RECT  9.595000  0.085000  9.925000 0.605000 ;
+      RECT  9.635000  2.085000  9.965000 3.245000 ;
+      RECT  9.650000  1.180000  9.980000 1.510000 ;
+      RECT 10.165000  1.170000 10.715000 1.790000 ;
+      RECT 10.165000  1.790000 10.495000 3.075000 ;
+      RECT 10.385000  0.265000 10.715000 1.170000 ;
+      RECT 10.695000  2.085000 11.025000 3.245000 ;
+      RECT 10.910000  1.180000 11.920000 1.510000 ;
+      RECT 11.175000  0.085000 11.505000 0.605000 ;
+      RECT 11.225000  1.920000 11.555000 3.075000 ;
+      RECT 11.755000  2.085000 12.085000 3.245000 ;
     LAYER mcon ;
-      RECT  3.035000 1.210000  3.205000 1.380000 ;
-      RECT  3.515000 1.210000  3.685000 1.380000 ;
-      RECT  4.955000 1.210000  5.125000 1.380000 ;
-      RECT  6.550000 1.210000  6.720000 1.380000 ;
-      RECT  7.835000 1.210000  8.005000 1.380000 ;
-      RECT  8.315000 1.210000  8.485000 1.380000 ;
-      RECT  9.755000 1.210000  9.925000 1.380000 ;
-      RECT 11.195000 1.210000 11.365000 1.380000 ;
-      RECT 11.675000 1.210000 11.845000 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  1.210000  3.685000 1.380000 ;
+      RECT  3.515000  3.245000  3.685000 3.415000 ;
+      RECT  3.885000  1.950000  4.055000 2.120000 ;
+      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  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.005000  1.950000  6.175000 2.120000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.550000  1.210000  6.720000 1.380000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.070000  1.950000  7.240000 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  1.210000  8.005000 1.380000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.130000  1.950000  8.300000 2.120000 ;
+      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.190000  1.950000  9.360000 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  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  1.950000 10.405000 2.120000 ;
+      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.210000 11.365000 1.380000 ;
+      RECT 11.195000  3.245000 11.365000 3.415000 ;
+      RECT 11.305000  1.950000 11.475000 2.120000 ;
+      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 ;
     LAYER met1 ;
       RECT 2.975000 1.180000 11.905000 1.410000 ;
   END
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef
index 903e9e6..32719e4 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.magic.lef
@@ -54,18 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.885000  0.085000 1.215000 0.605000 ;
-        RECT 2.465000  0.085000 2.795000 0.605000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -74,27 +62,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.820000 2.065000 1.150000 3.245000 ;
-        RECT 1.880000 2.085000 2.210000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.265000 0.375000 1.275000 ;
-      RECT 0.095000 1.275000 1.385000 1.535000 ;
-      RECT 0.095000 1.535000 0.620000 1.820000 ;
-      RECT 0.290000 1.820000 0.620000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.265000 0.375000 1.275000 ;
+      RECT 0.095000  1.275000 1.385000 1.535000 ;
+      RECT 0.095000  1.535000 0.620000 1.820000 ;
+      RECT 0.290000  1.820000 0.620000 3.075000 ;
+      RECT 0.820000  2.065000 1.150000 3.245000 ;
+      RECT 0.885000  0.085000 1.215000 0.605000 ;
+      RECT 1.880000  2.085000 2.210000 3.245000 ;
+      RECT 2.465000  0.085000 2.795000 0.605000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__clkbuflp_2
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef
index def99e7..8c72614 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.magic.lef
@@ -59,20 +59,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.125000  0.085000 0.425000 0.895000 ;
-        RECT 1.405000  0.085000 1.735000 0.655000 ;
-        RECT 2.985000  0.085000 3.315000 0.655000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -81,30 +67,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.125000 2.065000 0.425000 3.245000 ;
-        RECT 1.225000 2.065000 1.485000 3.245000 ;
-        RECT 2.215000 2.085000 2.545000 3.245000 ;
-        RECT 3.275000 2.085000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.625000 2.065000 1.055000 3.075000 ;
-      RECT 0.885000 0.255000 1.230000 1.205000 ;
-      RECT 0.885000 1.205000 2.130000 1.535000 ;
-      RECT 0.885000 1.535000 1.055000 2.065000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.125000  0.085000 0.425000 0.895000 ;
+      RECT 0.125000  2.065000 0.425000 3.245000 ;
+      RECT 0.625000  2.065000 1.055000 3.075000 ;
+      RECT 0.885000  0.255000 1.230000 1.205000 ;
+      RECT 0.885000  1.205000 2.130000 1.535000 ;
+      RECT 0.885000  1.535000 1.055000 2.065000 ;
+      RECT 1.225000  2.065000 1.485000 3.245000 ;
+      RECT 1.405000  0.085000 1.735000 0.655000 ;
+      RECT 2.215000  2.085000 2.545000 3.245000 ;
+      RECT 2.985000  0.085000 3.315000 0.655000 ;
+      RECT 3.275000  2.085000 3.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 ;
   END
 END sky130_fd_sc_lp__clkbuflp_4
diff --git a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef
index 743ac80..f0547e3 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.magic.lef
@@ -65,28 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.125000  0.085000 0.425000 0.890000 ;
-        RECT 1.675000  0.085000 2.550000 0.875000 ;
-        RECT 3.795000  0.085000 4.125000 0.605000 ;
-        RECT 5.375000  0.085000 5.705000 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 ;
-        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,43 +73,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.095000 2.065000 0.425000 3.245000 ;
-        RECT 1.155000 2.110000 1.485000 3.245000 ;
-        RECT 2.215000 2.085000 2.545000 3.245000 ;
-        RECT 3.275000 2.085000 3.605000 3.245000 ;
-        RECT 4.335000 2.085000 4.665000 3.245000 ;
-        RECT 5.395000 2.085000 5.725000 3.245000 ;
-        RECT 6.455000 2.085000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.625000 1.770000 1.995000 1.940000 ;
-      RECT 0.625000 1.940000 0.955000 3.075000 ;
-      RECT 0.885000 0.255000 1.230000 0.985000 ;
-      RECT 0.955000 0.985000 1.230000 1.205000 ;
-      RECT 0.955000 1.205000 3.870000 1.535000 ;
-      RECT 0.955000 1.535000 1.995000 1.770000 ;
-      RECT 1.660000 1.940000 1.995000 3.075000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.095000  2.065000 0.425000 3.245000 ;
+      RECT 0.125000  0.085000 0.425000 0.890000 ;
+      RECT 0.625000  1.770000 1.995000 1.940000 ;
+      RECT 0.625000  1.940000 0.955000 3.075000 ;
+      RECT 0.885000  0.255000 1.230000 0.985000 ;
+      RECT 0.955000  0.985000 1.230000 1.205000 ;
+      RECT 0.955000  1.205000 3.870000 1.535000 ;
+      RECT 0.955000  1.535000 1.995000 1.770000 ;
+      RECT 1.155000  2.110000 1.485000 3.245000 ;
+      RECT 1.660000  1.940000 1.995000 3.075000 ;
+      RECT 1.675000  0.085000 2.550000 0.875000 ;
+      RECT 2.215000  2.085000 2.545000 3.245000 ;
+      RECT 3.275000  2.085000 3.605000 3.245000 ;
+      RECT 3.795000  0.085000 4.125000 0.605000 ;
+      RECT 4.335000  2.085000 4.665000 3.245000 ;
+      RECT 5.375000  0.085000 5.705000 0.675000 ;
+      RECT 5.395000  2.085000 5.725000 3.245000 ;
+      RECT 6.455000  2.085000 6.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 ;
   END
 END sky130_fd_sc_lp__clkbuflp_8
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.magic.lef
index b6f24ec..f5f3fbb 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_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.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -75,46 +62,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.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 ;
       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.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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_lp__clkdlybuf4s15_1
diff --git a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef
index e7bc0a4..8000353 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.magic.lef
@@ -54,21 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -77,48 +62,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.040000 3.245000 ;
-        RECT 3.875000 1.815000 4.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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.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 ;
   END
 END sky130_fd_sc_lp__clkdlybuf4s15_2
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.magic.lef
index 31af200..c03d4aa 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_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.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -75,46 +62,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.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 ;
       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.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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_lp__clkdlybuf4s18_1
diff --git a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef
index 3cd81dc..f931cd9 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.magic.lef
@@ -54,21 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -77,48 +62,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.040000 3.245000 ;
-        RECT 3.875000 1.815000 4.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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.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 ;
   END
 END sky130_fd_sc_lp__clkdlybuf4s18_2
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.magic.lef
index c699c71..90ded45 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_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.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -75,46 +62,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.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 ;
       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.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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_lp__clkdlybuf4s25_1
diff --git a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef
index fa0d87b..f25f8ee 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.magic.lef
@@ -54,21 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -77,48 +62,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.040000 3.245000 ;
-        RECT 3.875000 1.815000 4.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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.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 ;
   END
 END sky130_fd_sc_lp__clkdlybuf4s25_2
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.magic.lef
index 9be1205..af4fc8b 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_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.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -75,46 +62,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.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 ;
       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.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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_lp__clkdlybuf4s50_1
diff --git a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef
index 2d658cc..818b2c4 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.magic.lef
@@ -54,21 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -77,48 +62,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.595000 2.380000 0.925000 3.245000 ;
-        RECT 2.710000 2.165000 3.040000 3.245000 ;
-        RECT 3.875000 1.815000 4.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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.245000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.245000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.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 ;
   END
 END sky130_fd_sc_lp__clkdlybuf4s50_2
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef
index ef8e09b..d0e7535 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.magic.lef
@@ -53,12 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-        RECT 0.105000  0.085000 0.435000 0.670000 ;
-      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
@@ -67,14 +61,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-        RECT 0.105000 2.300000 0.400000 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.105000  0.085000 0.435000 0.670000 ;
+      RECT 0.105000  2.300000 0.400000 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_lp__clkinv_0
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef
index e3d96be..ce8d726 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 1.015000  0.085000 1.345000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -69,16 +62,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.155000 2.180000 0.475000 3.245000 ;
-        RECT 1.045000 2.180000 1.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 ;
       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.155000  2.180000 0.475000 3.245000 ;
+      RECT 1.015000  0.085000 1.345000 0.670000 ;
+      RECT 1.045000  2.180000 1.345000 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_lp__clkinv_1
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef
index 3fe3fb7..c5b8d05 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.magic.lef
@@ -35,32 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.590000 1.160000  2.305000 1.625000 ;
-        RECT 2.900000 1.160000  3.165000 1.625000 ;
-        RECT 3.760000 1.160000  4.025000 1.625000 ;
-        RECT 4.620000 1.160000  4.885000 1.625000 ;
-        RECT 5.480000 1.160000  5.745000 1.625000 ;
-        RECT 6.340000 1.160000  6.605000 1.625000 ;
-        RECT 7.200000 1.160000  7.465000 1.625000 ;
-        RECT 8.060000 1.160000  8.325000 1.625000 ;
-        RECT 8.920000 1.160000 10.545000 1.625000 ;
-      LAYER mcon ;
-        RECT  0.775000 1.210000  0.945000 1.380000 ;
-        RECT  1.135000 1.210000  1.305000 1.380000 ;
-        RECT  1.495000 1.210000  1.665000 1.380000 ;
-        RECT  1.855000 1.210000  2.025000 1.380000 ;
-        RECT  2.950000 1.210000  3.120000 1.380000 ;
-        RECT  3.805000 1.210000  3.975000 1.380000 ;
-        RECT  4.670000 1.210000  4.840000 1.380000 ;
-        RECT  5.525000 1.210000  5.695000 1.380000 ;
-        RECT  6.390000 1.210000  6.560000 1.380000 ;
-        RECT  7.250000 1.210000  7.420000 1.380000 ;
-        RECT  8.110000 1.210000  8.280000 1.380000 ;
-        RECT  9.215000 1.210000  9.385000 1.380000 ;
-        RECT  9.575000 1.210000  9.745000 1.380000 ;
-        RECT  9.935000 1.210000 10.105000 1.380000 ;
-        RECT 10.295000 1.210000 10.465000 1.380000 ;
       LAYER met1 ;
         RECT 0.715000 1.180000 10.525000 1.410000 ;
     END
@@ -70,33 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  0.755000 1.835000  1.010000 3.055000 ;
-        RECT  1.615000 1.835000  1.870000 3.055000 ;
-        RECT  2.475000 0.395000  2.730000 3.055000 ;
-        RECT  3.335000 0.395000  3.590000 3.055000 ;
-        RECT  4.195000 0.395000  4.450000 3.055000 ;
-        RECT  5.050000 1.885000  5.310000 3.055000 ;
-        RECT  5.055000 0.395000  5.310000 1.885000 ;
-        RECT  5.915000 0.395000  6.170000 3.055000 ;
-        RECT  6.775000 0.395000  7.030000 3.055000 ;
-        RECT  7.635000 0.395000  7.890000 3.055000 ;
-        RECT  8.495000 0.395000  8.750000 3.055000 ;
-        RECT  9.355000 1.835000  9.610000 3.055000 ;
-        RECT 10.210000 1.835000 10.470000 3.055000 ;
-      LAYER mcon ;
-        RECT  0.795000 1.950000  0.965000 2.120000 ;
-        RECT  1.655000 1.950000  1.825000 2.120000 ;
-        RECT  2.515000 1.950000  2.685000 2.120000 ;
-        RECT  3.375000 1.950000  3.545000 2.120000 ;
-        RECT  4.235000 1.950000  4.405000 2.120000 ;
-        RECT  5.095000 1.950000  5.265000 2.120000 ;
-        RECT  5.955000 1.950000  6.125000 2.120000 ;
-        RECT  6.815000 1.950000  6.985000 2.120000 ;
-        RECT  7.675000 1.950000  7.845000 2.120000 ;
-        RECT  8.535000 1.950000  8.705000 2.120000 ;
-        RECT  9.395000 1.950000  9.565000 2.120000 ;
-        RECT 10.255000 1.950000 10.425000 2.120000 ;
       LAYER met1 ;
         RECT 0.735000 1.920000 10.485000 2.150000 ;
     END
@@ -105,41 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.040000 0.085000 ;
-        RECT 2.035000  0.085000  2.305000 0.725000 ;
-        RECT 2.900000  0.085000  3.165000 0.725000 ;
-        RECT 3.760000  0.085000  4.025000 0.725000 ;
-        RECT 4.620000  0.085000  4.885000 0.725000 ;
-        RECT 5.480000  0.085000  5.745000 0.725000 ;
-        RECT 6.340000  0.085000  6.605000 0.725000 ;
-        RECT 7.200000  0.085000  7.465000 0.725000 ;
-        RECT 8.060000  0.085000  8.325000 0.725000 ;
-        RECT 8.920000  0.085000  9.185000 0.725000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -148,47 +60,131 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.320000 1.835000  0.580000 3.245000 ;
-        RECT  1.180000 1.835000  1.440000 3.245000 ;
-        RECT  2.040000 1.835000  2.300000 3.245000 ;
-        RECT  2.900000 1.835000  3.160000 3.245000 ;
-        RECT  3.760000 1.835000  4.020000 3.245000 ;
-        RECT  4.620000 1.835000  4.880000 3.245000 ;
-        RECT  5.480000 1.835000  5.740000 3.245000 ;
-        RECT  6.340000 1.835000  6.600000 3.245000 ;
-        RECT  7.200000 1.835000  7.460000 3.245000 ;
-        RECT  8.060000 1.835000  8.320000 3.245000 ;
-        RECT  8.920000 1.835000  9.180000 3.245000 ;
-        RECT  9.780000 1.835000 10.040000 3.245000 ;
-        RECT 10.640000 1.835000 10.895000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.320000  1.835000  0.580000 3.245000 ;
+      RECT  0.590000  1.160000  2.305000 1.625000 ;
+      RECT  0.755000  1.835000  1.010000 3.055000 ;
+      RECT  1.180000  1.835000  1.440000 3.245000 ;
+      RECT  1.615000  1.835000  1.870000 3.055000 ;
+      RECT  2.035000  0.085000  2.305000 0.725000 ;
+      RECT  2.040000  1.835000  2.300000 3.245000 ;
+      RECT  2.475000  0.395000  2.730000 3.055000 ;
+      RECT  2.900000  0.085000  3.165000 0.725000 ;
+      RECT  2.900000  1.160000  3.165000 1.625000 ;
+      RECT  2.900000  1.835000  3.160000 3.245000 ;
+      RECT  3.335000  0.395000  3.590000 3.055000 ;
+      RECT  3.760000  0.085000  4.025000 0.725000 ;
+      RECT  3.760000  1.160000  4.025000 1.625000 ;
+      RECT  3.760000  1.835000  4.020000 3.245000 ;
+      RECT  4.195000  0.395000  4.450000 3.055000 ;
+      RECT  4.620000  0.085000  4.885000 0.725000 ;
+      RECT  4.620000  1.160000  4.885000 1.625000 ;
+      RECT  4.620000  1.835000  4.880000 3.245000 ;
+      RECT  5.050000  1.885000  5.310000 3.055000 ;
+      RECT  5.055000  0.395000  5.310000 1.885000 ;
+      RECT  5.480000  0.085000  5.745000 0.725000 ;
+      RECT  5.480000  1.160000  5.745000 1.625000 ;
+      RECT  5.480000  1.835000  5.740000 3.245000 ;
+      RECT  5.915000  0.395000  6.170000 3.055000 ;
+      RECT  6.340000  0.085000  6.605000 0.725000 ;
+      RECT  6.340000  1.160000  6.605000 1.625000 ;
+      RECT  6.340000  1.835000  6.600000 3.245000 ;
+      RECT  6.775000  0.395000  7.030000 3.055000 ;
+      RECT  7.200000  0.085000  7.465000 0.725000 ;
+      RECT  7.200000  1.160000  7.465000 1.625000 ;
+      RECT  7.200000  1.835000  7.460000 3.245000 ;
+      RECT  7.635000  0.395000  7.890000 3.055000 ;
+      RECT  8.060000  0.085000  8.325000 0.725000 ;
+      RECT  8.060000  1.160000  8.325000 1.625000 ;
+      RECT  8.060000  1.835000  8.320000 3.245000 ;
+      RECT  8.495000  0.395000  8.750000 3.055000 ;
+      RECT  8.920000  0.085000  9.185000 0.725000 ;
+      RECT  8.920000  1.160000 10.545000 1.625000 ;
+      RECT  8.920000  1.835000  9.180000 3.245000 ;
+      RECT  9.355000  1.835000  9.610000 3.055000 ;
+      RECT  9.780000  1.835000 10.040000 3.245000 ;
+      RECT 10.210000  1.835000 10.470000 3.055000 ;
+      RECT 10.640000  1.835000 10.895000 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.775000  1.210000  0.945000 1.380000 ;
+      RECT  0.795000  1.950000  0.965000 2.120000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.135000  1.210000  1.305000 1.380000 ;
+      RECT  1.495000  1.210000  1.665000 1.380000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  1.655000  1.950000  1.825000 2.120000 ;
+      RECT  1.855000  1.210000  2.025000 1.380000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.515000  1.950000  2.685000 2.120000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  2.950000  1.210000  3.120000 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.805000  1.210000  3.975000 1.380000 ;
+      RECT  3.995000 -0.085000  4.165000 0.085000 ;
+      RECT  3.995000  3.245000  4.165000 3.415000 ;
+      RECT  4.235000  1.950000  4.405000 2.120000 ;
+      RECT  4.475000 -0.085000  4.645000 0.085000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.670000  1.210000  4.840000 1.380000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  3.245000  5.125000 3.415000 ;
+      RECT  5.095000  1.950000  5.265000 2.120000 ;
+      RECT  5.435000 -0.085000  5.605000 0.085000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.525000  1.210000  5.695000 1.380000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  3.245000  6.085000 3.415000 ;
+      RECT  5.955000  1.950000  6.125000 2.120000 ;
+      RECT  6.390000  1.210000  6.560000 1.380000 ;
+      RECT  6.395000 -0.085000  6.565000 0.085000 ;
+      RECT  6.395000  3.245000  6.565000 3.415000 ;
+      RECT  6.815000  1.950000  6.985000 2.120000 ;
+      RECT  6.875000 -0.085000  7.045000 0.085000 ;
+      RECT  6.875000  3.245000  7.045000 3.415000 ;
+      RECT  7.250000  1.210000  7.420000 1.380000 ;
+      RECT  7.355000 -0.085000  7.525000 0.085000 ;
+      RECT  7.355000  3.245000  7.525000 3.415000 ;
+      RECT  7.675000  1.950000  7.845000 2.120000 ;
+      RECT  7.835000 -0.085000  8.005000 0.085000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.110000  1.210000  8.280000 1.380000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  3.245000  8.485000 3.415000 ;
+      RECT  8.535000  1.950000  8.705000 2.120000 ;
+      RECT  8.795000 -0.085000  8.965000 0.085000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.215000  1.210000  9.385000 1.380000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  3.245000  9.445000 3.415000 ;
+      RECT  9.395000  1.950000  9.565000 2.120000 ;
+      RECT  9.575000  1.210000  9.745000 1.380000 ;
+      RECT  9.755000 -0.085000  9.925000 0.085000 ;
+      RECT  9.755000  3.245000  9.925000 3.415000 ;
+      RECT  9.935000  1.210000 10.105000 1.380000 ;
+      RECT 10.235000 -0.085000 10.405000 0.085000 ;
+      RECT 10.235000  3.245000 10.405000 3.415000 ;
+      RECT 10.255000  1.950000 10.425000 2.120000 ;
+      RECT 10.295000  1.210000 10.465000 1.380000 ;
+      RECT 10.715000 -0.085000 10.885000 0.085000 ;
+      RECT 10.715000  3.245000 10.885000 3.415000 ;
+  END
 END sky130_fd_sc_lp__clkinv_16
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.magic.lef
index 6fb61a4..d9279d9 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__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.635000  0.085000 0.930000 0.725000 ;
-        RECT 1.495000  0.085000 1.825000 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 ;
       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.580000 2.055000 0.840000 3.245000 ;
-        RECT 1.440000 2.055000 1.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 ;
       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.580000  2.055000 0.840000 3.245000 ;
+      RECT 0.635000  0.085000 0.930000 0.725000 ;
+      RECT 1.440000  2.055000 1.695000 3.245000 ;
+      RECT 1.495000  0.085000 1.825000 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  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__clkinv_2
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.magic.lef
index 6a39478..e65fa55 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__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.695000  0.085000 0.990000 0.670000 ;
-        RECT 1.590000  0.085000 1.850000 0.670000 ;
-        RECT 2.445000  0.085000 2.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 ;
       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.300000 2.055000 0.560000 3.245000 ;
-        RECT 1.160000 2.055000 1.420000 3.245000 ;
-        RECT 2.020000 2.055000 2.280000 3.245000 ;
-        RECT 2.880000 2.055000 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.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.300000  2.055000 0.560000 3.245000 ;
+      RECT 0.695000  0.085000 0.990000 0.670000 ;
+      RECT 1.160000  2.055000 1.420000 3.245000 ;
+      RECT 1.590000  0.085000 1.850000 0.670000 ;
+      RECT 2.020000  2.055000 2.280000 3.245000 ;
+      RECT 2.445000  0.085000 2.745000 0.670000 ;
+      RECT 2.880000  2.055000 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_lp__clkinv_4
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef
index ab50187..2603d04 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.magic.lef
@@ -65,26 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 1.025000  0.085000 1.320000 0.670000 ;
-        RECT 1.920000  0.085000 2.180000 0.670000 ;
-        RECT 2.780000  0.085000 3.040000 0.670000 ;
-        RECT 3.640000  0.085000 3.900000 0.670000 ;
-        RECT 4.500000  0.085000 4.795000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -93,30 +73,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.200000 2.055000 0.460000 3.245000 ;
-        RECT 1.060000 2.055000 1.320000 3.245000 ;
-        RECT 1.920000 2.055000 2.180000 3.245000 ;
-        RECT 2.780000 2.055000 3.040000 3.245000 ;
-        RECT 3.640000 2.055000 3.900000 3.245000 ;
-        RECT 4.500000 2.055000 4.760000 3.245000 ;
-        RECT 5.360000 2.055000 5.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 ;
-        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.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.200000  2.055000 0.460000 3.245000 ;
+      RECT 1.025000  0.085000 1.320000 0.670000 ;
+      RECT 1.060000  2.055000 1.320000 3.245000 ;
+      RECT 1.920000  0.085000 2.180000 0.670000 ;
+      RECT 1.920000  2.055000 2.180000 3.245000 ;
+      RECT 2.780000  0.085000 3.040000 0.670000 ;
+      RECT 2.780000  2.055000 3.040000 3.245000 ;
+      RECT 3.640000  0.085000 3.900000 0.670000 ;
+      RECT 3.640000  2.055000 3.900000 3.245000 ;
+      RECT 4.500000  0.085000 4.795000 0.670000 ;
+      RECT 4.500000  2.055000 4.760000 3.245000 ;
+      RECT 5.360000  2.055000 5.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 ;
+      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_lp__clkinv_8
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef
index 79492af..56e8a34 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.165000  0.085000 0.495000 0.900000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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,15 +62,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.165000 2.320000 0.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 ;
       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.165000  0.085000 0.495000 0.900000 ;
+      RECT 0.165000  2.320000 0.495000 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_lp__clkinv_lp
diff --git a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef
index 87359aa..93b9631 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.165000  0.085000 0.495000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -69,15 +62,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.455000 1.960000 0.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 ;
       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.165000  0.085000 0.495000 0.775000 ;
+      RECT 0.455000  1.960000 0.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 ;
+  END
 END sky130_fd_sc_lp__clkinv_lp2
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef
index 57a57e5..dd80451 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.magic.lef
@@ -35,23 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.100000 1.105000 0.455000 1.780000 ;
-        RECT 1.075000 1.180000 2.265000 1.565000 ;
-        RECT 3.275000 1.180000 3.710000 1.565000 ;
-        RECT 4.655000 1.180000 5.380000 1.565000 ;
-        RECT 6.370000 1.180000 6.700000 1.565000 ;
-        RECT 7.705000 1.180000 8.715000 1.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 1.210000 0.325000 1.380000 ;
-        RECT 1.115000 1.210000 1.285000 1.380000 ;
-        RECT 1.595000 1.210000 1.765000 1.380000 ;
-        RECT 2.075000 1.210000 2.245000 1.380000 ;
-        RECT 3.515000 1.210000 3.685000 1.380000 ;
-        RECT 4.955000 1.210000 5.125000 1.380000 ;
-        RECT 6.395000 1.210000 6.565000 1.380000 ;
-        RECT 7.835000 1.210000 8.005000 1.380000 ;
-        RECT 8.315000 1.210000 8.485000 1.380000 ;
       LAYER met1 ;
         RECT 0.075000 1.180000 8.545000 1.410000 ;
     END
@@ -61,37 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.625000 0.315000 1.215000 0.780000 ;
-        RECT 0.625000 0.780000 0.955000 1.010000 ;
-        RECT 0.625000 1.010000 0.905000 1.735000 ;
-        RECT 0.625000 1.735000 0.955000 3.000000 ;
-        RECT 1.685000 1.920000 2.015000 3.000000 ;
-        RECT 2.465000 0.445000 2.795000 1.195000 ;
-        RECT 2.465000 1.195000 3.075000 1.565000 ;
-        RECT 2.745000 1.565000 3.075000 3.000000 ;
-        RECT 3.805000 1.805000 4.135000 3.000000 ;
-        RECT 3.880000 1.195000 4.375000 1.565000 ;
-        RECT 3.880000 1.565000 4.135000 1.805000 ;
-        RECT 4.045000 0.445000 4.375000 1.195000 ;
-        RECT 4.865000 1.920000 5.195000 3.000000 ;
-        RECT 5.625000 0.445000 5.955000 1.195000 ;
-        RECT 5.625000 1.195000 6.190000 1.565000 ;
-        RECT 5.895000 1.565000 6.190000 1.875000 ;
-        RECT 5.895000 1.875000 6.255000 3.000000 ;
-        RECT 6.985000 1.195000 7.535000 1.565000 ;
-        RECT 6.985000 1.565000 7.315000 3.000000 ;
-        RECT 7.205000 0.445000 7.535000 1.195000 ;
-        RECT 8.045000 1.920000 8.375000 3.000000 ;
-      LAYER mcon ;
-        RECT 0.635000 1.950000 0.805000 2.120000 ;
-        RECT 1.765000 1.950000 1.935000 2.120000 ;
-        RECT 2.825000 1.950000 2.995000 2.120000 ;
-        RECT 3.885000 1.950000 4.055000 2.120000 ;
-        RECT 4.955000 1.950000 5.125000 2.120000 ;
-        RECT 5.915000 1.950000 6.085000 2.120000 ;
-        RECT 7.065000 1.950000 7.235000 2.120000 ;
-        RECT 8.125000 1.950000 8.295000 2.120000 ;
       LAYER met1 ;
         RECT 0.575000 1.920000 8.355000 2.150000 ;
     END
@@ -100,34 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.775000 ;
-        RECT 1.675000  0.085000 2.005000 0.775000 ;
-        RECT 3.255000  0.085000 3.585000 0.775000 ;
-        RECT 4.835000  0.085000 5.165000 0.775000 ;
-        RECT 6.415000  0.085000 6.745000 0.775000 ;
-        RECT 7.995000  0.085000 8.325000 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 ;
-        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
@@ -136,39 +60,111 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.095000 1.960000 0.425000 3.245000 ;
-        RECT 1.155000 1.960000 1.485000 3.245000 ;
-        RECT 2.215000 1.960000 2.545000 3.245000 ;
-        RECT 3.275000 1.960000 3.605000 3.245000 ;
-        RECT 4.335000 1.960000 4.665000 3.245000 ;
-        RECT 5.395000 1.960000 5.725000 3.245000 ;
-        RECT 6.455000 1.960000 6.785000 3.245000 ;
-        RECT 7.515000 1.960000 7.845000 3.245000 ;
-        RECT 8.575000 1.960000 8.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.775000 ;
+      RECT 0.095000  1.960000 0.425000 3.245000 ;
+      RECT 0.100000  1.105000 0.455000 1.780000 ;
+      RECT 0.625000  0.315000 1.215000 0.780000 ;
+      RECT 0.625000  0.780000 0.955000 1.010000 ;
+      RECT 0.625000  1.010000 0.905000 1.735000 ;
+      RECT 0.625000  1.735000 0.955000 3.000000 ;
+      RECT 1.075000  1.180000 2.265000 1.565000 ;
+      RECT 1.155000  1.960000 1.485000 3.245000 ;
+      RECT 1.675000  0.085000 2.005000 0.775000 ;
+      RECT 1.685000  1.920000 2.015000 3.000000 ;
+      RECT 2.215000  1.960000 2.545000 3.245000 ;
+      RECT 2.465000  0.445000 2.795000 1.195000 ;
+      RECT 2.465000  1.195000 3.075000 1.565000 ;
+      RECT 2.745000  1.565000 3.075000 3.000000 ;
+      RECT 3.255000  0.085000 3.585000 0.775000 ;
+      RECT 3.275000  1.180000 3.710000 1.565000 ;
+      RECT 3.275000  1.960000 3.605000 3.245000 ;
+      RECT 3.805000  1.805000 4.135000 3.000000 ;
+      RECT 3.880000  1.195000 4.375000 1.565000 ;
+      RECT 3.880000  1.565000 4.135000 1.805000 ;
+      RECT 4.045000  0.445000 4.375000 1.195000 ;
+      RECT 4.335000  1.960000 4.665000 3.245000 ;
+      RECT 4.655000  1.180000 5.380000 1.565000 ;
+      RECT 4.835000  0.085000 5.165000 0.775000 ;
+      RECT 4.865000  1.920000 5.195000 3.000000 ;
+      RECT 5.395000  1.960000 5.725000 3.245000 ;
+      RECT 5.625000  0.445000 5.955000 1.195000 ;
+      RECT 5.625000  1.195000 6.190000 1.565000 ;
+      RECT 5.895000  1.565000 6.190000 1.875000 ;
+      RECT 5.895000  1.875000 6.255000 3.000000 ;
+      RECT 6.370000  1.180000 6.700000 1.565000 ;
+      RECT 6.415000  0.085000 6.745000 0.775000 ;
+      RECT 6.455000  1.960000 6.785000 3.245000 ;
+      RECT 6.985000  1.195000 7.535000 1.565000 ;
+      RECT 6.985000  1.565000 7.315000 3.000000 ;
+      RECT 7.205000  0.445000 7.535000 1.195000 ;
+      RECT 7.515000  1.960000 7.845000 3.245000 ;
+      RECT 7.705000  1.180000 8.715000 1.565000 ;
+      RECT 7.995000  0.085000 8.325000 0.775000 ;
+      RECT 8.045000  1.920000 8.375000 3.000000 ;
+      RECT 8.575000  1.960000 8.905000 3.245000 ;
+    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  1.950000 0.805000 2.120000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  1.210000 1.285000 1.380000 ;
+      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 1.765000  1.950000 1.935000 2.120000 ;
+      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 2.825000  1.950000 2.995000 2.120000 ;
+      RECT 3.035000 -0.085000 3.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.210000 3.685000 1.380000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.885000  1.950000 4.055000 2.120000 ;
+      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  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  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  1.210000 6.565000 1.380000 ;
+      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.065000  1.950000 7.235000 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  1.210000 8.005000 1.380000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
+      RECT 8.125000  1.950000 8.295000 2.120000 ;
+      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 ;
+  END
 END sky130_fd_sc_lp__clkinvlp_16
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef
index e182cbc..c8169c9 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.470000  0.085000 0.800000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -70,17 +62,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.400000 1.960000 0.730000 3.245000 ;
-        RECT 1.490000 1.960000 1.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 ;
       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.400000  1.960000 0.730000 3.245000 ;
+      RECT 0.470000  0.085000 0.800000 0.775000 ;
+      RECT 1.490000  1.960000 1.790000 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_lp__clkinvlp_2
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef
index 4713bc3..7f73861 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.magic.lef
@@ -56,17 +56,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.775000 ;
-        RECT 1.675000  0.085000 2.005000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -75,20 +64,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.095000 1.960000 0.425000 3.245000 ;
-        RECT 1.155000 1.960000 1.485000 3.245000 ;
-        RECT 2.215000 1.960000 2.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 ;
       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.095000  0.085000 0.425000 0.775000 ;
+      RECT 0.095000  1.960000 0.425000 3.245000 ;
+      RECT 1.155000  1.960000 1.485000 3.245000 ;
+      RECT 1.675000  0.085000 2.005000 0.775000 ;
+      RECT 2.215000  1.960000 2.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 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+  END
 END sky130_fd_sc_lp__clkinvlp_4
diff --git a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef
index 13669f2..6bf3bcd 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.magic.lef
@@ -59,22 +59,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.775000 ;
-        RECT 1.675000  0.085000 2.005000 0.775000 ;
-        RECT 3.255000  0.085000 3.585000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -83,26 +67,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.095000 1.960000 0.425000 3.245000 ;
-        RECT 1.155000 1.960000 1.485000 3.245000 ;
-        RECT 2.215000 1.960000 2.545000 3.245000 ;
-        RECT 3.275000 1.960000 3.605000 3.245000 ;
-        RECT 4.335000 1.960000 4.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 ;
-        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.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.775000 ;
+      RECT 0.095000  1.960000 0.425000 3.245000 ;
+      RECT 1.155000  1.960000 1.485000 3.245000 ;
+      RECT 1.675000  0.085000 2.005000 0.775000 ;
+      RECT 2.215000  1.960000 2.545000 3.245000 ;
+      RECT 3.255000  0.085000 3.585000 0.775000 ;
+      RECT 3.275000  1.960000 3.605000 3.245000 ;
+      RECT 4.335000  1.960000 4.665000 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_lp__clkinvlp_8
diff --git a/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef b/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef
index 47975c5..a98b36e 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef
+++ b/cells/conb/sky130_fd_sc_lp__conb_0.magic.lef
@@ -57,14 +57,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.155000  0.085000 0.450000 0.725000 ;
-        RECT 1.015000  0.085000 1.345000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -73,16 +65,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.155000 2.290000 0.425000 3.245000 ;
-        RECT 1.035000 2.290000 1.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 ;
       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.155000  0.085000 0.450000 0.725000 ;
+      RECT 0.155000  2.290000 0.425000 3.245000 ;
+      RECT 1.015000  0.085000 1.345000 0.670000 ;
+      RECT 1.035000  2.290000 1.345000 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_lp__conb_0
diff --git a/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef b/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef
index 9404d3c..40d6bdd 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_lp__conb_1.magic.lef
@@ -57,14 +57,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.155000  0.085000 0.450000 0.725000 ;
-        RECT 1.015000  0.085000 1.345000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -73,16 +65,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.155000 2.290000 0.425000 3.245000 ;
-        RECT 1.025000 2.290000 1.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 ;
       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.155000  0.085000 0.450000 0.725000 ;
+      RECT 0.155000  2.290000 0.425000 3.245000 ;
+      RECT 1.015000  0.085000 1.345000 0.670000 ;
+      RECT 1.025000  2.290000 1.345000 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_lp__conb_1
diff --git a/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
index 122d01b..8816408 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.magic.lef
@@ -34,24 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.650000  0.085000 0.980000 1.605000 ;
-        RECT 0.650000  1.605000 2.580000 1.935000 ;
-        RECT 4.930000  0.085000 5.260000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -60,26 +42,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.575000 2.105000 0.905000 3.245000 ;
-        RECT 2.925000 1.340000 5.195000 1.675000 ;
-        RECT 4.865000 1.675000 5.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 ;
-        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.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.575000  2.105000 0.905000 3.245000 ;
+      RECT 0.650000  0.085000 0.980000 1.605000 ;
+      RECT 0.650000  1.605000 2.580000 1.935000 ;
+      RECT 2.925000  1.340000 5.195000 1.675000 ;
+      RECT 4.865000  1.675000 5.195000 3.245000 ;
+      RECT 4.930000  0.085000 5.260000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__decap_12
diff --git a/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
index 0f9bc26..d5d4ef6 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.magic.lef
@@ -34,15 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.170000  0.085000 0.500000 1.605000 ;
-        RECT 0.170000  1.605000 0.660000 1.935000 ;
-        RECT 0.950000  0.085000 1.280000 0.625000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -51,17 +42,26 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.095000 2.105000 0.425000 3.245000 ;
-        RECT 0.670000 0.860000 1.215000 1.225000 ;
-        RECT 0.885000 1.225000 1.215000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 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.095000  2.105000 0.425000 3.245000 ;
+      RECT 0.170000  0.085000 0.500000 1.605000 ;
+      RECT 0.170000  1.605000 0.660000 1.935000 ;
+      RECT 0.670000  0.860000 1.215000 1.225000 ;
+      RECT 0.885000  1.225000 1.215000 3.245000 ;
+      RECT 0.950000  0.085000 1.280000 0.625000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__decap_3
diff --git a/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
index 6aa809e..99487d4 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_4.magic.lef
@@ -34,16 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.170000  0.085000 0.500000 1.605000 ;
-        RECT 0.170000  1.605000 0.740000 1.935000 ;
-        RECT 1.450000  0.085000 1.780000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -52,18 +42,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.095000 2.105000 0.425000 3.245000 ;
-        RECT 1.180000 1.340000 1.715000 1.675000 ;
-        RECT 1.385000 1.675000 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  2.105000 0.425000 3.245000 ;
+      RECT 0.170000  0.085000 0.500000 1.605000 ;
+      RECT 0.170000  1.605000 0.740000 1.935000 ;
+      RECT 1.180000  1.340000 1.715000 1.675000 ;
+      RECT 1.385000  1.675000 1.715000 3.245000 ;
+      RECT 1.450000  0.085000 1.780000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__decap_4
diff --git a/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
index 5e706bb..e40e0a7 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.magic.lef
@@ -34,18 +34,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.170000  0.085000 0.500000 1.605000 ;
-        RECT 0.170000  1.605000 1.080000 1.935000 ;
-        RECT 2.450000  0.085000 2.780000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -54,20 +42,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.095000 2.105000 0.425000 3.245000 ;
-        RECT 1.555000 1.340000 2.715000 1.675000 ;
-        RECT 2.385000 1.675000 2.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 ;
       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.095000  2.105000 0.425000 3.245000 ;
+      RECT 0.170000  0.085000 0.500000 1.605000 ;
+      RECT 0.170000  1.605000 1.080000 1.935000 ;
+      RECT 1.555000  1.340000 2.715000 1.675000 ;
+      RECT 2.385000  1.675000 2.715000 3.245000 ;
+      RECT 2.450000  0.085000 2.780000 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 ;
+  END
 END sky130_fd_sc_lp__decap_6
diff --git a/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef b/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
index 369b432..f8bdfac 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_lp__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.650000  0.085000 0.980000 1.605000 ;
-        RECT 0.650000  1.605000 1.560000 1.935000 ;
-        RECT 2.930000  0.085000 3.260000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.575000 2.105000 0.905000 3.245000 ;
-        RECT 1.955000 1.340000 3.195000 1.675000 ;
-        RECT 2.865000 1.675000 3.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 ;
       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.575000  2.105000 0.905000 3.245000 ;
+      RECT 0.650000  0.085000 0.980000 1.605000 ;
+      RECT 0.650000  1.605000 1.560000 1.935000 ;
+      RECT 1.955000  1.340000 3.195000 1.675000 ;
+      RECT 2.865000  1.675000 3.195000 3.245000 ;
+      RECT 2.930000  0.085000 3.260000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__decap_8
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
index 63bf011..b91b3c5 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.magic.lef
@@ -34,27 +34,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.575000 2.105000 0.905000 2.675000 ;
-        RECT 0.575000 2.675000 5.195000 2.945000 ;
-        RECT 0.575000 2.945000 0.905000 3.075000 ;
-        RECT 2.925000 1.340000 5.195000 1.675000 ;
-        RECT 4.865000 1.675000 5.195000 2.675000 ;
-        RECT 4.865000 2.945000 5.195000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.575000 2.725000 0.745000 2.895000 ;
-        RECT 0.935000 2.725000 1.105000 2.895000 ;
-        RECT 1.295000 2.725000 1.465000 2.895000 ;
-        RECT 1.655000 2.725000 1.825000 2.895000 ;
-        RECT 2.015000 2.725000 2.185000 2.895000 ;
-        RECT 2.375000 2.725000 2.545000 2.895000 ;
-        RECT 2.735000 2.725000 2.905000 2.895000 ;
-        RECT 3.095000 2.725000 3.265000 2.895000 ;
-        RECT 3.455000 2.725000 3.625000 2.895000 ;
-        RECT 3.850000 2.725000 4.020000 2.895000 ;
-        RECT 4.210000 2.725000 4.380000 2.895000 ;
-        RECT 4.570000 2.725000 4.740000 2.895000 ;
-        RECT 4.930000 2.725000 5.100000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 5.690000 2.945000 ;
     END
@@ -63,24 +42,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.650000  0.085000 0.980000 1.605000 ;
-        RECT 0.650000  1.605000 2.580000 1.935000 ;
-        RECT 4.930000  0.085000 5.260000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -89,23 +50,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 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 ;
-        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.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.575000  2.105000 0.905000 2.675000 ;
+      RECT 0.575000  2.675000 5.195000 2.945000 ;
+      RECT 0.575000  2.945000 0.905000 3.075000 ;
+      RECT 0.650000  0.085000 0.980000 1.605000 ;
+      RECT 0.650000  1.605000 2.580000 1.935000 ;
+      RECT 2.925000  1.340000 5.195000 1.675000 ;
+      RECT 4.865000  1.675000 5.195000 2.675000 ;
+      RECT 4.865000  2.945000 5.195000 3.075000 ;
+      RECT 4.930000  0.085000 5.260000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.575000  2.725000 0.745000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.935000  2.725000 1.105000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.295000  2.725000 1.465000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.655000  2.725000 1.825000 2.895000 ;
+      RECT 2.015000  2.725000 2.185000 2.895000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.375000  2.725000 2.545000 2.895000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.735000  2.725000 2.905000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.095000  2.725000 3.265000 2.895000 ;
+      RECT 3.455000  2.725000 3.625000 2.895000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.850000  2.725000 4.020000 2.895000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 4.210000  2.725000 4.380000 2.895000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.570000  2.725000 4.740000 2.895000 ;
+      RECT 4.930000  2.725000 5.100000 2.895000 ;
+      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_lp__decapkapwr_12
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
index 91b2646..2c99347 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.magic.lef
@@ -34,17 +34,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.095000 2.105000 0.425000 2.675000 ;
-        RECT 0.095000 2.675000 1.215000 2.945000 ;
-        RECT 0.095000 2.945000 0.425000 3.075000 ;
-        RECT 0.670000 0.860000 1.215000 1.225000 ;
-        RECT 0.885000 1.225000 1.215000 2.675000 ;
-        RECT 0.885000 2.945000 1.215000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.130000 2.725000 0.300000 2.895000 ;
-        RECT 0.580000 2.725000 0.750000 2.895000 ;
-        RECT 1.045000 2.725000 1.215000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 1.370000 2.945000 ;
     END
@@ -53,15 +42,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.170000  0.085000 0.500000 1.605000 ;
-        RECT 0.170000  1.605000 0.660000 1.935000 ;
-        RECT 0.950000  0.085000 1.280000 0.625000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -70,14 +50,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 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 ;
       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.095000  2.105000 0.425000 2.675000 ;
+      RECT 0.095000  2.675000 1.215000 2.945000 ;
+      RECT 0.095000  2.945000 0.425000 3.075000 ;
+      RECT 0.170000  0.085000 0.500000 1.605000 ;
+      RECT 0.170000  1.605000 0.660000 1.935000 ;
+      RECT 0.670000  0.860000 1.215000 1.225000 ;
+      RECT 0.885000  1.225000 1.215000 2.675000 ;
+      RECT 0.885000  2.945000 1.215000 3.075000 ;
+      RECT 0.950000  0.085000 1.280000 0.625000 ;
+    LAYER mcon ;
+      RECT 0.130000  2.725000 0.300000 2.895000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.580000  2.725000 0.750000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.045000  2.725000 1.215000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_lp__decapkapwr_3
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
index b44c024..0c1c4ed 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.magic.lef
@@ -34,19 +34,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.095000 2.105000 0.425000 2.675000 ;
-        RECT 0.095000 2.675000 1.790000 2.945000 ;
-        RECT 0.095000 2.945000 0.425000 3.075000 ;
-        RECT 1.180000 1.340000 1.790000 1.675000 ;
-        RECT 1.385000 1.675000 1.790000 2.675000 ;
-        RECT 1.385000 2.945000 1.790000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.130000 2.725000 0.300000 2.895000 ;
-        RECT 0.490000 2.725000 0.660000 2.895000 ;
-        RECT 0.850000 2.725000 1.020000 2.895000 ;
-        RECT 1.210000 2.725000 1.380000 2.895000 ;
-        RECT 1.620000 2.725000 1.790000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 1.850000 2.945000 ;
     END
@@ -55,16 +42,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.170000  0.085000 0.500000 1.605000 ;
-        RECT 0.170000  1.605000 0.740000 1.935000 ;
-        RECT 1.450000  0.085000 1.780000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -73,15 +50,36 @@
     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 ;
+      RECT 0.095000  2.105000 0.425000 2.675000 ;
+      RECT 0.095000  2.675000 1.790000 2.945000 ;
+      RECT 0.095000  2.945000 0.425000 3.075000 ;
+      RECT 0.170000  0.085000 0.500000 1.605000 ;
+      RECT 0.170000  1.605000 0.740000 1.935000 ;
+      RECT 1.180000  1.340000 1.790000 1.675000 ;
+      RECT 1.385000  1.675000 1.790000 2.675000 ;
+      RECT 1.385000  2.945000 1.790000 3.075000 ;
+      RECT 1.450000  0.085000 1.780000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.130000  2.725000 0.300000 2.895000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.490000  2.725000 0.660000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.850000  2.725000 1.020000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.210000  2.725000 1.380000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.620000  2.725000 1.790000 2.895000 ;
+  END
 END sky130_fd_sc_lp__decapkapwr_4
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
index 622376c..710ef90 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.magic.lef
@@ -34,21 +34,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.095000 2.105000 0.425000 2.675000 ;
-        RECT 0.095000 2.675000 2.750000 2.945000 ;
-        RECT 0.095000 2.945000 0.425000 3.075000 ;
-        RECT 1.555000 1.340000 2.750000 1.675000 ;
-        RECT 2.385000 1.675000 2.750000 2.675000 ;
-        RECT 2.385000 2.945000 2.750000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.130000 2.725000 0.300000 2.895000 ;
-        RECT 0.495000 2.725000 0.665000 2.895000 ;
-        RECT 0.900000 2.725000 1.070000 2.895000 ;
-        RECT 1.320000 2.725000 1.490000 2.895000 ;
-        RECT 1.725000 2.725000 1.895000 2.895000 ;
-        RECT 2.120000 2.725000 2.290000 2.895000 ;
-        RECT 2.580000 2.725000 2.750000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 2.810000 2.945000 ;
     END
@@ -57,18 +42,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.170000  0.085000 0.500000 1.605000 ;
-        RECT 0.170000  1.605000 1.080000 1.935000 ;
-        RECT 2.450000  0.085000 2.780000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -77,17 +50,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 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 ;
       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.095000  2.105000 0.425000 2.675000 ;
+      RECT 0.095000  2.675000 2.750000 2.945000 ;
+      RECT 0.095000  2.945000 0.425000 3.075000 ;
+      RECT 0.170000  0.085000 0.500000 1.605000 ;
+      RECT 0.170000  1.605000 1.080000 1.935000 ;
+      RECT 1.555000  1.340000 2.750000 1.675000 ;
+      RECT 2.385000  1.675000 2.750000 2.675000 ;
+      RECT 2.385000  2.945000 2.750000 3.075000 ;
+      RECT 2.450000  0.085000 2.780000 1.170000 ;
+    LAYER mcon ;
+      RECT 0.130000  2.725000 0.300000 2.895000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.495000  2.725000 0.665000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.900000  2.725000 1.070000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.320000  2.725000 1.490000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.725000  2.725000 1.895000 2.895000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.120000  2.725000 2.290000 2.895000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.580000  2.725000 2.750000 2.895000 ;
+  END
 END sky130_fd_sc_lp__decapkapwr_6
diff --git a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
index d0fc628..a0dc2b6 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.magic.lef
@@ -34,21 +34,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.495000 2.105000 0.905000 2.675000 ;
-        RECT 0.495000 2.675000 3.285000 2.945000 ;
-        RECT 0.495000 2.945000 0.905000 3.075000 ;
-        RECT 1.955000 1.340000 3.285000 1.675000 ;
-        RECT 2.865000 1.675000 3.285000 2.675000 ;
-        RECT 2.865000 2.945000 3.285000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.575000 2.725000 0.745000 2.895000 ;
-        RECT 0.940000 2.725000 1.110000 2.895000 ;
-        RECT 1.345000 2.725000 1.515000 2.895000 ;
-        RECT 1.765000 2.725000 1.935000 2.895000 ;
-        RECT 2.170000 2.725000 2.340000 2.895000 ;
-        RECT 2.565000 2.725000 2.735000 2.895000 ;
-        RECT 3.025000 2.725000 3.195000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 3.770000 2.945000 ;
     END
@@ -57,20 +42,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.650000  0.085000 0.980000 1.605000 ;
-        RECT 0.650000  1.605000 1.560000 1.935000 ;
-        RECT 2.930000  0.085000 3.260000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -79,19 +50,46 @@
     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 ;
+      RECT 0.495000  2.105000 0.905000 2.675000 ;
+      RECT 0.495000  2.675000 3.285000 2.945000 ;
+      RECT 0.495000  2.945000 0.905000 3.075000 ;
+      RECT 0.650000  0.085000 0.980000 1.605000 ;
+      RECT 0.650000  1.605000 1.560000 1.935000 ;
+      RECT 1.955000  1.340000 3.285000 1.675000 ;
+      RECT 2.865000  1.675000 3.285000 2.675000 ;
+      RECT 2.865000  2.945000 3.285000 3.075000 ;
+      RECT 2.930000  0.085000 3.260000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.575000  2.725000 0.745000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.940000  2.725000 1.110000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.345000  2.725000 1.515000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.765000  2.725000 1.935000 2.895000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.170000  2.725000 2.340000 2.895000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.565000  2.725000 2.735000 2.895000 ;
+      RECT 3.025000  2.725000 3.195000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__decapkapwr_8
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef
index aee3cda..8e9c3a7 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.magic.lef
@@ -75,12 +75,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.875000 1.405000 5.155000 1.780000 ;
-        RECT 8.795000 1.500000 9.580000 1.830000 ;
-      LAYER mcon ;
-        RECT 4.955000 1.580000 5.125000 1.750000 ;
-        RECT 8.795000 1.580000 8.965000 1.750000 ;
       LAYER met1 ;
         RECT 4.895000 1.550000 5.185000 1.595000 ;
         RECT 4.895000 1.595000 9.025000 1.735000 ;
@@ -102,45 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.110000  0.085000  0.360000 0.775000 ;
-        RECT  1.595000  0.085000  1.925000 1.000000 ;
-        RECT  4.180000  0.085000  4.510000 0.875000 ;
-        RECT  6.835000  0.085000  7.085000 0.905000 ;
-        RECT  8.945000  0.085000  9.275000 0.970000 ;
-        RECT 11.545000  0.085000 11.795000 1.000000 ;
-        RECT 13.045000  0.085000 13.295000 1.125000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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,125 +104,165 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.115000 2.385000  0.445000 3.245000 ;
-        RECT  1.715000 2.225000  2.045000 3.245000 ;
-        RECT  4.605000 2.660000  4.935000 3.245000 ;
-        RECT  6.725000 1.875000  7.055000 3.245000 ;
-        RECT  9.215000 2.580000  9.545000 3.245000 ;
-        RECT 10.515000 2.555000 10.845000 3.245000 ;
-        RECT 11.565000 2.555000 11.895000 3.245000 ;
-        RECT 13.045000 1.815000 13.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.540000 0.315000  0.870000 0.775000 ;
-      RECT  0.625000 0.775000  0.870000 1.195000 ;
-      RECT  0.625000 1.195000  1.065000 1.865000 ;
-      RECT  0.625000 1.865000  0.955000 3.065000 ;
-      RECT  1.085000 0.575000  1.415000 1.015000 ;
-      RECT  1.205000 2.045000  1.535000 2.905000 ;
-      RECT  1.245000 1.015000  1.415000 1.875000 ;
-      RECT  1.245000 1.875000  2.550000 2.045000 ;
-      RECT  2.275000 2.305000  2.900000 2.475000 ;
-      RECT  2.275000 2.475000  2.605000 2.685000 ;
-      RECT  2.290000 1.480000  2.550000 1.875000 ;
-      RECT  2.410000 0.575000  2.740000 1.130000 ;
-      RECT  2.410000 1.130000  2.900000 1.300000 ;
-      RECT  2.730000 1.300000  2.900000 2.305000 ;
-      RECT  2.920000 0.530000  3.250000 0.950000 ;
-      RECT  3.080000 0.950000  3.250000 2.225000 ;
-      RECT  3.080000 2.225000  3.970000 2.395000 ;
-      RECT  3.080000 2.395000  3.410000 2.685000 ;
-      RECT  3.430000 1.055000  4.860000 1.225000 ;
-      RECT  3.430000 1.225000  3.620000 1.750000 ;
-      RECT  3.800000 1.405000  4.695000 1.575000 ;
-      RECT  3.800000 1.575000  3.970000 2.225000 ;
-      RECT  4.150000 1.755000  4.345000 2.310000 ;
-      RECT  4.150000 2.310000  6.015000 2.480000 ;
-      RECT  4.525000 1.575000  4.695000 1.960000 ;
-      RECT  4.525000 1.960000  5.505000 2.130000 ;
-      RECT  4.690000 0.265000  6.655000 0.435000 ;
-      RECT  4.690000 0.435000  4.860000 1.055000 ;
-      RECT  5.040000 0.615000  6.305000 0.785000 ;
-      RECT  5.040000 0.785000  5.370000 0.990000 ;
-      RECT  5.335000 1.475000  5.955000 1.735000 ;
-      RECT  5.335000 1.735000  5.505000 1.960000 ;
-      RECT  5.550000 0.965000  5.880000 1.125000 ;
-      RECT  5.550000 1.125000  6.305000 1.295000 ;
-      RECT  5.685000 1.915000  6.545000 2.085000 ;
-      RECT  5.685000 2.085000  6.015000 2.310000 ;
-      RECT  5.685000 2.480000  6.015000 2.755000 ;
-      RECT  6.135000 0.785000  6.305000 0.945000 ;
-      RECT  6.135000 1.295000  6.305000 1.435000 ;
-      RECT  6.135000 1.435000  7.180000 1.695000 ;
-      RECT  6.375000 1.695000  6.545000 1.915000 ;
-      RECT  6.485000 0.435000  6.655000 1.085000 ;
-      RECT  6.485000 1.085000  7.530000 1.255000 ;
-      RECT  7.360000 1.255000  7.530000 1.345000 ;
-      RECT  7.360000 1.345000  7.750000 1.675000 ;
-      RECT  7.360000 1.675000  7.530000 2.895000 ;
-      RECT  7.360000 2.895000  8.615000 3.065000 ;
-      RECT  7.710000 2.120000  8.100000 2.715000 ;
-      RECT  7.930000 0.575000  8.260000 1.150000 ;
-      RECT  7.930000 1.150000  9.945000 1.320000 ;
-      RECT  7.930000 1.320000  8.100000 2.120000 ;
-      RECT  8.320000 1.730000  8.615000 2.895000 ;
-      RECT  8.860000 2.070000 10.055000 2.205000 ;
-      RECT  8.860000 2.205000 11.895000 2.375000 ;
-      RECT  8.860000 2.375000 10.055000 2.400000 ;
-      RECT  9.455000 0.265000 10.805000 0.435000 ;
-      RECT  9.455000 0.435000  9.785000 0.970000 ;
-      RECT  9.725000 2.400000 10.055000 3.065000 ;
-      RECT  9.775000 1.320000  9.945000 1.460000 ;
-      RECT  9.775000 1.460000 10.120000 1.790000 ;
-      RECT  9.965000 0.615000 10.295000 0.830000 ;
-      RECT  9.965000 0.830000 10.470000 0.970000 ;
-      RECT 10.125000 0.970000 10.470000 1.000000 ;
-      RECT 10.300000 1.000000 10.470000 2.205000 ;
-      RECT 10.475000 0.435000 10.805000 0.650000 ;
-      RECT 10.650000 0.830000 11.365000 1.000000 ;
-      RECT 10.650000 1.000000 10.980000 1.695000 ;
-      RECT 10.650000 1.695000 11.390000 2.025000 ;
-      RECT 11.035000 0.635000 11.365000 0.830000 ;
-      RECT 11.725000 1.185000 12.085000 1.515000 ;
-      RECT 11.725000 1.515000 11.895000 2.205000 ;
-      RECT 12.615000 0.665000 12.865000 1.305000 ;
-      RECT 12.615000 1.305000 13.480000 1.635000 ;
-      RECT 12.615000 1.635000 12.865000 2.495000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.110000  0.085000  0.360000 0.775000 ;
+      RECT  0.115000  2.385000  0.445000 3.245000 ;
+      RECT  0.540000  0.315000  0.870000 0.775000 ;
+      RECT  0.625000  0.775000  0.870000 1.195000 ;
+      RECT  0.625000  1.195000  1.065000 1.865000 ;
+      RECT  0.625000  1.865000  0.955000 3.065000 ;
+      RECT  1.085000  0.575000  1.415000 1.015000 ;
+      RECT  1.205000  2.045000  1.535000 2.905000 ;
+      RECT  1.245000  1.015000  1.415000 1.875000 ;
+      RECT  1.245000  1.875000  2.550000 2.045000 ;
+      RECT  1.595000  0.085000  1.925000 1.000000 ;
+      RECT  1.715000  2.225000  2.045000 3.245000 ;
+      RECT  2.275000  2.305000  2.900000 2.475000 ;
+      RECT  2.275000  2.475000  2.605000 2.685000 ;
+      RECT  2.290000  1.480000  2.550000 1.875000 ;
+      RECT  2.410000  0.575000  2.740000 1.130000 ;
+      RECT  2.410000  1.130000  2.900000 1.300000 ;
+      RECT  2.730000  1.300000  2.900000 2.305000 ;
+      RECT  2.920000  0.530000  3.250000 0.950000 ;
+      RECT  3.080000  0.950000  3.250000 2.225000 ;
+      RECT  3.080000  2.225000  3.970000 2.395000 ;
+      RECT  3.080000  2.395000  3.410000 2.685000 ;
+      RECT  3.430000  1.055000  4.860000 1.225000 ;
+      RECT  3.430000  1.225000  3.620000 1.750000 ;
+      RECT  3.800000  1.405000  4.695000 1.575000 ;
+      RECT  3.800000  1.575000  3.970000 2.225000 ;
+      RECT  4.150000  1.755000  4.345000 2.310000 ;
+      RECT  4.150000  2.310000  6.015000 2.480000 ;
+      RECT  4.180000  0.085000  4.510000 0.875000 ;
+      RECT  4.525000  1.575000  4.695000 1.960000 ;
+      RECT  4.525000  1.960000  5.505000 2.130000 ;
+      RECT  4.605000  2.660000  4.935000 3.245000 ;
+      RECT  4.690000  0.265000  6.655000 0.435000 ;
+      RECT  4.690000  0.435000  4.860000 1.055000 ;
+      RECT  4.875000  1.405000  5.155000 1.780000 ;
+      RECT  5.040000  0.615000  6.305000 0.785000 ;
+      RECT  5.040000  0.785000  5.370000 0.990000 ;
+      RECT  5.335000  1.475000  5.955000 1.735000 ;
+      RECT  5.335000  1.735000  5.505000 1.960000 ;
+      RECT  5.550000  0.965000  5.880000 1.125000 ;
+      RECT  5.550000  1.125000  6.305000 1.295000 ;
+      RECT  5.685000  1.915000  6.545000 2.085000 ;
+      RECT  5.685000  2.085000  6.015000 2.310000 ;
+      RECT  5.685000  2.480000  6.015000 2.755000 ;
+      RECT  6.135000  0.785000  6.305000 0.945000 ;
+      RECT  6.135000  1.295000  6.305000 1.435000 ;
+      RECT  6.135000  1.435000  7.180000 1.695000 ;
+      RECT  6.375000  1.695000  6.545000 1.915000 ;
+      RECT  6.485000  0.435000  6.655000 1.085000 ;
+      RECT  6.485000  1.085000  7.530000 1.255000 ;
+      RECT  6.725000  1.875000  7.055000 3.245000 ;
+      RECT  6.835000  0.085000  7.085000 0.905000 ;
+      RECT  7.360000  1.255000  7.530000 1.345000 ;
+      RECT  7.360000  1.345000  7.750000 1.675000 ;
+      RECT  7.360000  1.675000  7.530000 2.895000 ;
+      RECT  7.360000  2.895000  8.615000 3.065000 ;
+      RECT  7.710000  2.120000  8.100000 2.715000 ;
+      RECT  7.930000  0.575000  8.260000 1.150000 ;
+      RECT  7.930000  1.150000  9.945000 1.320000 ;
+      RECT  7.930000  1.320000  8.100000 2.120000 ;
+      RECT  8.320000  1.730000  8.615000 2.895000 ;
+      RECT  8.795000  1.500000  9.580000 1.830000 ;
+      RECT  8.860000  2.070000 10.055000 2.205000 ;
+      RECT  8.860000  2.205000 11.895000 2.375000 ;
+      RECT  8.860000  2.375000 10.055000 2.400000 ;
+      RECT  8.945000  0.085000  9.275000 0.970000 ;
+      RECT  9.215000  2.580000  9.545000 3.245000 ;
+      RECT  9.455000  0.265000 10.805000 0.435000 ;
+      RECT  9.455000  0.435000  9.785000 0.970000 ;
+      RECT  9.725000  2.400000 10.055000 3.065000 ;
+      RECT  9.775000  1.320000  9.945000 1.460000 ;
+      RECT  9.775000  1.460000 10.120000 1.790000 ;
+      RECT  9.965000  0.615000 10.295000 0.830000 ;
+      RECT  9.965000  0.830000 10.470000 0.970000 ;
+      RECT 10.125000  0.970000 10.470000 1.000000 ;
+      RECT 10.300000  1.000000 10.470000 2.205000 ;
+      RECT 10.475000  0.435000 10.805000 0.650000 ;
+      RECT 10.515000  2.555000 10.845000 3.245000 ;
+      RECT 10.650000  0.830000 11.365000 1.000000 ;
+      RECT 10.650000  1.000000 10.980000 1.695000 ;
+      RECT 10.650000  1.695000 11.390000 2.025000 ;
+      RECT 11.035000  0.635000 11.365000 0.830000 ;
+      RECT 11.545000  0.085000 11.795000 1.000000 ;
+      RECT 11.565000  2.555000 11.895000 3.245000 ;
+      RECT 11.725000  1.185000 12.085000 1.515000 ;
+      RECT 11.725000  1.515000 11.895000 2.205000 ;
+      RECT 12.615000  0.665000 12.865000 1.305000 ;
+      RECT 12.615000  1.305000 13.480000 1.635000 ;
+      RECT 12.615000  1.635000 12.865000 2.495000 ;
+      RECT 13.045000  0.085000 13.295000 1.125000 ;
+      RECT 13.045000  1.815000 13.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 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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  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 ;
   END
 END sky130_fd_sc_lp__dfbbn_1
diff --git a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef
index 6bc2ad0..50bd51a 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.magic.lef
@@ -77,12 +77,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.900000 1.405000 5.165000 1.780000 ;
-        RECT 8.795000 1.470000 9.575000 1.800000 ;
-      LAYER mcon ;
-        RECT 4.955000 1.580000 5.125000 1.750000 ;
-        RECT 8.795000 1.580000 8.965000 1.750000 ;
       LAYER met1 ;
         RECT 4.895000 1.550000 5.185000 1.595000 ;
         RECT 4.895000 1.595000 9.025000 1.735000 ;
@@ -104,49 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.880000 0.085000 ;
-        RECT  0.110000  0.085000  0.360000 0.725000 ;
-        RECT  1.600000  0.085000  1.930000 1.000000 ;
-        RECT  4.205000  0.085000  4.535000 0.875000 ;
-        RECT  6.860000  0.085000  7.110000 0.905000 ;
-        RECT  9.035000  0.085000  9.365000 0.940000 ;
-        RECT 11.650000  0.085000 11.900000 1.000000 ;
-        RECT 12.590000  0.085000 12.840000 1.095000 ;
-        RECT 13.580000  0.085000 13.830000 1.095000 ;
-        RECT 14.520000  0.085000 14.770000 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 ;
-        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
@@ -155,122 +106,166 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.880000 3.415000 ;
-        RECT  0.140000 2.385000  0.470000 3.245000 ;
-        RECT  1.720000 2.225000  2.050000 3.245000 ;
-        RECT  4.630000 2.660000  4.960000 3.245000 ;
-        RECT  6.235000 1.875000  6.565000 3.245000 ;
-        RECT  9.355000 2.550000  9.605000 3.245000 ;
-        RECT 10.575000 2.550000 10.905000 3.245000 ;
-        RECT 11.640000 2.550000 11.970000 3.245000 ;
-        RECT 12.590000 1.690000 12.840000 3.245000 ;
-        RECT 13.580000 1.815000 13.830000 3.245000 ;
-        RECT 14.520000 2.135000 14.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 ;
-        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.540000 0.265000  0.870000 0.725000 ;
-      RECT  0.650000 0.725000  0.870000 1.300000 ;
-      RECT  0.650000 1.300000  1.005000 3.065000 ;
-      RECT  1.090000 0.575000  1.420000 1.000000 ;
-      RECT  1.210000 1.000000  1.380000 1.875000 ;
-      RECT  1.210000 1.875000  2.560000 2.045000 ;
-      RECT  1.210000 2.045000  1.540000 2.905000 ;
-      RECT  2.290000 2.305000  2.910000 2.475000 ;
-      RECT  2.290000 2.475000  2.620000 2.685000 ;
-      RECT  2.295000 1.480000  2.560000 1.875000 ;
-      RECT  2.445000 0.575000  2.775000 1.130000 ;
-      RECT  2.445000 1.130000  2.910000 1.300000 ;
-      RECT  2.740000 1.300000  2.910000 2.305000 ;
-      RECT  3.035000 0.500000  3.260000 0.950000 ;
-      RECT  3.090000 0.950000  3.260000 2.225000 ;
-      RECT  3.090000 2.225000  3.990000 2.395000 ;
-      RECT  3.090000 2.395000  3.420000 2.685000 ;
-      RECT  3.440000 1.055000  4.885000 1.225000 ;
-      RECT  3.440000 1.225000  3.640000 1.760000 ;
-      RECT  3.820000 1.405000  4.720000 1.575000 ;
-      RECT  3.820000 1.575000  3.990000 2.225000 ;
-      RECT  4.170000 1.755000  4.370000 2.310000 ;
-      RECT  4.170000 2.310000  6.055000 2.480000 ;
-      RECT  4.550000 1.575000  4.720000 1.960000 ;
-      RECT  4.550000 1.960000  5.705000 2.130000 ;
-      RECT  4.715000 0.265000  6.680000 0.435000 ;
-      RECT  4.715000 0.435000  4.885000 1.055000 ;
-      RECT  5.065000 0.615000  6.330000 0.785000 ;
-      RECT  5.065000 0.785000  5.395000 0.960000 ;
-      RECT  5.140000 2.480000  5.470000 2.755000 ;
-      RECT  5.375000 1.475000  5.705000 1.960000 ;
-      RECT  5.575000 0.965000  5.905000 1.125000 ;
-      RECT  5.575000 1.125000  6.055000 1.295000 ;
-      RECT  5.885000 1.295000  6.055000 1.435000 ;
-      RECT  5.885000 1.435000  7.155000 1.605000 ;
-      RECT  5.885000 1.605000  6.055000 2.310000 ;
-      RECT  6.160000 0.785000  6.330000 0.945000 ;
-      RECT  6.510000 0.435000  6.680000 1.085000 ;
-      RECT  6.510000 1.085000  7.775000 1.255000 ;
-      RECT  6.825000 1.605000  7.155000 1.735000 ;
-      RECT  7.335000 1.255000  7.775000 1.675000 ;
-      RECT  7.335000 1.675000  7.505000 2.895000 ;
-      RECT  7.335000 2.895000  8.615000 3.065000 ;
-      RECT  7.685000 2.120000  8.125000 2.715000 ;
-      RECT  7.955000 0.575000  8.285000 1.120000 ;
-      RECT  7.955000 1.120000  9.955000 1.290000 ;
-      RECT  7.955000 1.290000  8.125000 2.120000 ;
-      RECT  8.345000 1.700000  8.615000 2.895000 ;
-      RECT  8.885000 2.040000  9.215000 2.200000 ;
-      RECT  8.885000 2.200000 11.965000 2.370000 ;
-      RECT  9.545000 0.265000 10.905000 0.435000 ;
-      RECT  9.545000 0.435000  9.875000 0.940000 ;
-      RECT  9.785000 1.290000  9.955000 1.345000 ;
-      RECT  9.785000 1.345000 10.125000 1.675000 ;
-      RECT  9.785000 2.370000 10.115000 3.000000 ;
-      RECT 10.135000 0.615000 10.475000 1.165000 ;
-      RECT 10.305000 1.165000 10.475000 2.200000 ;
-      RECT 10.655000 0.435000 10.905000 0.650000 ;
-      RECT 10.655000 0.830000 11.470000 1.000000 ;
-      RECT 10.655000 1.000000 10.985000 1.690000 ;
-      RECT 10.815000 1.690000 11.460000 2.020000 ;
-      RECT 11.220000 0.265000 11.470000 0.830000 ;
-      RECT 11.795000 1.185000 12.060000 1.515000 ;
-      RECT 11.795000 1.515000 11.965000 2.200000 ;
-      RECT 13.070000 0.635000 13.400000 1.275000 ;
-      RECT 13.070000 1.275000 14.095000 1.605000 ;
-      RECT 13.070000 1.605000 13.400000 2.495000 ;
+      RECT  0.000000 -0.085000 14.880000 0.085000 ;
+      RECT  0.000000  3.245000 14.880000 3.415000 ;
+      RECT  0.110000  0.085000  0.360000 0.725000 ;
+      RECT  0.140000  2.385000  0.470000 3.245000 ;
+      RECT  0.540000  0.265000  0.870000 0.725000 ;
+      RECT  0.650000  0.725000  0.870000 1.300000 ;
+      RECT  0.650000  1.300000  1.005000 3.065000 ;
+      RECT  1.090000  0.575000  1.420000 1.000000 ;
+      RECT  1.210000  1.000000  1.380000 1.875000 ;
+      RECT  1.210000  1.875000  2.560000 2.045000 ;
+      RECT  1.210000  2.045000  1.540000 2.905000 ;
+      RECT  1.600000  0.085000  1.930000 1.000000 ;
+      RECT  1.720000  2.225000  2.050000 3.245000 ;
+      RECT  2.290000  2.305000  2.910000 2.475000 ;
+      RECT  2.290000  2.475000  2.620000 2.685000 ;
+      RECT  2.295000  1.480000  2.560000 1.875000 ;
+      RECT  2.445000  0.575000  2.775000 1.130000 ;
+      RECT  2.445000  1.130000  2.910000 1.300000 ;
+      RECT  2.740000  1.300000  2.910000 2.305000 ;
+      RECT  3.035000  0.500000  3.260000 0.950000 ;
+      RECT  3.090000  0.950000  3.260000 2.225000 ;
+      RECT  3.090000  2.225000  3.990000 2.395000 ;
+      RECT  3.090000  2.395000  3.420000 2.685000 ;
+      RECT  3.440000  1.055000  4.885000 1.225000 ;
+      RECT  3.440000  1.225000  3.640000 1.760000 ;
+      RECT  3.820000  1.405000  4.720000 1.575000 ;
+      RECT  3.820000  1.575000  3.990000 2.225000 ;
+      RECT  4.170000  1.755000  4.370000 2.310000 ;
+      RECT  4.170000  2.310000  6.055000 2.480000 ;
+      RECT  4.205000  0.085000  4.535000 0.875000 ;
+      RECT  4.550000  1.575000  4.720000 1.960000 ;
+      RECT  4.550000  1.960000  5.705000 2.130000 ;
+      RECT  4.630000  2.660000  4.960000 3.245000 ;
+      RECT  4.715000  0.265000  6.680000 0.435000 ;
+      RECT  4.715000  0.435000  4.885000 1.055000 ;
+      RECT  4.900000  1.405000  5.165000 1.780000 ;
+      RECT  5.065000  0.615000  6.330000 0.785000 ;
+      RECT  5.065000  0.785000  5.395000 0.960000 ;
+      RECT  5.140000  2.480000  5.470000 2.755000 ;
+      RECT  5.375000  1.475000  5.705000 1.960000 ;
+      RECT  5.575000  0.965000  5.905000 1.125000 ;
+      RECT  5.575000  1.125000  6.055000 1.295000 ;
+      RECT  5.885000  1.295000  6.055000 1.435000 ;
+      RECT  5.885000  1.435000  7.155000 1.605000 ;
+      RECT  5.885000  1.605000  6.055000 2.310000 ;
+      RECT  6.160000  0.785000  6.330000 0.945000 ;
+      RECT  6.235000  1.875000  6.565000 3.245000 ;
+      RECT  6.510000  0.435000  6.680000 1.085000 ;
+      RECT  6.510000  1.085000  7.775000 1.255000 ;
+      RECT  6.825000  1.605000  7.155000 1.735000 ;
+      RECT  6.860000  0.085000  7.110000 0.905000 ;
+      RECT  7.335000  1.255000  7.775000 1.675000 ;
+      RECT  7.335000  1.675000  7.505000 2.895000 ;
+      RECT  7.335000  2.895000  8.615000 3.065000 ;
+      RECT  7.685000  2.120000  8.125000 2.715000 ;
+      RECT  7.955000  0.575000  8.285000 1.120000 ;
+      RECT  7.955000  1.120000  9.955000 1.290000 ;
+      RECT  7.955000  1.290000  8.125000 2.120000 ;
+      RECT  8.345000  1.700000  8.615000 2.895000 ;
+      RECT  8.795000  1.470000  9.575000 1.800000 ;
+      RECT  8.885000  2.040000  9.215000 2.200000 ;
+      RECT  8.885000  2.200000 11.965000 2.370000 ;
+      RECT  9.035000  0.085000  9.365000 0.940000 ;
+      RECT  9.355000  2.550000  9.605000 3.245000 ;
+      RECT  9.545000  0.265000 10.905000 0.435000 ;
+      RECT  9.545000  0.435000  9.875000 0.940000 ;
+      RECT  9.785000  1.290000  9.955000 1.345000 ;
+      RECT  9.785000  1.345000 10.125000 1.675000 ;
+      RECT  9.785000  2.370000 10.115000 3.000000 ;
+      RECT 10.135000  0.615000 10.475000 1.165000 ;
+      RECT 10.305000  1.165000 10.475000 2.200000 ;
+      RECT 10.575000  2.550000 10.905000 3.245000 ;
+      RECT 10.655000  0.435000 10.905000 0.650000 ;
+      RECT 10.655000  0.830000 11.470000 1.000000 ;
+      RECT 10.655000  1.000000 10.985000 1.690000 ;
+      RECT 10.815000  1.690000 11.460000 2.020000 ;
+      RECT 11.220000  0.265000 11.470000 0.830000 ;
+      RECT 11.640000  2.550000 11.970000 3.245000 ;
+      RECT 11.650000  0.085000 11.900000 1.000000 ;
+      RECT 11.795000  1.185000 12.060000 1.515000 ;
+      RECT 11.795000  1.515000 11.965000 2.200000 ;
+      RECT 12.590000  0.085000 12.840000 1.095000 ;
+      RECT 12.590000  1.690000 12.840000 3.245000 ;
+      RECT 13.070000  0.635000 13.400000 1.275000 ;
+      RECT 13.070000  1.275000 14.095000 1.605000 ;
+      RECT 13.070000  1.605000 13.400000 2.495000 ;
+      RECT 13.580000  0.085000 13.830000 1.095000 ;
+      RECT 13.580000  1.815000 13.830000 3.245000 ;
+      RECT 14.520000  0.085000 14.770000 0.745000 ;
+      RECT 14.520000  2.135000 14.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 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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  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 ;
   END
 END sky130_fd_sc_lp__dfbbn_2
diff --git a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef
index 2c1d416..a655b9e 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef
+++ b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.magic.lef
@@ -75,13 +75,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.375000 1.405000 4.705000 1.780000 ;
-        RECT 4.375000 1.780000 4.675000 2.150000 ;
-        RECT 8.265000 1.660000 8.560000 2.150000 ;
-      LAYER mcon ;
-        RECT 4.475000 1.950000 4.645000 2.120000 ;
-        RECT 8.315000 1.950000 8.485000 2.120000 ;
       LAYER met1 ;
         RECT 4.415000 1.920000 4.705000 1.965000 ;
         RECT 4.415000 1.965000 8.545000 2.105000 ;
@@ -103,43 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.115000  0.085000  0.365000 0.725000 ;
-        RECT  1.765000  0.085000  2.095000 0.585000 ;
-        RECT  4.050000  0.085000  4.380000 0.875000 ;
-        RECT  6.140000  0.085000  6.390000 0.580000 ;
-        RECT  8.070000  0.085000  8.320000 0.765000 ;
-        RECT 10.580000  0.085000 10.830000 1.000000 ;
-        RECT 12.075000  0.085000 12.325000 0.935000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -148,125 +104,163 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.185000 2.385000  0.515000 3.245000 ;
-        RECT  1.765000 2.585000  2.095000 3.245000 ;
-        RECT  4.265000 2.680000  4.595000 3.245000 ;
-        RECT  5.595000 2.310000  5.925000 3.245000 ;
-        RECT  8.140000 2.680000  8.470000 3.245000 ;
-        RECT  9.500000 2.555000  9.830000 3.245000 ;
-        RECT 10.575000 2.555000 10.905000 3.245000 ;
-        RECT 12.075000 1.815000 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.545000 0.265000  0.875000 0.725000 ;
-      RECT  0.695000 0.725000  0.875000 1.270000 ;
-      RECT  0.695000 1.270000  1.025000 3.065000 ;
-      RECT  1.105000 0.265000  1.585000 0.675000 ;
-      RECT  1.255000 0.675000  1.585000 2.235000 ;
-      RECT  1.255000 2.235000  2.630000 2.405000 ;
-      RECT  1.255000 2.405000  1.585000 2.975000 ;
-      RECT  2.460000 1.180000  2.755000 1.560000 ;
-      RECT  2.460000 1.560000  3.000000 1.880000 ;
-      RECT  2.460000 1.880000  2.630000 2.235000 ;
-      RECT  2.630000 0.265000  2.960000 0.830000 ;
-      RECT  2.630000 0.830000  3.350000 1.000000 ;
-      RECT  2.810000 2.060000  3.350000 2.230000 ;
-      RECT  2.810000 2.230000  3.140000 2.755000 ;
-      RECT  3.140000 0.265000  3.470000 0.480000 ;
-      RECT  3.140000 0.480000  3.700000 0.650000 ;
-      RECT  3.180000 1.000000  3.350000 2.060000 ;
-      RECT  3.320000 2.410000  3.700000 2.755000 ;
-      RECT  3.530000 0.650000  3.700000 1.055000 ;
-      RECT  3.530000 1.055000  5.200000 1.225000 ;
-      RECT  3.530000 1.225000  3.700000 2.410000 ;
-      RECT  3.880000 1.405000  4.165000 2.330000 ;
-      RECT  3.880000 2.330000  5.105000 2.500000 ;
-      RECT  4.560000 0.265000  5.910000 0.435000 ;
-      RECT  4.560000 0.435000  4.890000 0.875000 ;
-      RECT  4.855000 1.960000  6.555000 2.130000 ;
-      RECT  4.855000 2.130000  5.105000 2.330000 ;
-      RECT  4.855000 2.500000  5.105000 2.755000 ;
-      RECT  4.915000 1.225000  5.200000 1.385000 ;
-      RECT  5.070000 0.615000  5.400000 0.705000 ;
-      RECT  5.070000 0.705000  5.550000 0.875000 ;
-      RECT  5.380000 0.875000  5.550000 1.960000 ;
-      RECT  5.580000 0.435000  5.910000 0.525000 ;
-      RECT  5.730000 0.760000  6.740000 0.930000 ;
-      RECT  5.730000 0.930000  6.015000 1.315000 ;
-      RECT  6.225000 1.110000  6.555000 1.960000 ;
-      RECT  6.570000 0.265000  7.835000 0.435000 ;
-      RECT  6.570000 0.435000  6.740000 0.760000 ;
-      RECT  6.640000 2.580000  7.585000 2.750000 ;
-      RECT  6.640000 2.750000  6.970000 3.000000 ;
-      RECT  6.805000 1.110000  7.135000 2.070000 ;
-      RECT  6.805000 2.070000  7.235000 2.400000 ;
-      RECT  6.960000 0.615000  7.485000 0.930000 ;
-      RECT  7.315000 0.930000  7.485000 1.310000 ;
-      RECT  7.315000 1.310000  8.910000 1.480000 ;
-      RECT  7.415000 1.480000  7.585000 2.580000 ;
-      RECT  7.665000 0.435000  7.835000 0.945000 ;
-      RECT  7.665000 0.945000  8.910000 1.115000 ;
-      RECT  7.765000 1.660000  8.055000 2.330000 ;
-      RECT  7.765000 2.330000 10.905000 2.375000 ;
-      RECT  7.765000 2.375000  8.990000 2.500000 ;
-      RECT  8.500000 0.265000  9.845000 0.595000 ;
-      RECT  8.740000 0.775000 10.400000 0.945000 ;
-      RECT  8.740000 1.480000  8.910000 1.635000 ;
-      RECT  8.740000 1.635000  9.135000 1.965000 ;
-      RECT  8.740000 2.145000  9.485000 2.205000 ;
-      RECT  8.740000 2.205000 10.905000 2.330000 ;
-      RECT  8.740000 2.500000  8.990000 3.010000 ;
-      RECT  9.090000 1.125000  9.485000 1.455000 ;
-      RECT  9.315000 1.455000  9.485000 2.145000 ;
-      RECT  9.680000 0.945000 10.400000 1.000000 ;
-      RECT  9.680000 1.000000 10.010000 1.695000 ;
-      RECT  9.680000 1.695000 10.395000 2.025000 ;
-      RECT 10.070000 0.635000 10.400000 0.775000 ;
-      RECT 10.735000 1.185000 11.095000 1.515000 ;
-      RECT 10.735000 1.515000 10.905000 2.205000 ;
-      RECT 11.645000 0.635000 11.895000 1.115000 ;
-      RECT 11.645000 1.115000 12.325000 1.285000 ;
-      RECT 11.645000 1.465000 12.520000 1.635000 ;
-      RECT 11.645000 1.635000 11.895000 2.495000 ;
-      RECT 12.155000 1.285000 12.325000 1.305000 ;
-      RECT 12.155000 1.305000 12.520000 1.465000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.115000  0.085000  0.365000 0.725000 ;
+      RECT  0.185000  2.385000  0.515000 3.245000 ;
+      RECT  0.545000  0.265000  0.875000 0.725000 ;
+      RECT  0.695000  0.725000  0.875000 1.270000 ;
+      RECT  0.695000  1.270000  1.025000 3.065000 ;
+      RECT  1.105000  0.265000  1.585000 0.675000 ;
+      RECT  1.255000  0.675000  1.585000 2.235000 ;
+      RECT  1.255000  2.235000  2.630000 2.405000 ;
+      RECT  1.255000  2.405000  1.585000 2.975000 ;
+      RECT  1.765000  0.085000  2.095000 0.585000 ;
+      RECT  1.765000  2.585000  2.095000 3.245000 ;
+      RECT  2.460000  1.180000  2.755000 1.560000 ;
+      RECT  2.460000  1.560000  3.000000 1.880000 ;
+      RECT  2.460000  1.880000  2.630000 2.235000 ;
+      RECT  2.630000  0.265000  2.960000 0.830000 ;
+      RECT  2.630000  0.830000  3.350000 1.000000 ;
+      RECT  2.810000  2.060000  3.350000 2.230000 ;
+      RECT  2.810000  2.230000  3.140000 2.755000 ;
+      RECT  3.140000  0.265000  3.470000 0.480000 ;
+      RECT  3.140000  0.480000  3.700000 0.650000 ;
+      RECT  3.180000  1.000000  3.350000 2.060000 ;
+      RECT  3.320000  2.410000  3.700000 2.755000 ;
+      RECT  3.530000  0.650000  3.700000 1.055000 ;
+      RECT  3.530000  1.055000  5.200000 1.225000 ;
+      RECT  3.530000  1.225000  3.700000 2.410000 ;
+      RECT  3.880000  1.405000  4.165000 2.330000 ;
+      RECT  3.880000  2.330000  5.105000 2.500000 ;
+      RECT  4.050000  0.085000  4.380000 0.875000 ;
+      RECT  4.265000  2.680000  4.595000 3.245000 ;
+      RECT  4.375000  1.405000  4.705000 1.780000 ;
+      RECT  4.375000  1.780000  4.675000 2.150000 ;
+      RECT  4.560000  0.265000  5.910000 0.435000 ;
+      RECT  4.560000  0.435000  4.890000 0.875000 ;
+      RECT  4.855000  1.960000  6.555000 2.130000 ;
+      RECT  4.855000  2.130000  5.105000 2.330000 ;
+      RECT  4.855000  2.500000  5.105000 2.755000 ;
+      RECT  4.915000  1.225000  5.200000 1.385000 ;
+      RECT  5.070000  0.615000  5.400000 0.705000 ;
+      RECT  5.070000  0.705000  5.550000 0.875000 ;
+      RECT  5.380000  0.875000  5.550000 1.960000 ;
+      RECT  5.580000  0.435000  5.910000 0.525000 ;
+      RECT  5.595000  2.310000  5.925000 3.245000 ;
+      RECT  5.730000  0.760000  6.740000 0.930000 ;
+      RECT  5.730000  0.930000  6.015000 1.315000 ;
+      RECT  6.140000  0.085000  6.390000 0.580000 ;
+      RECT  6.225000  1.110000  6.555000 1.960000 ;
+      RECT  6.570000  0.265000  7.835000 0.435000 ;
+      RECT  6.570000  0.435000  6.740000 0.760000 ;
+      RECT  6.640000  2.580000  7.585000 2.750000 ;
+      RECT  6.640000  2.750000  6.970000 3.000000 ;
+      RECT  6.805000  1.110000  7.135000 2.070000 ;
+      RECT  6.805000  2.070000  7.235000 2.400000 ;
+      RECT  6.960000  0.615000  7.485000 0.930000 ;
+      RECT  7.315000  0.930000  7.485000 1.310000 ;
+      RECT  7.315000  1.310000  8.910000 1.480000 ;
+      RECT  7.415000  1.480000  7.585000 2.580000 ;
+      RECT  7.665000  0.435000  7.835000 0.945000 ;
+      RECT  7.665000  0.945000  8.910000 1.115000 ;
+      RECT  7.765000  1.660000  8.055000 2.330000 ;
+      RECT  7.765000  2.330000 10.905000 2.375000 ;
+      RECT  7.765000  2.375000  8.990000 2.500000 ;
+      RECT  8.070000  0.085000  8.320000 0.765000 ;
+      RECT  8.140000  2.680000  8.470000 3.245000 ;
+      RECT  8.265000  1.660000  8.560000 2.150000 ;
+      RECT  8.500000  0.265000  9.845000 0.595000 ;
+      RECT  8.740000  0.775000 10.400000 0.945000 ;
+      RECT  8.740000  1.480000  8.910000 1.635000 ;
+      RECT  8.740000  1.635000  9.135000 1.965000 ;
+      RECT  8.740000  2.145000  9.485000 2.205000 ;
+      RECT  8.740000  2.205000 10.905000 2.330000 ;
+      RECT  8.740000  2.500000  8.990000 3.010000 ;
+      RECT  9.090000  1.125000  9.485000 1.455000 ;
+      RECT  9.315000  1.455000  9.485000 2.145000 ;
+      RECT  9.500000  2.555000  9.830000 3.245000 ;
+      RECT  9.680000  0.945000 10.400000 1.000000 ;
+      RECT  9.680000  1.000000 10.010000 1.695000 ;
+      RECT  9.680000  1.695000 10.395000 2.025000 ;
+      RECT 10.070000  0.635000 10.400000 0.775000 ;
+      RECT 10.575000  2.555000 10.905000 3.245000 ;
+      RECT 10.580000  0.085000 10.830000 1.000000 ;
+      RECT 10.735000  1.185000 11.095000 1.515000 ;
+      RECT 10.735000  1.515000 10.905000 2.205000 ;
+      RECT 11.645000  0.635000 11.895000 1.115000 ;
+      RECT 11.645000  1.115000 12.325000 1.285000 ;
+      RECT 11.645000  1.465000 12.520000 1.635000 ;
+      RECT 11.645000  1.635000 11.895000 2.495000 ;
+      RECT 12.075000  0.085000 12.325000 0.935000 ;
+      RECT 12.075000  1.815000 12.325000 3.245000 ;
+      RECT 12.155000  1.285000 12.325000 1.305000 ;
+      RECT 12.155000  1.305000 12.520000 1.465000 ;
     LAYER mcon ;
-      RECT 2.555000 1.210000 2.725000 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  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  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  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  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 ;
+      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.180000 2.785000 1.225000 ;
       RECT 2.495000 1.225000 7.105000 1.365000 ;
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef
index 54f0316..5e98541 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.magic.lef
@@ -67,14 +67,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.595000 1.450000 1.860000 2.155000 ;
-        RECT 4.475000 1.790000 4.900000 2.120000 ;
-        RECT 7.740000 1.940000 8.070000 2.200000 ;
-      LAYER mcon ;
-        RECT 1.595000 1.950000 1.765000 2.120000 ;
-        RECT 4.475000 1.950000 4.645000 2.120000 ;
-        RECT 7.835000 1.950000 8.005000 2.120000 ;
       LAYER met1 ;
         RECT 1.535000 1.920000 1.825000 1.965000 ;
         RECT 1.535000 1.965000 8.065000 2.105000 ;
@@ -98,39 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.520000 0.085000 ;
-        RECT  0.600000  0.085000  0.810000 0.900000 ;
-        RECT  1.545000  0.085000  1.875000 0.700000 ;
-        RECT  5.225000  0.085000  5.555000 0.550000 ;
-        RECT  7.495000  0.085000  7.685000 0.950000 ;
-        RECT  9.600000  0.085000  9.930000 0.455000 ;
-        RECT 10.665000  0.085000 10.995000 0.455000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -139,113 +98,149 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.520000 3.415000 ;
-        RECT  0.530000 2.350000  0.860000 3.245000 ;
-        RECT  1.970000 2.665000  2.320000 3.245000 ;
-        RECT  4.340000 2.650000  4.670000 3.245000 ;
-        RECT  5.350000 2.240000  5.680000 3.245000 ;
-        RECT  7.325000 2.405000  7.995000 3.245000 ;
-        RECT  8.590000 2.405000  8.825000 3.245000 ;
-        RECT  9.505000 2.505000  9.835000 3.245000 ;
-        RECT 10.600000 1.820000 10.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 ;
-        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.100000 0.585000  0.430000 1.070000 ;
-      RECT  0.100000 1.070000  1.035000 1.400000 ;
-      RECT  0.100000 1.400000  0.360000 3.020000 ;
-      RECT  0.980000 0.585000  1.375000 0.870000 ;
-      RECT  0.980000 0.870000  2.255000 0.900000 ;
-      RECT  1.030000 2.350000  1.350000 3.020000 ;
-      RECT  1.110000 1.580000  1.395000 2.100000 ;
-      RECT  1.110000 2.100000  1.350000 2.350000 ;
-      RECT  1.205000 0.900000  2.255000 1.040000 ;
-      RECT  1.205000 1.040000  1.395000 1.580000 ;
-      RECT  1.520000 2.325000  3.345000 2.495000 ;
-      RECT  1.520000 2.495000  1.730000 2.735000 ;
-      RECT  2.045000 0.630000  4.755000 0.720000 ;
-      RECT  2.045000 0.720000  6.450000 0.800000 ;
-      RECT  2.045000 0.800000  2.255000 0.870000 ;
-      RECT  2.485000 0.980000  2.925000 1.220000 ;
-      RECT  2.540000 2.495000  3.345000 2.735000 ;
-      RECT  2.755000 1.220000  2.925000 2.115000 ;
-      RECT  2.755000 2.115000  3.150000 2.300000 ;
-      RECT  2.755000 2.300000  3.345000 2.325000 ;
-      RECT  3.095000 0.800000  3.265000 1.615000 ;
-      RECT  3.095000 1.615000  3.500000 1.945000 ;
-      RECT  3.435000 0.970000  4.215000 1.060000 ;
-      RECT  3.435000 1.060000  5.600000 1.260000 ;
-      RECT  3.435000 1.260000  3.860000 1.300000 ;
-      RECT  3.515000 2.370000  5.095000 2.470000 ;
-      RECT  3.515000 2.470000  3.965000 2.735000 ;
-      RECT  3.680000 1.300000  3.860000 2.300000 ;
-      RECT  3.680000 2.300000  5.095000 2.370000 ;
-      RECT  4.040000 1.440000  5.240000 1.610000 ;
-      RECT  4.040000 1.610000  4.295000 2.030000 ;
-      RECT  4.540000 0.800000  6.450000 0.890000 ;
-      RECT  4.850000 2.470000  5.095000 2.735000 ;
-      RECT  5.070000 1.610000  5.240000 1.900000 ;
-      RECT  5.070000 1.900000  6.145000 2.070000 ;
-      RECT  5.410000 1.260000  5.600000 1.720000 ;
-      RECT  5.770000 1.060000  6.100000 1.320000 ;
-      RECT  5.930000 1.320000  6.100000 1.900000 ;
-      RECT  5.930000 2.070000  6.145000 2.910000 ;
-      RECT  6.270000 0.890000  6.450000 1.720000 ;
-      RECT  6.500000 2.040000  6.820000 2.915000 ;
-      RECT  6.620000 0.630000  6.820000 1.250000 ;
-      RECT  6.620000 1.250000  8.430000 1.430000 ;
-      RECT  6.620000 1.430000  6.820000 2.040000 ;
-      RECT  7.200000 1.600000  8.790000 1.770000 ;
-      RECT  7.200000 1.770000  7.530000 2.190000 ;
-      RECT  7.875000 0.345000  9.130000 0.515000 ;
-      RECT  7.875000 0.515000  8.045000 1.190000 ;
-      RECT  7.875000 1.190000  8.430000 1.250000 ;
-      RECT  8.165000 2.345000  8.420000 2.735000 ;
-      RECT  8.225000 0.685000  8.790000 1.015000 ;
-      RECT  8.250000 1.770000  8.790000 1.970000 ;
-      RECT  8.250000 1.970000  8.420000 2.345000 ;
-      RECT  8.610000 1.015000  8.790000 1.600000 ;
-      RECT  8.960000 0.515000  9.130000 0.625000 ;
-      RECT  8.960000 0.625000 10.995000 0.795000 ;
-      RECT  8.960000 0.965000  9.290000 1.145000 ;
-      RECT  8.960000 1.145000  9.165000 1.250000 ;
-      RECT  8.995000 1.250000  9.165000 2.165000 ;
-      RECT  8.995000 2.165000 10.000000 2.335000 ;
-      RECT  8.995000 2.335000  9.325000 3.065000 ;
-      RECT  9.345000 1.325000  9.640000 1.995000 ;
-      RECT  9.460000 0.795000  9.640000 1.325000 ;
-      RECT  9.830000 1.345000 10.055000 1.675000 ;
-      RECT  9.830000 1.675000 10.000000 2.165000 ;
-      RECT 10.825000 0.795000 10.995000 1.185000 ;
-      RECT 10.825000 1.185000 11.015000 1.515000 ;
+      RECT  0.000000 -0.085000 11.520000 0.085000 ;
+      RECT  0.000000  3.245000 11.520000 3.415000 ;
+      RECT  0.100000  0.585000  0.430000 1.070000 ;
+      RECT  0.100000  1.070000  1.035000 1.400000 ;
+      RECT  0.100000  1.400000  0.360000 3.020000 ;
+      RECT  0.530000  2.350000  0.860000 3.245000 ;
+      RECT  0.600000  0.085000  0.810000 0.900000 ;
+      RECT  0.980000  0.585000  1.375000 0.870000 ;
+      RECT  0.980000  0.870000  2.255000 0.900000 ;
+      RECT  1.030000  2.350000  1.350000 3.020000 ;
+      RECT  1.110000  1.580000  1.395000 2.100000 ;
+      RECT  1.110000  2.100000  1.350000 2.350000 ;
+      RECT  1.205000  0.900000  2.255000 1.040000 ;
+      RECT  1.205000  1.040000  1.395000 1.580000 ;
+      RECT  1.520000  2.325000  3.345000 2.495000 ;
+      RECT  1.520000  2.495000  1.730000 2.735000 ;
+      RECT  1.545000  0.085000  1.875000 0.700000 ;
+      RECT  1.595000  1.450000  1.860000 2.155000 ;
+      RECT  1.970000  2.665000  2.320000 3.245000 ;
+      RECT  2.045000  0.630000  4.755000 0.720000 ;
+      RECT  2.045000  0.720000  6.450000 0.800000 ;
+      RECT  2.045000  0.800000  2.255000 0.870000 ;
+      RECT  2.485000  0.980000  2.925000 1.220000 ;
+      RECT  2.540000  2.495000  3.345000 2.735000 ;
+      RECT  2.755000  1.220000  2.925000 2.115000 ;
+      RECT  2.755000  2.115000  3.150000 2.300000 ;
+      RECT  2.755000  2.300000  3.345000 2.325000 ;
+      RECT  3.095000  0.800000  3.265000 1.615000 ;
+      RECT  3.095000  1.615000  3.500000 1.945000 ;
+      RECT  3.435000  0.970000  4.215000 1.060000 ;
+      RECT  3.435000  1.060000  5.600000 1.260000 ;
+      RECT  3.435000  1.260000  3.860000 1.300000 ;
+      RECT  3.515000  2.370000  5.095000 2.470000 ;
+      RECT  3.515000  2.470000  3.965000 2.735000 ;
+      RECT  3.680000  1.300000  3.860000 2.300000 ;
+      RECT  3.680000  2.300000  5.095000 2.370000 ;
+      RECT  4.040000  1.440000  5.240000 1.610000 ;
+      RECT  4.040000  1.610000  4.295000 2.030000 ;
+      RECT  4.340000  2.650000  4.670000 3.245000 ;
+      RECT  4.475000  1.790000  4.900000 2.120000 ;
+      RECT  4.540000  0.800000  6.450000 0.890000 ;
+      RECT  4.850000  2.470000  5.095000 2.735000 ;
+      RECT  5.070000  1.610000  5.240000 1.900000 ;
+      RECT  5.070000  1.900000  6.145000 2.070000 ;
+      RECT  5.225000  0.085000  5.555000 0.550000 ;
+      RECT  5.350000  2.240000  5.680000 3.245000 ;
+      RECT  5.410000  1.260000  5.600000 1.720000 ;
+      RECT  5.770000  1.060000  6.100000 1.320000 ;
+      RECT  5.930000  1.320000  6.100000 1.900000 ;
+      RECT  5.930000  2.070000  6.145000 2.910000 ;
+      RECT  6.270000  0.890000  6.450000 1.720000 ;
+      RECT  6.500000  2.040000  6.820000 2.915000 ;
+      RECT  6.620000  0.630000  6.820000 1.250000 ;
+      RECT  6.620000  1.250000  8.430000 1.430000 ;
+      RECT  6.620000  1.430000  6.820000 2.040000 ;
+      RECT  7.200000  1.600000  8.790000 1.770000 ;
+      RECT  7.200000  1.770000  7.530000 2.190000 ;
+      RECT  7.325000  2.405000  7.995000 3.245000 ;
+      RECT  7.495000  0.085000  7.685000 0.950000 ;
+      RECT  7.740000  1.940000  8.070000 2.200000 ;
+      RECT  7.875000  0.345000  9.130000 0.515000 ;
+      RECT  7.875000  0.515000  8.045000 1.190000 ;
+      RECT  7.875000  1.190000  8.430000 1.250000 ;
+      RECT  8.165000  2.345000  8.420000 2.735000 ;
+      RECT  8.225000  0.685000  8.790000 1.015000 ;
+      RECT  8.250000  1.770000  8.790000 1.970000 ;
+      RECT  8.250000  1.970000  8.420000 2.345000 ;
+      RECT  8.590000  2.405000  8.825000 3.245000 ;
+      RECT  8.610000  1.015000  8.790000 1.600000 ;
+      RECT  8.960000  0.515000  9.130000 0.625000 ;
+      RECT  8.960000  0.625000 10.995000 0.795000 ;
+      RECT  8.960000  0.965000  9.290000 1.145000 ;
+      RECT  8.960000  1.145000  9.165000 1.250000 ;
+      RECT  8.995000  1.250000  9.165000 2.165000 ;
+      RECT  8.995000  2.165000 10.000000 2.335000 ;
+      RECT  8.995000  2.335000  9.325000 3.065000 ;
+      RECT  9.345000  1.325000  9.640000 1.995000 ;
+      RECT  9.460000  0.795000  9.640000 1.325000 ;
+      RECT  9.505000  2.505000  9.835000 3.245000 ;
+      RECT  9.600000  0.085000  9.930000 0.455000 ;
+      RECT  9.830000  1.345000 10.055000 1.675000 ;
+      RECT  9.830000  1.675000 10.000000 2.165000 ;
+      RECT 10.600000  1.820000 10.865000 3.245000 ;
+      RECT 10.665000  0.085000 10.995000 0.455000 ;
+      RECT 10.825000  0.795000 10.995000 1.185000 ;
+      RECT 10.825000  1.185000 11.015000 1.515000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.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  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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_lp__dfrbp_1
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef
index 25f80f8..07cc9cb 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.magic.lef
@@ -63,14 +63,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.585000 1.450000 1.890000 2.155000 ;
-        RECT 4.475000 1.950000 4.920000 2.120000 ;
-        RECT 4.495000 1.790000 4.920000 1.950000 ;
-        RECT 7.760000 1.950000 8.050000 2.280000 ;
-      LAYER mcon ;
-        RECT 1.595000 1.950000 1.765000 2.120000 ;
-        RECT 7.835000 1.950000 8.005000 2.120000 ;
       LAYER met1 ;
         RECT 1.535000 1.920000 1.825000 1.965000 ;
         RECT 1.535000 1.965000 8.065000 2.105000 ;
@@ -94,42 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.570000  0.085000  0.830000 0.755000 ;
-        RECT  1.575000  0.085000  1.905000 0.700000 ;
-        RECT  5.245000  0.085000  5.575000 0.550000 ;
-        RECT  7.455000  0.085000  7.785000 1.015000 ;
-        RECT  8.765000  0.085000  9.095000 0.650000 ;
-        RECT  9.625000  0.085000  9.955000 1.110000 ;
-        RECT 10.660000  0.085000 11.015000 1.125000 ;
-        RECT 11.580000  0.085000 11.875000 1.205000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -138,102 +94,141 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  0.550000 2.335000  0.880000 3.245000 ;
-        RECT  1.990000 2.665000  2.340000 3.245000 ;
-        RECT  4.360000 2.650000  4.690000 3.245000 ;
-        RECT  5.370000 2.240000  5.700000 3.245000 ;
-        RECT  7.345000 2.525000  8.025000 3.245000 ;
-        RECT  8.685000 1.940000  9.015000 3.245000 ;
-        RECT  9.625000 1.620000  9.875000 3.245000 ;
-        RECT 10.600000 1.815000 10.955000 3.245000 ;
-        RECT 11.580000 1.815000 11.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 ;
-        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.120000 0.425000  0.400000 0.925000 ;
-      RECT  0.120000 0.925000  1.055000 1.255000 ;
-      RECT  0.120000 1.255000  0.355000 2.335000 ;
-      RECT  0.120000 2.335000  0.380000 3.020000 ;
-      RECT  1.000000 0.395000  1.405000 0.755000 ;
-      RECT  1.050000 2.335000  1.380000 3.020000 ;
-      RECT  1.110000 2.305000  1.380000 2.335000 ;
-      RECT  1.210000 1.935000  1.415000 2.155000 ;
-      RECT  1.210000 2.155000  1.380000 2.305000 ;
-      RECT  1.235000 0.755000  1.405000 0.870000 ;
-      RECT  1.235000 0.870000  2.315000 1.040000 ;
-      RECT  1.235000 1.040000  1.415000 1.935000 ;
-      RECT  1.550000 2.325000  3.365000 2.495000 ;
-      RECT  1.550000 2.495000  1.750000 2.735000 ;
-      RECT  2.075000 0.630000  4.775000 0.720000 ;
-      RECT  2.075000 0.720000  6.470000 0.800000 ;
-      RECT  2.075000 0.800000  2.315000 0.870000 ;
-      RECT  2.560000 2.495000  3.365000 2.735000 ;
-      RECT  2.810000 0.980000  3.035000 2.115000 ;
-      RECT  2.810000 2.115000  3.170000 2.300000 ;
-      RECT  2.810000 2.300000  3.365000 2.325000 ;
-      RECT  3.205000 0.800000  3.375000 1.615000 ;
-      RECT  3.205000 1.615000  3.625000 1.945000 ;
-      RECT  3.535000 2.370000  5.115000 2.470000 ;
-      RECT  3.535000 2.470000  3.985000 2.735000 ;
-      RECT  3.545000 0.970000  4.235000 1.060000 ;
-      RECT  3.545000 1.060000  5.620000 1.260000 ;
-      RECT  3.545000 1.260000  3.965000 1.300000 ;
-      RECT  3.795000 1.300000  3.965000 2.300000 ;
-      RECT  3.795000 2.300000  5.115000 2.370000 ;
-      RECT  4.135000 1.440000  5.260000 1.610000 ;
-      RECT  4.135000 1.610000  4.305000 2.030000 ;
-      RECT  4.560000 0.800000  6.470000 0.890000 ;
-      RECT  4.870000 2.470000  5.115000 2.735000 ;
-      RECT  5.090000 1.610000  5.260000 1.900000 ;
-      RECT  5.090000 1.900000  6.165000 2.070000 ;
-      RECT  5.430000 1.260000  5.620000 1.720000 ;
-      RECT  5.790000 1.060000  6.120000 1.320000 ;
-      RECT  5.950000 1.320000  6.120000 1.900000 ;
-      RECT  5.950000 2.070000  6.165000 2.910000 ;
-      RECT  6.290000 0.890000  6.470000 1.720000 ;
-      RECT  6.520000 2.040000  6.840000 2.915000 ;
-      RECT  6.640000 0.630000  6.840000 1.240000 ;
-      RECT  6.640000 1.240000  8.565000 1.430000 ;
-      RECT  6.640000 1.430000  6.840000 2.040000 ;
-      RECT  7.220000 1.600000  9.025000 1.770000 ;
-      RECT  7.220000 1.770000  8.490000 1.780000 ;
-      RECT  7.220000 1.780000  7.550000 2.270000 ;
-      RECT  8.220000 1.780000  8.490000 2.855000 ;
-      RECT  8.245000 0.820000  9.025000 1.070000 ;
-      RECT  8.745000 1.070000  9.025000 1.600000 ;
-      RECT 10.125000 0.385000 10.490000 1.295000 ;
-      RECT 10.125000 1.295000 11.015000 1.625000 ;
-      RECT 10.125000 1.625000 10.430000 2.485000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.120000  0.425000  0.400000 0.925000 ;
+      RECT  0.120000  0.925000  1.055000 1.255000 ;
+      RECT  0.120000  1.255000  0.355000 2.335000 ;
+      RECT  0.120000  2.335000  0.380000 3.020000 ;
+      RECT  0.550000  2.335000  0.880000 3.245000 ;
+      RECT  0.570000  0.085000  0.830000 0.755000 ;
+      RECT  1.000000  0.395000  1.405000 0.755000 ;
+      RECT  1.050000  2.335000  1.380000 3.020000 ;
+      RECT  1.110000  2.305000  1.380000 2.335000 ;
+      RECT  1.210000  1.935000  1.415000 2.155000 ;
+      RECT  1.210000  2.155000  1.380000 2.305000 ;
+      RECT  1.235000  0.755000  1.405000 0.870000 ;
+      RECT  1.235000  0.870000  2.315000 1.040000 ;
+      RECT  1.235000  1.040000  1.415000 1.935000 ;
+      RECT  1.550000  2.325000  3.365000 2.495000 ;
+      RECT  1.550000  2.495000  1.750000 2.735000 ;
+      RECT  1.575000  0.085000  1.905000 0.700000 ;
+      RECT  1.585000  1.450000  1.890000 2.155000 ;
+      RECT  1.990000  2.665000  2.340000 3.245000 ;
+      RECT  2.075000  0.630000  4.775000 0.720000 ;
+      RECT  2.075000  0.720000  6.470000 0.800000 ;
+      RECT  2.075000  0.800000  2.315000 0.870000 ;
+      RECT  2.560000  2.495000  3.365000 2.735000 ;
+      RECT  2.810000  0.980000  3.035000 2.115000 ;
+      RECT  2.810000  2.115000  3.170000 2.300000 ;
+      RECT  2.810000  2.300000  3.365000 2.325000 ;
+      RECT  3.205000  0.800000  3.375000 1.615000 ;
+      RECT  3.205000  1.615000  3.625000 1.945000 ;
+      RECT  3.535000  2.370000  5.115000 2.470000 ;
+      RECT  3.535000  2.470000  3.985000 2.735000 ;
+      RECT  3.545000  0.970000  4.235000 1.060000 ;
+      RECT  3.545000  1.060000  5.620000 1.260000 ;
+      RECT  3.545000  1.260000  3.965000 1.300000 ;
+      RECT  3.795000  1.300000  3.965000 2.300000 ;
+      RECT  3.795000  2.300000  5.115000 2.370000 ;
+      RECT  4.135000  1.440000  5.260000 1.610000 ;
+      RECT  4.135000  1.610000  4.305000 2.030000 ;
+      RECT  4.360000  2.650000  4.690000 3.245000 ;
+      RECT  4.475000  1.950000  4.920000 2.120000 ;
+      RECT  4.495000  1.790000  4.920000 1.950000 ;
+      RECT  4.560000  0.800000  6.470000 0.890000 ;
+      RECT  4.870000  2.470000  5.115000 2.735000 ;
+      RECT  5.090000  1.610000  5.260000 1.900000 ;
+      RECT  5.090000  1.900000  6.165000 2.070000 ;
+      RECT  5.245000  0.085000  5.575000 0.550000 ;
+      RECT  5.370000  2.240000  5.700000 3.245000 ;
+      RECT  5.430000  1.260000  5.620000 1.720000 ;
+      RECT  5.790000  1.060000  6.120000 1.320000 ;
+      RECT  5.950000  1.320000  6.120000 1.900000 ;
+      RECT  5.950000  2.070000  6.165000 2.910000 ;
+      RECT  6.290000  0.890000  6.470000 1.720000 ;
+      RECT  6.520000  2.040000  6.840000 2.915000 ;
+      RECT  6.640000  0.630000  6.840000 1.240000 ;
+      RECT  6.640000  1.240000  8.565000 1.430000 ;
+      RECT  6.640000  1.430000  6.840000 2.040000 ;
+      RECT  7.220000  1.600000  9.025000 1.770000 ;
+      RECT  7.220000  1.770000  8.490000 1.780000 ;
+      RECT  7.220000  1.780000  7.550000 2.270000 ;
+      RECT  7.345000  2.525000  8.025000 3.245000 ;
+      RECT  7.455000  0.085000  7.785000 1.015000 ;
+      RECT  7.760000  1.950000  8.050000 2.280000 ;
+      RECT  8.220000  1.780000  8.490000 2.855000 ;
+      RECT  8.245000  0.820000  9.025000 1.070000 ;
+      RECT  8.685000  1.940000  9.015000 3.245000 ;
+      RECT  8.745000  1.070000  9.025000 1.600000 ;
+      RECT  8.765000  0.085000  9.095000 0.650000 ;
+      RECT  9.625000  0.085000  9.955000 1.110000 ;
+      RECT  9.625000  1.620000  9.875000 3.245000 ;
+      RECT 10.125000  0.385000 10.490000 1.295000 ;
+      RECT 10.125000  1.295000 11.015000 1.625000 ;
+      RECT 10.125000  1.625000 10.430000 2.485000 ;
+      RECT 10.600000  1.815000 10.955000 3.245000 ;
+      RECT 10.660000  0.085000 11.015000 1.125000 ;
+      RECT 11.580000  0.085000 11.875000 1.205000 ;
+      RECT 11.580000  1.815000 11.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  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.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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.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 ;
+      RECT 11.675000 -0.085000 11.845000 0.085000 ;
+      RECT 11.675000  3.245000 11.845000 3.415000 ;
   END
 END sky130_fd_sc_lp__dfrbp_2
diff --git a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef
index 90ce7ef..0cd66ee 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.magic.lef
@@ -62,14 +62,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  0.985000 1.110000  1.315000 1.780000 ;
-        RECT  4.925000 1.450000  5.275000 1.780000 ;
-        RECT 12.125000 1.110000 12.455000 1.780000 ;
-      LAYER mcon ;
-        RECT  1.115000 1.580000  1.285000 1.750000 ;
-        RECT  4.955000 1.580000  5.125000 1.750000 ;
-        RECT 12.155000 1.580000 12.325000 1.750000 ;
       LAYER met1 ;
         RECT  1.055000 1.550000  1.345000 1.595000 ;
         RECT  1.055000 1.595000 12.385000 1.735000 ;
@@ -93,54 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 18.240000 0.085000 ;
-        RECT  1.055000  0.085000  1.385000 0.700000 ;
-        RECT  1.055000  0.700000  1.315000 0.940000 ;
-        RECT  4.715000  0.085000  5.045000 0.570000 ;
-        RECT  6.910000  0.085000  7.240000 0.995000 ;
-        RECT 10.635000  0.085000 10.965000 0.485000 ;
-        RECT 14.490000  0.085000 14.820000 0.550000 ;
-        RECT 16.995000  0.085000 17.325000 1.125000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -149,141 +93,192 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 18.240000 3.415000 ;
-        RECT  1.425000 2.660000  1.755000 3.245000 ;
-        RECT  4.660000 2.660000  4.990000 3.245000 ;
-        RECT  6.840000 2.395000  7.170000 3.245000 ;
-        RECT 10.635000 2.655000 10.885000 3.245000 ;
-        RECT 12.815000 2.660000 12.985000 3.245000 ;
-        RECT 14.715000 2.290000 15.045000 3.245000 ;
-        RECT 16.995000 1.815000 17.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 ;
-        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.100000 2.265000  0.350000 2.895000 ;
-      RECT  0.100000 2.895000  1.210000 3.065000 ;
-      RECT  0.530000 1.960000  2.985000 2.130000 ;
-      RECT  0.530000 2.130000  0.860000 2.715000 ;
-      RECT  1.040000 2.310000  2.185000 2.480000 ;
-      RECT  1.040000 2.480000  1.210000 2.895000 ;
-      RECT  1.935000 2.480000  2.185000 2.910000 ;
-      RECT  2.385000 2.310000  2.635000 2.895000 ;
-      RECT  2.385000 2.895000  4.385000 3.065000 ;
-      RECT  2.495000 0.580000  2.825000 1.960000 ;
-      RECT  2.815000 2.130000  2.985000 2.545000 ;
-      RECT  2.815000 2.545000  3.845000 2.715000 ;
-      RECT  3.005000 0.580000  3.335000 1.000000 ;
-      RECT  3.165000 1.000000  3.335000 1.685000 ;
-      RECT  3.165000 1.685000  4.195000 1.855000 ;
-      RECT  3.165000 1.855000  3.335000 2.365000 ;
-      RECT  3.515000 0.750000  5.395000 0.920000 ;
-      RECT  3.515000 0.920000  3.845000 1.460000 ;
-      RECT  3.515000 2.035000  3.845000 2.545000 ;
-      RECT  4.025000 1.100000  5.870000 1.270000 ;
-      RECT  4.025000 1.270000  4.195000 1.685000 ;
-      RECT  4.025000 1.855000  4.195000 2.310000 ;
-      RECT  4.025000 2.310000  5.850000 2.480000 ;
-      RECT  4.055000 2.660000  4.385000 2.895000 ;
-      RECT  4.375000 1.455000  4.705000 1.960000 ;
-      RECT  4.375000 1.960000  6.380000 2.045000 ;
-      RECT  4.375000 2.045000  8.440000 2.130000 ;
-      RECT  5.225000 0.265000  6.730000 0.435000 ;
-      RECT  5.225000 0.435000  5.395000 0.750000 ;
-      RECT  5.520000 2.480000  5.850000 2.725000 ;
-      RECT  5.540000 1.270000  5.870000 1.770000 ;
-      RECT  6.050000 0.615000  6.380000 1.960000 ;
-      RECT  6.050000 2.130000  8.440000 2.215000 ;
-      RECT  6.050000 2.215000  6.380000 2.725000 ;
-      RECT  6.560000 0.435000  6.730000 1.175000 ;
-      RECT  6.560000 1.175000  8.740000 1.345000 ;
-      RECT  7.815000 0.535000  8.145000 1.175000 ;
-      RECT  7.815000 1.345000  8.090000 1.865000 ;
-      RECT  8.270000 1.525000  9.250000 1.695000 ;
-      RECT  8.270000 1.695000  8.440000 2.045000 ;
-      RECT  8.410000 0.675000  8.740000 1.175000 ;
-      RECT  8.620000 1.875000  8.870000 2.895000 ;
-      RECT  8.620000 2.895000 10.455000 3.065000 ;
-      RECT  8.920000 0.265000  9.250000 1.525000 ;
-      RECT  9.075000 2.385000 10.105000 2.715000 ;
-      RECT  9.080000 1.695000  9.250000 1.875000 ;
-      RECT  9.080000 1.875000  9.755000 2.205000 ;
-      RECT  9.430000 0.265000  9.760000 1.525000 ;
-      RECT  9.430000 1.525000 11.585000 1.695000 ;
-      RECT  9.935000 1.695000 10.105000 2.385000 ;
-      RECT  9.940000 0.665000 11.315000 0.835000 ;
-      RECT  9.940000 0.835000 10.270000 1.345000 ;
-      RECT 10.285000 2.655000 10.455000 2.895000 ;
-      RECT 10.510000 1.015000 11.935000 1.185000 ;
-      RECT 10.510000 1.185000 10.840000 1.345000 ;
-      RECT 10.905000 1.965000 11.235000 2.425000 ;
-      RECT 11.065000 2.425000 11.235000 2.895000 ;
-      RECT 11.065000 2.895000 12.635000 3.065000 ;
-      RECT 11.145000 0.265000 14.000000 0.435000 ;
-      RECT 11.145000 0.435000 11.315000 0.665000 ;
-      RECT 11.215000 1.365000 11.585000 1.525000 ;
-      RECT 11.415000 1.695000 11.585000 2.545000 ;
-      RECT 11.415000 2.545000 12.285000 2.715000 ;
-      RECT 11.765000 0.615000 13.275000 0.865000 ;
-      RECT 11.765000 0.865000 11.935000 1.015000 ;
-      RECT 11.765000 1.185000 11.935000 2.365000 ;
-      RECT 12.115000 1.960000 13.370000 2.130000 ;
-      RECT 12.115000 2.130000 12.285000 2.545000 ;
-      RECT 12.465000 2.310000 13.495000 2.480000 ;
-      RECT 12.465000 2.480000 12.635000 2.895000 ;
-      RECT 13.040000 1.590000 14.985000 1.760000 ;
-      RECT 13.040000 1.760000 13.370000 1.960000 ;
-      RECT 13.165000 2.480000 13.495000 2.990000 ;
-      RECT 13.670000 0.435000 14.000000 0.730000 ;
-      RECT 13.670000 0.730000 15.335000 0.900000 ;
-      RECT 13.700000 1.940000 15.335000 2.110000 ;
-      RECT 13.700000 2.110000 14.030000 2.495000 ;
-      RECT 14.725000 1.345000 14.985000 1.590000 ;
-      RECT 15.165000 0.900000 15.335000 1.940000 ;
-      RECT 16.090000 0.665000 16.420000 1.305000 ;
-      RECT 16.090000 1.305000 17.605000 1.635000 ;
-      RECT 16.090000 1.635000 16.420000 2.495000 ;
+      RECT  0.000000 -0.085000 18.240000 0.085000 ;
+      RECT  0.000000  3.245000 18.240000 3.415000 ;
+      RECT  0.100000  2.265000  0.350000 2.895000 ;
+      RECT  0.100000  2.895000  1.210000 3.065000 ;
+      RECT  0.530000  1.960000  2.985000 2.130000 ;
+      RECT  0.530000  2.130000  0.860000 2.715000 ;
+      RECT  0.985000  1.110000  1.315000 1.780000 ;
+      RECT  1.040000  2.310000  2.185000 2.480000 ;
+      RECT  1.040000  2.480000  1.210000 2.895000 ;
+      RECT  1.055000  0.085000  1.385000 0.700000 ;
+      RECT  1.055000  0.700000  1.315000 0.940000 ;
+      RECT  1.425000  2.660000  1.755000 3.245000 ;
+      RECT  1.935000  2.480000  2.185000 2.910000 ;
+      RECT  2.385000  2.310000  2.635000 2.895000 ;
+      RECT  2.385000  2.895000  4.385000 3.065000 ;
+      RECT  2.495000  0.580000  2.825000 1.960000 ;
+      RECT  2.815000  2.130000  2.985000 2.545000 ;
+      RECT  2.815000  2.545000  3.845000 2.715000 ;
+      RECT  3.005000  0.580000  3.335000 1.000000 ;
+      RECT  3.165000  1.000000  3.335000 1.685000 ;
+      RECT  3.165000  1.685000  4.195000 1.855000 ;
+      RECT  3.165000  1.855000  3.335000 2.365000 ;
+      RECT  3.515000  0.750000  5.395000 0.920000 ;
+      RECT  3.515000  0.920000  3.845000 1.460000 ;
+      RECT  3.515000  2.035000  3.845000 2.545000 ;
+      RECT  4.025000  1.100000  5.870000 1.270000 ;
+      RECT  4.025000  1.270000  4.195000 1.685000 ;
+      RECT  4.025000  1.855000  4.195000 2.310000 ;
+      RECT  4.025000  2.310000  5.850000 2.480000 ;
+      RECT  4.055000  2.660000  4.385000 2.895000 ;
+      RECT  4.375000  1.455000  4.705000 1.960000 ;
+      RECT  4.375000  1.960000  6.380000 2.045000 ;
+      RECT  4.375000  2.045000  8.440000 2.130000 ;
+      RECT  4.660000  2.660000  4.990000 3.245000 ;
+      RECT  4.715000  0.085000  5.045000 0.570000 ;
+      RECT  4.925000  1.450000  5.275000 1.780000 ;
+      RECT  5.225000  0.265000  6.730000 0.435000 ;
+      RECT  5.225000  0.435000  5.395000 0.750000 ;
+      RECT  5.520000  2.480000  5.850000 2.725000 ;
+      RECT  5.540000  1.270000  5.870000 1.770000 ;
+      RECT  6.050000  0.615000  6.380000 1.960000 ;
+      RECT  6.050000  2.130000  8.440000 2.215000 ;
+      RECT  6.050000  2.215000  6.380000 2.725000 ;
+      RECT  6.560000  0.435000  6.730000 1.175000 ;
+      RECT  6.560000  1.175000  8.740000 1.345000 ;
+      RECT  6.840000  2.395000  7.170000 3.245000 ;
+      RECT  6.910000  0.085000  7.240000 0.995000 ;
+      RECT  7.815000  0.535000  8.145000 1.175000 ;
+      RECT  7.815000  1.345000  8.090000 1.865000 ;
+      RECT  8.270000  1.525000  9.250000 1.695000 ;
+      RECT  8.270000  1.695000  8.440000 2.045000 ;
+      RECT  8.410000  0.675000  8.740000 1.175000 ;
+      RECT  8.620000  1.875000  8.870000 2.895000 ;
+      RECT  8.620000  2.895000 10.455000 3.065000 ;
+      RECT  8.920000  0.265000  9.250000 1.525000 ;
+      RECT  9.075000  2.385000 10.105000 2.715000 ;
+      RECT  9.080000  1.695000  9.250000 1.875000 ;
+      RECT  9.080000  1.875000  9.755000 2.205000 ;
+      RECT  9.430000  0.265000  9.760000 1.525000 ;
+      RECT  9.430000  1.525000 11.585000 1.695000 ;
+      RECT  9.935000  1.695000 10.105000 2.385000 ;
+      RECT  9.940000  0.665000 11.315000 0.835000 ;
+      RECT  9.940000  0.835000 10.270000 1.345000 ;
+      RECT 10.285000  2.655000 10.455000 2.895000 ;
+      RECT 10.510000  1.015000 11.935000 1.185000 ;
+      RECT 10.510000  1.185000 10.840000 1.345000 ;
+      RECT 10.635000  0.085000 10.965000 0.485000 ;
+      RECT 10.635000  2.655000 10.885000 3.245000 ;
+      RECT 10.905000  1.965000 11.235000 2.425000 ;
+      RECT 11.065000  2.425000 11.235000 2.895000 ;
+      RECT 11.065000  2.895000 12.635000 3.065000 ;
+      RECT 11.145000  0.265000 14.000000 0.435000 ;
+      RECT 11.145000  0.435000 11.315000 0.665000 ;
+      RECT 11.215000  1.365000 11.585000 1.525000 ;
+      RECT 11.415000  1.695000 11.585000 2.545000 ;
+      RECT 11.415000  2.545000 12.285000 2.715000 ;
+      RECT 11.765000  0.615000 13.275000 0.865000 ;
+      RECT 11.765000  0.865000 11.935000 1.015000 ;
+      RECT 11.765000  1.185000 11.935000 2.365000 ;
+      RECT 12.115000  1.960000 13.370000 2.130000 ;
+      RECT 12.115000  2.130000 12.285000 2.545000 ;
+      RECT 12.125000  1.110000 12.455000 1.780000 ;
+      RECT 12.465000  2.310000 13.495000 2.480000 ;
+      RECT 12.465000  2.480000 12.635000 2.895000 ;
+      RECT 12.815000  2.660000 12.985000 3.245000 ;
+      RECT 13.040000  1.590000 14.985000 1.760000 ;
+      RECT 13.040000  1.760000 13.370000 1.960000 ;
+      RECT 13.165000  2.480000 13.495000 2.990000 ;
+      RECT 13.670000  0.435000 14.000000 0.730000 ;
+      RECT 13.670000  0.730000 15.335000 0.900000 ;
+      RECT 13.700000  1.940000 15.335000 2.110000 ;
+      RECT 13.700000  2.110000 14.030000 2.495000 ;
+      RECT 14.490000  0.085000 14.820000 0.550000 ;
+      RECT 14.715000  2.290000 15.045000 3.245000 ;
+      RECT 14.725000  1.345000 14.985000 1.590000 ;
+      RECT 15.165000  0.900000 15.335000 1.940000 ;
+      RECT 16.090000  0.665000 16.420000 1.305000 ;
+      RECT 16.090000  1.305000 17.605000 1.635000 ;
+      RECT 16.090000  1.635000 16.420000 2.495000 ;
+      RECT 16.995000  0.085000 17.325000 1.125000 ;
+      RECT 16.995000  1.815000 17.325000 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  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  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 ;
+      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 ;
   END
 END sky130_fd_sc_lp__dfrbp_lp
diff --git a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef
index e58a8d6..1a171c1 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.magic.lef
@@ -55,15 +55,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.095000 1.565000 0.680000 2.120000 ;
-        RECT 2.555000 1.565000 3.375000 1.750000 ;
-        RECT 6.855000 1.580000 7.295000 1.835000 ;
-        RECT 7.045000 1.835000 7.295000 2.250000 ;
-      LAYER mcon ;
-        RECT 0.155000 1.580000 0.325000 1.750000 ;
-        RECT 2.555000 1.580000 2.725000 1.750000 ;
-        RECT 6.875000 1.580000 7.045000 1.750000 ;
       LAYER met1 ;
         RECT 0.095000 1.550000 0.385000 1.595000 ;
         RECT 0.095000 1.595000 7.105000 1.735000 ;
@@ -87,39 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.255000  0.085000  0.585000 0.980000 ;
-        RECT 3.250000  0.085000  3.580000 0.540000 ;
-        RECT 4.470000  0.085000  4.800000 0.415000 ;
-        RECT 6.790000  0.085000  7.120000 0.710000 ;
-        RECT 8.760000  0.085000  8.930000 0.890000 ;
-        RECT 8.760000  0.890000  9.215000 1.060000 ;
-        RECT 9.015000  1.060000  9.215000 1.320000 ;
-        RECT 9.725000  0.085000  9.985000 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 ;
-        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
@@ -128,117 +86,154 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 0.640000 2.630000  0.970000 3.245000 ;
-        RECT 2.830000 2.610000  3.160000 3.245000 ;
-        RECT 4.525000 2.965000  4.855000 3.245000 ;
-        RECT 6.720000 2.785000  6.920000 3.245000 ;
-        RECT 8.145000 2.745000  8.335000 3.245000 ;
-        RECT 9.605000 1.845000  9.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 ;
-        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.100000 2.290000  1.565000 2.460000 ;
-      RECT 0.100000 2.460000  0.470000 2.735000 ;
-      RECT 1.150000 0.650000  1.635000 0.980000 ;
-      RECT 1.160000 1.565000  1.635000 1.820000 ;
-      RECT 1.160000 1.820000  1.565000 2.290000 ;
-      RECT 1.160000 2.460000  1.565000 2.735000 ;
-      RECT 1.465000 0.980000  1.635000 1.565000 ;
-      RECT 1.470000 0.255000  2.335000 0.480000 ;
-      RECT 1.735000 2.085000  1.985000 2.270000 ;
-      RECT 1.735000 2.270000  4.845000 2.440000 ;
-      RECT 1.735000 2.440000  2.040000 2.735000 ;
-      RECT 1.805000 0.675000  1.985000 2.085000 ;
-      RECT 2.155000 0.480000  2.335000 0.710000 ;
-      RECT 2.155000 0.710000  5.140000 0.765000 ;
-      RECT 2.155000 0.765000  4.165000 0.880000 ;
-      RECT 2.155000 0.880000  2.335000 1.920000 ;
-      RECT 2.155000 1.920000  4.275000 2.100000 ;
-      RECT 2.505000 1.050000  5.480000 1.105000 ;
-      RECT 2.505000 1.105000  4.505000 1.220000 ;
-      RECT 2.505000 1.220000  2.835000 1.395000 ;
-      RECT 3.330000 2.440000  3.645000 2.735000 ;
-      RECT 3.915000 0.550000  4.245000 0.585000 ;
-      RECT 3.915000 0.585000  5.140000 0.710000 ;
-      RECT 4.025000 2.625000  5.370000 2.765000 ;
-      RECT 4.025000 2.765000  6.245000 2.795000 ;
-      RECT 4.025000 2.795000  4.355000 3.065000 ;
-      RECT 4.335000 0.935000  5.480000 1.050000 ;
-      RECT 4.675000 1.275000  4.845000 2.270000 ;
-      RECT 4.970000 0.255000  6.375000 0.425000 ;
-      RECT 4.970000 0.425000  5.140000 0.585000 ;
-      RECT 5.025000 1.105000  5.480000 1.205000 ;
-      RECT 5.025000 1.205000  5.205000 2.245000 ;
-      RECT 5.025000 2.245000  5.370000 2.455000 ;
-      RECT 5.200000 2.795000  6.245000 2.935000 ;
-      RECT 5.310000 0.595000  5.480000 0.935000 ;
-      RECT 5.385000 1.480000  5.830000 1.735000 ;
-      RECT 5.385000 1.735000  5.555000 1.810000 ;
-      RECT 5.540000 1.980000  6.170000 2.075000 ;
-      RECT 5.540000 2.075000  5.830000 2.100000 ;
-      RECT 5.540000 2.100000  5.800000 2.115000 ;
-      RECT 5.540000 2.115000  5.770000 2.155000 ;
-      RECT 5.540000 2.155000  5.720000 2.585000 ;
-      RECT 5.610000 1.975000  6.170000 1.980000 ;
-      RECT 5.625000 1.965000  6.170000 1.975000 ;
-      RECT 5.640000 1.960000  6.170000 1.965000 ;
-      RECT 5.655000 1.950000  6.170000 1.960000 ;
-      RECT 5.660000 0.425000  6.375000 0.435000 ;
-      RECT 5.660000 0.435000  5.830000 1.480000 ;
-      RECT 5.680000 1.935000  6.170000 1.950000 ;
-      RECT 5.700000 1.905000  6.170000 1.935000 ;
-      RECT 5.920000 2.245000  6.250000 2.430000 ;
-      RECT 5.920000 2.430000  7.260000 2.600000 ;
-      RECT 5.920000 2.600000  6.245000 2.765000 ;
-      RECT 6.000000 0.605000  6.225000 0.880000 ;
-      RECT 6.000000 0.880000  7.490000 1.060000 ;
-      RECT 6.000000 1.060000  6.170000 1.905000 ;
-      RECT 6.515000 1.230000  7.990000 1.400000 ;
-      RECT 6.515000 1.400000  6.685000 2.050000 ;
-      RECT 7.090000 2.600000  7.260000 2.895000 ;
-      RECT 7.090000 2.895000  7.975000 3.065000 ;
-      RECT 7.310000 0.265000  8.360000 0.490000 ;
-      RECT 7.310000 0.490000  7.490000 0.880000 ;
-      RECT 7.465000 1.400000  7.635000 2.725000 ;
-      RECT 7.660000 0.660000  7.990000 1.230000 ;
-      RECT 7.805000 2.405000  8.845000 2.575000 ;
-      RECT 7.805000 2.575000  7.975000 2.895000 ;
-      RECT 8.215000 0.940000  8.475000 1.230000 ;
-      RECT 8.215000 1.230000  8.845000 1.400000 ;
-      RECT 8.505000 2.575000  8.845000 3.075000 ;
-      RECT 8.675000 1.400000  8.845000 2.405000 ;
-      RECT 9.120000 1.505000 10.035000 1.675000 ;
-      RECT 9.120000 1.675000  9.435000 2.495000 ;
-      RECT 9.180000 0.280000  9.555000 0.610000 ;
-      RECT 9.385000 0.610000  9.555000 1.345000 ;
-      RECT 9.385000 1.345000 10.035000 1.505000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.095000  1.565000  0.680000 2.120000 ;
+      RECT 0.100000  2.290000  1.565000 2.460000 ;
+      RECT 0.100000  2.460000  0.470000 2.735000 ;
+      RECT 0.255000  0.085000  0.585000 0.980000 ;
+      RECT 0.640000  2.630000  0.970000 3.245000 ;
+      RECT 1.150000  0.650000  1.635000 0.980000 ;
+      RECT 1.160000  1.565000  1.635000 1.820000 ;
+      RECT 1.160000  1.820000  1.565000 2.290000 ;
+      RECT 1.160000  2.460000  1.565000 2.735000 ;
+      RECT 1.465000  0.980000  1.635000 1.565000 ;
+      RECT 1.470000  0.255000  2.335000 0.480000 ;
+      RECT 1.735000  2.085000  1.985000 2.270000 ;
+      RECT 1.735000  2.270000  4.845000 2.440000 ;
+      RECT 1.735000  2.440000  2.040000 2.735000 ;
+      RECT 1.805000  0.675000  1.985000 2.085000 ;
+      RECT 2.155000  0.480000  2.335000 0.710000 ;
+      RECT 2.155000  0.710000  5.140000 0.765000 ;
+      RECT 2.155000  0.765000  4.165000 0.880000 ;
+      RECT 2.155000  0.880000  2.335000 1.920000 ;
+      RECT 2.155000  1.920000  4.275000 2.100000 ;
+      RECT 2.505000  1.050000  5.480000 1.105000 ;
+      RECT 2.505000  1.105000  4.505000 1.220000 ;
+      RECT 2.505000  1.220000  2.835000 1.395000 ;
+      RECT 2.555000  1.565000  3.375000 1.750000 ;
+      RECT 2.830000  2.610000  3.160000 3.245000 ;
+      RECT 3.250000  0.085000  3.580000 0.540000 ;
+      RECT 3.330000  2.440000  3.645000 2.735000 ;
+      RECT 3.915000  0.550000  4.245000 0.585000 ;
+      RECT 3.915000  0.585000  5.140000 0.710000 ;
+      RECT 4.025000  2.625000  5.370000 2.765000 ;
+      RECT 4.025000  2.765000  6.245000 2.795000 ;
+      RECT 4.025000  2.795000  4.355000 3.065000 ;
+      RECT 4.335000  0.935000  5.480000 1.050000 ;
+      RECT 4.470000  0.085000  4.800000 0.415000 ;
+      RECT 4.525000  2.965000  4.855000 3.245000 ;
+      RECT 4.675000  1.275000  4.845000 2.270000 ;
+      RECT 4.970000  0.255000  6.375000 0.425000 ;
+      RECT 4.970000  0.425000  5.140000 0.585000 ;
+      RECT 5.025000  1.105000  5.480000 1.205000 ;
+      RECT 5.025000  1.205000  5.205000 2.245000 ;
+      RECT 5.025000  2.245000  5.370000 2.455000 ;
+      RECT 5.200000  2.795000  6.245000 2.935000 ;
+      RECT 5.310000  0.595000  5.480000 0.935000 ;
+      RECT 5.385000  1.480000  5.830000 1.735000 ;
+      RECT 5.385000  1.735000  5.555000 1.810000 ;
+      RECT 5.540000  1.980000  6.170000 2.075000 ;
+      RECT 5.540000  2.075000  5.830000 2.100000 ;
+      RECT 5.540000  2.100000  5.800000 2.115000 ;
+      RECT 5.540000  2.115000  5.770000 2.155000 ;
+      RECT 5.540000  2.155000  5.720000 2.585000 ;
+      RECT 5.610000  1.975000  6.170000 1.980000 ;
+      RECT 5.625000  1.965000  6.170000 1.975000 ;
+      RECT 5.640000  1.960000  6.170000 1.965000 ;
+      RECT 5.655000  1.950000  6.170000 1.960000 ;
+      RECT 5.660000  0.425000  6.375000 0.435000 ;
+      RECT 5.660000  0.435000  5.830000 1.480000 ;
+      RECT 5.680000  1.935000  6.170000 1.950000 ;
+      RECT 5.700000  1.905000  6.170000 1.935000 ;
+      RECT 5.920000  2.245000  6.250000 2.430000 ;
+      RECT 5.920000  2.430000  7.260000 2.600000 ;
+      RECT 5.920000  2.600000  6.245000 2.765000 ;
+      RECT 6.000000  0.605000  6.225000 0.880000 ;
+      RECT 6.000000  0.880000  7.490000 1.060000 ;
+      RECT 6.000000  1.060000  6.170000 1.905000 ;
+      RECT 6.515000  1.230000  7.990000 1.400000 ;
+      RECT 6.515000  1.400000  6.685000 2.050000 ;
+      RECT 6.720000  2.785000  6.920000 3.245000 ;
+      RECT 6.790000  0.085000  7.120000 0.710000 ;
+      RECT 6.855000  1.580000  7.295000 1.835000 ;
+      RECT 7.045000  1.835000  7.295000 2.250000 ;
+      RECT 7.090000  2.600000  7.260000 2.895000 ;
+      RECT 7.090000  2.895000  7.975000 3.065000 ;
+      RECT 7.310000  0.265000  8.360000 0.490000 ;
+      RECT 7.310000  0.490000  7.490000 0.880000 ;
+      RECT 7.465000  1.400000  7.635000 2.725000 ;
+      RECT 7.660000  0.660000  7.990000 1.230000 ;
+      RECT 7.805000  2.405000  8.845000 2.575000 ;
+      RECT 7.805000  2.575000  7.975000 2.895000 ;
+      RECT 8.145000  2.745000  8.335000 3.245000 ;
+      RECT 8.215000  0.940000  8.475000 1.230000 ;
+      RECT 8.215000  1.230000  8.845000 1.400000 ;
+      RECT 8.505000  2.575000  8.845000 3.075000 ;
+      RECT 8.675000  1.400000  8.845000 2.405000 ;
+      RECT 8.760000  0.085000  8.930000 0.890000 ;
+      RECT 8.760000  0.890000  9.215000 1.060000 ;
+      RECT 9.015000  1.060000  9.215000 1.320000 ;
+      RECT 9.120000  1.505000 10.035000 1.675000 ;
+      RECT 9.120000  1.675000  9.435000 2.495000 ;
+      RECT 9.180000  0.280000  9.555000 0.610000 ;
+      RECT 9.385000  0.610000  9.555000 1.345000 ;
+      RECT 9.385000  1.345000 10.035000 1.505000 ;
+      RECT 9.605000  1.845000  9.975000 3.245000 ;
+      RECT 9.725000  0.085000  9.985000 1.090000 ;
+    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  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  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  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_lp__dfrtn_1
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef
index 1f9c9d8..6b80e5a 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.magic.lef
@@ -77,36 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.595000  0.085000  0.785000 0.930000 ;
-        RECT 2.005000  0.085000  2.335000 1.005000 ;
-        RECT 5.005000  0.085000  5.335000 0.355000 ;
-        RECT 7.510000  0.085000  7.840000 1.025000 ;
-        RECT 9.695000  0.085000 10.035000 1.165000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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,109 +85,135 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 0.525000 2.640000  0.855000 3.245000 ;
-        RECT 1.910000 2.845000  2.240000 3.245000 ;
-        RECT 3.755000 2.795000  3.975000 3.245000 ;
-        RECT 5.255000 2.975000  5.585000 3.245000 ;
-        RECT 7.565000 2.630000  7.905000 3.245000 ;
-        RECT 8.635000 2.630000  8.920000 3.245000 ;
-        RECT 9.585000 1.845000  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 ;
-        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.620000  0.425000 1.100000 ;
-      RECT 0.095000 1.100000  1.125000 1.280000 ;
-      RECT 0.095000 2.300000  0.835000 2.470000 ;
-      RECT 0.095000 2.470000  0.355000 2.970000 ;
-      RECT 0.665000 1.280000  1.125000 1.770000 ;
-      RECT 0.665000 1.770000  0.835000 2.300000 ;
-      RECT 0.955000 0.280000  1.825000 0.450000 ;
-      RECT 0.955000 0.450000  1.125000 1.100000 ;
-      RECT 1.025000 1.940000  1.485000 2.135000 ;
-      RECT 1.025000 2.135000  2.905000 2.335000 ;
-      RECT 1.025000 2.335000  1.285000 2.960000 ;
-      RECT 1.295000 0.620000  1.485000 1.940000 ;
-      RECT 1.480000 2.505000  3.245000 2.675000 ;
-      RECT 1.480000 2.675000  1.740000 3.035000 ;
-      RECT 1.655000 0.450000  1.825000 1.175000 ;
-      RECT 1.655000 1.175000  2.685000 1.345000 ;
-      RECT 2.410000 2.675000  2.640000 3.035000 ;
-      RECT 2.515000 0.470000  4.835000 0.525000 ;
-      RECT 2.515000 0.525000  6.345000 0.640000 ;
-      RECT 2.515000 0.640000  2.685000 1.175000 ;
-      RECT 2.810000 2.845000  3.585000 3.075000 ;
-      RECT 2.855000 0.810000  3.055000 1.785000 ;
-      RECT 2.855000 1.785000  3.245000 1.955000 ;
-      RECT 3.075000 1.955000  3.245000 2.505000 ;
-      RECT 3.225000 0.640000  3.395000 1.605000 ;
-      RECT 3.415000 2.445000  4.415000 2.615000 ;
-      RECT 3.415000 2.615000  3.585000 2.845000 ;
-      RECT 3.455000 1.875000  4.015000 2.180000 ;
-      RECT 3.565000 0.810000  4.145000 0.930000 ;
-      RECT 3.565000 0.930000  5.485000 1.140000 ;
-      RECT 3.685000 1.310000  4.015000 1.875000 ;
-      RECT 4.145000 2.615000  4.415000 3.035000 ;
-      RECT 4.195000 2.125000  5.485000 2.295000 ;
-      RECT 4.195000 2.295000  4.415000 2.445000 ;
-      RECT 4.225000 1.355000  4.555000 1.495000 ;
-      RECT 4.225000 1.495000  5.935000 1.665000 ;
-      RECT 4.225000 1.665000  4.555000 1.955000 ;
-      RECT 4.470000 0.640000  6.345000 0.705000 ;
-      RECT 5.155000 1.140000  5.485000 1.315000 ;
-      RECT 5.155000 1.845000  5.485000 2.125000 ;
-      RECT 5.505000 0.255000  7.175000 0.525000 ;
-      RECT 5.665000 0.875000  5.995000 1.065000 ;
-      RECT 5.665000 1.065000  5.935000 1.495000 ;
-      RECT 5.765000 1.665000  5.935000 2.265000 ;
-      RECT 5.765000 2.265000  6.200000 2.465000 ;
-      RECT 6.105000 1.755000  6.345000 2.085000 ;
-      RECT 6.175000 0.705000  6.345000 1.755000 ;
-      RECT 6.370000 2.265000  6.695000 2.735000 ;
-      RECT 6.515000 0.695000  6.775000 1.195000 ;
-      RECT 6.515000 1.195000  8.655000 1.365000 ;
-      RECT 6.515000 1.365000  6.695000 2.265000 ;
-      RECT 6.865000 1.545000  7.055000 2.215000 ;
-      RECT 7.565000 2.095000  8.995000 2.265000 ;
-      RECT 7.565000 2.265000  8.465000 2.425000 ;
-      RECT 8.160000 2.425000  8.465000 2.960000 ;
-      RECT 8.300000 0.695000  8.995000 1.025000 ;
-      RECT 8.395000 1.365000  8.655000 1.865000 ;
-      RECT 8.825000 1.025000  8.995000 2.095000 ;
-      RECT 9.165000 0.430000  9.525000 1.335000 ;
-      RECT 9.165000 1.335000 10.035000 1.665000 ;
-      RECT 9.165000 1.665000  9.390000 2.490000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.095000  0.620000  0.425000 1.100000 ;
+      RECT 0.095000  1.100000  1.125000 1.280000 ;
+      RECT 0.095000  2.300000  0.835000 2.470000 ;
+      RECT 0.095000  2.470000  0.355000 2.970000 ;
+      RECT 0.525000  2.640000  0.855000 3.245000 ;
+      RECT 0.595000  0.085000  0.785000 0.930000 ;
+      RECT 0.665000  1.280000  1.125000 1.770000 ;
+      RECT 0.665000  1.770000  0.835000 2.300000 ;
+      RECT 0.955000  0.280000  1.825000 0.450000 ;
+      RECT 0.955000  0.450000  1.125000 1.100000 ;
+      RECT 1.025000  1.940000  1.485000 2.135000 ;
+      RECT 1.025000  2.135000  2.905000 2.335000 ;
+      RECT 1.025000  2.335000  1.285000 2.960000 ;
+      RECT 1.295000  0.620000  1.485000 1.940000 ;
+      RECT 1.480000  2.505000  3.245000 2.675000 ;
+      RECT 1.480000  2.675000  1.740000 3.035000 ;
+      RECT 1.655000  0.450000  1.825000 1.175000 ;
+      RECT 1.655000  1.175000  2.685000 1.345000 ;
+      RECT 1.910000  2.845000  2.240000 3.245000 ;
+      RECT 2.005000  0.085000  2.335000 1.005000 ;
+      RECT 2.410000  2.675000  2.640000 3.035000 ;
+      RECT 2.515000  0.470000  4.835000 0.525000 ;
+      RECT 2.515000  0.525000  6.345000 0.640000 ;
+      RECT 2.515000  0.640000  2.685000 1.175000 ;
+      RECT 2.810000  2.845000  3.585000 3.075000 ;
+      RECT 2.855000  0.810000  3.055000 1.785000 ;
+      RECT 2.855000  1.785000  3.245000 1.955000 ;
+      RECT 3.075000  1.955000  3.245000 2.505000 ;
+      RECT 3.225000  0.640000  3.395000 1.605000 ;
+      RECT 3.415000  2.445000  4.415000 2.615000 ;
+      RECT 3.415000  2.615000  3.585000 2.845000 ;
+      RECT 3.455000  1.875000  4.015000 2.180000 ;
+      RECT 3.565000  0.810000  4.145000 0.930000 ;
+      RECT 3.565000  0.930000  5.485000 1.140000 ;
+      RECT 3.685000  1.310000  4.015000 1.875000 ;
+      RECT 3.755000  2.795000  3.975000 3.245000 ;
+      RECT 4.145000  2.615000  4.415000 3.035000 ;
+      RECT 4.195000  2.125000  5.485000 2.295000 ;
+      RECT 4.195000  2.295000  4.415000 2.445000 ;
+      RECT 4.225000  1.355000  4.555000 1.495000 ;
+      RECT 4.225000  1.495000  5.935000 1.665000 ;
+      RECT 4.225000  1.665000  4.555000 1.955000 ;
+      RECT 4.470000  0.640000  6.345000 0.705000 ;
+      RECT 5.005000  0.085000  5.335000 0.355000 ;
+      RECT 5.155000  1.140000  5.485000 1.315000 ;
+      RECT 5.155000  1.845000  5.485000 2.125000 ;
+      RECT 5.255000  2.975000  5.585000 3.245000 ;
+      RECT 5.505000  0.255000  7.175000 0.525000 ;
+      RECT 5.665000  0.875000  5.995000 1.065000 ;
+      RECT 5.665000  1.065000  5.935000 1.495000 ;
+      RECT 5.765000  1.665000  5.935000 2.265000 ;
+      RECT 5.765000  2.265000  6.200000 2.465000 ;
+      RECT 6.105000  1.755000  6.345000 2.085000 ;
+      RECT 6.175000  0.705000  6.345000 1.755000 ;
+      RECT 6.370000  2.265000  6.695000 2.735000 ;
+      RECT 6.515000  0.695000  6.775000 1.195000 ;
+      RECT 6.515000  1.195000  8.655000 1.365000 ;
+      RECT 6.515000  1.365000  6.695000 2.265000 ;
+      RECT 6.865000  1.545000  7.055000 2.215000 ;
+      RECT 7.510000  0.085000  7.840000 1.025000 ;
+      RECT 7.565000  2.095000  8.995000 2.265000 ;
+      RECT 7.565000  2.265000  8.465000 2.425000 ;
+      RECT 7.565000  2.630000  7.905000 3.245000 ;
+      RECT 8.160000  2.425000  8.465000 2.960000 ;
+      RECT 8.300000  0.695000  8.995000 1.025000 ;
+      RECT 8.395000  1.365000  8.655000 1.865000 ;
+      RECT 8.635000  2.630000  8.920000 3.245000 ;
+      RECT 8.825000  1.025000  8.995000 2.095000 ;
+      RECT 9.165000  0.430000  9.525000 1.335000 ;
+      RECT 9.165000  1.335000 10.035000 1.665000 ;
+      RECT 9.165000  1.665000  9.390000 2.490000 ;
+      RECT 9.585000  1.845000  9.960000 3.245000 ;
+      RECT 9.695000  0.085000 10.035000 1.165000 ;
     LAYER mcon ;
-      RECT 1.115000 1.950000 1.285000 2.120000 ;
-      RECT 3.515000 1.950000 3.685000 2.120000 ;
-      RECT 6.875000 1.950000 7.045000 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  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.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.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  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  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  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 1.055000 1.920000 1.345000 1.965000 ;
       RECT 1.055000 1.965000 7.105000 2.105000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef
index 4641a9a..466bf21 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.magic.lef
@@ -77,39 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.560000  0.085000  0.785000 0.880000 ;
-        RECT  1.995000  0.085000  2.240000 0.700000 ;
-        RECT  5.045000  0.085000  5.315000 0.635000 ;
-        RECT  7.510000  0.085000  7.840000 0.885000 ;
-        RECT  9.570000  0.085000 10.060000 0.475000 ;
-        RECT  9.705000  0.475000 10.060000 1.015000 ;
-        RECT 10.625000  0.085000 10.920000 1.095000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -118,118 +85,147 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.525000 2.640000  0.855000 3.245000 ;
-        RECT  1.980000 2.765000  2.310000 3.245000 ;
-        RECT  3.755000 2.720000  3.995000 3.245000 ;
-        RECT  5.065000 2.735000  5.325000 3.245000 ;
-        RECT  7.205000 2.775000  8.160000 3.245000 ;
-        RECT  8.700000 2.775000  9.030000 3.245000 ;
-        RECT  9.725000 1.815000 10.060000 3.245000 ;
-        RECT 10.625000 1.815000 10.920000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.095000 0.545000  0.390000 1.100000 ;
-      RECT 0.095000 1.100000  1.125000 1.270000 ;
-      RECT 0.095000 2.300000  0.835000 2.470000 ;
-      RECT 0.095000 2.470000  0.355000 2.970000 ;
-      RECT 0.665000 1.270000  1.125000 1.705000 ;
-      RECT 0.665000 1.705000  0.835000 2.300000 ;
-      RECT 0.955000 0.255000  1.825000 0.425000 ;
-      RECT 0.955000 0.425000  1.125000 1.100000 ;
-      RECT 1.025000 2.085000  2.905000 2.255000 ;
-      RECT 1.025000 2.255000  1.285000 2.970000 ;
-      RECT 1.295000 0.595000  1.485000 1.500000 ;
-      RECT 1.295000 1.500000  1.825000 1.830000 ;
-      RECT 1.295000 1.830000  1.475000 2.085000 ;
-      RECT 1.550000 2.425000  3.245000 2.595000 ;
-      RECT 1.550000 2.595000  1.810000 3.050000 ;
-      RECT 1.655000 0.425000  1.825000 0.870000 ;
-      RECT 1.655000 0.870000  2.580000 1.040000 ;
-      RECT 2.410000 0.255000  4.220000 0.470000 ;
-      RECT 2.410000 0.470000  2.580000 0.870000 ;
-      RECT 2.480000 2.595000  2.700000 3.050000 ;
-      RECT 2.645000 1.925000  2.905000 2.085000 ;
-      RECT 2.785000 0.640000  3.160000 0.970000 ;
-      RECT 2.785000 0.970000  2.955000 1.565000 ;
-      RECT 2.785000 1.565000  3.245000 1.735000 ;
-      RECT 2.870000 2.765000  3.585000 3.050000 ;
-      RECT 3.075000 1.735000  3.245000 2.425000 ;
-      RECT 3.135000 1.140000  3.500000 1.385000 ;
-      RECT 3.330000 0.470000  3.500000 1.140000 ;
-      RECT 3.415000 1.555000  4.005000 1.750000 ;
-      RECT 3.415000 1.920000  5.645000 2.065000 ;
-      RECT 3.415000 2.065000  4.455000 2.220000 ;
-      RECT 3.415000 2.220000  3.585000 2.765000 ;
-      RECT 3.670000 0.640000  3.880000 1.145000 ;
-      RECT 3.670000 1.145000  5.645000 1.325000 ;
-      RECT 4.050000 0.470000  4.220000 0.805000 ;
-      RECT 4.050000 0.805000  5.655000 0.975000 ;
-      RECT 4.165000 2.220000  4.455000 3.050000 ;
-      RECT 4.185000 1.845000  5.645000 1.920000 ;
-      RECT 4.265000 1.495000  6.005000 1.675000 ;
-      RECT 5.485000 0.255000  7.175000 0.425000 ;
-      RECT 5.485000 0.425000  5.655000 0.805000 ;
-      RECT 5.825000 0.595000  6.005000 1.495000 ;
-      RECT 5.835000 1.675000  6.005000 2.405000 ;
-      RECT 5.835000 2.405000  6.095000 2.735000 ;
-      RECT 6.175000 0.425000  7.175000 0.435000 ;
-      RECT 6.175000 0.435000  6.355000 2.075000 ;
-      RECT 6.265000 2.405000  6.695000 2.735000 ;
-      RECT 6.525000 0.605000  6.775000 1.055000 ;
-      RECT 6.525000 1.055000  7.395000 1.225000 ;
-      RECT 6.525000 1.225000  6.695000 2.405000 ;
-      RECT 6.865000 1.455000  7.045000 2.125000 ;
-      RECT 7.225000 1.225000  7.395000 1.325000 ;
-      RECT 7.225000 1.325000  8.855000 1.495000 ;
-      RECT 7.575000 2.185000  7.825000 2.435000 ;
-      RECT 7.575000 2.435000  8.835000 2.605000 ;
-      RECT 8.300000 0.670000  8.630000 0.985000 ;
-      RECT 8.300000 0.985000  9.195000 1.155000 ;
-      RECT 8.330000 2.605000  8.530000 3.050000 ;
-      RECT 8.665000 2.175000  9.195000 2.345000 ;
-      RECT 8.665000 2.345000  8.835000 2.435000 ;
-      RECT 8.685000 1.495000  8.855000 1.995000 ;
-      RECT 9.025000 1.155000  9.195000 2.175000 ;
-      RECT 9.140000 0.255000  9.400000 0.645000 ;
-      RECT 9.140000 0.645000  9.535000 0.815000 ;
-      RECT 9.220000 2.515000  9.555000 3.075000 ;
-      RECT 9.365000 0.815000  9.535000 1.185000 ;
-      RECT 9.365000 1.185000 10.060000 1.515000 ;
-      RECT 9.365000 1.515000  9.555000 2.515000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.095000  0.545000  0.390000 1.100000 ;
+      RECT  0.095000  1.100000  1.125000 1.270000 ;
+      RECT  0.095000  2.300000  0.835000 2.470000 ;
+      RECT  0.095000  2.470000  0.355000 2.970000 ;
+      RECT  0.525000  2.640000  0.855000 3.245000 ;
+      RECT  0.560000  0.085000  0.785000 0.880000 ;
+      RECT  0.665000  1.270000  1.125000 1.705000 ;
+      RECT  0.665000  1.705000  0.835000 2.300000 ;
+      RECT  0.955000  0.255000  1.825000 0.425000 ;
+      RECT  0.955000  0.425000  1.125000 1.100000 ;
+      RECT  1.025000  2.085000  2.905000 2.255000 ;
+      RECT  1.025000  2.255000  1.285000 2.970000 ;
+      RECT  1.295000  0.595000  1.485000 1.500000 ;
+      RECT  1.295000  1.500000  1.825000 1.830000 ;
+      RECT  1.295000  1.830000  1.475000 2.085000 ;
+      RECT  1.550000  2.425000  3.245000 2.595000 ;
+      RECT  1.550000  2.595000  1.810000 3.050000 ;
+      RECT  1.655000  0.425000  1.825000 0.870000 ;
+      RECT  1.655000  0.870000  2.580000 1.040000 ;
+      RECT  1.980000  2.765000  2.310000 3.245000 ;
+      RECT  1.995000  0.085000  2.240000 0.700000 ;
+      RECT  2.410000  0.255000  4.220000 0.470000 ;
+      RECT  2.410000  0.470000  2.580000 0.870000 ;
+      RECT  2.480000  2.595000  2.700000 3.050000 ;
+      RECT  2.645000  1.925000  2.905000 2.085000 ;
+      RECT  2.785000  0.640000  3.160000 0.970000 ;
+      RECT  2.785000  0.970000  2.955000 1.565000 ;
+      RECT  2.785000  1.565000  3.245000 1.735000 ;
+      RECT  2.870000  2.765000  3.585000 3.050000 ;
+      RECT  3.075000  1.735000  3.245000 2.425000 ;
+      RECT  3.135000  1.140000  3.500000 1.385000 ;
+      RECT  3.330000  0.470000  3.500000 1.140000 ;
+      RECT  3.415000  1.555000  4.005000 1.750000 ;
+      RECT  3.415000  1.920000  5.645000 2.065000 ;
+      RECT  3.415000  2.065000  4.455000 2.220000 ;
+      RECT  3.415000  2.220000  3.585000 2.765000 ;
+      RECT  3.670000  0.640000  3.880000 1.145000 ;
+      RECT  3.670000  1.145000  5.645000 1.325000 ;
+      RECT  3.755000  2.720000  3.995000 3.245000 ;
+      RECT  4.050000  0.470000  4.220000 0.805000 ;
+      RECT  4.050000  0.805000  5.655000 0.975000 ;
+      RECT  4.165000  2.220000  4.455000 3.050000 ;
+      RECT  4.185000  1.845000  5.645000 1.920000 ;
+      RECT  4.265000  1.495000  6.005000 1.675000 ;
+      RECT  5.045000  0.085000  5.315000 0.635000 ;
+      RECT  5.065000  2.735000  5.325000 3.245000 ;
+      RECT  5.485000  0.255000  7.175000 0.425000 ;
+      RECT  5.485000  0.425000  5.655000 0.805000 ;
+      RECT  5.825000  0.595000  6.005000 1.495000 ;
+      RECT  5.835000  1.675000  6.005000 2.405000 ;
+      RECT  5.835000  2.405000  6.095000 2.735000 ;
+      RECT  6.175000  0.425000  7.175000 0.435000 ;
+      RECT  6.175000  0.435000  6.355000 2.075000 ;
+      RECT  6.265000  2.405000  6.695000 2.735000 ;
+      RECT  6.525000  0.605000  6.775000 1.055000 ;
+      RECT  6.525000  1.055000  7.395000 1.225000 ;
+      RECT  6.525000  1.225000  6.695000 2.405000 ;
+      RECT  6.865000  1.455000  7.045000 2.125000 ;
+      RECT  7.205000  2.775000  8.160000 3.245000 ;
+      RECT  7.225000  1.225000  7.395000 1.325000 ;
+      RECT  7.225000  1.325000  8.855000 1.495000 ;
+      RECT  7.510000  0.085000  7.840000 0.885000 ;
+      RECT  7.575000  2.185000  7.825000 2.435000 ;
+      RECT  7.575000  2.435000  8.835000 2.605000 ;
+      RECT  8.300000  0.670000  8.630000 0.985000 ;
+      RECT  8.300000  0.985000  9.195000 1.155000 ;
+      RECT  8.330000  2.605000  8.530000 3.050000 ;
+      RECT  8.665000  2.175000  9.195000 2.345000 ;
+      RECT  8.665000  2.345000  8.835000 2.435000 ;
+      RECT  8.685000  1.495000  8.855000 1.995000 ;
+      RECT  8.700000  2.775000  9.030000 3.245000 ;
+      RECT  9.025000  1.155000  9.195000 2.175000 ;
+      RECT  9.140000  0.255000  9.400000 0.645000 ;
+      RECT  9.140000  0.645000  9.535000 0.815000 ;
+      RECT  9.220000  2.515000  9.555000 3.075000 ;
+      RECT  9.365000  0.815000  9.535000 1.185000 ;
+      RECT  9.365000  1.185000 10.060000 1.515000 ;
+      RECT  9.365000  1.515000  9.555000 2.515000 ;
+      RECT  9.570000  0.085000 10.060000 0.475000 ;
+      RECT  9.705000  0.475000 10.060000 1.015000 ;
+      RECT  9.725000  1.815000 10.060000 3.245000 ;
+      RECT 10.625000  0.085000 10.920000 1.095000 ;
+      RECT 10.625000  1.815000 10.920000 3.245000 ;
     LAYER mcon ;
-      RECT 1.595000 1.580000 1.765000 1.750000 ;
-      RECT 3.515000 1.580000 3.685000 1.750000 ;
-      RECT 6.875000 1.580000 7.045000 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  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  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  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  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 ;
     LAYER met1 ;
       RECT 1.535000 1.550000 1.825000 1.595000 ;
       RECT 1.535000 1.595000 7.105000 1.735000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef
index a7e0ebc..7db9abc 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.magic.lef
@@ -83,41 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.525000  0.085000  0.865000 0.690000 ;
-        RECT  2.235000  0.085000  2.480000 0.915000 ;
-        RECT  5.155000  0.085000  5.485000 0.355000 ;
-        RECT  7.895000  0.085000  8.225000 0.930000 ;
-        RECT  9.880000  0.085000 10.140000 1.095000 ;
-        RECT 10.705000  0.085000 10.980000 0.895000 ;
-        RECT 11.565000  0.085000 11.895000 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 ;
-        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,118 +91,149 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  0.625000 2.640000  0.935000 3.245000 ;
-        RECT  2.090000 2.795000  2.420000 3.245000 ;
-        RECT  3.935000 2.795000  4.150000 3.245000 ;
-        RECT  5.275000 2.975000  5.605000 3.245000 ;
-        RECT  7.715000 2.640000  8.045000 3.245000 ;
-        RECT  8.875000 2.640000  9.205000 3.245000 ;
-        RECT  9.880000 1.815000 10.140000 3.245000 ;
-        RECT 10.705000 2.095000 11.035000 3.245000 ;
-        RECT 11.565000 2.095000 11.895000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.095000 0.495000  0.355000 0.860000 ;
-      RECT 0.095000 0.860000  1.205000 1.030000 ;
-      RECT 0.195000 2.300000  0.935000 2.470000 ;
-      RECT 0.195000 2.470000  0.455000 2.970000 ;
-      RECT 0.765000 1.030000  1.205000 1.650000 ;
-      RECT 0.765000 1.650000  0.935000 2.300000 ;
-      RECT 1.035000 0.290000  2.065000 0.460000 ;
-      RECT 1.035000 0.460000  1.205000 0.860000 ;
-      RECT 1.105000 1.870000  1.715000 2.085000 ;
-      RECT 1.105000 2.085000  3.085000 2.285000 ;
-      RECT 1.105000 2.285000  1.385000 2.960000 ;
-      RECT 1.385000 0.630000  1.715000 1.870000 ;
-      RECT 1.660000 2.455000  3.425000 2.625000 ;
-      RECT 1.660000 2.625000  1.920000 3.050000 ;
-      RECT 1.895000 0.460000  2.065000 1.085000 ;
-      RECT 1.895000 1.085000  2.820000 1.255000 ;
-      RECT 2.590000 2.625000  2.820000 3.050000 ;
-      RECT 2.650000 0.365000  4.310000 0.525000 ;
-      RECT 2.650000 0.525000  7.425000 0.535000 ;
-      RECT 2.650000 0.535000  2.820000 1.085000 ;
-      RECT 2.990000 0.725000  3.250000 1.055000 ;
-      RECT 2.990000 1.055000  3.195000 1.745000 ;
-      RECT 2.990000 1.745000  3.425000 1.915000 ;
-      RECT 2.990000 2.795000  3.765000 3.075000 ;
-      RECT 3.255000 1.915000  3.425000 2.455000 ;
-      RECT 3.365000 1.235000  3.590000 1.565000 ;
-      RECT 3.420000 0.535000  3.590000 1.235000 ;
-      RECT 3.595000 2.455000  4.545000 2.625000 ;
-      RECT 3.595000 2.625000  3.765000 2.795000 ;
-      RECT 3.760000 0.715000  3.960000 0.875000 ;
-      RECT 3.760000 0.875000  5.605000 1.045000 ;
-      RECT 3.835000 1.215000  4.205000 2.180000 ;
-      RECT 4.140000 0.535000  7.425000 0.695000 ;
-      RECT 4.320000 2.625000  4.585000 3.050000 ;
-      RECT 4.375000 1.215000  4.705000 1.485000 ;
-      RECT 4.375000 1.485000  5.955000 1.655000 ;
-      RECT 4.375000 1.655000  4.705000 1.745000 ;
-      RECT 4.375000 1.915000  5.605000 2.085000 ;
-      RECT 4.375000 2.085000  4.545000 2.455000 ;
-      RECT 5.275000 1.045000  5.605000 1.315000 ;
-      RECT 5.275000 1.825000  5.605000 1.915000 ;
-      RECT 5.785000 0.865000  6.145000 1.065000 ;
-      RECT 5.785000 1.065000  5.955000 1.485000 ;
-      RECT 5.785000 1.655000  5.955000 2.205000 ;
-      RECT 5.785000 2.205000  6.150000 2.465000 ;
-      RECT 6.125000 1.245000  6.485000 1.415000 ;
-      RECT 6.125000 1.415000  6.315000 1.955000 ;
-      RECT 6.315000 0.695000  6.485000 1.245000 ;
-      RECT 6.330000 2.345000  6.660000 2.615000 ;
-      RECT 6.485000 1.595000  6.845000 1.765000 ;
-      RECT 6.485000 1.765000  6.660000 2.345000 ;
-      RECT 6.655000 0.865000  6.985000 1.100000 ;
-      RECT 6.655000 1.100000  8.955000 1.270000 ;
-      RECT 6.655000 1.270000  6.845000 1.595000 ;
-      RECT 6.830000 1.935000  7.165000 2.195000 ;
-      RECT 7.095000 0.255000  7.425000 0.525000 ;
-      RECT 7.685000 1.950000  7.945000 2.300000 ;
-      RECT 7.685000 2.300000  9.295000 2.470000 ;
-      RECT 8.365000 2.470000  8.695000 2.815000 ;
-      RECT 8.735000 1.270000  8.955000 1.865000 ;
-      RECT 8.840000 0.650000  9.295000 0.930000 ;
-      RECT 9.125000 0.930000  9.295000 2.300000 ;
-      RECT 9.465000 0.255000  9.710000 1.405000 ;
-      RECT 9.465000 1.405000 11.500000 1.585000 ;
-      RECT 9.465000 1.585000  9.710000 3.075000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.095000  0.495000  0.355000 0.860000 ;
+      RECT  0.095000  0.860000  1.205000 1.030000 ;
+      RECT  0.195000  2.300000  0.935000 2.470000 ;
+      RECT  0.195000  2.470000  0.455000 2.970000 ;
+      RECT  0.525000  0.085000  0.865000 0.690000 ;
+      RECT  0.625000  2.640000  0.935000 3.245000 ;
+      RECT  0.765000  1.030000  1.205000 1.650000 ;
+      RECT  0.765000  1.650000  0.935000 2.300000 ;
+      RECT  1.035000  0.290000  2.065000 0.460000 ;
+      RECT  1.035000  0.460000  1.205000 0.860000 ;
+      RECT  1.105000  1.870000  1.715000 2.085000 ;
+      RECT  1.105000  2.085000  3.085000 2.285000 ;
+      RECT  1.105000  2.285000  1.385000 2.960000 ;
+      RECT  1.385000  0.630000  1.715000 1.870000 ;
+      RECT  1.660000  2.455000  3.425000 2.625000 ;
+      RECT  1.660000  2.625000  1.920000 3.050000 ;
+      RECT  1.895000  0.460000  2.065000 1.085000 ;
+      RECT  1.895000  1.085000  2.820000 1.255000 ;
+      RECT  2.090000  2.795000  2.420000 3.245000 ;
+      RECT  2.235000  0.085000  2.480000 0.915000 ;
+      RECT  2.590000  2.625000  2.820000 3.050000 ;
+      RECT  2.650000  0.365000  4.310000 0.525000 ;
+      RECT  2.650000  0.525000  7.425000 0.535000 ;
+      RECT  2.650000  0.535000  2.820000 1.085000 ;
+      RECT  2.990000  0.725000  3.250000 1.055000 ;
+      RECT  2.990000  1.055000  3.195000 1.745000 ;
+      RECT  2.990000  1.745000  3.425000 1.915000 ;
+      RECT  2.990000  2.795000  3.765000 3.075000 ;
+      RECT  3.255000  1.915000  3.425000 2.455000 ;
+      RECT  3.365000  1.235000  3.590000 1.565000 ;
+      RECT  3.420000  0.535000  3.590000 1.235000 ;
+      RECT  3.595000  2.455000  4.545000 2.625000 ;
+      RECT  3.595000  2.625000  3.765000 2.795000 ;
+      RECT  3.760000  0.715000  3.960000 0.875000 ;
+      RECT  3.760000  0.875000  5.605000 1.045000 ;
+      RECT  3.835000  1.215000  4.205000 2.180000 ;
+      RECT  3.935000  2.795000  4.150000 3.245000 ;
+      RECT  4.140000  0.535000  7.425000 0.695000 ;
+      RECT  4.320000  2.625000  4.585000 3.050000 ;
+      RECT  4.375000  1.215000  4.705000 1.485000 ;
+      RECT  4.375000  1.485000  5.955000 1.655000 ;
+      RECT  4.375000  1.655000  4.705000 1.745000 ;
+      RECT  4.375000  1.915000  5.605000 2.085000 ;
+      RECT  4.375000  2.085000  4.545000 2.455000 ;
+      RECT  5.155000  0.085000  5.485000 0.355000 ;
+      RECT  5.275000  1.045000  5.605000 1.315000 ;
+      RECT  5.275000  1.825000  5.605000 1.915000 ;
+      RECT  5.275000  2.975000  5.605000 3.245000 ;
+      RECT  5.785000  0.865000  6.145000 1.065000 ;
+      RECT  5.785000  1.065000  5.955000 1.485000 ;
+      RECT  5.785000  1.655000  5.955000 2.205000 ;
+      RECT  5.785000  2.205000  6.150000 2.465000 ;
+      RECT  6.125000  1.245000  6.485000 1.415000 ;
+      RECT  6.125000  1.415000  6.315000 1.955000 ;
+      RECT  6.315000  0.695000  6.485000 1.245000 ;
+      RECT  6.330000  2.345000  6.660000 2.615000 ;
+      RECT  6.485000  1.595000  6.845000 1.765000 ;
+      RECT  6.485000  1.765000  6.660000 2.345000 ;
+      RECT  6.655000  0.865000  6.985000 1.100000 ;
+      RECT  6.655000  1.100000  8.955000 1.270000 ;
+      RECT  6.655000  1.270000  6.845000 1.595000 ;
+      RECT  6.830000  1.935000  7.165000 2.195000 ;
+      RECT  7.095000  0.255000  7.425000 0.525000 ;
+      RECT  7.685000  1.950000  7.945000 2.300000 ;
+      RECT  7.685000  2.300000  9.295000 2.470000 ;
+      RECT  7.715000  2.640000  8.045000 3.245000 ;
+      RECT  7.895000  0.085000  8.225000 0.930000 ;
+      RECT  8.365000  2.470000  8.695000 2.815000 ;
+      RECT  8.735000  1.270000  8.955000 1.865000 ;
+      RECT  8.840000  0.650000  9.295000 0.930000 ;
+      RECT  8.875000  2.640000  9.205000 3.245000 ;
+      RECT  9.125000  0.930000  9.295000 2.300000 ;
+      RECT  9.465000  0.255000  9.710000 1.405000 ;
+      RECT  9.465000  1.405000 11.500000 1.585000 ;
+      RECT  9.465000  1.585000  9.710000 3.075000 ;
+      RECT  9.880000  0.085000 10.140000 1.095000 ;
+      RECT  9.880000  1.815000 10.140000 3.245000 ;
+      RECT 10.705000  0.085000 10.980000 0.895000 ;
+      RECT 10.705000  2.095000 11.035000 3.245000 ;
+      RECT 11.565000  0.085000 11.895000 0.895000 ;
+      RECT 11.565000  2.095000 11.895000 3.245000 ;
     LAYER mcon ;
-      RECT 1.115000 1.950000 1.285000 2.120000 ;
-      RECT 3.995000 1.950000 4.165000 2.120000 ;
-      RECT 6.875000 1.950000 7.045000 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  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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  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 ;
     LAYER met1 ;
       RECT 1.055000 1.920000 1.345000 1.965000 ;
       RECT 1.055000 1.965000 7.105000 2.105000 ;
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef
index da38315..9094d94 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.magic.lef
@@ -87,42 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.480000 0.085000 ;
-        RECT  0.100000  0.085000  0.430000 1.040000 ;
-        RECT  1.645000  0.085000  1.975000 0.845000 ;
-        RECT  3.725000  0.085000  3.925000 0.905000 ;
-        RECT  5.250000  0.085000  5.520000 1.075000 ;
-        RECT  8.620000  0.085000  8.950000 0.730000 ;
-        RECT  9.605000  0.085000  9.865000 0.970000 ;
-        RECT 11.580000  0.085000 11.910000 1.060000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -131,119 +95,152 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.480000 3.415000 ;
-        RECT  0.100000 2.660000  0.430000 3.245000 ;
-        RECT  2.000000 2.675000  2.330000 3.245000 ;
-        RECT  3.770000 2.825000  4.100000 3.245000 ;
-        RECT  5.820000 2.660000  6.150000 3.245000 ;
-        RECT  7.850000 2.280000  8.090000 3.245000 ;
-        RECT  9.570000 2.155000  9.885000 3.245000 ;
-        RECT 11.440000 2.735000 11.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 ;
-        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.600000 2.260000  1.315000 2.930000 ;
-      RECT  0.640000 0.830000  0.900000 1.285000 ;
-      RECT  0.640000 1.285000  1.830000 1.455000 ;
-      RECT  0.640000 1.455000  0.840000 2.260000 ;
-      RECT  0.805000 0.265000  1.465000 0.515000 ;
-      RECT  0.965000 2.930000  1.315000 3.075000 ;
-      RECT  1.020000 1.815000  1.765000 2.090000 ;
-      RECT  1.205000 0.515000  1.465000 0.945000 ;
-      RECT  1.485000 2.090000  1.765000 2.975000 ;
-      RECT  1.635000 1.015000  2.315000 1.185000 ;
-      RECT  1.635000 1.185000  1.830000 1.285000 ;
-      RECT  2.145000 0.300000  3.495000 0.470000 ;
-      RECT  2.145000 0.470000  2.315000 1.015000 ;
-      RECT  2.485000 0.645000  2.775000 0.975000 ;
-      RECT  2.550000 2.720000  2.890000 3.050000 ;
-      RECT  2.605000 0.975000  2.775000 1.765000 ;
-      RECT  2.605000 1.765000  2.890000 1.935000 ;
-      RECT  2.720000 1.935000  2.890000 2.720000 ;
-      RECT  2.945000 0.645000  3.155000 1.415000 ;
-      RECT  2.945000 1.415000  3.230000 1.585000 ;
-      RECT  3.060000 1.585000  3.230000 2.485000 ;
-      RECT  3.060000 2.485000  3.955000 2.655000 ;
-      RECT  3.060000 2.655000  3.310000 3.050000 ;
-      RECT  3.325000 0.470000  3.495000 1.075000 ;
-      RECT  3.325000 1.075000  4.265000 1.235000 ;
-      RECT  3.400000 1.235000  4.265000 1.245000 ;
-      RECT  3.400000 1.245000  3.615000 2.165000 ;
-      RECT  3.785000 1.765000  4.985000 1.935000 ;
-      RECT  3.785000 1.935000  3.955000 2.485000 ;
-      RECT  3.900000 1.415000  4.635000 1.585000 ;
-      RECT  4.095000 0.605000  4.985000 0.775000 ;
-      RECT  4.095000 0.775000  4.265000 1.075000 ;
-      RECT  4.135000 2.175000  4.450000 2.505000 ;
-      RECT  4.280000 2.505000  4.450000 2.685000 ;
-      RECT  4.280000 2.685000  5.565000 3.015000 ;
-      RECT  4.445000 0.955000  4.635000 1.415000 ;
-      RECT  4.675000 1.935000  4.985000 2.505000 ;
-      RECT  4.815000 0.775000  4.985000 1.245000 ;
-      RECT  4.815000 1.245000  6.530000 1.335000 ;
-      RECT  4.815000 1.335000  6.765000 1.415000 ;
-      RECT  4.815000 1.595000  5.845000 1.685000 ;
-      RECT  4.815000 1.685000  6.215000 1.765000 ;
-      RECT  5.675000 1.765000  6.215000 2.015000 ;
-      RECT  5.740000 0.265000  7.620000 0.445000 ;
-      RECT  5.740000 0.445000  6.010000 1.075000 ;
-      RECT  6.200000 0.615000  8.100000 0.785000 ;
-      RECT  6.200000 0.785000  6.530000 1.075000 ;
-      RECT  6.270000 1.415000  6.765000 1.505000 ;
-      RECT  6.505000 1.505000  6.765000 2.005000 ;
-      RECT  6.700000 0.955000  7.105000 1.165000 ;
-      RECT  6.810000 2.285000  7.140000 2.675000 ;
-      RECT  6.935000 1.165000  7.105000 1.315000 ;
-      RECT  6.935000 1.315000  9.595000 1.325000 ;
-      RECT  6.935000 1.325000 10.870000 1.485000 ;
-      RECT  6.935000 1.485000  7.140000 2.285000 ;
-      RECT  7.805000 0.955000  9.435000 1.145000 ;
-      RECT  7.830000 0.400000  8.100000 0.615000 ;
-      RECT  8.290000 2.225000  8.705000 2.555000 ;
-      RECT  8.535000 1.485000  8.705000 2.225000 ;
-      RECT  8.875000 2.200000  9.400000 2.530000 ;
-      RECT  8.875000 2.530000  9.130000 3.065000 ;
-      RECT  9.140000 0.640000  9.435000 0.955000 ;
-      RECT  9.265000 1.485000 10.870000 1.495000 ;
-      RECT  9.265000 1.495000  9.595000 1.985000 ;
-      RECT 10.035000 0.640000 10.730000 1.155000 ;
-      RECT 10.055000 1.985000 10.530000 2.155000 ;
-      RECT 10.055000 2.155000 10.340000 2.805000 ;
-      RECT 10.280000 1.665000 10.530000 1.985000 ;
-      RECT 10.700000 1.495000 10.870000 2.395000 ;
-      RECT 10.700000 2.395000 11.750000 2.565000 ;
-      RECT 11.580000 1.230000 11.955000 1.560000 ;
-      RECT 11.580000 1.560000 11.750000 2.395000 ;
+      RECT  0.000000 -0.085000 12.480000 0.085000 ;
+      RECT  0.000000  3.245000 12.480000 3.415000 ;
+      RECT  0.100000  0.085000  0.430000 1.040000 ;
+      RECT  0.100000  2.660000  0.430000 3.245000 ;
+      RECT  0.600000  2.260000  1.315000 2.930000 ;
+      RECT  0.640000  0.830000  0.900000 1.285000 ;
+      RECT  0.640000  1.285000  1.830000 1.455000 ;
+      RECT  0.640000  1.455000  0.840000 2.260000 ;
+      RECT  0.805000  0.265000  1.465000 0.515000 ;
+      RECT  0.965000  2.930000  1.315000 3.075000 ;
+      RECT  1.020000  1.815000  1.765000 2.090000 ;
+      RECT  1.205000  0.515000  1.465000 0.945000 ;
+      RECT  1.485000  2.090000  1.765000 2.975000 ;
+      RECT  1.635000  1.015000  2.315000 1.185000 ;
+      RECT  1.635000  1.185000  1.830000 1.285000 ;
+      RECT  1.645000  0.085000  1.975000 0.845000 ;
+      RECT  2.000000  2.675000  2.330000 3.245000 ;
+      RECT  2.145000  0.300000  3.495000 0.470000 ;
+      RECT  2.145000  0.470000  2.315000 1.015000 ;
+      RECT  2.485000  0.645000  2.775000 0.975000 ;
+      RECT  2.550000  2.720000  2.890000 3.050000 ;
+      RECT  2.605000  0.975000  2.775000 1.765000 ;
+      RECT  2.605000  1.765000  2.890000 1.935000 ;
+      RECT  2.720000  1.935000  2.890000 2.720000 ;
+      RECT  2.945000  0.645000  3.155000 1.415000 ;
+      RECT  2.945000  1.415000  3.230000 1.585000 ;
+      RECT  3.060000  1.585000  3.230000 2.485000 ;
+      RECT  3.060000  2.485000  3.955000 2.655000 ;
+      RECT  3.060000  2.655000  3.310000 3.050000 ;
+      RECT  3.325000  0.470000  3.495000 1.075000 ;
+      RECT  3.325000  1.075000  4.265000 1.235000 ;
+      RECT  3.400000  1.235000  4.265000 1.245000 ;
+      RECT  3.400000  1.245000  3.615000 2.165000 ;
+      RECT  3.725000  0.085000  3.925000 0.905000 ;
+      RECT  3.770000  2.825000  4.100000 3.245000 ;
+      RECT  3.785000  1.765000  4.985000 1.935000 ;
+      RECT  3.785000  1.935000  3.955000 2.485000 ;
+      RECT  3.900000  1.415000  4.635000 1.585000 ;
+      RECT  4.095000  0.605000  4.985000 0.775000 ;
+      RECT  4.095000  0.775000  4.265000 1.075000 ;
+      RECT  4.135000  2.175000  4.450000 2.505000 ;
+      RECT  4.280000  2.505000  4.450000 2.685000 ;
+      RECT  4.280000  2.685000  5.565000 3.015000 ;
+      RECT  4.445000  0.955000  4.635000 1.415000 ;
+      RECT  4.675000  1.935000  4.985000 2.505000 ;
+      RECT  4.815000  0.775000  4.985000 1.245000 ;
+      RECT  4.815000  1.245000  6.530000 1.335000 ;
+      RECT  4.815000  1.335000  6.765000 1.415000 ;
+      RECT  4.815000  1.595000  5.845000 1.685000 ;
+      RECT  4.815000  1.685000  6.215000 1.765000 ;
+      RECT  5.250000  0.085000  5.520000 1.075000 ;
+      RECT  5.675000  1.765000  6.215000 2.015000 ;
+      RECT  5.740000  0.265000  7.620000 0.445000 ;
+      RECT  5.740000  0.445000  6.010000 1.075000 ;
+      RECT  5.820000  2.660000  6.150000 3.245000 ;
+      RECT  6.200000  0.615000  8.100000 0.785000 ;
+      RECT  6.200000  0.785000  6.530000 1.075000 ;
+      RECT  6.270000  1.415000  6.765000 1.505000 ;
+      RECT  6.505000  1.505000  6.765000 2.005000 ;
+      RECT  6.700000  0.955000  7.105000 1.165000 ;
+      RECT  6.810000  2.285000  7.140000 2.675000 ;
+      RECT  6.935000  1.165000  7.105000 1.315000 ;
+      RECT  6.935000  1.315000  9.595000 1.325000 ;
+      RECT  6.935000  1.325000 10.870000 1.485000 ;
+      RECT  6.935000  1.485000  7.140000 2.285000 ;
+      RECT  7.805000  0.955000  9.435000 1.145000 ;
+      RECT  7.830000  0.400000  8.100000 0.615000 ;
+      RECT  7.850000  2.280000  8.090000 3.245000 ;
+      RECT  8.290000  2.225000  8.705000 2.555000 ;
+      RECT  8.535000  1.485000  8.705000 2.225000 ;
+      RECT  8.620000  0.085000  8.950000 0.730000 ;
+      RECT  8.875000  2.200000  9.400000 2.530000 ;
+      RECT  8.875000  2.530000  9.130000 3.065000 ;
+      RECT  9.140000  0.640000  9.435000 0.955000 ;
+      RECT  9.265000  1.485000 10.870000 1.495000 ;
+      RECT  9.265000  1.495000  9.595000 1.985000 ;
+      RECT  9.570000  2.155000  9.885000 3.245000 ;
+      RECT  9.605000  0.085000  9.865000 0.970000 ;
+      RECT 10.035000  0.640000 10.730000 1.155000 ;
+      RECT 10.055000  1.985000 10.530000 2.155000 ;
+      RECT 10.055000  2.155000 10.340000 2.805000 ;
+      RECT 10.280000  1.665000 10.530000 1.985000 ;
+      RECT 10.700000  1.495000 10.870000 2.395000 ;
+      RECT 10.700000  2.395000 11.750000 2.565000 ;
+      RECT 11.440000  2.735000 11.770000 3.245000 ;
+      RECT 11.580000  0.085000 11.910000 1.060000 ;
+      RECT 11.580000  1.230000 11.955000 1.560000 ;
+      RECT 11.580000  1.560000 11.750000 2.395000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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_lp__dfsbp_1
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef
index a63556b..a2fb0f9 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.magic.lef
@@ -85,45 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.185000  0.085000  0.450000 1.270000 ;
-        RECT  1.730000  0.085000  2.060000 0.845000 ;
-        RECT  3.815000  0.085000  4.075000 0.955000 ;
-        RECT  5.410000  0.085000  5.740000 0.995000 ;
-        RECT  8.720000  0.085000  9.050000 0.815000 ;
-        RECT  9.765000  0.085000 10.055000 0.895000 ;
-        RECT 10.635000  0.085000 10.980000 1.095000 ;
-        RECT 11.670000  0.085000 11.975000 1.175000 ;
-        RECT 12.560000  0.085000 12.860000 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 ;
-        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
@@ -132,116 +93,152 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.190000 2.290000  0.520000 3.245000 ;
-        RECT  2.030000 2.685000  2.360000 3.245000 ;
-        RECT  3.840000 2.835000  4.675000 3.245000 ;
-        RECT  5.985000 2.660000  6.265000 3.245000 ;
-        RECT  7.790000 2.275000  8.085000 3.245000 ;
-        RECT  9.725000 2.155000 10.055000 3.245000 ;
-        RECT 10.645000 1.815000 10.980000 3.245000 ;
-        RECT 11.670000 1.845000 11.975000 3.245000 ;
-        RECT 12.560000 1.815000 12.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 ;
-        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.620000 1.015000  2.410000 1.195000 ;
-      RECT  0.620000 1.195000  1.675000 1.305000 ;
-      RECT  0.690000 2.290000  0.950000 2.630000 ;
-      RECT  0.720000 1.305000  1.675000 1.485000 ;
-      RECT  0.720000 1.485000  0.950000 2.290000 ;
-      RECT  0.720000 2.630000  0.950000 2.775000 ;
-      RECT  0.720000 2.775000  1.215000 3.075000 ;
-      RECT  0.955000 0.255000  1.550000 0.845000 ;
-      RECT  1.215000 1.805000  1.545000 2.305000 ;
-      RECT  1.215000 2.305000  1.745000 2.475000 ;
-      RECT  1.480000 2.475000  1.745000 2.975000 ;
-      RECT  2.240000 0.255000  3.645000 0.425000 ;
-      RECT  2.240000 0.425000  2.410000 1.015000 ;
-      RECT  2.580000 0.670000  2.815000 1.265000 ;
-      RECT  2.580000 1.265000  2.945000 1.435000 ;
-      RECT  2.640000 2.695000  2.945000 3.025000 ;
-      RECT  2.765000 1.435000  2.945000 2.695000 ;
-      RECT  2.985000 0.670000  3.295000 1.000000 ;
-      RECT  3.115000 1.000000  3.295000 2.365000 ;
-      RECT  3.115000 2.365000  3.995000 2.535000 ;
-      RECT  3.115000 2.535000  3.375000 3.045000 ;
-      RECT  3.465000 0.425000  3.645000 1.125000 ;
-      RECT  3.465000 1.125000  4.425000 1.295000 ;
-      RECT  3.465000 1.295000  3.655000 2.185000 ;
-      RECT  3.825000 1.815000  5.145000 1.985000 ;
-      RECT  3.825000 1.985000  3.995000 2.365000 ;
-      RECT  3.965000 1.465000  4.795000 1.645000 ;
-      RECT  4.175000 2.185000  4.345000 2.495000 ;
-      RECT  4.175000 2.495000  5.145000 2.665000 ;
-      RECT  4.255000 0.515000  5.145000 0.720000 ;
-      RECT  4.255000 0.720000  4.425000 1.125000 ;
-      RECT  4.595000 0.890000  4.795000 1.465000 ;
-      RECT  4.650000 1.985000  5.145000 2.325000 ;
-      RECT  4.845000 2.665000  5.145000 2.720000 ;
-      RECT  4.845000 2.720000  5.730000 3.075000 ;
-      RECT  4.975000 0.720000  5.145000 1.165000 ;
-      RECT  4.975000 1.165000  6.195000 1.335000 ;
-      RECT  4.975000 1.505000  5.845000 1.675000 ;
-      RECT  4.975000 1.675000  5.145000 1.815000 ;
-      RECT  5.675000 1.675000  5.845000 1.705000 ;
-      RECT  5.675000 1.705000  6.410000 2.035000 ;
-      RECT  5.910000 0.265000  7.740000 0.465000 ;
-      RECT  5.910000 0.465000  6.170000 0.995000 ;
-      RECT  6.025000 1.335000  6.195000 1.355000 ;
-      RECT  6.025000 1.355000  6.910000 1.525000 ;
-      RECT  6.365000 0.635000  8.260000 0.805000 ;
-      RECT  6.365000 0.805000  6.665000 1.170000 ;
-      RECT  6.650000 1.525000  6.910000 2.025000 ;
-      RECT  6.785000 2.405000  7.250000 2.735000 ;
-      RECT  6.835000 0.975000  7.250000 1.175000 ;
-      RECT  7.080000 1.175000  7.250000 1.405000 ;
-      RECT  7.080000 1.405000  9.655000 1.585000 ;
-      RECT  7.080000 1.585000  7.250000 2.405000 ;
-      RECT  7.930000 0.500000  8.260000 0.635000 ;
-      RECT  8.025000 0.985000  9.570000 1.065000 ;
-      RECT  8.025000 1.065000 10.005000 1.235000 ;
-      RECT  8.255000 2.275000  8.695000 2.605000 ;
-      RECT  8.525000 1.585000  9.655000 1.645000 ;
-      RECT  8.525000 1.645000  8.695000 2.275000 ;
-      RECT  9.200000 1.815000 10.005000 1.985000 ;
-      RECT  9.200000 1.985000  9.530000 2.210000 ;
-      RECT  9.240000 0.700000  9.570000 0.985000 ;
-      RECT  9.835000 1.235000 10.005000 1.815000 ;
-      RECT 11.150000 0.700000 11.480000 1.345000 ;
-      RECT 11.150000 1.345000 11.975000 1.675000 ;
-      RECT 11.150000 1.675000 11.465000 2.485000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.185000  0.085000  0.450000 1.270000 ;
+      RECT  0.190000  2.290000  0.520000 3.245000 ;
+      RECT  0.620000  1.015000  2.410000 1.195000 ;
+      RECT  0.620000  1.195000  1.675000 1.305000 ;
+      RECT  0.690000  2.290000  0.950000 2.630000 ;
+      RECT  0.720000  1.305000  1.675000 1.485000 ;
+      RECT  0.720000  1.485000  0.950000 2.290000 ;
+      RECT  0.720000  2.630000  0.950000 2.775000 ;
+      RECT  0.720000  2.775000  1.215000 3.075000 ;
+      RECT  0.955000  0.255000  1.550000 0.845000 ;
+      RECT  1.215000  1.805000  1.545000 2.305000 ;
+      RECT  1.215000  2.305000  1.745000 2.475000 ;
+      RECT  1.480000  2.475000  1.745000 2.975000 ;
+      RECT  1.730000  0.085000  2.060000 0.845000 ;
+      RECT  2.030000  2.685000  2.360000 3.245000 ;
+      RECT  2.240000  0.255000  3.645000 0.425000 ;
+      RECT  2.240000  0.425000  2.410000 1.015000 ;
+      RECT  2.580000  0.670000  2.815000 1.265000 ;
+      RECT  2.580000  1.265000  2.945000 1.435000 ;
+      RECT  2.640000  2.695000  2.945000 3.025000 ;
+      RECT  2.765000  1.435000  2.945000 2.695000 ;
+      RECT  2.985000  0.670000  3.295000 1.000000 ;
+      RECT  3.115000  1.000000  3.295000 2.365000 ;
+      RECT  3.115000  2.365000  3.995000 2.535000 ;
+      RECT  3.115000  2.535000  3.375000 3.045000 ;
+      RECT  3.465000  0.425000  3.645000 1.125000 ;
+      RECT  3.465000  1.125000  4.425000 1.295000 ;
+      RECT  3.465000  1.295000  3.655000 2.185000 ;
+      RECT  3.815000  0.085000  4.075000 0.955000 ;
+      RECT  3.825000  1.815000  5.145000 1.985000 ;
+      RECT  3.825000  1.985000  3.995000 2.365000 ;
+      RECT  3.840000  2.835000  4.675000 3.245000 ;
+      RECT  3.965000  1.465000  4.795000 1.645000 ;
+      RECT  4.175000  2.185000  4.345000 2.495000 ;
+      RECT  4.175000  2.495000  5.145000 2.665000 ;
+      RECT  4.255000  0.515000  5.145000 0.720000 ;
+      RECT  4.255000  0.720000  4.425000 1.125000 ;
+      RECT  4.595000  0.890000  4.795000 1.465000 ;
+      RECT  4.650000  1.985000  5.145000 2.325000 ;
+      RECT  4.845000  2.665000  5.145000 2.720000 ;
+      RECT  4.845000  2.720000  5.730000 3.075000 ;
+      RECT  4.975000  0.720000  5.145000 1.165000 ;
+      RECT  4.975000  1.165000  6.195000 1.335000 ;
+      RECT  4.975000  1.505000  5.845000 1.675000 ;
+      RECT  4.975000  1.675000  5.145000 1.815000 ;
+      RECT  5.410000  0.085000  5.740000 0.995000 ;
+      RECT  5.675000  1.675000  5.845000 1.705000 ;
+      RECT  5.675000  1.705000  6.410000 2.035000 ;
+      RECT  5.910000  0.265000  7.740000 0.465000 ;
+      RECT  5.910000  0.465000  6.170000 0.995000 ;
+      RECT  5.985000  2.660000  6.265000 3.245000 ;
+      RECT  6.025000  1.335000  6.195000 1.355000 ;
+      RECT  6.025000  1.355000  6.910000 1.525000 ;
+      RECT  6.365000  0.635000  8.260000 0.805000 ;
+      RECT  6.365000  0.805000  6.665000 1.170000 ;
+      RECT  6.650000  1.525000  6.910000 2.025000 ;
+      RECT  6.785000  2.405000  7.250000 2.735000 ;
+      RECT  6.835000  0.975000  7.250000 1.175000 ;
+      RECT  7.080000  1.175000  7.250000 1.405000 ;
+      RECT  7.080000  1.405000  9.655000 1.585000 ;
+      RECT  7.080000  1.585000  7.250000 2.405000 ;
+      RECT  7.790000  2.275000  8.085000 3.245000 ;
+      RECT  7.930000  0.500000  8.260000 0.635000 ;
+      RECT  8.025000  0.985000  9.570000 1.065000 ;
+      RECT  8.025000  1.065000 10.005000 1.235000 ;
+      RECT  8.255000  2.275000  8.695000 2.605000 ;
+      RECT  8.525000  1.585000  9.655000 1.645000 ;
+      RECT  8.525000  1.645000  8.695000 2.275000 ;
+      RECT  8.720000  0.085000  9.050000 0.815000 ;
+      RECT  9.200000  1.815000 10.005000 1.985000 ;
+      RECT  9.200000  1.985000  9.530000 2.210000 ;
+      RECT  9.240000  0.700000  9.570000 0.985000 ;
+      RECT  9.725000  2.155000 10.055000 3.245000 ;
+      RECT  9.765000  0.085000 10.055000 0.895000 ;
+      RECT  9.835000  1.235000 10.005000 1.815000 ;
+      RECT 10.635000  0.085000 10.980000 1.095000 ;
+      RECT 10.645000  1.815000 10.980000 3.245000 ;
+      RECT 11.150000  0.700000 11.480000 1.345000 ;
+      RECT 11.150000  1.345000 11.975000 1.675000 ;
+      RECT 11.150000  1.675000 11.465000 2.485000 ;
+      RECT 11.670000  0.085000 11.975000 1.175000 ;
+      RECT 11.670000  1.845000 11.975000 3.245000 ;
+      RECT 12.560000  0.085000 12.860000 1.255000 ;
+      RECT 12.560000  1.815000 12.860000 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 ;
   END
 END sky130_fd_sc_lp__dfsbp_2
diff --git a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef
index 2ec3c21..a73d6ce 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.magic.lef
@@ -67,12 +67,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 6.395000 1.605000 6.665000 2.150000 ;
-        RECT 9.585000 1.265000 9.955000 2.150000 ;
-      LAYER mcon ;
-        RECT 6.395000 1.950000 6.565000 2.120000 ;
-        RECT 9.755000 1.950000 9.925000 2.120000 ;
       LAYER met1 ;
         RECT 6.335000 1.920000 6.625000 1.965000 ;
         RECT 6.335000 1.965000 9.985000 2.105000 ;
@@ -94,45 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.095000  0.085000  0.425000 0.725000 ;
-        RECT  2.280000  0.085000  2.450000 0.920000 ;
-        RECT  4.915000  0.085000  5.165000 0.685000 ;
-        RECT  6.750000  0.085000  7.080000 1.065000 ;
-        RECT  8.945000  0.085000  9.275000 0.735000 ;
-        RECT 10.545000  0.085000 10.875000 0.725000 ;
-        RECT 12.685000  0.085000 13.015000 0.725000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -141,117 +96,157 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.170000 2.025000  0.500000 3.245000 ;
-        RECT  1.825000 2.310000  2.155000 3.245000 ;
-        RECT  4.985000 2.855000  5.315000 3.245000 ;
-        RECT  6.495000 2.855000  6.825000 3.245000 ;
-        RECT  9.110000 2.680000  9.440000 3.245000 ;
-        RECT 11.145000 2.020000 11.395000 3.245000 ;
-        RECT 12.685000 1.850000 13.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 ;
-        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.700000 2.025000  1.030000 3.065000 ;
-      RECT  0.860000 0.265000  2.090000 0.435000 ;
-      RECT  0.860000 0.435000  1.215000 0.725000 ;
-      RECT  0.860000 0.725000  1.030000 2.025000 ;
-      RECT  1.210000 0.905000  1.740000 1.075000 ;
-      RECT  1.210000 1.075000  1.380000 1.960000 ;
-      RECT  1.210000 1.960000  2.460000 2.130000 ;
-      RECT  1.210000 2.130000  1.625000 3.065000 ;
-      RECT  1.410000 0.615000  1.740000 0.905000 ;
-      RECT  1.920000 0.435000  2.090000 1.100000 ;
-      RECT  1.920000 1.100000  2.810000 1.270000 ;
-      RECT  2.130000 1.555000  2.460000 1.960000 ;
-      RECT  2.355000 2.310000  2.685000 2.895000 ;
-      RECT  2.355000 2.895000  4.545000 3.065000 ;
-      RECT  2.640000 0.265000  3.840000 0.435000 ;
-      RECT  2.640000 0.435000  2.810000 1.100000 ;
-      RECT  2.640000 1.270000  2.810000 1.960000 ;
-      RECT  2.640000 1.960000  3.335000 2.130000 ;
-      RECT  2.990000 0.615000  3.320000 1.330000 ;
-      RECT  2.990000 1.330000  4.520000 1.780000 ;
-      RECT  3.005000 2.130000  3.335000 2.715000 ;
-      RECT  3.510000 0.435000  3.840000 0.885000 ;
-      RECT  3.515000 1.780000  3.685000 2.895000 ;
-      RECT  3.865000 2.075000  4.870000 2.245000 ;
-      RECT  3.865000 2.245000  4.195000 2.715000 ;
-      RECT  4.085000 0.425000  4.335000 0.865000 ;
-      RECT  4.085000 0.865000  5.515000 1.035000 ;
-      RECT  4.085000 1.035000  4.870000 1.065000 ;
-      RECT  4.375000 2.505000  7.585000 2.675000 ;
-      RECT  4.375000 2.675000  4.545000 2.895000 ;
-      RECT  4.700000 1.065000  4.870000 2.075000 ;
-      RECT  5.050000 1.215000  5.865000 1.385000 ;
-      RECT  5.050000 1.385000  5.380000 2.075000 ;
-      RECT  5.050000 2.075000  6.215000 2.325000 ;
-      RECT  5.345000 0.265000  6.470000 0.435000 ;
-      RECT  5.345000 0.435000  5.515000 0.865000 ;
-      RECT  5.620000 1.565000  6.215000 1.895000 ;
-      RECT  5.695000 0.615000  6.120000 1.065000 ;
-      RECT  5.695000 1.065000  5.865000 1.215000 ;
-      RECT  6.045000 1.245000  7.205000 1.415000 ;
-      RECT  6.045000 1.415000  6.215000 1.565000 ;
-      RECT  6.300000 0.435000  6.470000 1.245000 ;
-      RECT  6.875000 1.415000  7.205000 1.915000 ;
-      RECT  7.415000 1.300000  7.745000 1.460000 ;
-      RECT  7.415000 1.460000  8.580000 1.630000 ;
-      RECT  7.415000 1.630000  7.585000 2.505000 ;
-      RECT  7.650000 0.605000  8.095000 0.915000 ;
-      RECT  7.650000 0.915000  8.930000 1.065000 ;
-      RECT  7.805000 2.075000  8.135000 2.330000 ;
-      RECT  7.805000 2.330000 10.140000 2.500000 ;
-      RECT  7.805000 2.500000  8.135000 3.065000 ;
-      RECT  7.925000 1.065000  8.930000 1.085000 ;
-      RECT  8.315000 1.630000  8.580000 1.935000 ;
-      RECT  8.760000 1.085000  8.930000 2.330000 ;
-      RECT  9.110000 0.915000 10.615000 1.085000 ;
-      RECT  9.110000 1.085000  9.375000 1.885000 ;
-      RECT  9.755000 0.265000 10.085000 0.915000 ;
-      RECT  9.810000 2.500000 10.140000 2.895000 ;
-      RECT  9.810000 2.895000 10.965000 3.065000 ;
-      RECT 10.365000 1.085000 10.615000 2.715000 ;
-      RECT 10.795000 1.170000 11.125000 1.840000 ;
-      RECT 10.795000 1.840000 10.965000 2.895000 ;
-      RECT 11.895000 0.265000 12.275000 0.725000 ;
-      RECT 12.105000 0.725000 12.275000 1.490000 ;
-      RECT 12.105000 1.490000 13.320000 1.660000 ;
-      RECT 12.105000 1.660000 12.485000 2.890000 ;
-      RECT 12.990000 0.990000 13.320000 1.490000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.095000  0.085000  0.425000 0.725000 ;
+      RECT  0.170000  2.025000  0.500000 3.245000 ;
+      RECT  0.700000  2.025000  1.030000 3.065000 ;
+      RECT  0.860000  0.265000  2.090000 0.435000 ;
+      RECT  0.860000  0.435000  1.215000 0.725000 ;
+      RECT  0.860000  0.725000  1.030000 2.025000 ;
+      RECT  1.210000  0.905000  1.740000 1.075000 ;
+      RECT  1.210000  1.075000  1.380000 1.960000 ;
+      RECT  1.210000  1.960000  2.460000 2.130000 ;
+      RECT  1.210000  2.130000  1.625000 3.065000 ;
+      RECT  1.410000  0.615000  1.740000 0.905000 ;
+      RECT  1.825000  2.310000  2.155000 3.245000 ;
+      RECT  1.920000  0.435000  2.090000 1.100000 ;
+      RECT  1.920000  1.100000  2.810000 1.270000 ;
+      RECT  2.130000  1.555000  2.460000 1.960000 ;
+      RECT  2.280000  0.085000  2.450000 0.920000 ;
+      RECT  2.355000  2.310000  2.685000 2.895000 ;
+      RECT  2.355000  2.895000  4.545000 3.065000 ;
+      RECT  2.640000  0.265000  3.840000 0.435000 ;
+      RECT  2.640000  0.435000  2.810000 1.100000 ;
+      RECT  2.640000  1.270000  2.810000 1.960000 ;
+      RECT  2.640000  1.960000  3.335000 2.130000 ;
+      RECT  2.990000  0.615000  3.320000 1.330000 ;
+      RECT  2.990000  1.330000  4.520000 1.780000 ;
+      RECT  3.005000  2.130000  3.335000 2.715000 ;
+      RECT  3.510000  0.435000  3.840000 0.885000 ;
+      RECT  3.515000  1.780000  3.685000 2.895000 ;
+      RECT  3.865000  2.075000  4.870000 2.245000 ;
+      RECT  3.865000  2.245000  4.195000 2.715000 ;
+      RECT  4.085000  0.425000  4.335000 0.865000 ;
+      RECT  4.085000  0.865000  5.515000 1.035000 ;
+      RECT  4.085000  1.035000  4.870000 1.065000 ;
+      RECT  4.375000  2.505000  7.585000 2.675000 ;
+      RECT  4.375000  2.675000  4.545000 2.895000 ;
+      RECT  4.700000  1.065000  4.870000 2.075000 ;
+      RECT  4.915000  0.085000  5.165000 0.685000 ;
+      RECT  4.985000  2.855000  5.315000 3.245000 ;
+      RECT  5.050000  1.215000  5.865000 1.385000 ;
+      RECT  5.050000  1.385000  5.380000 2.075000 ;
+      RECT  5.050000  2.075000  6.215000 2.325000 ;
+      RECT  5.345000  0.265000  6.470000 0.435000 ;
+      RECT  5.345000  0.435000  5.515000 0.865000 ;
+      RECT  5.620000  1.565000  6.215000 1.895000 ;
+      RECT  5.695000  0.615000  6.120000 1.065000 ;
+      RECT  5.695000  1.065000  5.865000 1.215000 ;
+      RECT  6.045000  1.245000  7.205000 1.415000 ;
+      RECT  6.045000  1.415000  6.215000 1.565000 ;
+      RECT  6.300000  0.435000  6.470000 1.245000 ;
+      RECT  6.395000  1.605000  6.665000 2.150000 ;
+      RECT  6.495000  2.855000  6.825000 3.245000 ;
+      RECT  6.750000  0.085000  7.080000 1.065000 ;
+      RECT  6.875000  1.415000  7.205000 1.915000 ;
+      RECT  7.415000  1.300000  7.745000 1.460000 ;
+      RECT  7.415000  1.460000  8.580000 1.630000 ;
+      RECT  7.415000  1.630000  7.585000 2.505000 ;
+      RECT  7.650000  0.605000  8.095000 0.915000 ;
+      RECT  7.650000  0.915000  8.930000 1.065000 ;
+      RECT  7.805000  2.075000  8.135000 2.330000 ;
+      RECT  7.805000  2.330000 10.140000 2.500000 ;
+      RECT  7.805000  2.500000  8.135000 3.065000 ;
+      RECT  7.925000  1.065000  8.930000 1.085000 ;
+      RECT  8.315000  1.630000  8.580000 1.935000 ;
+      RECT  8.760000  1.085000  8.930000 2.330000 ;
+      RECT  8.945000  0.085000  9.275000 0.735000 ;
+      RECT  9.110000  0.915000 10.615000 1.085000 ;
+      RECT  9.110000  1.085000  9.375000 1.885000 ;
+      RECT  9.110000  2.680000  9.440000 3.245000 ;
+      RECT  9.585000  1.265000  9.955000 2.150000 ;
+      RECT  9.755000  0.265000 10.085000 0.915000 ;
+      RECT  9.810000  2.500000 10.140000 2.895000 ;
+      RECT  9.810000  2.895000 10.965000 3.065000 ;
+      RECT 10.365000  1.085000 10.615000 2.715000 ;
+      RECT 10.545000  0.085000 10.875000 0.725000 ;
+      RECT 10.795000  1.170000 11.125000 1.840000 ;
+      RECT 10.795000  1.840000 10.965000 2.895000 ;
+      RECT 11.145000  2.020000 11.395000 3.245000 ;
+      RECT 11.895000  0.265000 12.275000 0.725000 ;
+      RECT 12.105000  0.725000 12.275000 1.490000 ;
+      RECT 12.105000  1.490000 13.320000 1.660000 ;
+      RECT 12.105000  1.660000 12.485000 2.890000 ;
+      RECT 12.685000  0.085000 13.015000 0.725000 ;
+      RECT 12.685000  1.850000 13.015000 3.245000 ;
+      RECT 12.990000  0.990000 13.320000 1.490000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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  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.950000  9.925000 2.120000 ;
+      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_lp__dfsbp_lp
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef
index 69b54b7..c240350 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.magic.lef
@@ -76,38 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.665000  0.085000  0.865000 0.670000 ;
-        RECT 1.545000  0.085000  1.845000 0.970000 ;
-        RECT 3.290000  0.085000  3.620000 0.765000 ;
-        RECT 4.600000  0.085000  5.425000 0.610000 ;
-        RECT 5.065000  0.610000  5.425000 0.885000 ;
-        RECT 7.130000  0.085000  7.460000 0.735000 ;
-        RECT 9.570000  0.085000  9.925000 1.095000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -116,95 +84,123 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 0.565000 2.305000  0.875000 3.245000 ;
-        RECT 1.595000 2.360000  1.895000 3.245000 ;
-        RECT 3.295000 2.360000  3.580000 3.245000 ;
-        RECT 4.285000 2.355000  4.730000 3.245000 ;
-        RECT 4.470000 2.105000  4.730000 2.355000 ;
-        RECT 7.530000 2.435000  7.700000 3.245000 ;
-        RECT 8.230000 1.585000  8.480000 1.925000 ;
-        RECT 8.310000 1.925000  8.480000 3.245000 ;
-        RECT 9.560000 1.825000 10.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 ;
-        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.090000 0.390000  0.495000 0.670000 ;
-      RECT 0.090000 0.670000  0.260000 1.560000 ;
-      RECT 0.090000 1.560000  0.865000 1.810000 ;
-      RECT 0.090000 1.810000  0.395000 2.965000 ;
-      RECT 1.045000 0.410000  1.355000 1.515000 ;
-      RECT 1.045000 1.515000  2.235000 1.685000 ;
-      RECT 1.045000 1.685000  1.255000 2.965000 ;
-      RECT 2.005000 1.685000  2.235000 1.845000 ;
-      RECT 2.015000 0.640000  2.235000 1.175000 ;
-      RECT 2.015000 1.175000  2.575000 1.345000 ;
-      RECT 2.065000 2.015000  2.575000 2.185000 ;
-      RECT 2.065000 2.185000  2.285000 2.690000 ;
-      RECT 2.405000 0.645000  2.925000 0.975000 ;
-      RECT 2.405000 1.345000  2.575000 2.015000 ;
-      RECT 2.455000 2.355000  2.925000 2.685000 ;
-      RECT 2.755000 0.975000  2.925000 1.555000 ;
-      RECT 2.755000 1.555000  3.920000 1.725000 ;
-      RECT 2.755000 1.725000  2.925000 2.355000 ;
-      RECT 3.105000 0.935000  4.080000 1.105000 ;
-      RECT 3.105000 1.105000  3.435000 1.385000 ;
-      RECT 3.120000 1.895000  3.920000 2.155000 ;
-      RECT 3.660000 1.285000  3.920000 1.555000 ;
-      RECT 3.750000 2.155000  3.920000 2.360000 ;
-      RECT 3.750000 2.360000  4.115000 2.690000 ;
-      RECT 3.810000 0.280000  4.080000 0.935000 ;
-      RECT 4.900000 2.105000  5.230000 2.835000 ;
-      RECT 4.900000 2.835000  6.800000 3.075000 ;
-      RECT 5.375000 1.380000  5.705000 1.595000 ;
-      RECT 5.420000 2.125000  5.750000 2.495000 ;
-      RECT 5.420000 2.495000  7.350000 2.665000 ;
-      RECT 5.435000 1.210000  5.705000 1.380000 ;
-      RECT 5.885000 0.285000  6.305000 0.905000 ;
-      RECT 5.885000 0.905000  8.475000 1.075000 ;
-      RECT 5.920000 2.105000  8.140000 2.265000 ;
-      RECT 5.920000 2.265000  6.405000 2.325000 ;
-      RECT 6.235000 2.095000  8.140000 2.105000 ;
-      RECT 7.020000 2.435000  7.350000 2.495000 ;
-      RECT 7.660000 0.315000  8.930000 0.485000 ;
-      RECT 7.660000 0.485000  7.990000 0.735000 ;
-      RECT 7.775000 1.075000  8.475000 1.335000 ;
-      RECT 7.775000 1.335000  8.050000 2.095000 ;
-      RECT 7.880000 2.265000  8.140000 2.690000 ;
-      RECT 8.160000 0.665000  8.475000 0.905000 ;
-      RECT 8.650000 0.485000  8.930000 3.065000 ;
-      RECT 9.120000 0.700000  9.390000 1.315000 ;
-      RECT 9.120000 1.315000 10.035000 1.645000 ;
-      RECT 9.120000 1.645000  9.390000 2.485000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.090000  0.390000  0.495000 0.670000 ;
+      RECT 0.090000  0.670000  0.260000 1.560000 ;
+      RECT 0.090000  1.560000  0.865000 1.810000 ;
+      RECT 0.090000  1.810000  0.395000 2.965000 ;
+      RECT 0.565000  2.305000  0.875000 3.245000 ;
+      RECT 0.665000  0.085000  0.865000 0.670000 ;
+      RECT 1.045000  0.410000  1.355000 1.515000 ;
+      RECT 1.045000  1.515000  2.235000 1.685000 ;
+      RECT 1.045000  1.685000  1.255000 2.965000 ;
+      RECT 1.545000  0.085000  1.845000 0.970000 ;
+      RECT 1.595000  2.360000  1.895000 3.245000 ;
+      RECT 2.005000  1.685000  2.235000 1.845000 ;
+      RECT 2.015000  0.640000  2.235000 1.175000 ;
+      RECT 2.015000  1.175000  2.575000 1.345000 ;
+      RECT 2.065000  2.015000  2.575000 2.185000 ;
+      RECT 2.065000  2.185000  2.285000 2.690000 ;
+      RECT 2.405000  0.645000  2.925000 0.975000 ;
+      RECT 2.405000  1.345000  2.575000 2.015000 ;
+      RECT 2.455000  2.355000  2.925000 2.685000 ;
+      RECT 2.755000  0.975000  2.925000 1.555000 ;
+      RECT 2.755000  1.555000  3.920000 1.725000 ;
+      RECT 2.755000  1.725000  2.925000 2.355000 ;
+      RECT 3.105000  0.935000  4.080000 1.105000 ;
+      RECT 3.105000  1.105000  3.435000 1.385000 ;
+      RECT 3.120000  1.895000  3.920000 2.155000 ;
+      RECT 3.290000  0.085000  3.620000 0.765000 ;
+      RECT 3.295000  2.360000  3.580000 3.245000 ;
+      RECT 3.660000  1.285000  3.920000 1.555000 ;
+      RECT 3.750000  2.155000  3.920000 2.360000 ;
+      RECT 3.750000  2.360000  4.115000 2.690000 ;
+      RECT 3.810000  0.280000  4.080000 0.935000 ;
+      RECT 4.285000  2.355000  4.730000 3.245000 ;
+      RECT 4.470000  2.105000  4.730000 2.355000 ;
+      RECT 4.600000  0.085000  5.425000 0.610000 ;
+      RECT 4.900000  2.105000  5.230000 2.835000 ;
+      RECT 4.900000  2.835000  6.800000 3.075000 ;
+      RECT 5.065000  0.610000  5.425000 0.885000 ;
+      RECT 5.375000  1.380000  5.705000 1.595000 ;
+      RECT 5.420000  2.125000  5.750000 2.495000 ;
+      RECT 5.420000  2.495000  7.350000 2.665000 ;
+      RECT 5.435000  1.210000  5.705000 1.380000 ;
+      RECT 5.885000  0.285000  6.305000 0.905000 ;
+      RECT 5.885000  0.905000  8.475000 1.075000 ;
+      RECT 5.920000  2.105000  8.140000 2.265000 ;
+      RECT 5.920000  2.265000  6.405000 2.325000 ;
+      RECT 6.235000  2.095000  8.140000 2.105000 ;
+      RECT 7.020000  2.435000  7.350000 2.495000 ;
+      RECT 7.130000  0.085000  7.460000 0.735000 ;
+      RECT 7.530000  2.435000  7.700000 3.245000 ;
+      RECT 7.660000  0.315000  8.930000 0.485000 ;
+      RECT 7.660000  0.485000  7.990000 0.735000 ;
+      RECT 7.775000  1.075000  8.475000 1.335000 ;
+      RECT 7.775000  1.335000  8.050000 2.095000 ;
+      RECT 7.880000  2.265000  8.140000 2.690000 ;
+      RECT 8.160000  0.665000  8.475000 0.905000 ;
+      RECT 8.230000  1.585000  8.480000 1.925000 ;
+      RECT 8.310000  1.925000  8.480000 3.245000 ;
+      RECT 8.650000  0.485000  8.930000 3.065000 ;
+      RECT 9.120000  0.700000  9.390000 1.315000 ;
+      RECT 9.120000  1.315000 10.035000 1.645000 ;
+      RECT 9.120000  1.645000  9.390000 2.485000 ;
+      RECT 9.560000  1.825000 10.035000 3.245000 ;
+      RECT 9.570000  0.085000  9.925000 1.095000 ;
     LAYER mcon ;
-      RECT 1.115000 1.210000 1.285000 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  1.210000  1.285000 1.380000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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 ;
     LAYER met1 ;
       RECT 1.055000 1.180000 1.345000 1.225000 ;
       RECT 1.055000 1.225000 5.665000 1.365000 ;
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef
index 0b7d638..48005b7 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.magic.lef
@@ -77,40 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.575000  0.085000  0.905000 0.670000 ;
-        RECT  1.545000  0.085000  1.840000 0.970000 ;
-        RECT  3.195000  0.085000  3.525000 0.845000 ;
-        RECT  4.895000  0.085000  5.225000 0.815000 ;
-        RECT  7.030000  0.085000  7.360000 0.665000 ;
-        RECT  9.685000  0.085000 10.055000 0.545000 ;
-        RECT  9.745000  0.545000 10.055000 1.015000 ;
-        RECT 10.635000  0.085000 10.935000 1.095000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -119,99 +85,129 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.585000 2.315000  0.795000 3.245000 ;
-        RECT  1.545000 2.360000  1.875000 3.245000 ;
-        RECT  3.195000 2.360000  3.465000 3.245000 ;
-        RECT  4.165000 2.360000  4.745000 3.245000 ;
-        RECT  4.485000 2.105000  4.745000 2.360000 ;
-        RECT  7.555000 2.435000  7.785000 3.245000 ;
-        RECT  8.365000 1.670000  8.565000 3.245000 ;
-        RECT  9.725000 1.975000  9.935000 3.245000 ;
-        RECT 10.635000 1.815000 10.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 ;
-        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.090000 0.410000  0.405000 0.740000 ;
-      RECT 0.090000 0.740000  0.260000 1.575000 ;
-      RECT 0.090000 1.575000  0.845000 1.825000 ;
-      RECT 0.090000 1.825000  0.365000 2.975000 ;
-      RECT 1.025000 0.840000  1.355000 1.455000 ;
-      RECT 1.025000 1.455000  2.125000 1.635000 ;
-      RECT 1.025000 1.635000  1.195000 2.315000 ;
-      RECT 1.025000 2.315000  1.235000 2.985000 ;
-      RECT 1.075000 0.415000  1.355000 0.840000 ;
-      RECT 1.945000 1.635000  2.125000 1.845000 ;
-      RECT 2.010000 0.640000  2.235000 1.005000 ;
-      RECT 2.010000 1.005000  2.465000 1.175000 ;
-      RECT 2.045000 2.095000  2.465000 2.265000 ;
-      RECT 2.045000 2.265000  2.235000 2.690000 ;
-      RECT 2.295000 1.175000  2.465000 2.095000 ;
-      RECT 2.405000 0.615000  2.815000 0.835000 ;
-      RECT 2.405000 2.435000  2.815000 2.710000 ;
-      RECT 2.645000 0.835000  2.815000 1.555000 ;
-      RECT 2.645000 1.555000  3.945000 1.725000 ;
-      RECT 2.645000 1.725000  2.815000 2.435000 ;
-      RECT 3.070000 1.015000  3.955000 1.185000 ;
-      RECT 3.070000 1.185000  3.400000 1.385000 ;
-      RECT 3.070000 1.895000  3.805000 2.155000 ;
-      RECT 3.615000 1.355000  3.945000 1.555000 ;
-      RECT 3.635000 2.155000  3.805000 2.360000 ;
-      RECT 3.635000 2.360000  3.995000 2.690000 ;
-      RECT 3.785000 0.280000  4.100000 0.610000 ;
-      RECT 3.785000 0.610000  3.955000 1.015000 ;
-      RECT 4.915000 2.105000  5.245000 2.855000 ;
-      RECT 4.915000 2.855000  6.835000 3.055000 ;
-      RECT 5.405000 1.205000  5.735000 1.595000 ;
-      RECT 5.435000 2.170000  5.710000 2.515000 ;
-      RECT 5.435000 2.515000  7.385000 2.685000 ;
-      RECT 5.785000 0.255000  6.115000 0.865000 ;
-      RECT 5.785000 0.865000  8.535000 1.035000 ;
-      RECT 5.925000 2.105000  8.195000 2.265000 ;
-      RECT 5.925000 2.265000  6.350000 2.345000 ;
-      RECT 6.255000 2.095000  8.195000 2.105000 ;
-      RECT 7.055000 2.435000  7.385000 2.515000 ;
-      RECT 7.625000 0.445000  9.065000 0.615000 ;
-      RECT 7.625000 0.615000  7.955000 0.695000 ;
-      RECT 7.955000 2.265000  8.195000 2.690000 ;
-      RECT 7.975000 1.035000  8.535000 1.465000 ;
-      RECT 7.975000 1.465000  8.195000 2.095000 ;
-      RECT 8.285000 0.795000  8.535000 0.865000 ;
-      RECT 8.735000 0.615000  9.065000 3.075000 ;
-      RECT 9.235000 0.255000  9.515000 1.185000 ;
-      RECT 9.235000 1.185000 10.055000 1.515000 ;
-      RECT 9.235000 1.515000  9.505000 2.635000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.090000  0.410000  0.405000 0.740000 ;
+      RECT  0.090000  0.740000  0.260000 1.575000 ;
+      RECT  0.090000  1.575000  0.845000 1.825000 ;
+      RECT  0.090000  1.825000  0.365000 2.975000 ;
+      RECT  0.575000  0.085000  0.905000 0.670000 ;
+      RECT  0.585000  2.315000  0.795000 3.245000 ;
+      RECT  1.025000  0.840000  1.355000 1.455000 ;
+      RECT  1.025000  1.455000  2.125000 1.635000 ;
+      RECT  1.025000  1.635000  1.195000 2.315000 ;
+      RECT  1.025000  2.315000  1.235000 2.985000 ;
+      RECT  1.075000  0.415000  1.355000 0.840000 ;
+      RECT  1.545000  0.085000  1.840000 0.970000 ;
+      RECT  1.545000  2.360000  1.875000 3.245000 ;
+      RECT  1.945000  1.635000  2.125000 1.845000 ;
+      RECT  2.010000  0.640000  2.235000 1.005000 ;
+      RECT  2.010000  1.005000  2.465000 1.175000 ;
+      RECT  2.045000  2.095000  2.465000 2.265000 ;
+      RECT  2.045000  2.265000  2.235000 2.690000 ;
+      RECT  2.295000  1.175000  2.465000 2.095000 ;
+      RECT  2.405000  0.615000  2.815000 0.835000 ;
+      RECT  2.405000  2.435000  2.815000 2.710000 ;
+      RECT  2.645000  0.835000  2.815000 1.555000 ;
+      RECT  2.645000  1.555000  3.945000 1.725000 ;
+      RECT  2.645000  1.725000  2.815000 2.435000 ;
+      RECT  3.070000  1.015000  3.955000 1.185000 ;
+      RECT  3.070000  1.185000  3.400000 1.385000 ;
+      RECT  3.070000  1.895000  3.805000 2.155000 ;
+      RECT  3.195000  0.085000  3.525000 0.845000 ;
+      RECT  3.195000  2.360000  3.465000 3.245000 ;
+      RECT  3.615000  1.355000  3.945000 1.555000 ;
+      RECT  3.635000  2.155000  3.805000 2.360000 ;
+      RECT  3.635000  2.360000  3.995000 2.690000 ;
+      RECT  3.785000  0.280000  4.100000 0.610000 ;
+      RECT  3.785000  0.610000  3.955000 1.015000 ;
+      RECT  4.165000  2.360000  4.745000 3.245000 ;
+      RECT  4.485000  2.105000  4.745000 2.360000 ;
+      RECT  4.895000  0.085000  5.225000 0.815000 ;
+      RECT  4.915000  2.105000  5.245000 2.855000 ;
+      RECT  4.915000  2.855000  6.835000 3.055000 ;
+      RECT  5.405000  1.205000  5.735000 1.595000 ;
+      RECT  5.435000  2.170000  5.710000 2.515000 ;
+      RECT  5.435000  2.515000  7.385000 2.685000 ;
+      RECT  5.785000  0.255000  6.115000 0.865000 ;
+      RECT  5.785000  0.865000  8.535000 1.035000 ;
+      RECT  5.925000  2.105000  8.195000 2.265000 ;
+      RECT  5.925000  2.265000  6.350000 2.345000 ;
+      RECT  6.255000  2.095000  8.195000 2.105000 ;
+      RECT  7.030000  0.085000  7.360000 0.665000 ;
+      RECT  7.055000  2.435000  7.385000 2.515000 ;
+      RECT  7.555000  2.435000  7.785000 3.245000 ;
+      RECT  7.625000  0.445000  9.065000 0.615000 ;
+      RECT  7.625000  0.615000  7.955000 0.695000 ;
+      RECT  7.955000  2.265000  8.195000 2.690000 ;
+      RECT  7.975000  1.035000  8.535000 1.465000 ;
+      RECT  7.975000  1.465000  8.195000 2.095000 ;
+      RECT  8.285000  0.795000  8.535000 0.865000 ;
+      RECT  8.365000  1.670000  8.565000 3.245000 ;
+      RECT  8.735000  0.615000  9.065000 3.075000 ;
+      RECT  9.235000  0.255000  9.515000 1.185000 ;
+      RECT  9.235000  1.185000 10.055000 1.515000 ;
+      RECT  9.235000  1.515000  9.505000 2.635000 ;
+      RECT  9.685000  0.085000 10.055000 0.545000 ;
+      RECT  9.725000  1.975000  9.935000 3.245000 ;
+      RECT  9.745000  0.545000 10.055000 1.015000 ;
+      RECT 10.635000  0.085000 10.935000 1.095000 ;
+      RECT 10.635000  1.815000 10.935000 3.245000 ;
     LAYER mcon ;
-      RECT 1.115000 1.210000 1.285000 1.380000 ;
-      RECT 5.435000 1.210000 5.605000 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  1.210000  1.285000 1.380000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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 ;
     LAYER met1 ;
       RECT 1.055000 1.180000 1.345000 1.225000 ;
       RECT 1.055000 1.225000 5.665000 1.365000 ;
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef
index f415d66..ebfa2fc 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.magic.lef
@@ -80,44 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.480000 0.085000 ;
-        RECT  0.985000  0.085000  1.205000 0.870000 ;
-        RECT  1.985000  0.085000  2.225000 0.970000 ;
-        RECT  3.575000  0.085000  3.905000 0.815000 ;
-        RECT  4.905000  0.085000  5.750000 0.610000 ;
-        RECT  5.420000  0.610000  5.750000 0.885000 ;
-        RECT  7.475000  0.085000  8.145000 0.785000 ;
-        RECT 10.370000  0.085000 10.630000 1.105000 ;
-        RECT 11.195000  0.085000 11.525000 0.905000 ;
-        RECT 12.055000  0.085000 12.385000 0.905000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -126,99 +88,133 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.480000 3.415000 ;
-        RECT  0.695000 2.640000  1.025000 3.245000 ;
-        RECT  2.135000 2.415000  2.465000 3.245000 ;
-        RECT  3.805000 2.360000  4.135000 3.245000 ;
-        RECT  5.015000 2.105000  5.275000 3.245000 ;
-        RECT  7.995000 2.355000  8.325000 3.245000 ;
-        RECT  9.005000 1.720000  9.265000 3.245000 ;
-        RECT 10.375000 1.795000 10.630000 3.245000 ;
-        RECT 11.195000 2.105000 11.525000 3.245000 ;
-        RECT 12.055000 2.105000 12.385000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.170000 0.540000  0.360000 2.300000 ;
-      RECT 0.170000 2.300000  1.260000 2.470000 ;
-      RECT 0.170000 2.470000  0.525000 2.975000 ;
-      RECT 1.000000 1.495000  1.260000 2.300000 ;
-      RECT 1.195000 2.640000  1.600000 2.970000 ;
-      RECT 1.375000 0.540000  1.815000 0.935000 ;
-      RECT 1.430000 0.935000  1.815000 1.485000 ;
-      RECT 1.430000 1.485000  2.600000 1.745000 ;
-      RECT 1.430000 1.745000  1.600000 2.640000 ;
-      RECT 2.395000 0.640000  2.650000 1.085000 ;
-      RECT 2.395000 1.085000  2.950000 1.255000 ;
-      RECT 2.635000 1.915000  2.950000 2.085000 ;
-      RECT 2.635000 2.085000  2.865000 2.690000 ;
-      RECT 2.780000 1.255000  2.950000 1.915000 ;
-      RECT 2.820000 0.585000  3.300000 0.915000 ;
-      RECT 3.035000 2.295000  3.300000 2.690000 ;
-      RECT 3.130000 0.915000  3.300000 1.555000 ;
-      RECT 3.130000 1.555000  4.465000 1.725000 ;
-      RECT 3.130000 1.725000  3.300000 2.295000 ;
-      RECT 3.480000 0.985000  4.445000 1.155000 ;
-      RECT 3.480000 1.155000  3.810000 1.385000 ;
-      RECT 3.660000 1.895000  4.475000 2.155000 ;
-      RECT 4.115000 0.285000  4.445000 0.985000 ;
-      RECT 4.135000 1.325000  4.465000 1.555000 ;
-      RECT 4.305000 2.155000  4.475000 2.325000 ;
-      RECT 4.305000 2.325000  4.660000 2.690000 ;
-      RECT 5.370000 1.150000  6.010000 1.595000 ;
-      RECT 5.445000 2.105000  5.775000 2.865000 ;
-      RECT 5.445000 2.865000  7.345000 3.065000 ;
-      RECT 5.965000 2.105000  6.295000 2.525000 ;
-      RECT 5.965000 2.525000  7.825000 2.695000 ;
-      RECT 6.210000 0.255000  6.705000 0.955000 ;
-      RECT 6.210000 0.955000  9.265000 1.125000 ;
-      RECT 6.520000 2.015000  8.835000 2.185000 ;
-      RECT 6.520000 2.185000  6.795000 2.355000 ;
-      RECT 7.565000 2.355000  7.825000 2.525000 ;
-      RECT 8.315000 0.265000  9.775000 0.435000 ;
-      RECT 8.315000 0.435000  8.575000 0.785000 ;
-      RECT 8.495000 2.185000  8.835000 2.660000 ;
-      RECT 8.655000 1.125000  9.265000 1.205000 ;
-      RECT 8.655000 1.205000  8.835000 2.015000 ;
-      RECT 8.935000 0.605000  9.265000 0.955000 ;
-      RECT 9.435000 0.435000  9.775000 3.075000 ;
-      RECT 9.945000 0.255000 10.200000 1.425000 ;
-      RECT 9.945000 1.425000 11.975000 1.595000 ;
-      RECT 9.945000 1.595000 10.205000 3.075000 ;
+      RECT  0.000000 -0.085000 12.480000 0.085000 ;
+      RECT  0.000000  3.245000 12.480000 3.415000 ;
+      RECT  0.170000  0.540000  0.360000 2.300000 ;
+      RECT  0.170000  2.300000  1.260000 2.470000 ;
+      RECT  0.170000  2.470000  0.525000 2.975000 ;
+      RECT  0.695000  2.640000  1.025000 3.245000 ;
+      RECT  0.985000  0.085000  1.205000 0.870000 ;
+      RECT  1.000000  1.495000  1.260000 2.300000 ;
+      RECT  1.195000  2.640000  1.600000 2.970000 ;
+      RECT  1.375000  0.540000  1.815000 0.935000 ;
+      RECT  1.430000  0.935000  1.815000 1.485000 ;
+      RECT  1.430000  1.485000  2.600000 1.745000 ;
+      RECT  1.430000  1.745000  1.600000 2.640000 ;
+      RECT  1.985000  0.085000  2.225000 0.970000 ;
+      RECT  2.135000  2.415000  2.465000 3.245000 ;
+      RECT  2.395000  0.640000  2.650000 1.085000 ;
+      RECT  2.395000  1.085000  2.950000 1.255000 ;
+      RECT  2.635000  1.915000  2.950000 2.085000 ;
+      RECT  2.635000  2.085000  2.865000 2.690000 ;
+      RECT  2.780000  1.255000  2.950000 1.915000 ;
+      RECT  2.820000  0.585000  3.300000 0.915000 ;
+      RECT  3.035000  2.295000  3.300000 2.690000 ;
+      RECT  3.130000  0.915000  3.300000 1.555000 ;
+      RECT  3.130000  1.555000  4.465000 1.725000 ;
+      RECT  3.130000  1.725000  3.300000 2.295000 ;
+      RECT  3.480000  0.985000  4.445000 1.155000 ;
+      RECT  3.480000  1.155000  3.810000 1.385000 ;
+      RECT  3.575000  0.085000  3.905000 0.815000 ;
+      RECT  3.660000  1.895000  4.475000 2.155000 ;
+      RECT  3.805000  2.360000  4.135000 3.245000 ;
+      RECT  4.115000  0.285000  4.445000 0.985000 ;
+      RECT  4.135000  1.325000  4.465000 1.555000 ;
+      RECT  4.305000  2.155000  4.475000 2.325000 ;
+      RECT  4.305000  2.325000  4.660000 2.690000 ;
+      RECT  4.905000  0.085000  5.750000 0.610000 ;
+      RECT  5.015000  2.105000  5.275000 3.245000 ;
+      RECT  5.370000  1.150000  6.010000 1.595000 ;
+      RECT  5.420000  0.610000  5.750000 0.885000 ;
+      RECT  5.445000  2.105000  5.775000 2.865000 ;
+      RECT  5.445000  2.865000  7.345000 3.065000 ;
+      RECT  5.965000  2.105000  6.295000 2.525000 ;
+      RECT  5.965000  2.525000  7.825000 2.695000 ;
+      RECT  6.210000  0.255000  6.705000 0.955000 ;
+      RECT  6.210000  0.955000  9.265000 1.125000 ;
+      RECT  6.520000  2.015000  8.835000 2.185000 ;
+      RECT  6.520000  2.185000  6.795000 2.355000 ;
+      RECT  7.475000  0.085000  8.145000 0.785000 ;
+      RECT  7.565000  2.355000  7.825000 2.525000 ;
+      RECT  7.995000  2.355000  8.325000 3.245000 ;
+      RECT  8.315000  0.265000  9.775000 0.435000 ;
+      RECT  8.315000  0.435000  8.575000 0.785000 ;
+      RECT  8.495000  2.185000  8.835000 2.660000 ;
+      RECT  8.655000  1.125000  9.265000 1.205000 ;
+      RECT  8.655000  1.205000  8.835000 2.015000 ;
+      RECT  8.935000  0.605000  9.265000 0.955000 ;
+      RECT  9.005000  1.720000  9.265000 3.245000 ;
+      RECT  9.435000  0.435000  9.775000 3.075000 ;
+      RECT  9.945000  0.255000 10.200000 1.425000 ;
+      RECT  9.945000  1.425000 11.975000 1.595000 ;
+      RECT  9.945000  1.595000 10.205000 3.075000 ;
+      RECT 10.370000  0.085000 10.630000 1.105000 ;
+      RECT 10.375000  1.795000 10.630000 3.245000 ;
+      RECT 11.195000  0.085000 11.525000 0.905000 ;
+      RECT 11.195000  2.105000 11.525000 3.245000 ;
+      RECT 12.055000  0.085000 12.385000 0.905000 ;
+      RECT 12.055000  2.105000 12.385000 3.245000 ;
     LAYER mcon ;
-      RECT 1.595000 1.210000 1.765000 1.380000 ;
-      RECT 5.435000 1.210000 5.605000 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  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  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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 ;
+      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 ;
     LAYER met1 ;
       RECT 1.535000 1.180000 1.825000 1.225000 ;
       RECT 1.535000 1.225000 5.665000 1.365000 ;
diff --git a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef
index 13879d2..9b9afcc 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.magic.lef
@@ -55,12 +55,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 6.395000 1.550000  6.700000 1.880000 ;
-        RECT 9.700000 1.510000 10.030000 1.840000 ;
-      LAYER mcon ;
-        RECT 6.395000 1.580000 6.565000 1.750000 ;
-        RECT 9.755000 1.580000 9.925000 1.750000 ;
       LAYER met1 ;
         RECT 6.335000 1.550000 6.625000 1.595000 ;
         RECT 6.335000 1.595000 9.985000 1.735000 ;
@@ -82,44 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  0.095000  0.085000  0.425000 0.725000 ;
-        RECT  2.280000  0.085000  2.450000 0.920000 ;
-        RECT  4.915000  0.085000  5.165000 0.695000 ;
-        RECT  6.685000  0.085000  7.015000 1.020000 ;
-        RECT  9.435000  0.085000  9.765000 0.980000 ;
-        RECT 10.855000  0.085000 11.185000 0.645000 ;
-        RECT 12.205000  0.085000 12.535000 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
@@ -128,124 +84,163 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  0.120000 2.025000  0.450000 3.245000 ;
-        RECT  1.840000 2.310000  2.170000 3.245000 ;
-        RECT  4.940000 2.785000  5.270000 3.245000 ;
-        RECT  6.685000 2.410000  7.015000 3.245000 ;
-        RECT  9.145000 2.370000  9.475000 3.245000 ;
-        RECT 11.265000 1.675000 11.515000 3.245000 ;
-        RECT 12.275000 1.850000 12.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 ;
-        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.650000 2.025000  0.980000 3.065000 ;
-      RECT  0.810000 0.265000  2.100000 0.435000 ;
-      RECT  0.810000 0.435000  1.215000 0.725000 ;
-      RECT  0.810000 0.725000  0.980000 2.025000 ;
-      RECT  1.160000 1.100000  1.740000 1.270000 ;
-      RECT  1.160000 1.270000  1.330000 1.960000 ;
-      RECT  1.160000 1.960000  2.190000 2.130000 ;
-      RECT  1.160000 2.130000  1.640000 3.065000 ;
-      RECT  1.410000 0.615000  1.740000 1.100000 ;
-      RECT  1.930000 0.435000  2.100000 1.100000 ;
-      RECT  1.930000 1.100000  2.800000 1.165000 ;
-      RECT  1.930000 1.165000  2.970000 1.270000 ;
-      RECT  2.020000 1.515000  2.475000 1.845000 ;
-      RECT  2.020000 1.845000  2.190000 1.960000 ;
-      RECT  2.100000 1.270000  2.970000 1.335000 ;
-      RECT  2.370000 2.025000  2.620000 2.895000 ;
-      RECT  2.370000 2.895000  4.760000 3.065000 ;
-      RECT  2.630000 0.265000  3.840000 0.435000 ;
-      RECT  2.630000 0.435000  2.800000 1.100000 ;
-      RECT  2.800000 1.335000  2.970000 2.075000 ;
-      RECT  2.800000 2.075000  3.320000 2.715000 ;
-      RECT  2.990000 0.615000  3.320000 0.985000 ;
-      RECT  3.150000 0.985000  3.320000 1.245000 ;
-      RECT  3.150000 1.245000  4.505000 1.575000 ;
-      RECT  3.150000 1.575000  3.670000 1.840000 ;
-      RECT  3.500000 1.840000  3.670000 2.895000 ;
-      RECT  3.510000 0.435000  3.840000 1.065000 ;
-      RECT  3.850000 2.075000  4.855000 2.245000 ;
-      RECT  3.850000 2.245000  4.180000 2.715000 ;
-      RECT  4.085000 0.605000  4.335000 0.875000 ;
-      RECT  4.085000 0.875000  5.515000 1.045000 ;
-      RECT  4.085000 1.045000  4.855000 1.065000 ;
-      RECT  4.590000 2.435000  5.620000 2.605000 ;
-      RECT  4.590000 2.605000  4.760000 2.895000 ;
-      RECT  4.685000 1.065000  4.855000 2.075000 ;
-      RECT  5.035000 1.225000  5.865000 1.395000 ;
-      RECT  5.035000 1.395000  5.365000 2.085000 ;
-      RECT  5.035000 2.085000  6.155000 2.255000 ;
-      RECT  5.345000 0.265000  6.505000 0.435000 ;
-      RECT  5.345000 0.435000  5.515000 0.875000 ;
-      RECT  5.450000 2.605000  5.620000 2.895000 ;
-      RECT  5.450000 2.895000  6.505000 3.065000 ;
-      RECT  5.575000 1.575000  6.215000 1.745000 ;
-      RECT  5.575000 1.745000  5.905000 1.905000 ;
-      RECT  5.695000 0.615000  6.155000 1.020000 ;
-      RECT  5.695000 1.020000  5.865000 1.225000 ;
-      RECT  5.825000 2.255000  6.155000 2.715000 ;
-      RECT  6.045000 1.200000  7.240000 1.370000 ;
-      RECT  6.045000 1.370000  6.215000 1.575000 ;
-      RECT  6.335000 0.435000  6.505000 1.200000 ;
-      RECT  6.335000 2.060000  7.780000 2.230000 ;
-      RECT  6.335000 2.230000  6.505000 2.895000 ;
-      RECT  6.910000 1.370000  7.240000 1.870000 ;
-      RECT  7.450000 1.300000  7.780000 1.510000 ;
-      RECT  7.450000 1.510000  8.655000 1.840000 ;
-      RECT  7.450000 1.840000  7.780000 2.060000 ;
-      RECT  7.960000 0.605000  8.290000 0.895000 ;
-      RECT  7.960000 0.895000  9.005000 1.065000 ;
-      RECT  8.045000 2.020000 10.255000 2.190000 ;
-      RECT  8.045000 2.190000  8.375000 3.065000 ;
-      RECT  8.835000 1.065000  9.005000 2.020000 ;
-      RECT  9.185000 1.160000 10.655000 1.330000 ;
-      RECT  9.185000 1.330000  9.490000 1.840000 ;
-      RECT  9.925000 2.190000 10.255000 2.895000 ;
-      RECT  9.925000 2.895000 11.085000 3.065000 ;
-      RECT 10.065000 0.265000 10.395000 1.160000 ;
-      RECT 10.485000 1.330000 10.655000 1.675000 ;
-      RECT 10.485000 1.675000 10.735000 2.715000 ;
-      RECT 10.835000 0.825000 11.165000 1.495000 ;
-      RECT 10.915000 1.495000 11.085000 2.895000 ;
-      RECT 11.415000 0.350000 11.865000 0.810000 ;
-      RECT 11.695000 0.810000 11.865000 1.490000 ;
-      RECT 11.695000 1.490000 12.840000 1.660000 ;
-      RECT 11.695000 1.660000 12.075000 2.890000 ;
-      RECT 12.510000 0.990000 12.840000 1.490000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.095000  0.085000  0.425000 0.725000 ;
+      RECT  0.120000  2.025000  0.450000 3.245000 ;
+      RECT  0.650000  2.025000  0.980000 3.065000 ;
+      RECT  0.810000  0.265000  2.100000 0.435000 ;
+      RECT  0.810000  0.435000  1.215000 0.725000 ;
+      RECT  0.810000  0.725000  0.980000 2.025000 ;
+      RECT  1.160000  1.100000  1.740000 1.270000 ;
+      RECT  1.160000  1.270000  1.330000 1.960000 ;
+      RECT  1.160000  1.960000  2.190000 2.130000 ;
+      RECT  1.160000  2.130000  1.640000 3.065000 ;
+      RECT  1.410000  0.615000  1.740000 1.100000 ;
+      RECT  1.840000  2.310000  2.170000 3.245000 ;
+      RECT  1.930000  0.435000  2.100000 1.100000 ;
+      RECT  1.930000  1.100000  2.800000 1.165000 ;
+      RECT  1.930000  1.165000  2.970000 1.270000 ;
+      RECT  2.020000  1.515000  2.475000 1.845000 ;
+      RECT  2.020000  1.845000  2.190000 1.960000 ;
+      RECT  2.100000  1.270000  2.970000 1.335000 ;
+      RECT  2.280000  0.085000  2.450000 0.920000 ;
+      RECT  2.370000  2.025000  2.620000 2.895000 ;
+      RECT  2.370000  2.895000  4.760000 3.065000 ;
+      RECT  2.630000  0.265000  3.840000 0.435000 ;
+      RECT  2.630000  0.435000  2.800000 1.100000 ;
+      RECT  2.800000  1.335000  2.970000 2.075000 ;
+      RECT  2.800000  2.075000  3.320000 2.715000 ;
+      RECT  2.990000  0.615000  3.320000 0.985000 ;
+      RECT  3.150000  0.985000  3.320000 1.245000 ;
+      RECT  3.150000  1.245000  4.505000 1.575000 ;
+      RECT  3.150000  1.575000  3.670000 1.840000 ;
+      RECT  3.500000  1.840000  3.670000 2.895000 ;
+      RECT  3.510000  0.435000  3.840000 1.065000 ;
+      RECT  3.850000  2.075000  4.855000 2.245000 ;
+      RECT  3.850000  2.245000  4.180000 2.715000 ;
+      RECT  4.085000  0.605000  4.335000 0.875000 ;
+      RECT  4.085000  0.875000  5.515000 1.045000 ;
+      RECT  4.085000  1.045000  4.855000 1.065000 ;
+      RECT  4.590000  2.435000  5.620000 2.605000 ;
+      RECT  4.590000  2.605000  4.760000 2.895000 ;
+      RECT  4.685000  1.065000  4.855000 2.075000 ;
+      RECT  4.915000  0.085000  5.165000 0.695000 ;
+      RECT  4.940000  2.785000  5.270000 3.245000 ;
+      RECT  5.035000  1.225000  5.865000 1.395000 ;
+      RECT  5.035000  1.395000  5.365000 2.085000 ;
+      RECT  5.035000  2.085000  6.155000 2.255000 ;
+      RECT  5.345000  0.265000  6.505000 0.435000 ;
+      RECT  5.345000  0.435000  5.515000 0.875000 ;
+      RECT  5.450000  2.605000  5.620000 2.895000 ;
+      RECT  5.450000  2.895000  6.505000 3.065000 ;
+      RECT  5.575000  1.575000  6.215000 1.745000 ;
+      RECT  5.575000  1.745000  5.905000 1.905000 ;
+      RECT  5.695000  0.615000  6.155000 1.020000 ;
+      RECT  5.695000  1.020000  5.865000 1.225000 ;
+      RECT  5.825000  2.255000  6.155000 2.715000 ;
+      RECT  6.045000  1.200000  7.240000 1.370000 ;
+      RECT  6.045000  1.370000  6.215000 1.575000 ;
+      RECT  6.335000  0.435000  6.505000 1.200000 ;
+      RECT  6.335000  2.060000  7.780000 2.230000 ;
+      RECT  6.335000  2.230000  6.505000 2.895000 ;
+      RECT  6.395000  1.550000  6.700000 1.880000 ;
+      RECT  6.685000  0.085000  7.015000 1.020000 ;
+      RECT  6.685000  2.410000  7.015000 3.245000 ;
+      RECT  6.910000  1.370000  7.240000 1.870000 ;
+      RECT  7.450000  1.300000  7.780000 1.510000 ;
+      RECT  7.450000  1.510000  8.655000 1.840000 ;
+      RECT  7.450000  1.840000  7.780000 2.060000 ;
+      RECT  7.960000  0.605000  8.290000 0.895000 ;
+      RECT  7.960000  0.895000  9.005000 1.065000 ;
+      RECT  8.045000  2.020000 10.255000 2.190000 ;
+      RECT  8.045000  2.190000  8.375000 3.065000 ;
+      RECT  8.835000  1.065000  9.005000 2.020000 ;
+      RECT  9.145000  2.370000  9.475000 3.245000 ;
+      RECT  9.185000  1.160000 10.655000 1.330000 ;
+      RECT  9.185000  1.330000  9.490000 1.840000 ;
+      RECT  9.435000  0.085000  9.765000 0.980000 ;
+      RECT  9.700000  1.510000 10.030000 1.840000 ;
+      RECT  9.925000  2.190000 10.255000 2.895000 ;
+      RECT  9.925000  2.895000 11.085000 3.065000 ;
+      RECT 10.065000  0.265000 10.395000 1.160000 ;
+      RECT 10.485000  1.330000 10.655000 1.675000 ;
+      RECT 10.485000  1.675000 10.735000 2.715000 ;
+      RECT 10.835000  0.825000 11.165000 1.495000 ;
+      RECT 10.855000  0.085000 11.185000 0.645000 ;
+      RECT 10.915000  1.495000 11.085000 2.895000 ;
+      RECT 11.265000  1.675000 11.515000 3.245000 ;
+      RECT 11.415000  0.350000 11.865000 0.810000 ;
+      RECT 11.695000  0.810000 11.865000 1.490000 ;
+      RECT 11.695000  1.490000 12.840000 1.660000 ;
+      RECT 11.695000  1.660000 12.075000 2.890000 ;
+      RECT 12.205000  0.085000 12.535000 0.810000 ;
+      RECT 12.275000  1.850000 12.605000 3.245000 ;
+      RECT 12.510000  0.990000 12.840000 1.490000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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 ;
+      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 ;
   END
 END sky130_fd_sc_lp__dfstp_lp
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef
index 80961c9..c0cf9f5 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.magic.lef
@@ -70,35 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.670000 ;
-        RECT 1.755000  0.085000 2.075000 0.975000 ;
-        RECT 3.610000  0.085000 4.335000 0.915000 ;
-        RECT 6.050000  0.085000 6.380000 0.955000 ;
-        RECT 7.775000  0.085000 8.085000 1.230000 ;
-        RECT 8.745000  0.085000 9.015000 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 ;
-        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,89 +78,115 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.095000 2.320000 0.390000 3.245000 ;
-        RECT 1.495000 2.655000 1.735000 3.245000 ;
-        RECT 3.945000 2.765000 4.275000 3.245000 ;
-        RECT 6.080000 1.975000 6.410000 3.245000 ;
-        RECT 7.785000 2.715000 8.115000 3.245000 ;
-        RECT 8.805000 2.785000 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 ;
-        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.560000 2.320000 0.795000 2.990000 ;
-      RECT 0.595000 0.450000 0.875000 1.215000 ;
-      RECT 0.595000 1.215000 1.040000 1.885000 ;
-      RECT 0.595000 1.885000 0.795000 2.320000 ;
-      RECT 1.045000 2.295000 1.420000 2.315000 ;
-      RECT 1.045000 2.315000 2.075000 2.485000 ;
-      RECT 1.045000 2.485000 1.325000 2.965000 ;
-      RECT 1.210000 0.640000 1.420000 2.295000 ;
-      RECT 1.905000 2.485000 2.075000 2.865000 ;
-      RECT 1.905000 2.865000 3.300000 3.075000 ;
-      RECT 2.245000 0.635000 2.695000 0.965000 ;
-      RECT 2.245000 0.965000 2.435000 2.695000 ;
-      RECT 2.605000 1.555000 4.460000 1.725000 ;
-      RECT 2.605000 1.725000 2.775000 2.365000 ;
-      RECT 2.605000 2.365000 2.960000 2.695000 ;
-      RECT 2.865000 0.635000 3.160000 1.555000 ;
-      RECT 2.945000 1.895000 3.300000 2.155000 ;
-      RECT 3.130000 2.155000 3.300000 2.415000 ;
-      RECT 3.130000 2.415000 5.035000 2.585000 ;
-      RECT 3.130000 2.585000 3.300000 2.865000 ;
-      RECT 3.495000 1.895000 4.695000 2.235000 ;
-      RECT 3.545000 1.085000 4.695000 1.255000 ;
-      RECT 3.545000 1.255000 3.875000 1.385000 ;
-      RECT 4.130000 1.425000 4.460000 1.555000 ;
-      RECT 4.505000 0.585000 4.695000 1.085000 ;
-      RECT 4.865000 1.225000 5.095000 1.555000 ;
-      RECT 4.865000 1.555000 5.035000 2.415000 ;
-      RECT 5.010000 0.640000 5.435000 0.995000 ;
-      RECT 5.205000 1.875000 5.465000 2.750000 ;
-      RECT 5.265000 0.995000 5.435000 1.125000 ;
-      RECT 5.265000 1.125000 6.685000 1.295000 ;
-      RECT 5.265000 1.295000 5.465000 1.875000 ;
-      RECT 5.895000 1.485000 6.225000 1.635000 ;
-      RECT 5.895000 1.635000 7.265000 1.650000 ;
-      RECT 5.895000 1.650000 7.035000 1.805000 ;
-      RECT 6.435000 1.295000 6.685000 1.455000 ;
-      RECT 6.550000 0.355000 6.890000 0.775000 ;
-      RECT 6.550000 0.775000 7.035000 0.955000 ;
-      RECT 6.580000 1.805000 7.035000 2.375000 ;
-      RECT 6.580000 2.375000 9.050000 2.545000 ;
-      RECT 6.580000 2.545000 6.875000 2.755000 ;
-      RECT 6.865000 0.955000 7.035000 1.320000 ;
-      RECT 6.865000 1.320000 7.265000 1.635000 ;
-      RECT 7.060000 0.265000 7.385000 0.595000 ;
-      RECT 7.215000 0.595000 7.385000 0.830000 ;
-      RECT 7.215000 0.830000 7.605000 1.040000 ;
-      RECT 7.260000 1.875000 7.605000 2.205000 ;
-      RECT 7.435000 1.040000 7.605000 1.875000 ;
-      RECT 8.720000 1.425000 9.050000 2.375000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.670000 ;
+      RECT 0.095000  2.320000 0.390000 3.245000 ;
+      RECT 0.560000  2.320000 0.795000 2.990000 ;
+      RECT 0.595000  0.450000 0.875000 1.215000 ;
+      RECT 0.595000  1.215000 1.040000 1.885000 ;
+      RECT 0.595000  1.885000 0.795000 2.320000 ;
+      RECT 1.045000  2.295000 1.420000 2.315000 ;
+      RECT 1.045000  2.315000 2.075000 2.485000 ;
+      RECT 1.045000  2.485000 1.325000 2.965000 ;
+      RECT 1.210000  0.640000 1.420000 2.295000 ;
+      RECT 1.495000  2.655000 1.735000 3.245000 ;
+      RECT 1.755000  0.085000 2.075000 0.975000 ;
+      RECT 1.905000  2.485000 2.075000 2.865000 ;
+      RECT 1.905000  2.865000 3.300000 3.075000 ;
+      RECT 2.245000  0.635000 2.695000 0.965000 ;
+      RECT 2.245000  0.965000 2.435000 2.695000 ;
+      RECT 2.605000  1.555000 4.460000 1.725000 ;
+      RECT 2.605000  1.725000 2.775000 2.365000 ;
+      RECT 2.605000  2.365000 2.960000 2.695000 ;
+      RECT 2.865000  0.635000 3.160000 1.555000 ;
+      RECT 2.945000  1.895000 3.300000 2.155000 ;
+      RECT 3.130000  2.155000 3.300000 2.415000 ;
+      RECT 3.130000  2.415000 5.035000 2.585000 ;
+      RECT 3.130000  2.585000 3.300000 2.865000 ;
+      RECT 3.495000  1.895000 4.695000 2.235000 ;
+      RECT 3.545000  1.085000 4.695000 1.255000 ;
+      RECT 3.545000  1.255000 3.875000 1.385000 ;
+      RECT 3.610000  0.085000 4.335000 0.915000 ;
+      RECT 3.945000  2.765000 4.275000 3.245000 ;
+      RECT 4.130000  1.425000 4.460000 1.555000 ;
+      RECT 4.505000  0.585000 4.695000 1.085000 ;
+      RECT 4.865000  1.225000 5.095000 1.555000 ;
+      RECT 4.865000  1.555000 5.035000 2.415000 ;
+      RECT 5.010000  0.640000 5.435000 0.995000 ;
+      RECT 5.205000  1.875000 5.465000 2.750000 ;
+      RECT 5.265000  0.995000 5.435000 1.125000 ;
+      RECT 5.265000  1.125000 6.685000 1.295000 ;
+      RECT 5.265000  1.295000 5.465000 1.875000 ;
+      RECT 5.895000  1.485000 6.225000 1.635000 ;
+      RECT 5.895000  1.635000 7.265000 1.650000 ;
+      RECT 5.895000  1.650000 7.035000 1.805000 ;
+      RECT 6.050000  0.085000 6.380000 0.955000 ;
+      RECT 6.080000  1.975000 6.410000 3.245000 ;
+      RECT 6.435000  1.295000 6.685000 1.455000 ;
+      RECT 6.550000  0.355000 6.890000 0.775000 ;
+      RECT 6.550000  0.775000 7.035000 0.955000 ;
+      RECT 6.580000  1.805000 7.035000 2.375000 ;
+      RECT 6.580000  2.375000 9.050000 2.545000 ;
+      RECT 6.580000  2.545000 6.875000 2.755000 ;
+      RECT 6.865000  0.955000 7.035000 1.320000 ;
+      RECT 6.865000  1.320000 7.265000 1.635000 ;
+      RECT 7.060000  0.265000 7.385000 0.595000 ;
+      RECT 7.215000  0.595000 7.385000 0.830000 ;
+      RECT 7.215000  0.830000 7.605000 1.040000 ;
+      RECT 7.260000  1.875000 7.605000 2.205000 ;
+      RECT 7.435000  1.040000 7.605000 1.875000 ;
+      RECT 7.775000  0.085000 8.085000 1.230000 ;
+      RECT 7.785000  2.715000 8.115000 3.245000 ;
+      RECT 8.720000  1.425000 9.050000 2.375000 ;
+      RECT 8.745000  0.085000 9.015000 1.255000 ;
+      RECT 8.805000  2.785000 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 ;
+      RECT 9.275000 -0.085000 9.445000 0.085000 ;
+      RECT 9.275000  3.245000 9.445000 3.415000 ;
   END
 END sky130_fd_sc_lp__dfxbp_1
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef
index 0aaaf9f..c1bca86 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.magic.lef
@@ -71,38 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.560000 0.085000 ;
-        RECT  0.095000  0.085000  0.425000 0.670000 ;
-        RECT  1.645000  0.085000  1.975000 0.955000 ;
-        RECT  3.475000  0.085000  4.355000 0.835000 ;
-        RECT  5.970000  0.085000  6.490000 0.975000 ;
-        RECT  8.095000  0.085000  8.425000 0.375000 ;
-        RECT  9.150000  0.085000  9.480000 0.375000 ;
-        RECT 10.125000  0.085000 10.420000 1.125000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -111,91 +79,120 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 10.560000 3.415000 ;
-        RECT  0.095000 2.280000  0.405000 3.245000 ;
-        RECT  1.580000 2.640000  1.830000 3.245000 ;
-        RECT  3.945000 2.575000  4.275000 3.245000 ;
-        RECT  6.270000 2.335000  6.730000 3.245000 ;
-        RECT  8.045000 1.815000  8.470000 3.245000 ;
-        RECT  9.150000 1.820000  9.480000 3.245000 ;
-        RECT 10.125000 1.815000 10.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 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.575000 1.930000 1.040000 2.100000 ;
-      RECT 0.575000 2.100000 0.855000 2.950000 ;
-      RECT 0.595000 0.330000 1.040000 0.720000 ;
-      RECT 0.790000 0.720000 1.040000 1.930000 ;
-      RECT 1.140000 2.295000 1.475000 2.300000 ;
-      RECT 1.140000 2.300000 2.170000 2.470000 ;
-      RECT 1.140000 2.470000 1.410000 2.965000 ;
-      RECT 1.215000 0.640000 1.475000 2.295000 ;
-      RECT 2.000000 2.470000 2.170000 2.905000 ;
-      RECT 2.000000 2.905000 3.475000 3.075000 ;
-      RECT 2.180000 0.625000 2.595000 0.955000 ;
-      RECT 2.350000 2.300000 2.595000 2.630000 ;
-      RECT 2.425000 0.955000 2.595000 2.300000 ;
-      RECT 2.765000 0.640000 3.015000 1.555000 ;
-      RECT 2.765000 1.555000 4.285000 1.725000 ;
-      RECT 2.765000 1.725000 2.945000 2.405000 ;
-      RECT 2.765000 2.405000 3.125000 2.735000 ;
-      RECT 3.125000 1.895000 3.475000 2.155000 ;
-      RECT 3.305000 2.155000 3.475000 2.235000 ;
-      RECT 3.305000 2.235000 5.145000 2.405000 ;
-      RECT 3.305000 2.405000 3.475000 2.905000 ;
-      RECT 3.485000 1.005000 4.785000 1.175000 ;
-      RECT 3.485000 1.175000 3.815000 1.385000 ;
-      RECT 4.025000 1.355000 4.285000 1.555000 ;
-      RECT 4.455000 1.175000 4.785000 2.065000 ;
-      RECT 4.525000 0.585000 4.785000 1.005000 ;
-      RECT 4.955000 1.175000 5.145000 2.235000 ;
-      RECT 5.075000 0.640000 5.565000 0.975000 ;
-      RECT 5.315000 0.975000 5.565000 1.145000 ;
-      RECT 5.315000 1.145000 6.795000 1.315000 ;
-      RECT 5.315000 1.315000 5.565000 2.705000 ;
-      RECT 5.995000 1.505000 6.325000 1.985000 ;
-      RECT 5.995000 1.985000 7.170000 2.165000 ;
-      RECT 6.535000 1.315000 6.795000 1.815000 ;
-      RECT 6.660000 0.355000 7.135000 0.545000 ;
-      RECT 6.660000 0.545000 9.540000 0.715000 ;
-      RECT 6.660000 0.715000 7.135000 0.975000 ;
-      RECT 6.900000 2.165000 7.170000 3.075000 ;
-      RECT 6.965000 0.975000 7.135000 1.255000 ;
-      RECT 6.965000 1.255000 7.435000 1.515000 ;
-      RECT 6.965000 1.515000 7.170000 1.985000 ;
-      RECT 7.545000 0.895000 8.470000 1.085000 ;
-      RECT 7.545000 1.815000 7.815000 1.830000 ;
-      RECT 7.545000 1.830000 7.875000 2.485000 ;
-      RECT 7.605000 1.085000 8.470000 1.625000 ;
-      RECT 7.605000 1.625000 7.815000 1.815000 ;
-      RECT 9.370000 0.715000 9.540000 1.320000 ;
-      RECT 9.370000 1.320000 9.555000 1.650000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.095000  0.085000  0.425000 0.670000 ;
+      RECT  0.095000  2.280000  0.405000 3.245000 ;
+      RECT  0.575000  1.930000  1.040000 2.100000 ;
+      RECT  0.575000  2.100000  0.855000 2.950000 ;
+      RECT  0.595000  0.330000  1.040000 0.720000 ;
+      RECT  0.790000  0.720000  1.040000 1.930000 ;
+      RECT  1.140000  2.295000  1.475000 2.300000 ;
+      RECT  1.140000  2.300000  2.170000 2.470000 ;
+      RECT  1.140000  2.470000  1.410000 2.965000 ;
+      RECT  1.215000  0.640000  1.475000 2.295000 ;
+      RECT  1.580000  2.640000  1.830000 3.245000 ;
+      RECT  1.645000  0.085000  1.975000 0.955000 ;
+      RECT  2.000000  2.470000  2.170000 2.905000 ;
+      RECT  2.000000  2.905000  3.475000 3.075000 ;
+      RECT  2.180000  0.625000  2.595000 0.955000 ;
+      RECT  2.350000  2.300000  2.595000 2.630000 ;
+      RECT  2.425000  0.955000  2.595000 2.300000 ;
+      RECT  2.765000  0.640000  3.015000 1.555000 ;
+      RECT  2.765000  1.555000  4.285000 1.725000 ;
+      RECT  2.765000  1.725000  2.945000 2.405000 ;
+      RECT  2.765000  2.405000  3.125000 2.735000 ;
+      RECT  3.125000  1.895000  3.475000 2.155000 ;
+      RECT  3.305000  2.155000  3.475000 2.235000 ;
+      RECT  3.305000  2.235000  5.145000 2.405000 ;
+      RECT  3.305000  2.405000  3.475000 2.905000 ;
+      RECT  3.475000  0.085000  4.355000 0.835000 ;
+      RECT  3.485000  1.005000  4.785000 1.175000 ;
+      RECT  3.485000  1.175000  3.815000 1.385000 ;
+      RECT  3.945000  2.575000  4.275000 3.245000 ;
+      RECT  4.025000  1.355000  4.285000 1.555000 ;
+      RECT  4.455000  1.175000  4.785000 2.065000 ;
+      RECT  4.525000  0.585000  4.785000 1.005000 ;
+      RECT  4.955000  1.175000  5.145000 2.235000 ;
+      RECT  5.075000  0.640000  5.565000 0.975000 ;
+      RECT  5.315000  0.975000  5.565000 1.145000 ;
+      RECT  5.315000  1.145000  6.795000 1.315000 ;
+      RECT  5.315000  1.315000  5.565000 2.705000 ;
+      RECT  5.970000  0.085000  6.490000 0.975000 ;
+      RECT  5.995000  1.505000  6.325000 1.985000 ;
+      RECT  5.995000  1.985000  7.170000 2.165000 ;
+      RECT  6.270000  2.335000  6.730000 3.245000 ;
+      RECT  6.535000  1.315000  6.795000 1.815000 ;
+      RECT  6.660000  0.355000  7.135000 0.545000 ;
+      RECT  6.660000  0.545000  9.540000 0.715000 ;
+      RECT  6.660000  0.715000  7.135000 0.975000 ;
+      RECT  6.900000  2.165000  7.170000 3.075000 ;
+      RECT  6.965000  0.975000  7.135000 1.255000 ;
+      RECT  6.965000  1.255000  7.435000 1.515000 ;
+      RECT  6.965000  1.515000  7.170000 1.985000 ;
+      RECT  7.545000  0.895000  8.470000 1.085000 ;
+      RECT  7.545000  1.815000  7.815000 1.830000 ;
+      RECT  7.545000  1.830000  7.875000 2.485000 ;
+      RECT  7.605000  1.085000  8.470000 1.625000 ;
+      RECT  7.605000  1.625000  7.815000 1.815000 ;
+      RECT  8.045000  1.815000  8.470000 3.245000 ;
+      RECT  8.095000  0.085000  8.425000 0.375000 ;
+      RECT  9.150000  0.085000  9.480000 0.375000 ;
+      RECT  9.150000  1.820000  9.480000 3.245000 ;
+      RECT  9.370000  0.715000  9.540000 1.320000 ;
+      RECT  9.370000  1.320000  9.555000 1.650000 ;
+      RECT 10.125000  0.085000 10.420000 1.125000 ;
+      RECT 10.125000  1.815000 10.415000 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 ;
   END
 END sky130_fd_sc_lp__dfxbp_2
diff --git a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef
index 7d2cca2..5bd9ed0 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.magic.lef
@@ -72,42 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  1.110000  0.085000  1.360000 0.865000 ;
-        RECT  3.280000  0.085000  3.610000 0.785000 ;
-        RECT  5.660000  0.085000  5.910000 1.065000 ;
-        RECT  8.335000  0.085000  8.585000 0.725000 ;
-        RECT 10.465000  0.085000 10.715000 1.075000 ;
-        RECT 11.725000  0.085000 12.055000 0.725000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -116,114 +80,147 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.640000 2.775000  0.970000 3.245000 ;
-        RECT  3.865000 1.985000  4.195000 3.245000 ;
-        RECT  5.490000 2.465000  5.820000 3.245000 ;
-        RECT  7.795000 2.370000  8.125000 3.245000 ;
-        RECT  9.755000 1.815000 10.085000 3.245000 ;
-        RECT 11.985000 2.115000 12.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 ;
-        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.110000 0.405000  0.420000 1.995000 ;
-      RECT  0.110000 1.995000  0.440000 2.425000 ;
-      RECT  0.110000 2.425000  1.320000 2.595000 ;
-      RECT  0.110000 2.595000  0.440000 3.035000 ;
-      RECT  1.150000 2.595000  1.320000 2.775000 ;
-      RECT  1.150000 2.775000  2.315000 3.065000 ;
-      RECT  1.170000 2.035000  3.110000 2.205000 ;
-      RECT  1.170000 2.205000  1.500000 2.245000 ;
-      RECT  1.720000 2.385000  2.050000 2.425000 ;
-      RECT  1.720000 2.425000  3.665000 2.595000 ;
-      RECT  1.820000 0.405000  2.150000 0.865000 ;
-      RECT  1.820000 0.865000  1.990000 2.035000 ;
-      RECT  2.250000 1.595000  2.660000 1.635000 ;
-      RECT  2.250000 1.635000  4.215000 1.805000 ;
-      RECT  2.250000 1.805000  2.580000 1.855000 ;
-      RECT  2.330000 0.405000  2.660000 1.595000 ;
-      RECT  2.780000 1.985000  3.110000 2.035000 ;
-      RECT  2.780000 2.205000  3.110000 2.245000 ;
-      RECT  3.075000 0.965000  4.780000 1.135000 ;
-      RECT  3.075000 1.135000  3.405000 1.455000 ;
-      RECT  3.335000 1.985000  3.665000 2.425000 ;
-      RECT  3.335000 2.595000  3.665000 2.755000 ;
-      RECT  4.045000 1.315000  4.430000 1.575000 ;
-      RECT  4.045000 1.575000  4.215000 1.635000 ;
-      RECT  4.150000 0.265000  5.480000 0.435000 ;
-      RECT  4.150000 0.435000  4.480000 0.965000 ;
-      RECT  4.395000 1.755000  4.780000 2.115000 ;
-      RECT  4.395000 2.115000  6.470000 2.285000 ;
-      RECT  4.395000 2.285000  4.780000 2.755000 ;
-      RECT  4.610000 1.135000  4.780000 1.755000 ;
-      RECT  4.710000 0.615000  5.130000 0.785000 ;
-      RECT  4.960000 0.785000  5.130000 1.685000 ;
-      RECT  4.960000 1.685000  7.265000 1.855000 ;
-      RECT  4.960000 1.855000  5.290000 1.935000 ;
-      RECT  5.310000 0.435000  5.480000 1.335000 ;
-      RECT  5.310000 1.335000  6.740000 1.505000 ;
-      RECT  6.140000 0.265000  8.155000 0.435000 ;
-      RECT  6.140000 0.435000  6.390000 1.155000 ;
-      RECT  6.140000 2.075000  6.470000 2.115000 ;
-      RECT  6.140000 2.285000  6.470000 3.065000 ;
-      RECT  6.570000 0.615000  7.600000 0.785000 ;
-      RECT  6.570000 0.785000  6.740000 1.335000 ;
-      RECT  6.670000 2.115000  7.615000 2.285000 ;
-      RECT  6.670000 2.285000  7.000000 3.065000 ;
-      RECT  6.920000 0.965000  7.090000 1.265000 ;
-      RECT  6.920000 1.265000  8.695000 1.435000 ;
-      RECT  6.935000 1.615000  7.265000 1.685000 ;
-      RECT  6.935000 1.855000  7.265000 1.935000 ;
-      RECT  7.270000 0.785000  7.600000 1.085000 ;
-      RECT  7.445000 1.435000  7.615000 2.115000 ;
-      RECT  7.795000 1.615000  8.125000 2.020000 ;
-      RECT  7.795000 2.020000  9.045000 2.190000 ;
-      RECT  7.825000 0.435000  8.155000 0.725000 ;
-      RECT  8.365000 1.170000  8.695000 1.265000 ;
-      RECT  8.365000 1.435000  8.695000 1.840000 ;
-      RECT  8.590000 2.190000  9.045000 3.065000 ;
-      RECT  8.875000 0.265000 10.275000 0.435000 ;
-      RECT  8.875000 0.435000  9.375000 0.725000 ;
-      RECT  8.875000 0.725000  9.045000 2.020000 ;
-      RECT  9.735000 1.255000 11.765000 1.585000 ;
-      RECT 10.105000 0.435000 10.275000 1.255000 ;
-      RECT 10.285000 1.765000 12.335000 1.935000 ;
-      RECT 10.285000 1.935000 10.615000 2.855000 ;
-      RECT 11.175000 0.615000 11.505000 0.905000 ;
-      RECT 11.175000 0.905000 12.175000 1.075000 ;
-      RECT 12.005000 1.075000 12.175000 1.215000 ;
-      RECT 12.005000 1.215000 12.335000 1.765000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.110000  0.405000  0.420000 1.995000 ;
+      RECT  0.110000  1.995000  0.440000 2.425000 ;
+      RECT  0.110000  2.425000  1.320000 2.595000 ;
+      RECT  0.110000  2.595000  0.440000 3.035000 ;
+      RECT  0.640000  2.775000  0.970000 3.245000 ;
+      RECT  1.110000  0.085000  1.360000 0.865000 ;
+      RECT  1.150000  2.595000  1.320000 2.775000 ;
+      RECT  1.150000  2.775000  2.315000 3.065000 ;
+      RECT  1.170000  2.035000  3.110000 2.205000 ;
+      RECT  1.170000  2.205000  1.500000 2.245000 ;
+      RECT  1.720000  2.385000  2.050000 2.425000 ;
+      RECT  1.720000  2.425000  3.665000 2.595000 ;
+      RECT  1.820000  0.405000  2.150000 0.865000 ;
+      RECT  1.820000  0.865000  1.990000 2.035000 ;
+      RECT  2.250000  1.595000  2.660000 1.635000 ;
+      RECT  2.250000  1.635000  4.215000 1.805000 ;
+      RECT  2.250000  1.805000  2.580000 1.855000 ;
+      RECT  2.330000  0.405000  2.660000 1.595000 ;
+      RECT  2.780000  1.985000  3.110000 2.035000 ;
+      RECT  2.780000  2.205000  3.110000 2.245000 ;
+      RECT  3.075000  0.965000  4.780000 1.135000 ;
+      RECT  3.075000  1.135000  3.405000 1.455000 ;
+      RECT  3.280000  0.085000  3.610000 0.785000 ;
+      RECT  3.335000  1.985000  3.665000 2.425000 ;
+      RECT  3.335000  2.595000  3.665000 2.755000 ;
+      RECT  3.865000  1.985000  4.195000 3.245000 ;
+      RECT  4.045000  1.315000  4.430000 1.575000 ;
+      RECT  4.045000  1.575000  4.215000 1.635000 ;
+      RECT  4.150000  0.265000  5.480000 0.435000 ;
+      RECT  4.150000  0.435000  4.480000 0.965000 ;
+      RECT  4.395000  1.755000  4.780000 2.115000 ;
+      RECT  4.395000  2.115000  6.470000 2.285000 ;
+      RECT  4.395000  2.285000  4.780000 2.755000 ;
+      RECT  4.610000  1.135000  4.780000 1.755000 ;
+      RECT  4.710000  0.615000  5.130000 0.785000 ;
+      RECT  4.960000  0.785000  5.130000 1.685000 ;
+      RECT  4.960000  1.685000  7.265000 1.855000 ;
+      RECT  4.960000  1.855000  5.290000 1.935000 ;
+      RECT  5.310000  0.435000  5.480000 1.335000 ;
+      RECT  5.310000  1.335000  6.740000 1.505000 ;
+      RECT  5.490000  2.465000  5.820000 3.245000 ;
+      RECT  5.660000  0.085000  5.910000 1.065000 ;
+      RECT  6.140000  0.265000  8.155000 0.435000 ;
+      RECT  6.140000  0.435000  6.390000 1.155000 ;
+      RECT  6.140000  2.075000  6.470000 2.115000 ;
+      RECT  6.140000  2.285000  6.470000 3.065000 ;
+      RECT  6.570000  0.615000  7.600000 0.785000 ;
+      RECT  6.570000  0.785000  6.740000 1.335000 ;
+      RECT  6.670000  2.115000  7.615000 2.285000 ;
+      RECT  6.670000  2.285000  7.000000 3.065000 ;
+      RECT  6.920000  0.965000  7.090000 1.265000 ;
+      RECT  6.920000  1.265000  8.695000 1.435000 ;
+      RECT  6.935000  1.615000  7.265000 1.685000 ;
+      RECT  6.935000  1.855000  7.265000 1.935000 ;
+      RECT  7.270000  0.785000  7.600000 1.085000 ;
+      RECT  7.445000  1.435000  7.615000 2.115000 ;
+      RECT  7.795000  1.615000  8.125000 2.020000 ;
+      RECT  7.795000  2.020000  9.045000 2.190000 ;
+      RECT  7.795000  2.370000  8.125000 3.245000 ;
+      RECT  7.825000  0.435000  8.155000 0.725000 ;
+      RECT  8.335000  0.085000  8.585000 0.725000 ;
+      RECT  8.365000  1.170000  8.695000 1.265000 ;
+      RECT  8.365000  1.435000  8.695000 1.840000 ;
+      RECT  8.590000  2.190000  9.045000 3.065000 ;
+      RECT  8.875000  0.265000 10.275000 0.435000 ;
+      RECT  8.875000  0.435000  9.375000 0.725000 ;
+      RECT  8.875000  0.725000  9.045000 2.020000 ;
+      RECT  9.735000  1.255000 11.765000 1.585000 ;
+      RECT  9.755000  1.815000 10.085000 3.245000 ;
+      RECT 10.105000  0.435000 10.275000 1.255000 ;
+      RECT 10.285000  1.765000 12.335000 1.935000 ;
+      RECT 10.285000  1.935000 10.615000 2.855000 ;
+      RECT 10.465000  0.085000 10.715000 1.075000 ;
+      RECT 11.175000  0.615000 11.505000 0.905000 ;
+      RECT 11.175000  0.905000 12.175000 1.075000 ;
+      RECT 11.725000  0.085000 12.055000 0.725000 ;
+      RECT 11.985000  2.115000 12.315000 3.245000 ;
+      RECT 12.005000  1.075000 12.175000 1.215000 ;
+      RECT 12.005000  1.215000 12.335000 1.765000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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 ;
   END
 END sky130_fd_sc_lp__dfxbp_lp
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef
index f083400..5aecae3 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.magic.lef
@@ -61,31 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.670000 ;
-        RECT 1.710000  0.085000 2.040000 1.040000 ;
-        RECT 3.570000  0.085000 4.240000 0.935000 ;
-        RECT 5.975000  0.085000 6.305000 0.945000 ;
-        RECT 7.340000  0.085000 7.605000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -94,75 +69,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.095000 2.325000 0.425000 3.245000 ;
-        RECT 1.510000 2.300000 1.735000 3.245000 ;
-        RECT 3.760000 2.635000 4.090000 3.245000 ;
-        RECT 5.980000 1.965000 6.360000 3.245000 ;
-        RECT 7.305000 1.825000 7.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 ;
-        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.595000 0.400000 0.855000 0.955000 ;
-      RECT 0.595000 0.955000 1.010000 1.625000 ;
-      RECT 0.595000 1.625000 0.795000 2.990000 ;
-      RECT 1.045000 2.045000 2.075000 2.130000 ;
-      RECT 1.045000 2.130000 1.340000 2.715000 ;
-      RECT 1.180000 0.855000 1.410000 1.960000 ;
-      RECT 1.180000 1.960000 2.075000 2.045000 ;
-      RECT 1.905000 2.130000 2.075000 2.605000 ;
-      RECT 1.905000 2.605000 3.495000 2.880000 ;
-      RECT 2.245000 0.860000 2.575000 1.190000 ;
-      RECT 2.245000 1.190000 2.425000 2.435000 ;
-      RECT 2.595000 1.575000 2.775000 2.605000 ;
-      RECT 2.755000 0.860000 3.125000 1.105000 ;
-      RECT 2.755000 1.105000 4.240000 1.190000 ;
-      RECT 2.945000 1.190000 4.240000 1.275000 ;
-      RECT 2.945000 1.275000 3.155000 2.435000 ;
-      RECT 3.325000 2.285000 4.930000 2.455000 ;
-      RECT 3.325000 2.455000 3.495000 2.605000 ;
-      RECT 3.370000 1.445000 3.700000 1.855000 ;
-      RECT 3.370000 1.855000 4.580000 2.115000 ;
-      RECT 3.980000 1.275000 4.240000 1.675000 ;
-      RECT 4.410000 0.575000 4.685000 1.245000 ;
-      RECT 4.410000 1.245000 4.580000 1.855000 ;
-      RECT 4.760000 1.425000 5.035000 1.595000 ;
-      RECT 4.760000 1.595000 4.930000 2.285000 ;
-      RECT 4.855000 1.195000 5.035000 1.425000 ;
-      RECT 4.990000 0.640000 5.395000 0.970000 ;
-      RECT 5.110000 1.875000 5.375000 2.755000 ;
-      RECT 5.205000 0.970000 5.395000 1.125000 ;
-      RECT 5.205000 1.125000 6.595000 1.295000 ;
-      RECT 5.205000 1.295000 5.375000 1.875000 ;
-      RECT 5.790000 1.465000 6.120000 1.625000 ;
-      RECT 5.790000 1.625000 7.605000 1.655000 ;
-      RECT 5.790000 1.655000 6.935000 1.795000 ;
-      RECT 6.335000 1.295000 6.595000 1.455000 ;
-      RECT 6.475000 0.415000 6.935000 0.945000 ;
-      RECT 6.540000 1.795000 6.935000 2.750000 ;
-      RECT 6.765000 0.945000 7.170000 1.270000 ;
-      RECT 6.765000 1.270000 7.605000 1.625000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.670000 ;
+      RECT 0.095000  2.325000 0.425000 3.245000 ;
+      RECT 0.595000  0.400000 0.855000 0.955000 ;
+      RECT 0.595000  0.955000 1.010000 1.625000 ;
+      RECT 0.595000  1.625000 0.795000 2.990000 ;
+      RECT 1.045000  2.045000 2.075000 2.130000 ;
+      RECT 1.045000  2.130000 1.340000 2.715000 ;
+      RECT 1.180000  0.855000 1.410000 1.960000 ;
+      RECT 1.180000  1.960000 2.075000 2.045000 ;
+      RECT 1.510000  2.300000 1.735000 3.245000 ;
+      RECT 1.710000  0.085000 2.040000 1.040000 ;
+      RECT 1.905000  2.130000 2.075000 2.605000 ;
+      RECT 1.905000  2.605000 3.495000 2.880000 ;
+      RECT 2.245000  0.860000 2.575000 1.190000 ;
+      RECT 2.245000  1.190000 2.425000 2.435000 ;
+      RECT 2.595000  1.575000 2.775000 2.605000 ;
+      RECT 2.755000  0.860000 3.125000 1.105000 ;
+      RECT 2.755000  1.105000 4.240000 1.190000 ;
+      RECT 2.945000  1.190000 4.240000 1.275000 ;
+      RECT 2.945000  1.275000 3.155000 2.435000 ;
+      RECT 3.325000  2.285000 4.930000 2.455000 ;
+      RECT 3.325000  2.455000 3.495000 2.605000 ;
+      RECT 3.370000  1.445000 3.700000 1.855000 ;
+      RECT 3.370000  1.855000 4.580000 2.115000 ;
+      RECT 3.570000  0.085000 4.240000 0.935000 ;
+      RECT 3.760000  2.635000 4.090000 3.245000 ;
+      RECT 3.980000  1.275000 4.240000 1.675000 ;
+      RECT 4.410000  0.575000 4.685000 1.245000 ;
+      RECT 4.410000  1.245000 4.580000 1.855000 ;
+      RECT 4.760000  1.425000 5.035000 1.595000 ;
+      RECT 4.760000  1.595000 4.930000 2.285000 ;
+      RECT 4.855000  1.195000 5.035000 1.425000 ;
+      RECT 4.990000  0.640000 5.395000 0.970000 ;
+      RECT 5.110000  1.875000 5.375000 2.755000 ;
+      RECT 5.205000  0.970000 5.395000 1.125000 ;
+      RECT 5.205000  1.125000 6.595000 1.295000 ;
+      RECT 5.205000  1.295000 5.375000 1.875000 ;
+      RECT 5.790000  1.465000 6.120000 1.625000 ;
+      RECT 5.790000  1.625000 7.605000 1.655000 ;
+      RECT 5.790000  1.655000 6.935000 1.795000 ;
+      RECT 5.975000  0.085000 6.305000 0.945000 ;
+      RECT 5.980000  1.965000 6.360000 3.245000 ;
+      RECT 6.335000  1.295000 6.595000 1.455000 ;
+      RECT 6.475000  0.415000 6.935000 0.945000 ;
+      RECT 6.540000  1.795000 6.935000 2.750000 ;
+      RECT 6.765000  0.945000 7.170000 1.270000 ;
+      RECT 6.765000  1.270000 7.605000 1.625000 ;
+      RECT 7.305000  1.825000 7.605000 3.245000 ;
+      RECT 7.340000  0.085000 7.605000 1.095000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dfxtp_1
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef
index e579111..49f898f 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.magic.lef
@@ -61,33 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.670000 ;
-        RECT 1.755000  0.085000 2.035000 0.970000 ;
-        RECT 3.520000  0.085000 4.425000 0.885000 ;
-        RECT 6.000000  0.085000 6.520000 0.945000 ;
-        RECT 7.335000  0.085000 7.615000 1.255000 ;
-        RECT 8.220000  0.085000 8.455000 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 ;
-        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
@@ -96,74 +69,98 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.095000 2.660000 0.425000 3.245000 ;
-        RECT 1.590000 2.285000 1.920000 3.245000 ;
-        RECT 3.975000 2.625000 4.305000 3.245000 ;
-        RECT 6.150000 1.975000 6.530000 3.245000 ;
-        RECT 7.335000 1.815000 7.615000 3.245000 ;
-        RECT 8.220000 1.815000 8.455000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.595000 0.330000 1.040000 3.050000 ;
-      RECT 1.210000 0.640000 1.585000 1.935000 ;
-      RECT 1.210000 1.935000 2.270000 2.105000 ;
-      RECT 1.210000 2.105000 1.420000 2.865000 ;
-      RECT 2.090000 2.105000 2.270000 2.760000 ;
-      RECT 2.090000 2.760000 3.690000 2.940000 ;
-      RECT 2.225000 0.640000 2.620000 0.970000 ;
-      RECT 2.440000 0.970000 2.620000 1.220000 ;
-      RECT 2.440000 1.220000 2.630000 2.590000 ;
-      RECT 2.790000 0.640000 3.060000 0.865000 ;
-      RECT 2.790000 0.865000 3.340000 1.035000 ;
-      RECT 2.800000 1.385000 2.970000 2.760000 ;
-      RECT 3.140000 1.035000 3.340000 1.055000 ;
-      RECT 3.140000 1.055000 4.425000 1.225000 ;
-      RECT 3.140000 1.225000 3.350000 2.590000 ;
-      RECT 3.520000 2.285000 5.165000 2.455000 ;
-      RECT 3.520000 2.455000 3.690000 2.760000 ;
-      RECT 3.605000 1.405000 3.935000 1.915000 ;
-      RECT 3.605000 1.915000 4.815000 2.115000 ;
-      RECT 4.175000 1.225000 4.425000 1.675000 ;
-      RECT 4.595000 0.585000 4.805000 1.915000 ;
-      RECT 4.975000 1.295000 5.305000 1.475000 ;
-      RECT 4.985000 1.475000 5.305000 1.555000 ;
-      RECT 4.985000 1.555000 5.165000 2.285000 ;
-      RECT 5.145000 0.645000 5.655000 1.125000 ;
-      RECT 5.335000 1.875000 5.655000 2.755000 ;
-      RECT 5.485000 1.125000 6.825000 1.295000 ;
-      RECT 5.485000 1.295000 5.655000 1.875000 ;
-      RECT 6.025000 1.465000 6.355000 1.635000 ;
-      RECT 6.025000 1.635000 7.435000 1.645000 ;
-      RECT 6.025000 1.645000 7.165000 1.805000 ;
-      RECT 6.565000 1.295000 6.825000 1.455000 ;
-      RECT 6.690000 0.415000 7.165000 0.945000 ;
-      RECT 6.750000 1.805000 7.165000 2.755000 ;
-      RECT 6.995000 0.945000 7.165000 1.425000 ;
-      RECT 6.995000 1.425000 7.435000 1.635000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.670000 ;
+      RECT 0.095000  2.660000 0.425000 3.245000 ;
+      RECT 0.595000  0.330000 1.040000 3.050000 ;
+      RECT 1.210000  0.640000 1.585000 1.935000 ;
+      RECT 1.210000  1.935000 2.270000 2.105000 ;
+      RECT 1.210000  2.105000 1.420000 2.865000 ;
+      RECT 1.590000  2.285000 1.920000 3.245000 ;
+      RECT 1.755000  0.085000 2.035000 0.970000 ;
+      RECT 2.090000  2.105000 2.270000 2.760000 ;
+      RECT 2.090000  2.760000 3.690000 2.940000 ;
+      RECT 2.225000  0.640000 2.620000 0.970000 ;
+      RECT 2.440000  0.970000 2.620000 1.220000 ;
+      RECT 2.440000  1.220000 2.630000 2.590000 ;
+      RECT 2.790000  0.640000 3.060000 0.865000 ;
+      RECT 2.790000  0.865000 3.340000 1.035000 ;
+      RECT 2.800000  1.385000 2.970000 2.760000 ;
+      RECT 3.140000  1.035000 3.340000 1.055000 ;
+      RECT 3.140000  1.055000 4.425000 1.225000 ;
+      RECT 3.140000  1.225000 3.350000 2.590000 ;
+      RECT 3.520000  0.085000 4.425000 0.885000 ;
+      RECT 3.520000  2.285000 5.165000 2.455000 ;
+      RECT 3.520000  2.455000 3.690000 2.760000 ;
+      RECT 3.605000  1.405000 3.935000 1.915000 ;
+      RECT 3.605000  1.915000 4.815000 2.115000 ;
+      RECT 3.975000  2.625000 4.305000 3.245000 ;
+      RECT 4.175000  1.225000 4.425000 1.675000 ;
+      RECT 4.595000  0.585000 4.805000 1.915000 ;
+      RECT 4.975000  1.295000 5.305000 1.475000 ;
+      RECT 4.985000  1.475000 5.305000 1.555000 ;
+      RECT 4.985000  1.555000 5.165000 2.285000 ;
+      RECT 5.145000  0.645000 5.655000 1.125000 ;
+      RECT 5.335000  1.875000 5.655000 2.755000 ;
+      RECT 5.485000  1.125000 6.825000 1.295000 ;
+      RECT 5.485000  1.295000 5.655000 1.875000 ;
+      RECT 6.000000  0.085000 6.520000 0.945000 ;
+      RECT 6.025000  1.465000 6.355000 1.635000 ;
+      RECT 6.025000  1.635000 7.435000 1.645000 ;
+      RECT 6.025000  1.645000 7.165000 1.805000 ;
+      RECT 6.150000  1.975000 6.530000 3.245000 ;
+      RECT 6.565000  1.295000 6.825000 1.455000 ;
+      RECT 6.690000  0.415000 7.165000 0.945000 ;
+      RECT 6.750000  1.805000 7.165000 2.755000 ;
+      RECT 6.995000  0.945000 7.165000 1.425000 ;
+      RECT 6.995000  1.425000 7.435000 1.635000 ;
+      RECT 7.335000  0.085000 7.615000 1.255000 ;
+      RECT 7.335000  1.815000 7.615000 3.245000 ;
+      RECT 8.220000  0.085000 8.455000 1.255000 ;
+      RECT 8.220000  1.815000 8.455000 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_lp__dfxtp_2
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef
index 237b53d..7ddabc3 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.magic.lef
@@ -70,35 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.670000 ;
-        RECT 1.650000  0.085000 1.980000 0.955000 ;
-        RECT 3.705000  0.085000 4.035000 0.935000 ;
-        RECT 5.785000  0.085000 6.115000 0.845000 ;
-        RECT 6.960000  0.085000 7.250000 1.095000 ;
-        RECT 7.820000  0.085000 8.150000 0.885000 ;
-        RECT 8.680000  0.085000 9.010000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -107,79 +78,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.095000 2.665000 0.425000 3.245000 ;
-        RECT 1.535000 2.395000 1.725000 3.245000 ;
-        RECT 3.760000 2.625000 4.090000 3.245000 ;
-        RECT 6.010000 2.035000 6.340000 3.245000 ;
-        RECT 6.960000 1.815000 7.255000 3.245000 ;
-        RECT 7.820000 2.075000 8.150000 3.245000 ;
-        RECT 8.680000 2.660000 9.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 ;
-        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.595000 0.395000 0.855000 1.195000 ;
-      RECT 0.595000 1.195000 1.030000 1.865000 ;
-      RECT 0.595000 1.865000 0.855000 2.990000 ;
-      RECT 1.045000 2.045000 2.075000 2.215000 ;
-      RECT 1.045000 2.215000 1.315000 2.715000 ;
-      RECT 1.200000 0.640000 1.480000 0.960000 ;
-      RECT 1.200000 0.960000 1.410000 2.045000 ;
-      RECT 1.905000 2.215000 2.075000 2.535000 ;
-      RECT 1.905000 2.535000 3.495000 2.705000 ;
-      RECT 2.220000 0.625000 2.550000 0.955000 ;
-      RECT 2.245000 0.955000 2.415000 1.930000 ;
-      RECT 2.245000 1.930000 2.425000 2.355000 ;
-      RECT 2.595000 1.545000 2.775000 2.535000 ;
-      RECT 2.720000 0.640000 3.050000 1.105000 ;
-      RECT 2.720000 1.105000 4.220000 1.275000 ;
-      RECT 2.720000 1.275000 3.145000 1.350000 ;
-      RECT 2.945000 1.350000 3.145000 2.355000 ;
-      RECT 3.325000 2.285000 4.930000 2.455000 ;
-      RECT 3.325000 2.455000 3.495000 2.535000 ;
-      RECT 3.420000 1.445000 3.750000 1.855000 ;
-      RECT 3.420000 1.855000 4.560000 1.915000 ;
-      RECT 3.420000 1.915000 4.580000 2.115000 ;
-      RECT 3.960000 1.275000 4.220000 1.675000 ;
-      RECT 4.290000 0.585000 4.560000 0.935000 ;
-      RECT 4.390000 0.935000 4.560000 1.855000 ;
-      RECT 4.730000 1.225000 4.930000 1.555000 ;
-      RECT 4.760000 1.555000 4.930000 2.285000 ;
-      RECT 4.895000 0.640000 5.280000 0.995000 ;
-      RECT 5.110000 0.995000 5.280000 1.015000 ;
-      RECT 5.110000 1.015000 6.410000 1.185000 ;
-      RECT 5.110000 1.185000 5.360000 2.700000 ;
-      RECT 5.560000 1.355000 5.890000 1.695000 ;
-      RECT 5.560000 1.695000 6.750000 1.865000 ;
-      RECT 6.150000 1.185000 6.410000 1.515000 ;
-      RECT 6.295000 0.285000 6.750000 0.845000 ;
-      RECT 6.510000 1.865000 6.750000 3.005000 ;
-      RECT 6.580000 0.845000 6.750000 1.395000 ;
-      RECT 6.580000 1.395000 8.615000 1.565000 ;
-      RECT 6.580000 1.565000 6.750000 1.695000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.670000 ;
+      RECT 0.095000  2.665000 0.425000 3.245000 ;
+      RECT 0.595000  0.395000 0.855000 1.195000 ;
+      RECT 0.595000  1.195000 1.030000 1.865000 ;
+      RECT 0.595000  1.865000 0.855000 2.990000 ;
+      RECT 1.045000  2.045000 2.075000 2.215000 ;
+      RECT 1.045000  2.215000 1.315000 2.715000 ;
+      RECT 1.200000  0.640000 1.480000 0.960000 ;
+      RECT 1.200000  0.960000 1.410000 2.045000 ;
+      RECT 1.535000  2.395000 1.725000 3.245000 ;
+      RECT 1.650000  0.085000 1.980000 0.955000 ;
+      RECT 1.905000  2.215000 2.075000 2.535000 ;
+      RECT 1.905000  2.535000 3.495000 2.705000 ;
+      RECT 2.220000  0.625000 2.550000 0.955000 ;
+      RECT 2.245000  0.955000 2.415000 1.930000 ;
+      RECT 2.245000  1.930000 2.425000 2.355000 ;
+      RECT 2.595000  1.545000 2.775000 2.535000 ;
+      RECT 2.720000  0.640000 3.050000 1.105000 ;
+      RECT 2.720000  1.105000 4.220000 1.275000 ;
+      RECT 2.720000  1.275000 3.145000 1.350000 ;
+      RECT 2.945000  1.350000 3.145000 2.355000 ;
+      RECT 3.325000  2.285000 4.930000 2.455000 ;
+      RECT 3.325000  2.455000 3.495000 2.535000 ;
+      RECT 3.420000  1.445000 3.750000 1.855000 ;
+      RECT 3.420000  1.855000 4.560000 1.915000 ;
+      RECT 3.420000  1.915000 4.580000 2.115000 ;
+      RECT 3.705000  0.085000 4.035000 0.935000 ;
+      RECT 3.760000  2.625000 4.090000 3.245000 ;
+      RECT 3.960000  1.275000 4.220000 1.675000 ;
+      RECT 4.290000  0.585000 4.560000 0.935000 ;
+      RECT 4.390000  0.935000 4.560000 1.855000 ;
+      RECT 4.730000  1.225000 4.930000 1.555000 ;
+      RECT 4.760000  1.555000 4.930000 2.285000 ;
+      RECT 4.895000  0.640000 5.280000 0.995000 ;
+      RECT 5.110000  0.995000 5.280000 1.015000 ;
+      RECT 5.110000  1.015000 6.410000 1.185000 ;
+      RECT 5.110000  1.185000 5.360000 2.700000 ;
+      RECT 5.560000  1.355000 5.890000 1.695000 ;
+      RECT 5.560000  1.695000 6.750000 1.865000 ;
+      RECT 5.785000  0.085000 6.115000 0.845000 ;
+      RECT 6.010000  2.035000 6.340000 3.245000 ;
+      RECT 6.150000  1.185000 6.410000 1.515000 ;
+      RECT 6.295000  0.285000 6.750000 0.845000 ;
+      RECT 6.510000  1.865000 6.750000 3.005000 ;
+      RECT 6.580000  0.845000 6.750000 1.395000 ;
+      RECT 6.580000  1.395000 8.615000 1.565000 ;
+      RECT 6.580000  1.565000 6.750000 1.695000 ;
+      RECT 6.960000  0.085000 7.250000 1.095000 ;
+      RECT 6.960000  1.815000 7.255000 3.245000 ;
+      RECT 7.820000  0.085000 8.150000 0.885000 ;
+      RECT 7.820000  2.075000 8.150000 3.245000 ;
+      RECT 8.680000  0.085000 9.010000 0.670000 ;
+      RECT 8.680000  2.660000 9.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 ;
+      RECT 8.795000 -0.085000 8.965000 0.085000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
   END
 END sky130_fd_sc_lp__dfxtp_4
diff --git a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef
index aca6c1a..74cb5d2 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.magic.lef
@@ -62,37 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.040000 0.085000 ;
-        RECT 0.895000  0.085000  1.225000 0.645000 ;
-        RECT 2.260000  0.085000  2.590000 0.990000 ;
-        RECT 6.320000  0.085000  6.570000 0.685000 ;
-        RECT 8.545000  0.085000  8.795000 0.815000 ;
-        RECT 9.895000  0.085000 10.145000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -101,96 +70,124 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.760000 2.025000  1.090000 3.245000 ;
-        RECT  2.540000 2.030000  2.870000 3.245000 ;
-        RECT  5.360000 2.075000  5.690000 3.245000 ;
-        RECT  8.535000 2.105000  8.865000 3.245000 ;
-        RECT 10.065000 1.960000 10.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 11.040000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.105000 0.265000  0.435000 0.825000 ;
-      RECT  0.105000 0.825000  1.495000 0.995000 ;
-      RECT  0.105000 0.995000  0.275000 2.025000 ;
-      RECT  0.105000 2.025000  0.560000 3.065000 ;
-      RECT  1.165000 0.995000  1.495000 1.495000 ;
-      RECT  1.290000 2.025000  1.845000 3.065000 ;
-      RECT  1.675000 0.265000  2.015000 0.725000 ;
-      RECT  1.675000 0.725000  1.845000 1.680000 ;
-      RECT  1.675000 1.680000  3.105000 1.850000 ;
-      RECT  1.675000 1.850000  1.845000 2.025000 ;
-      RECT  2.935000 1.215000  3.645000 1.545000 ;
-      RECT  2.935000 1.545000  3.105000 1.680000 ;
-      RECT  3.200000 0.375000  3.530000 0.865000 ;
-      RECT  3.200000 0.865000  3.995000 1.035000 ;
-      RECT  3.285000 1.725000  3.995000 1.895000 ;
-      RECT  3.285000 1.895000  3.615000 2.730000 ;
-      RECT  3.710000 0.375000  4.345000 0.685000 ;
-      RECT  3.825000 1.035000  3.995000 1.725000 ;
-      RECT  4.175000 0.685000  4.345000 1.685000 ;
-      RECT  4.175000 1.685000  5.065000 1.855000 ;
-      RECT  4.175000 1.855000  4.505000 2.875000 ;
-      RECT  4.525000 0.455000  6.140000 0.625000 ;
-      RECT  4.525000 0.625000  4.715000 1.485000 ;
-      RECT  4.895000 0.805000  5.790000 0.975000 ;
-      RECT  4.895000 0.975000  5.065000 1.685000 ;
-      RECT  5.245000 1.155000  5.440000 1.725000 ;
-      RECT  5.245000 1.725000  8.005000 1.895000 ;
-      RECT  5.620000 0.975000  5.790000 1.215000 ;
-      RECT  5.620000 1.215000  6.330000 1.545000 ;
-      RECT  5.970000 0.625000  6.140000 0.865000 ;
-      RECT  5.970000 0.865000  6.680000 1.035000 ;
-      RECT  6.510000 1.035000  6.680000 1.215000 ;
-      RECT  6.510000 1.215000  7.655000 1.385000 ;
-      RECT  6.510000 1.685000  6.840000 1.725000 ;
-      RECT  6.510000 1.895000  6.840000 2.935000 ;
-      RECT  7.115000 0.605000  7.445000 0.865000 ;
-      RECT  7.115000 0.865000  8.005000 1.035000 ;
-      RECT  7.120000 2.075000  8.355000 2.245000 ;
-      RECT  7.120000 2.245000  7.450000 2.935000 ;
-      RECT  7.345000 1.385000  7.655000 1.545000 ;
-      RECT  7.675000 0.355000  8.355000 0.685000 ;
-      RECT  7.835000 1.035000  8.005000 1.725000 ;
-      RECT  8.185000 0.685000  8.355000 0.995000 ;
-      RECT  8.185000 0.995000  9.365000 1.165000 ;
-      RECT  8.185000 1.165000  8.355000 2.075000 ;
-      RECT  8.535000 1.425000  8.845000 1.755000 ;
-      RECT  8.535000 1.755000  9.720000 1.925000 ;
-      RECT  9.055000 0.905000  9.365000 0.995000 ;
-      RECT  9.055000 1.165000  9.365000 1.575000 ;
-      RECT  9.255000 0.355000  9.715000 0.725000 ;
-      RECT  9.390000 1.925000  9.720000 2.935000 ;
-      RECT  9.545000 0.725000  9.715000 1.585000 ;
-      RECT  9.545000 1.585000 10.415000 1.755000 ;
-      RECT 10.085000 1.085000 10.415000 1.585000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.105000  0.265000  0.435000 0.825000 ;
+      RECT  0.105000  0.825000  1.495000 0.995000 ;
+      RECT  0.105000  0.995000  0.275000 2.025000 ;
+      RECT  0.105000  2.025000  0.560000 3.065000 ;
+      RECT  0.760000  2.025000  1.090000 3.245000 ;
+      RECT  0.895000  0.085000  1.225000 0.645000 ;
+      RECT  1.165000  0.995000  1.495000 1.495000 ;
+      RECT  1.290000  2.025000  1.845000 3.065000 ;
+      RECT  1.675000  0.265000  2.015000 0.725000 ;
+      RECT  1.675000  0.725000  1.845000 1.680000 ;
+      RECT  1.675000  1.680000  3.105000 1.850000 ;
+      RECT  1.675000  1.850000  1.845000 2.025000 ;
+      RECT  2.260000  0.085000  2.590000 0.990000 ;
+      RECT  2.540000  2.030000  2.870000 3.245000 ;
+      RECT  2.935000  1.215000  3.645000 1.545000 ;
+      RECT  2.935000  1.545000  3.105000 1.680000 ;
+      RECT  3.200000  0.375000  3.530000 0.865000 ;
+      RECT  3.200000  0.865000  3.995000 1.035000 ;
+      RECT  3.285000  1.725000  3.995000 1.895000 ;
+      RECT  3.285000  1.895000  3.615000 2.730000 ;
+      RECT  3.710000  0.375000  4.345000 0.685000 ;
+      RECT  3.825000  1.035000  3.995000 1.725000 ;
+      RECT  4.175000  0.685000  4.345000 1.685000 ;
+      RECT  4.175000  1.685000  5.065000 1.855000 ;
+      RECT  4.175000  1.855000  4.505000 2.875000 ;
+      RECT  4.525000  0.455000  6.140000 0.625000 ;
+      RECT  4.525000  0.625000  4.715000 1.485000 ;
+      RECT  4.895000  0.805000  5.790000 0.975000 ;
+      RECT  4.895000  0.975000  5.065000 1.685000 ;
+      RECT  5.245000  1.155000  5.440000 1.725000 ;
+      RECT  5.245000  1.725000  8.005000 1.895000 ;
+      RECT  5.360000  2.075000  5.690000 3.245000 ;
+      RECT  5.620000  0.975000  5.790000 1.215000 ;
+      RECT  5.620000  1.215000  6.330000 1.545000 ;
+      RECT  5.970000  0.625000  6.140000 0.865000 ;
+      RECT  5.970000  0.865000  6.680000 1.035000 ;
+      RECT  6.320000  0.085000  6.570000 0.685000 ;
+      RECT  6.510000  1.035000  6.680000 1.215000 ;
+      RECT  6.510000  1.215000  7.655000 1.385000 ;
+      RECT  6.510000  1.685000  6.840000 1.725000 ;
+      RECT  6.510000  1.895000  6.840000 2.935000 ;
+      RECT  7.115000  0.605000  7.445000 0.865000 ;
+      RECT  7.115000  0.865000  8.005000 1.035000 ;
+      RECT  7.120000  2.075000  8.355000 2.245000 ;
+      RECT  7.120000  2.245000  7.450000 2.935000 ;
+      RECT  7.345000  1.385000  7.655000 1.545000 ;
+      RECT  7.675000  0.355000  8.355000 0.685000 ;
+      RECT  7.835000  1.035000  8.005000 1.725000 ;
+      RECT  8.185000  0.685000  8.355000 0.995000 ;
+      RECT  8.185000  0.995000  9.365000 1.165000 ;
+      RECT  8.185000  1.165000  8.355000 2.075000 ;
+      RECT  8.535000  1.425000  8.845000 1.755000 ;
+      RECT  8.535000  1.755000  9.720000 1.925000 ;
+      RECT  8.535000  2.105000  8.865000 3.245000 ;
+      RECT  8.545000  0.085000  8.795000 0.815000 ;
+      RECT  9.055000  0.905000  9.365000 0.995000 ;
+      RECT  9.055000  1.165000  9.365000 1.575000 ;
+      RECT  9.255000  0.355000  9.715000 0.725000 ;
+      RECT  9.390000  1.925000  9.720000 2.935000 ;
+      RECT  9.545000  0.725000  9.715000 1.585000 ;
+      RECT  9.545000  1.585000 10.415000 1.755000 ;
+      RECT  9.895000  0.085000 10.145000 0.900000 ;
+      RECT 10.065000  1.960000 10.395000 3.245000 ;
+      RECT 10.085000  1.085000 10.415000 1.585000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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_lp__dfxtp_lp
diff --git a/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef b/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
index 10ebff8..8e826ea 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_0.magic.lef
+++ b/cells/diode/sky130_fd_sc_lp__diode_0.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_lp__diode_0
diff --git a/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef b/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
index 1b5462e..788d430 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_1.magic.lef
+++ b/cells/diode/sky130_fd_sc_lp__diode_1.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_lp__diode_1
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.magic.lef
index d57e8b0..b351d07 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_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.745000  0.085000 1.075000 0.650000 ;
-        RECT 2.790000  0.085000 3.040000 0.780000 ;
-        RECT 4.440000  0.085000 4.770000 0.515000 ;
-        RECT 5.865000  0.085000 6.195000 0.495000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,78 +69,96 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.605000 2.240000 0.805000 3.245000 ;
-        RECT 2.715000 2.615000 3.045000 3.245000 ;
-        RECT 4.695000 2.905000 5.025000 3.245000 ;
-        RECT 5.635000 1.835000 6.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 ;
-        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.255000 0.575000 0.820000 ;
-      RECT 0.095000 0.820000 1.415000 0.990000 ;
-      RECT 0.095000 0.990000 0.580000 1.095000 ;
-      RECT 0.095000 1.095000 0.365000 1.900000 ;
-      RECT 0.095000 1.900000 1.145000 2.070000 ;
-      RECT 0.095000 2.070000 0.425000 3.075000 ;
-      RECT 0.535000 1.345000 0.795000 1.560000 ;
-      RECT 0.535000 1.560000 1.755000 1.730000 ;
-      RECT 0.975000 2.070000 1.145000 2.905000 ;
-      RECT 0.975000 2.905000 2.445000 3.075000 ;
-      RECT 1.245000 0.255000 2.620000 0.425000 ;
-      RECT 1.245000 0.425000 1.415000 0.820000 ;
-      RECT 1.315000 1.730000 1.755000 1.740000 ;
-      RECT 1.315000 1.740000 1.485000 2.485000 ;
-      RECT 1.315000 2.485000 2.070000 2.735000 ;
-      RECT 1.585000 0.595000 2.060000 0.795000 ;
-      RECT 1.585000 0.795000 1.755000 1.560000 ;
-      RECT 1.655000 1.910000 2.095000 1.935000 ;
-      RECT 1.655000 1.935000 3.825000 2.105000 ;
-      RECT 1.655000 2.105000 2.095000 2.240000 ;
-      RECT 1.925000 0.965000 2.280000 1.295000 ;
-      RECT 1.925000 1.295000 2.095000 1.910000 ;
-      RECT 2.265000 1.505000 3.295000 1.765000 ;
-      RECT 2.275000 2.275000 3.395000 2.445000 ;
-      RECT 2.275000 2.445000 2.445000 2.905000 ;
-      RECT 2.450000 0.425000 2.620000 0.950000 ;
-      RECT 2.450000 0.950000 2.835000 1.265000 ;
-      RECT 3.045000 1.025000 4.415000 1.250000 ;
-      RECT 3.045000 1.250000 3.295000 1.505000 ;
-      RECT 3.210000 0.445000 3.500000 0.685000 ;
-      RECT 3.210000 0.685000 4.755000 0.855000 ;
-      RECT 3.225000 2.445000 3.395000 2.565000 ;
-      RECT 3.225000 2.565000 5.095000 2.735000 ;
-      RECT 3.225000 2.735000 3.915000 2.745000 ;
-      RECT 3.565000 2.105000 3.825000 2.225000 ;
-      RECT 3.565000 2.225000 4.755000 2.395000 ;
-      RECT 3.585000 2.745000 3.915000 3.075000 ;
-      RECT 4.085000 1.250000 4.415000 2.055000 ;
-      RECT 4.585000 0.855000 4.755000 2.225000 ;
-      RECT 4.925000 1.005000 5.675000 1.325000 ;
-      RECT 4.925000 1.325000 5.095000 2.565000 ;
-      RECT 5.265000 1.495000 6.195000 1.665000 ;
-      RECT 5.265000 1.665000 5.465000 2.495000 ;
-      RECT 5.345000 0.440000 5.675000 0.665000 ;
-      RECT 5.345000 0.665000 6.195000 0.835000 ;
-      RECT 5.945000 0.835000 6.195000 1.495000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.095000  0.255000 0.575000 0.820000 ;
+      RECT 0.095000  0.820000 1.415000 0.990000 ;
+      RECT 0.095000  0.990000 0.580000 1.095000 ;
+      RECT 0.095000  1.095000 0.365000 1.900000 ;
+      RECT 0.095000  1.900000 1.145000 2.070000 ;
+      RECT 0.095000  2.070000 0.425000 3.075000 ;
+      RECT 0.535000  1.345000 0.795000 1.560000 ;
+      RECT 0.535000  1.560000 1.755000 1.730000 ;
+      RECT 0.605000  2.240000 0.805000 3.245000 ;
+      RECT 0.745000  0.085000 1.075000 0.650000 ;
+      RECT 0.975000  2.070000 1.145000 2.905000 ;
+      RECT 0.975000  2.905000 2.445000 3.075000 ;
+      RECT 1.245000  0.255000 2.620000 0.425000 ;
+      RECT 1.245000  0.425000 1.415000 0.820000 ;
+      RECT 1.315000  1.730000 1.755000 1.740000 ;
+      RECT 1.315000  1.740000 1.485000 2.485000 ;
+      RECT 1.315000  2.485000 2.070000 2.735000 ;
+      RECT 1.585000  0.595000 2.060000 0.795000 ;
+      RECT 1.585000  0.795000 1.755000 1.560000 ;
+      RECT 1.655000  1.910000 2.095000 1.935000 ;
+      RECT 1.655000  1.935000 3.825000 2.105000 ;
+      RECT 1.655000  2.105000 2.095000 2.240000 ;
+      RECT 1.925000  0.965000 2.280000 1.295000 ;
+      RECT 1.925000  1.295000 2.095000 1.910000 ;
+      RECT 2.265000  1.505000 3.295000 1.765000 ;
+      RECT 2.275000  2.275000 3.395000 2.445000 ;
+      RECT 2.275000  2.445000 2.445000 2.905000 ;
+      RECT 2.450000  0.425000 2.620000 0.950000 ;
+      RECT 2.450000  0.950000 2.835000 1.265000 ;
+      RECT 2.715000  2.615000 3.045000 3.245000 ;
+      RECT 2.790000  0.085000 3.040000 0.780000 ;
+      RECT 3.045000  1.025000 4.415000 1.250000 ;
+      RECT 3.045000  1.250000 3.295000 1.505000 ;
+      RECT 3.210000  0.445000 3.500000 0.685000 ;
+      RECT 3.210000  0.685000 4.755000 0.855000 ;
+      RECT 3.225000  2.445000 3.395000 2.565000 ;
+      RECT 3.225000  2.565000 5.095000 2.735000 ;
+      RECT 3.225000  2.735000 3.915000 2.745000 ;
+      RECT 3.565000  2.105000 3.825000 2.225000 ;
+      RECT 3.565000  2.225000 4.755000 2.395000 ;
+      RECT 3.585000  2.745000 3.915000 3.075000 ;
+      RECT 4.085000  1.250000 4.415000 2.055000 ;
+      RECT 4.440000  0.085000 4.770000 0.515000 ;
+      RECT 4.585000  0.855000 4.755000 2.225000 ;
+      RECT 4.695000  2.905000 5.025000 3.245000 ;
+      RECT 4.925000  1.005000 5.675000 1.325000 ;
+      RECT 4.925000  1.325000 5.095000 2.565000 ;
+      RECT 5.265000  1.495000 6.195000 1.665000 ;
+      RECT 5.265000  1.665000 5.465000 2.495000 ;
+      RECT 5.345000  0.440000 5.675000 0.665000 ;
+      RECT 5.345000  0.665000 6.195000 0.835000 ;
+      RECT 5.635000  1.835000 6.195000 3.245000 ;
+      RECT 5.865000  0.085000 6.195000 0.495000 ;
+      RECT 5.945000  0.835000 6.195000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlclkp_1
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef
index 2998f16..48e960a 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.magic.lef
@@ -61,29 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 0.495000 ;
-        RECT 2.700000  0.085000 2.890000 0.765000 ;
-        RECT 4.440000  0.085000 4.770000 0.345000 ;
-        RECT 5.865000  0.085000 6.195000 0.835000 ;
-        RECT 6.760000  0.085000 7.055000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -92,76 +69,96 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.640000 2.970000 0.970000 3.245000 ;
-        RECT 2.560000 2.685000 2.890000 3.245000 ;
-        RECT 4.660000 2.685000 4.990000 3.245000 ;
-        RECT 5.775000 2.045000 6.195000 3.245000 ;
-        RECT 6.785000 1.815000 7.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 ;
-        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.120000 0.255000 0.405000 0.665000 ;
-      RECT 0.120000 0.665000 1.255000 0.835000 ;
-      RECT 0.120000 0.835000 0.455000 1.095000 ;
-      RECT 0.120000 1.095000 0.290000 1.910000 ;
-      RECT 0.120000 1.910000 0.460000 2.630000 ;
-      RECT 0.120000 2.630000 1.320000 2.800000 ;
-      RECT 0.460000 1.345000 0.720000 1.560000 ;
-      RECT 0.460000 1.560000 1.675000 1.730000 ;
-      RECT 1.070000 1.730000 1.240000 2.280000 ;
-      RECT 1.070000 2.280000 1.825000 2.450000 ;
-      RECT 1.075000 0.265000 2.530000 0.435000 ;
-      RECT 1.075000 0.435000 1.255000 0.665000 ;
-      RECT 1.150000 2.800000 1.320000 2.905000 ;
-      RECT 1.150000 2.905000 2.165000 3.075000 ;
-      RECT 1.420000 1.900000 2.025000 1.930000 ;
-      RECT 1.420000 1.930000 3.400000 1.985000 ;
-      RECT 1.420000 1.985000 4.705000 2.110000 ;
-      RECT 1.505000 0.605000 1.955000 0.845000 ;
-      RECT 1.505000 0.845000 1.675000 1.560000 ;
-      RECT 1.545000 2.450000 1.825000 2.735000 ;
-      RECT 1.855000 1.015000 2.190000 1.265000 ;
-      RECT 1.855000 1.265000 2.025000 1.900000 ;
-      RECT 1.995000 2.345000 5.045000 2.515000 ;
-      RECT 1.995000 2.515000 2.165000 2.905000 ;
-      RECT 2.205000 1.475000 3.235000 1.760000 ;
-      RECT 2.360000 0.435000 2.530000 0.935000 ;
-      RECT 2.360000 0.935000 2.730000 1.265000 ;
-      RECT 3.025000 0.875000 4.365000 1.065000 ;
-      RECT 3.025000 1.065000 3.235000 1.475000 ;
-      RECT 3.070000 0.485000 3.400000 0.525000 ;
-      RECT 3.070000 0.525000 4.705000 0.695000 ;
-      RECT 3.070000 2.110000 4.705000 2.175000 ;
-      RECT 3.335000 2.515000 3.665000 3.075000 ;
-      RECT 4.035000 1.065000 4.365000 1.815000 ;
-      RECT 4.535000 0.695000 4.705000 1.985000 ;
-      RECT 4.875000 1.345000 5.735000 1.535000 ;
-      RECT 4.875000 1.535000 5.045000 2.345000 ;
-      RECT 5.215000 1.705000 6.195000 1.875000 ;
-      RECT 5.215000 1.875000 5.550000 2.495000 ;
-      RECT 5.345000 0.710000 5.675000 1.005000 ;
-      RECT 5.345000 1.005000 6.195000 1.175000 ;
-      RECT 5.945000 1.175000 6.195000 1.705000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.120000  0.255000 0.405000 0.665000 ;
+      RECT 0.120000  0.665000 1.255000 0.835000 ;
+      RECT 0.120000  0.835000 0.455000 1.095000 ;
+      RECT 0.120000  1.095000 0.290000 1.910000 ;
+      RECT 0.120000  1.910000 0.460000 2.630000 ;
+      RECT 0.120000  2.630000 1.320000 2.800000 ;
+      RECT 0.460000  1.345000 0.720000 1.560000 ;
+      RECT 0.460000  1.560000 1.675000 1.730000 ;
+      RECT 0.575000  0.085000 0.905000 0.495000 ;
+      RECT 0.640000  2.970000 0.970000 3.245000 ;
+      RECT 1.070000  1.730000 1.240000 2.280000 ;
+      RECT 1.070000  2.280000 1.825000 2.450000 ;
+      RECT 1.075000  0.265000 2.530000 0.435000 ;
+      RECT 1.075000  0.435000 1.255000 0.665000 ;
+      RECT 1.150000  2.800000 1.320000 2.905000 ;
+      RECT 1.150000  2.905000 2.165000 3.075000 ;
+      RECT 1.420000  1.900000 2.025000 1.930000 ;
+      RECT 1.420000  1.930000 3.400000 1.985000 ;
+      RECT 1.420000  1.985000 4.705000 2.110000 ;
+      RECT 1.505000  0.605000 1.955000 0.845000 ;
+      RECT 1.505000  0.845000 1.675000 1.560000 ;
+      RECT 1.545000  2.450000 1.825000 2.735000 ;
+      RECT 1.855000  1.015000 2.190000 1.265000 ;
+      RECT 1.855000  1.265000 2.025000 1.900000 ;
+      RECT 1.995000  2.345000 5.045000 2.515000 ;
+      RECT 1.995000  2.515000 2.165000 2.905000 ;
+      RECT 2.205000  1.475000 3.235000 1.760000 ;
+      RECT 2.360000  0.435000 2.530000 0.935000 ;
+      RECT 2.360000  0.935000 2.730000 1.265000 ;
+      RECT 2.560000  2.685000 2.890000 3.245000 ;
+      RECT 2.700000  0.085000 2.890000 0.765000 ;
+      RECT 3.025000  0.875000 4.365000 1.065000 ;
+      RECT 3.025000  1.065000 3.235000 1.475000 ;
+      RECT 3.070000  0.485000 3.400000 0.525000 ;
+      RECT 3.070000  0.525000 4.705000 0.695000 ;
+      RECT 3.070000  2.110000 4.705000 2.175000 ;
+      RECT 3.335000  2.515000 3.665000 3.075000 ;
+      RECT 4.035000  1.065000 4.365000 1.815000 ;
+      RECT 4.440000  0.085000 4.770000 0.345000 ;
+      RECT 4.535000  0.695000 4.705000 1.985000 ;
+      RECT 4.660000  2.685000 4.990000 3.245000 ;
+      RECT 4.875000  1.345000 5.735000 1.535000 ;
+      RECT 4.875000  1.535000 5.045000 2.345000 ;
+      RECT 5.215000  1.705000 6.195000 1.875000 ;
+      RECT 5.215000  1.875000 5.550000 2.495000 ;
+      RECT 5.345000  0.710000 5.675000 1.005000 ;
+      RECT 5.345000  1.005000 6.195000 1.175000 ;
+      RECT 5.775000  2.045000 6.195000 3.245000 ;
+      RECT 5.865000  0.085000 6.195000 0.835000 ;
+      RECT 5.945000  1.175000 6.195000 1.705000 ;
+      RECT 6.760000  0.085000 7.055000 1.095000 ;
+      RECT 6.785000  1.815000 7.055000 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_lp__dlclkp_2
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef
index 81d54ab..6c6bc33 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.magic.lef
@@ -67,32 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.550000  0.085000 0.890000 0.660000 ;
-        RECT 2.685000  0.085000 2.945000 0.780000 ;
-        RECT 4.675000  0.085000 5.005000 0.455000 ;
-        RECT 5.985000  0.085000 6.315000 0.895000 ;
-        RECT 6.845000  0.085000 7.175000 0.905000 ;
-        RECT 7.740000  0.085000 8.035000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -101,84 +75,107 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.605000 2.970000 0.935000 3.245000 ;
-        RECT 2.525000 2.620000 2.855000 3.245000 ;
-        RECT 4.840000 2.850000 5.170000 3.245000 ;
-        RECT 5.795000 2.850000 6.125000 3.245000 ;
-        RECT 6.695000 2.165000 7.025000 3.245000 ;
-        RECT 7.705000 1.815000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.380000 0.830000 ;
-      RECT 0.095000 0.830000 1.230000 1.000000 ;
-      RECT 0.095000 1.000000 0.450000 1.095000 ;
-      RECT 0.095000 1.095000 0.265000 1.900000 ;
-      RECT 0.095000 1.900000 0.425000 2.630000 ;
-      RECT 0.095000 2.630000 1.285000 2.800000 ;
-      RECT 0.095000 2.800000 0.435000 3.075000 ;
-      RECT 0.435000 1.345000 0.685000 1.560000 ;
-      RECT 0.435000 1.560000 1.655000 1.730000 ;
-      RECT 1.035000 1.730000 1.205000 2.280000 ;
-      RECT 1.035000 2.280000 1.840000 2.450000 ;
-      RECT 1.060000 0.265000 2.515000 0.435000 ;
-      RECT 1.060000 0.435000 1.230000 0.830000 ;
-      RECT 1.115000 2.800000 1.285000 2.905000 ;
-      RECT 1.115000 2.905000 2.190000 3.075000 ;
-      RECT 1.385000 1.900000 2.165000 1.930000 ;
-      RECT 1.385000 1.930000 3.695000 2.110000 ;
-      RECT 1.485000 0.605000 1.930000 0.845000 ;
-      RECT 1.485000 0.845000 1.655000 1.560000 ;
-      RECT 1.510000 2.450000 1.840000 2.735000 ;
-      RECT 1.835000 1.015000 2.165000 1.900000 ;
-      RECT 2.020000 2.280000 3.195000 2.450000 ;
-      RECT 2.020000 2.450000 2.190000 2.905000 ;
-      RECT 2.345000 0.435000 2.515000 1.015000 ;
-      RECT 2.345000 1.015000 2.705000 1.265000 ;
-      RECT 2.345000 1.475000 3.230000 1.760000 ;
-      RECT 2.920000 0.965000 4.530000 1.195000 ;
-      RECT 2.920000 1.195000 3.230000 1.475000 ;
-      RECT 3.025000 2.450000 3.195000 2.765000 ;
-      RECT 3.025000 2.765000 4.540000 3.075000 ;
-      RECT 3.115000 0.465000 3.375000 0.625000 ;
-      RECT 3.115000 0.625000 5.080000 0.795000 ;
-      RECT 3.365000 2.110000 3.695000 2.160000 ;
-      RECT 3.365000 2.160000 5.080000 2.340000 ;
-      RECT 3.365000 2.340000 3.635000 2.535000 ;
-      RECT 3.805000 2.510000 5.975000 2.680000 ;
-      RECT 3.805000 2.680000 4.540000 2.765000 ;
-      RECT 4.200000 1.195000 4.530000 1.990000 ;
-      RECT 4.700000 0.795000 5.080000 2.160000 ;
-      RECT 5.250000 1.065000 6.315000 1.235000 ;
-      RECT 5.250000 1.235000 5.420000 2.010000 ;
-      RECT 5.250000 2.010000 5.625000 2.340000 ;
-      RECT 5.465000 0.255000 5.795000 1.065000 ;
-      RECT 5.600000 1.405000 5.975000 1.665000 ;
-      RECT 5.795000 1.665000 5.975000 2.510000 ;
-      RECT 6.145000 1.235000 6.315000 1.415000 ;
-      RECT 6.145000 1.415000 7.155000 1.585000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.255000 0.380000 0.830000 ;
+      RECT 0.095000  0.830000 1.230000 1.000000 ;
+      RECT 0.095000  1.000000 0.450000 1.095000 ;
+      RECT 0.095000  1.095000 0.265000 1.900000 ;
+      RECT 0.095000  1.900000 0.425000 2.630000 ;
+      RECT 0.095000  2.630000 1.285000 2.800000 ;
+      RECT 0.095000  2.800000 0.435000 3.075000 ;
+      RECT 0.435000  1.345000 0.685000 1.560000 ;
+      RECT 0.435000  1.560000 1.655000 1.730000 ;
+      RECT 0.550000  0.085000 0.890000 0.660000 ;
+      RECT 0.605000  2.970000 0.935000 3.245000 ;
+      RECT 1.035000  1.730000 1.205000 2.280000 ;
+      RECT 1.035000  2.280000 1.840000 2.450000 ;
+      RECT 1.060000  0.265000 2.515000 0.435000 ;
+      RECT 1.060000  0.435000 1.230000 0.830000 ;
+      RECT 1.115000  2.800000 1.285000 2.905000 ;
+      RECT 1.115000  2.905000 2.190000 3.075000 ;
+      RECT 1.385000  1.900000 2.165000 1.930000 ;
+      RECT 1.385000  1.930000 3.695000 2.110000 ;
+      RECT 1.485000  0.605000 1.930000 0.845000 ;
+      RECT 1.485000  0.845000 1.655000 1.560000 ;
+      RECT 1.510000  2.450000 1.840000 2.735000 ;
+      RECT 1.835000  1.015000 2.165000 1.900000 ;
+      RECT 2.020000  2.280000 3.195000 2.450000 ;
+      RECT 2.020000  2.450000 2.190000 2.905000 ;
+      RECT 2.345000  0.435000 2.515000 1.015000 ;
+      RECT 2.345000  1.015000 2.705000 1.265000 ;
+      RECT 2.345000  1.475000 3.230000 1.760000 ;
+      RECT 2.525000  2.620000 2.855000 3.245000 ;
+      RECT 2.685000  0.085000 2.945000 0.780000 ;
+      RECT 2.920000  0.965000 4.530000 1.195000 ;
+      RECT 2.920000  1.195000 3.230000 1.475000 ;
+      RECT 3.025000  2.450000 3.195000 2.765000 ;
+      RECT 3.025000  2.765000 4.540000 3.075000 ;
+      RECT 3.115000  0.465000 3.375000 0.625000 ;
+      RECT 3.115000  0.625000 5.080000 0.795000 ;
+      RECT 3.365000  2.110000 3.695000 2.160000 ;
+      RECT 3.365000  2.160000 5.080000 2.340000 ;
+      RECT 3.365000  2.340000 3.635000 2.535000 ;
+      RECT 3.805000  2.510000 5.975000 2.680000 ;
+      RECT 3.805000  2.680000 4.540000 2.765000 ;
+      RECT 4.200000  1.195000 4.530000 1.990000 ;
+      RECT 4.675000  0.085000 5.005000 0.455000 ;
+      RECT 4.700000  0.795000 5.080000 2.160000 ;
+      RECT 4.840000  2.850000 5.170000 3.245000 ;
+      RECT 5.250000  1.065000 6.315000 1.235000 ;
+      RECT 5.250000  1.235000 5.420000 2.010000 ;
+      RECT 5.250000  2.010000 5.625000 2.340000 ;
+      RECT 5.465000  0.255000 5.795000 1.065000 ;
+      RECT 5.600000  1.405000 5.975000 1.665000 ;
+      RECT 5.795000  1.665000 5.975000 2.510000 ;
+      RECT 5.795000  2.850000 6.125000 3.245000 ;
+      RECT 5.985000  0.085000 6.315000 0.895000 ;
+      RECT 6.145000  1.235000 6.315000 1.415000 ;
+      RECT 6.145000  1.415000 7.155000 1.585000 ;
+      RECT 6.695000  2.165000 7.025000 3.245000 ;
+      RECT 6.845000  0.085000 7.175000 0.905000 ;
+      RECT 7.705000  1.815000 7.955000 3.245000 ;
+      RECT 7.740000  0.085000 8.035000 1.095000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlclkp_4
diff --git a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef
index 0d80356..aa2611b 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.magic.lef
@@ -63,28 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.885000  0.085000 1.215000 0.535000 ;
-        RECT 3.045000  0.085000 3.375000 0.635000 ;
-        RECT 5.065000  0.085000 5.395000 1.275000 ;
-        RECT 5.965000  0.085000 6.295000 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 ;
-        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
@@ -93,69 +71,88 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.675000 2.330000 1.005000 3.245000 ;
-        RECT 3.180000 2.865000 3.510000 3.245000 ;
-        RECT 5.180000 2.315000 5.510000 3.245000 ;
-        RECT 6.240000 2.665000 6.570000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.265000 0.425000 0.715000 ;
-      RECT 0.095000 0.715000 2.420000 0.885000 ;
-      RECT 0.095000 0.885000 0.265000 2.330000 ;
-      RECT 0.095000 2.330000 0.475000 3.065000 ;
-      RECT 0.445000 1.065000 1.810000 1.395000 ;
-      RECT 1.480000 1.395000 1.810000 1.450000 ;
-      RECT 1.640000 1.450000 2.710000 1.780000 ;
-      RECT 1.640000 1.780000 1.810000 2.515000 ;
-      RECT 1.640000 2.515000 4.980000 2.685000 ;
-      RECT 1.785000 0.265000 2.770000 0.535000 ;
-      RECT 2.075000 2.075000 3.600000 2.335000 ;
-      RECT 2.090000 0.885000 2.420000 1.095000 ;
-      RECT 2.600000 0.535000 2.770000 0.815000 ;
-      RECT 2.600000 0.815000 3.630000 1.145000 ;
-      RECT 2.920000 1.325000 4.140000 1.495000 ;
-      RECT 2.920000 1.495000 3.250000 1.715000 ;
-      RECT 3.430000 1.675000 3.790000 1.935000 ;
-      RECT 3.430000 1.935000 3.600000 2.075000 ;
-      RECT 3.780000 2.155000 4.140000 2.335000 ;
-      RECT 3.810000 0.265000 4.195000 0.505000 ;
-      RECT 3.810000 0.505000 4.840000 0.675000 ;
-      RECT 3.810000 0.675000 3.980000 1.325000 ;
-      RECT 3.970000 1.495000 4.140000 2.155000 ;
-      RECT 4.160000 0.895000 4.490000 1.145000 ;
-      RECT 4.320000 1.145000 4.490000 2.315000 ;
-      RECT 4.320000 2.315000 4.980000 2.515000 ;
-      RECT 4.650000 2.685000 4.980000 3.065000 ;
-      RECT 4.670000 0.675000 4.840000 1.965000 ;
-      RECT 4.670000 1.965000 6.275000 2.135000 ;
-      RECT 5.710000 2.315000 6.655000 2.485000 ;
-      RECT 5.710000 2.485000 6.040000 3.065000 ;
-      RECT 5.885000 0.905000 6.760000 1.075000 ;
-      RECT 5.885000 1.075000 6.215000 1.365000 ;
-      RECT 5.945000 1.545000 6.275000 1.965000 ;
-      RECT 6.485000 1.075000 6.760000 1.575000 ;
-      RECT 6.485000 1.575000 6.655000 2.315000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.095000  0.265000 0.425000 0.715000 ;
+      RECT 0.095000  0.715000 2.420000 0.885000 ;
+      RECT 0.095000  0.885000 0.265000 2.330000 ;
+      RECT 0.095000  2.330000 0.475000 3.065000 ;
+      RECT 0.445000  1.065000 1.810000 1.395000 ;
+      RECT 0.675000  2.330000 1.005000 3.245000 ;
+      RECT 0.885000  0.085000 1.215000 0.535000 ;
+      RECT 1.480000  1.395000 1.810000 1.450000 ;
+      RECT 1.640000  1.450000 2.710000 1.780000 ;
+      RECT 1.640000  1.780000 1.810000 2.515000 ;
+      RECT 1.640000  2.515000 4.980000 2.685000 ;
+      RECT 1.785000  0.265000 2.770000 0.535000 ;
+      RECT 2.075000  2.075000 3.600000 2.335000 ;
+      RECT 2.090000  0.885000 2.420000 1.095000 ;
+      RECT 2.600000  0.535000 2.770000 0.815000 ;
+      RECT 2.600000  0.815000 3.630000 1.145000 ;
+      RECT 2.920000  1.325000 4.140000 1.495000 ;
+      RECT 2.920000  1.495000 3.250000 1.715000 ;
+      RECT 3.045000  0.085000 3.375000 0.635000 ;
+      RECT 3.180000  2.865000 3.510000 3.245000 ;
+      RECT 3.430000  1.675000 3.790000 1.935000 ;
+      RECT 3.430000  1.935000 3.600000 2.075000 ;
+      RECT 3.780000  2.155000 4.140000 2.335000 ;
+      RECT 3.810000  0.265000 4.195000 0.505000 ;
+      RECT 3.810000  0.505000 4.840000 0.675000 ;
+      RECT 3.810000  0.675000 3.980000 1.325000 ;
+      RECT 3.970000  1.495000 4.140000 2.155000 ;
+      RECT 4.160000  0.895000 4.490000 1.145000 ;
+      RECT 4.320000  1.145000 4.490000 2.315000 ;
+      RECT 4.320000  2.315000 4.980000 2.515000 ;
+      RECT 4.650000  2.685000 4.980000 3.065000 ;
+      RECT 4.670000  0.675000 4.840000 1.965000 ;
+      RECT 4.670000  1.965000 6.275000 2.135000 ;
+      RECT 5.065000  0.085000 5.395000 1.275000 ;
+      RECT 5.180000  2.315000 5.510000 3.245000 ;
+      RECT 5.710000  2.315000 6.655000 2.485000 ;
+      RECT 5.710000  2.485000 6.040000 3.065000 ;
+      RECT 5.885000  0.905000 6.760000 1.075000 ;
+      RECT 5.885000  1.075000 6.215000 1.365000 ;
+      RECT 5.945000  1.545000 6.275000 1.965000 ;
+      RECT 5.965000  0.085000 6.295000 0.675000 ;
+      RECT 6.240000  2.665000 6.570000 3.245000 ;
+      RECT 6.485000  1.075000 6.760000 1.575000 ;
+      RECT 6.485000  1.575000 6.655000 2.315000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlclkp_lp
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef
index 1f94271..5cc707a 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.magic.lef
@@ -82,34 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.105000  0.085000 0.435000 0.670000 ;
-        RECT 1.800000  0.085000 2.020000 1.040000 ;
-        RECT 4.685000  0.085000 4.920000 0.720000 ;
-        RECT 6.390000  0.085000 6.720000 0.660000 ;
-        RECT 8.605000  0.085000 8.840000 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
@@ -118,87 +90,112 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.150000 2.345000 0.480000 3.245000 ;
-        RECT 1.835000 1.775000 2.165000 2.435000 ;
-        RECT 1.835000 2.435000 2.245000 2.605000 ;
-        RECT 1.905000 2.605000 2.245000 3.245000 ;
-        RECT 4.400000 2.195000 4.730000 3.245000 ;
-        RECT 5.560000 2.270000 5.890000 3.245000 ;
-        RECT 6.455000 1.930000 6.810000 3.245000 ;
-        RECT 8.285000 1.815000 8.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 ;
-        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.605000 0.340000 0.830000 0.670000 ;
-      RECT 0.660000 0.670000 0.830000 1.505000 ;
-      RECT 0.660000 1.505000 1.065000 2.175000 ;
-      RECT 0.660000 2.175000 0.850000 2.775000 ;
-      RECT 0.660000 2.775000 1.735000 3.075000 ;
-      RECT 1.035000 0.280000 1.365000 0.760000 ;
-      RECT 1.035000 0.760000 1.630000 1.030000 ;
-      RECT 1.245000 1.030000 1.630000 1.040000 ;
-      RECT 1.245000 1.040000 1.415000 1.775000 ;
-      RECT 1.245000 1.775000 1.660000 2.455000 ;
-      RECT 2.190000 0.710000 2.595000 1.040000 ;
-      RECT 2.425000 0.265000 4.120000 0.435000 ;
-      RECT 2.425000 0.435000 2.595000 0.710000 ;
-      RECT 2.425000 1.040000 2.595000 1.775000 ;
-      RECT 2.425000 1.775000 2.625000 2.445000 ;
-      RECT 2.765000 0.605000 4.515000 0.775000 ;
-      RECT 2.765000 0.775000 2.990000 1.210000 ;
-      RECT 2.795000 1.515000 3.385000 1.685000 ;
-      RECT 2.795000 1.685000 2.965000 2.430000 ;
-      RECT 2.795000 2.430000 3.940000 2.705000 ;
-      RECT 2.795000 2.705000 3.675000 2.710000 ;
-      RECT 3.135000 1.855000 5.255000 2.025000 ;
-      RECT 3.135000 2.025000 3.355000 2.260000 ;
-      RECT 3.160000 0.945000 3.385000 1.515000 ;
-      RECT 3.345000 2.710000 3.675000 3.075000 ;
-      RECT 3.555000 0.945000 5.370000 1.175000 ;
-      RECT 3.610000 2.195000 3.940000 2.430000 ;
-      RECT 4.290000 0.390000 4.515000 0.605000 ;
-      RECT 4.775000 1.355000 5.735000 1.685000 ;
-      RECT 4.925000 2.025000 5.255000 2.260000 ;
-      RECT 5.140000 0.390000 5.370000 0.945000 ;
-      RECT 5.425000 1.685000 5.735000 1.930000 ;
-      RECT 5.425000 1.930000 6.285000 2.100000 ;
-      RECT 5.540000 0.255000 5.930000 0.830000 ;
-      RECT 5.540000 0.830000 7.080000 1.000000 ;
-      RECT 5.540000 1.000000 5.735000 1.355000 ;
-      RECT 6.060000 2.100000 6.285000 3.075000 ;
-      RECT 6.820000 1.000000 7.080000 1.515000 ;
-      RECT 6.900000 0.255000 8.435000 0.425000 ;
-      RECT 6.900000 0.425000 7.080000 0.830000 ;
-      RECT 6.980000 1.815000 7.665000 2.485000 ;
-      RECT 7.250000 0.705000 7.665000 1.035000 ;
-      RECT 7.395000 1.035000 7.665000 1.815000 ;
-      RECT 8.265000 0.425000 8.435000 1.260000 ;
-      RECT 8.265000 1.260000 8.885000 1.590000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.105000  0.085000 0.435000 0.670000 ;
+      RECT 0.150000  2.345000 0.480000 3.245000 ;
+      RECT 0.605000  0.340000 0.830000 0.670000 ;
+      RECT 0.660000  0.670000 0.830000 1.505000 ;
+      RECT 0.660000  1.505000 1.065000 2.175000 ;
+      RECT 0.660000  2.175000 0.850000 2.775000 ;
+      RECT 0.660000  2.775000 1.735000 3.075000 ;
+      RECT 1.035000  0.280000 1.365000 0.760000 ;
+      RECT 1.035000  0.760000 1.630000 1.030000 ;
+      RECT 1.245000  1.030000 1.630000 1.040000 ;
+      RECT 1.245000  1.040000 1.415000 1.775000 ;
+      RECT 1.245000  1.775000 1.660000 2.455000 ;
+      RECT 1.800000  0.085000 2.020000 1.040000 ;
+      RECT 1.835000  1.775000 2.165000 2.435000 ;
+      RECT 1.835000  2.435000 2.245000 2.605000 ;
+      RECT 1.905000  2.605000 2.245000 3.245000 ;
+      RECT 2.190000  0.710000 2.595000 1.040000 ;
+      RECT 2.425000  0.265000 4.120000 0.435000 ;
+      RECT 2.425000  0.435000 2.595000 0.710000 ;
+      RECT 2.425000  1.040000 2.595000 1.775000 ;
+      RECT 2.425000  1.775000 2.625000 2.445000 ;
+      RECT 2.765000  0.605000 4.515000 0.775000 ;
+      RECT 2.765000  0.775000 2.990000 1.210000 ;
+      RECT 2.795000  1.515000 3.385000 1.685000 ;
+      RECT 2.795000  1.685000 2.965000 2.430000 ;
+      RECT 2.795000  2.430000 3.940000 2.705000 ;
+      RECT 2.795000  2.705000 3.675000 2.710000 ;
+      RECT 3.135000  1.855000 5.255000 2.025000 ;
+      RECT 3.135000  2.025000 3.355000 2.260000 ;
+      RECT 3.160000  0.945000 3.385000 1.515000 ;
+      RECT 3.345000  2.710000 3.675000 3.075000 ;
+      RECT 3.555000  0.945000 5.370000 1.175000 ;
+      RECT 3.610000  2.195000 3.940000 2.430000 ;
+      RECT 4.290000  0.390000 4.515000 0.605000 ;
+      RECT 4.400000  2.195000 4.730000 3.245000 ;
+      RECT 4.685000  0.085000 4.920000 0.720000 ;
+      RECT 4.775000  1.355000 5.735000 1.685000 ;
+      RECT 4.925000  2.025000 5.255000 2.260000 ;
+      RECT 5.140000  0.390000 5.370000 0.945000 ;
+      RECT 5.425000  1.685000 5.735000 1.930000 ;
+      RECT 5.425000  1.930000 6.285000 2.100000 ;
+      RECT 5.540000  0.255000 5.930000 0.830000 ;
+      RECT 5.540000  0.830000 7.080000 1.000000 ;
+      RECT 5.540000  1.000000 5.735000 1.355000 ;
+      RECT 5.560000  2.270000 5.890000 3.245000 ;
+      RECT 6.060000  2.100000 6.285000 3.075000 ;
+      RECT 6.390000  0.085000 6.720000 0.660000 ;
+      RECT 6.455000  1.930000 6.810000 3.245000 ;
+      RECT 6.820000  1.000000 7.080000 1.515000 ;
+      RECT 6.900000  0.255000 8.435000 0.425000 ;
+      RECT 6.900000  0.425000 7.080000 0.830000 ;
+      RECT 6.980000  1.815000 7.665000 2.485000 ;
+      RECT 7.250000  0.705000 7.665000 1.035000 ;
+      RECT 7.395000  1.035000 7.665000 1.815000 ;
+      RECT 8.265000  0.425000 8.435000 1.260000 ;
+      RECT 8.265000  1.260000 8.885000 1.590000 ;
+      RECT 8.285000  1.815000 8.545000 3.245000 ;
+      RECT 8.605000  0.085000 8.840000 1.090000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrbn_1
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef
index 9d82778..5bbfcd3 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.magic.lef
@@ -81,36 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 1.040000 ;
-        RECT 1.575000  0.085000 1.795000 1.040000 ;
-        RECT 4.545000  0.085000 4.765000 0.765000 ;
-        RECT 6.295000  0.085000 6.625000 1.040000 ;
-        RECT 7.285000  0.085000 7.595000 1.155000 ;
-        RECT 8.285000  0.085000 8.615000 0.715000 ;
-        RECT 9.205000  0.085000 9.495000 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
@@ -119,81 +89,108 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.140000 2.660000 0.470000 3.245000 ;
-        RECT 1.690000 1.920000 1.940000 3.245000 ;
-        RECT 4.310000 2.115000 4.640000 3.245000 ;
-        RECT 5.525000 2.665000 5.765000 3.245000 ;
-        RECT 6.345000 2.665000 6.675000 3.245000 ;
-        RECT 7.225000 2.665000 7.555000 3.245000 ;
-        RECT 8.305000 2.105000 8.625000 3.245000 ;
-        RECT 9.205000 1.815000 9.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 ;
-        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.610000 0.700000 0.820000 1.030000 ;
-      RECT 0.640000 1.030000 0.820000 1.250000 ;
-      RECT 0.640000 1.250000 1.055000 1.580000 ;
-      RECT 0.640000 1.580000 0.900000 2.775000 ;
-      RECT 0.640000 2.775000 1.520000 3.075000 ;
-      RECT 0.810000 0.280000 1.405000 0.450000 ;
-      RECT 1.075000 0.450000 1.405000 1.080000 ;
-      RECT 1.115000 1.775000 1.405000 2.445000 ;
-      RECT 1.235000 1.080000 1.405000 1.775000 ;
-      RECT 1.965000 0.700000 2.380000 1.040000 ;
-      RECT 2.130000 1.920000 2.460000 2.445000 ;
-      RECT 2.200000 1.040000 2.380000 1.775000 ;
-      RECT 2.200000 1.775000 2.460000 1.920000 ;
-      RECT 2.210000 0.255000 3.955000 0.445000 ;
-      RECT 2.210000 0.445000 2.380000 0.700000 ;
-      RECT 2.550000 0.615000 4.375000 0.795000 ;
-      RECT 2.550000 0.795000 2.760000 1.150000 ;
-      RECT 2.700000 1.425000 3.260000 1.595000 ;
-      RECT 2.700000 1.595000 2.870000 2.285000 ;
-      RECT 2.700000 2.285000 4.130000 2.595000 ;
-      RECT 2.930000 0.965000 3.260000 1.425000 ;
-      RECT 3.040000 1.775000 5.165000 1.945000 ;
-      RECT 3.040000 1.945000 3.320000 2.115000 ;
-      RECT 3.440000 0.965000 5.235000 1.155000 ;
-      RECT 3.515000 2.115000 3.845000 2.285000 ;
-      RECT 3.800000 2.595000 4.130000 3.025000 ;
-      RECT 4.710000 1.325000 5.735000 1.605000 ;
-      RECT 4.835000 1.945000 5.165000 2.170000 ;
-      RECT 4.935000 0.455000 5.235000 0.965000 ;
-      RECT 5.465000 0.280000 5.735000 1.325000 ;
-      RECT 5.565000 1.605000 5.735000 2.325000 ;
-      RECT 5.565000 2.325000 7.580000 2.495000 ;
-      RECT 5.935000 2.495000 6.175000 3.075000 ;
-      RECT 7.145000 1.405000 8.155000 1.575000 ;
-      RECT 7.225000 1.575000 7.580000 2.325000 ;
-      RECT 7.750000 1.755000 8.615000 1.925000 ;
-      RECT 7.750000 1.925000 8.020000 2.485000 ;
-      RECT 7.765000 0.885000 8.615000 1.115000 ;
-      RECT 8.365000 1.115000 8.615000 1.755000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.110000  0.085000 0.440000 1.040000 ;
+      RECT 0.140000  2.660000 0.470000 3.245000 ;
+      RECT 0.610000  0.700000 0.820000 1.030000 ;
+      RECT 0.640000  1.030000 0.820000 1.250000 ;
+      RECT 0.640000  1.250000 1.055000 1.580000 ;
+      RECT 0.640000  1.580000 0.900000 2.775000 ;
+      RECT 0.640000  2.775000 1.520000 3.075000 ;
+      RECT 0.810000  0.280000 1.405000 0.450000 ;
+      RECT 1.075000  0.450000 1.405000 1.080000 ;
+      RECT 1.115000  1.775000 1.405000 2.445000 ;
+      RECT 1.235000  1.080000 1.405000 1.775000 ;
+      RECT 1.575000  0.085000 1.795000 1.040000 ;
+      RECT 1.690000  1.920000 1.940000 3.245000 ;
+      RECT 1.965000  0.700000 2.380000 1.040000 ;
+      RECT 2.130000  1.920000 2.460000 2.445000 ;
+      RECT 2.200000  1.040000 2.380000 1.775000 ;
+      RECT 2.200000  1.775000 2.460000 1.920000 ;
+      RECT 2.210000  0.255000 3.955000 0.445000 ;
+      RECT 2.210000  0.445000 2.380000 0.700000 ;
+      RECT 2.550000  0.615000 4.375000 0.795000 ;
+      RECT 2.550000  0.795000 2.760000 1.150000 ;
+      RECT 2.700000  1.425000 3.260000 1.595000 ;
+      RECT 2.700000  1.595000 2.870000 2.285000 ;
+      RECT 2.700000  2.285000 4.130000 2.595000 ;
+      RECT 2.930000  0.965000 3.260000 1.425000 ;
+      RECT 3.040000  1.775000 5.165000 1.945000 ;
+      RECT 3.040000  1.945000 3.320000 2.115000 ;
+      RECT 3.440000  0.965000 5.235000 1.155000 ;
+      RECT 3.515000  2.115000 3.845000 2.285000 ;
+      RECT 3.800000  2.595000 4.130000 3.025000 ;
+      RECT 4.310000  2.115000 4.640000 3.245000 ;
+      RECT 4.545000  0.085000 4.765000 0.765000 ;
+      RECT 4.710000  1.325000 5.735000 1.605000 ;
+      RECT 4.835000  1.945000 5.165000 2.170000 ;
+      RECT 4.935000  0.455000 5.235000 0.965000 ;
+      RECT 5.465000  0.280000 5.735000 1.325000 ;
+      RECT 5.525000  2.665000 5.765000 3.245000 ;
+      RECT 5.565000  1.605000 5.735000 2.325000 ;
+      RECT 5.565000  2.325000 7.580000 2.495000 ;
+      RECT 5.935000  2.495000 6.175000 3.075000 ;
+      RECT 6.295000  0.085000 6.625000 1.040000 ;
+      RECT 6.345000  2.665000 6.675000 3.245000 ;
+      RECT 7.145000  1.405000 8.155000 1.575000 ;
+      RECT 7.225000  1.575000 7.580000 2.325000 ;
+      RECT 7.225000  2.665000 7.555000 3.245000 ;
+      RECT 7.285000  0.085000 7.595000 1.155000 ;
+      RECT 7.750000  1.755000 8.615000 1.925000 ;
+      RECT 7.750000  1.925000 8.020000 2.485000 ;
+      RECT 7.765000  0.885000 8.615000 1.115000 ;
+      RECT 8.285000  0.085000 8.615000 0.715000 ;
+      RECT 8.305000  2.105000 8.625000 3.245000 ;
+      RECT 8.365000  1.115000 8.615000 1.755000 ;
+      RECT 9.205000  0.085000 9.495000 1.130000 ;
+      RECT 9.205000  1.815000 9.495000 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_lp__dlrbn_2
diff --git a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef
index 971c2b3..224b946 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.magic.lef
@@ -83,35 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.905000  0.085000  1.235000 0.780000 ;
-        RECT 3.045000  0.085000  3.375000 0.675000 ;
-        RECT 5.345000  0.085000  5.675000 0.425000 ;
-        RECT 6.720000  0.085000  7.050000 1.075000 ;
-        RECT 8.850000  0.085000  9.180000 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
@@ -120,89 +91,115 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.705000 2.740000  1.035000 3.245000 ;
-        RECT 3.015000 2.405000  3.265000 3.245000 ;
-        RECT 4.985000 2.385000  5.315000 3.245000 ;
-        RECT 7.195000 2.075000  7.525000 3.245000 ;
-        RECT 8.850000 1.850000  9.180000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.090000 0.320000 0.445000 0.780000 ;
-      RECT 0.090000 0.780000 0.260000 1.960000 ;
-      RECT 0.090000 1.960000 0.505000 2.390000 ;
-      RECT 0.090000 2.390000 1.385000 2.560000 ;
-      RECT 0.090000 2.560000 0.505000 3.000000 ;
-      RECT 1.215000 2.560000 1.385000 2.895000 ;
-      RECT 1.215000 2.895000 2.835000 3.065000 ;
-      RECT 1.235000 1.960000 1.965000 2.210000 ;
-      RECT 1.695000 0.320000 1.965000 1.960000 ;
-      RECT 1.695000 2.210000 1.965000 2.630000 ;
-      RECT 2.145000 0.265000 2.585000 0.675000 ;
-      RECT 2.145000 0.675000 2.315000 1.705000 ;
-      RECT 2.145000 1.705000 3.045000 1.875000 ;
-      RECT 2.145000 1.875000 2.485000 2.715000 ;
-      RECT 2.495000 0.855000 4.360000 1.025000 ;
-      RECT 2.495000 1.025000 2.695000 1.525000 ;
-      RECT 2.665000 2.055000 3.490000 2.225000 ;
-      RECT 2.665000 2.225000 2.835000 2.895000 ;
-      RECT 2.875000 1.255000 3.850000 1.425000 ;
-      RECT 2.875000 1.425000 3.045000 1.705000 ;
-      RECT 3.225000 1.605000 3.490000 2.055000 ;
-      RECT 3.680000 1.425000 4.770000 1.595000 ;
-      RECT 3.680000 1.595000 4.030000 1.755000 ;
-      RECT 3.965000 2.035000 5.645000 2.205000 ;
-      RECT 3.965000 2.205000 4.295000 3.065000 ;
-      RECT 4.030000 1.025000 4.360000 1.185000 ;
-      RECT 4.295000 0.265000 4.710000 0.605000 ;
-      RECT 4.295000 0.605000 6.185000 0.675000 ;
-      RECT 4.540000 0.675000 6.185000 0.775000 ;
-      RECT 4.600000 0.955000 4.930000 1.285000 ;
-      RECT 4.600000 1.285000 4.770000 1.425000 ;
-      RECT 4.965000 1.525000 5.295000 1.855000 ;
-      RECT 5.125000 0.955000 6.260000 1.205000 ;
-      RECT 5.125000 1.205000 5.295000 1.525000 ;
-      RECT 5.475000 1.565000 5.890000 1.895000 ;
-      RECT 5.475000 1.895000 5.645000 2.035000 ;
-      RECT 5.825000 2.075000 6.155000 2.700000 ;
-      RECT 5.825000 2.700000 7.015000 2.870000 ;
-      RECT 5.825000 2.870000 6.155000 3.065000 ;
-      RECT 5.855000 0.325000 6.185000 0.605000 ;
-      RECT 6.090000 1.205000 6.260000 1.255000 ;
-      RECT 6.090000 1.255000 7.330000 1.425000 ;
-      RECT 6.845000 1.425000 7.330000 1.625000 ;
-      RECT 6.845000 1.625000 7.015000 2.700000 ;
-      RECT 8.060000 0.360000 8.405000 0.820000 ;
-      RECT 8.235000 0.820000 8.405000 1.000000 ;
-      RECT 8.235000 1.000000 9.485000 1.170000 ;
-      RECT 8.235000 1.170000 8.650000 2.890000 ;
-      RECT 9.155000 1.170000 9.485000 1.670000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.090000  0.320000  0.445000 0.780000 ;
+      RECT 0.090000  0.780000  0.260000 1.960000 ;
+      RECT 0.090000  1.960000  0.505000 2.390000 ;
+      RECT 0.090000  2.390000  1.385000 2.560000 ;
+      RECT 0.090000  2.560000  0.505000 3.000000 ;
+      RECT 0.705000  2.740000  1.035000 3.245000 ;
+      RECT 0.905000  0.085000  1.235000 0.780000 ;
+      RECT 1.215000  2.560000  1.385000 2.895000 ;
+      RECT 1.215000  2.895000  2.835000 3.065000 ;
+      RECT 1.235000  1.960000  1.965000 2.210000 ;
+      RECT 1.695000  0.320000  1.965000 1.960000 ;
+      RECT 1.695000  2.210000  1.965000 2.630000 ;
+      RECT 2.145000  0.265000  2.585000 0.675000 ;
+      RECT 2.145000  0.675000  2.315000 1.705000 ;
+      RECT 2.145000  1.705000  3.045000 1.875000 ;
+      RECT 2.145000  1.875000  2.485000 2.715000 ;
+      RECT 2.495000  0.855000  4.360000 1.025000 ;
+      RECT 2.495000  1.025000  2.695000 1.525000 ;
+      RECT 2.665000  2.055000  3.490000 2.225000 ;
+      RECT 2.665000  2.225000  2.835000 2.895000 ;
+      RECT 2.875000  1.255000  3.850000 1.425000 ;
+      RECT 2.875000  1.425000  3.045000 1.705000 ;
+      RECT 3.015000  2.405000  3.265000 3.245000 ;
+      RECT 3.045000  0.085000  3.375000 0.675000 ;
+      RECT 3.225000  1.605000  3.490000 2.055000 ;
+      RECT 3.680000  1.425000  4.770000 1.595000 ;
+      RECT 3.680000  1.595000  4.030000 1.755000 ;
+      RECT 3.965000  2.035000  5.645000 2.205000 ;
+      RECT 3.965000  2.205000  4.295000 3.065000 ;
+      RECT 4.030000  1.025000  4.360000 1.185000 ;
+      RECT 4.295000  0.265000  4.710000 0.605000 ;
+      RECT 4.295000  0.605000  6.185000 0.675000 ;
+      RECT 4.540000  0.675000  6.185000 0.775000 ;
+      RECT 4.600000  0.955000  4.930000 1.285000 ;
+      RECT 4.600000  1.285000  4.770000 1.425000 ;
+      RECT 4.965000  1.525000  5.295000 1.855000 ;
+      RECT 4.985000  2.385000  5.315000 3.245000 ;
+      RECT 5.125000  0.955000  6.260000 1.205000 ;
+      RECT 5.125000  1.205000  5.295000 1.525000 ;
+      RECT 5.345000  0.085000  5.675000 0.425000 ;
+      RECT 5.475000  1.565000  5.890000 1.895000 ;
+      RECT 5.475000  1.895000  5.645000 2.035000 ;
+      RECT 5.825000  2.075000  6.155000 2.700000 ;
+      RECT 5.825000  2.700000  7.015000 2.870000 ;
+      RECT 5.825000  2.870000  6.155000 3.065000 ;
+      RECT 5.855000  0.325000  6.185000 0.605000 ;
+      RECT 6.090000  1.205000  6.260000 1.255000 ;
+      RECT 6.090000  1.255000  7.330000 1.425000 ;
+      RECT 6.720000  0.085000  7.050000 1.075000 ;
+      RECT 6.845000  1.425000  7.330000 1.625000 ;
+      RECT 6.845000  1.625000  7.015000 2.700000 ;
+      RECT 7.195000  2.075000  7.525000 3.245000 ;
+      RECT 8.060000  0.360000  8.405000 0.820000 ;
+      RECT 8.235000  0.820000  8.405000 1.000000 ;
+      RECT 8.235000  1.000000  9.485000 1.170000 ;
+      RECT 8.235000  1.170000  8.650000 2.890000 ;
+      RECT 8.850000  0.085000  9.180000 0.820000 ;
+      RECT 8.850000  1.850000  9.180000 3.245000 ;
+      RECT 9.155000  1.170000  9.485000 1.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  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrbn_lp
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef
index 7867c44..927d67f 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.magic.lef
@@ -81,31 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.715000  0.085000 1.045000 0.825000 ;
-        RECT 2.350000  0.085000 2.645000 0.940000 ;
-        RECT 4.005000  0.085000 4.335000 0.825000 ;
-        RECT 5.335000  0.085000 5.665000 0.485000 ;
-        RECT 7.225000  0.085000 7.435000 1.060000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -114,80 +89,102 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.670000 2.425000 0.895000 3.245000 ;
-        RECT 2.595000 2.630000 2.855000 3.245000 ;
-        RECT 4.525000 2.640000 4.825000 3.245000 ;
-        RECT 5.385000 2.665000 5.715000 3.245000 ;
-        RECT 7.120000 2.665000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.205000 0.510000 0.535000 0.825000 ;
-      RECT 0.205000 0.825000 0.455000 1.925000 ;
-      RECT 0.205000 1.925000 1.205000 2.255000 ;
-      RECT 0.205000 2.255000 0.500000 3.075000 ;
-      RECT 1.065000 2.425000 1.545000 2.905000 ;
-      RECT 1.065000 2.905000 2.425000 3.075000 ;
-      RECT 1.220000 0.510000 1.550000 0.840000 ;
-      RECT 1.375000 0.840000 1.545000 2.425000 ;
-      RECT 1.725000 1.085000 2.180000 1.110000 ;
-      RECT 1.725000 1.110000 2.840000 1.280000 ;
-      RECT 1.725000 1.280000 1.895000 2.385000 ;
-      RECT 1.725000 2.385000 2.085000 2.735000 ;
-      RECT 1.885000 0.640000 2.180000 1.085000 ;
-      RECT 2.255000 2.290000 3.195000 2.460000 ;
-      RECT 2.255000 2.460000 2.425000 2.905000 ;
-      RECT 2.590000 1.280000 2.840000 2.025000 ;
-      RECT 3.025000 1.125000 3.245000 1.455000 ;
-      RECT 3.025000 1.455000 3.195000 2.290000 ;
-      RECT 3.025000 2.460000 3.195000 2.905000 ;
-      RECT 3.025000 2.905000 4.015000 3.075000 ;
-      RECT 3.160000 0.635000 3.585000 0.955000 ;
-      RECT 3.365000 2.385000 3.585000 2.735000 ;
-      RECT 3.415000 0.955000 3.585000 0.995000 ;
-      RECT 3.415000 0.995000 4.775000 1.165000 ;
-      RECT 3.415000 1.165000 3.585000 2.385000 ;
-      RECT 3.755000 2.135000 4.015000 2.905000 ;
-      RECT 3.985000 1.335000 4.355000 1.925000 ;
-      RECT 4.185000 1.925000 4.355000 2.300000 ;
-      RECT 4.185000 2.300000 5.810000 2.325000 ;
-      RECT 4.185000 2.325000 7.450000 2.470000 ;
-      RECT 4.525000 1.165000 4.775000 1.515000 ;
-      RECT 4.545000 0.255000 4.875000 0.655000 ;
-      RECT 4.545000 0.655000 5.810000 0.825000 ;
-      RECT 4.995000 2.470000 7.450000 2.495000 ;
-      RECT 4.995000 2.495000 5.215000 3.060000 ;
-      RECT 5.640000 0.825000 5.810000 1.295000 ;
-      RECT 5.640000 1.295000 6.030000 1.625000 ;
-      RECT 5.640000 1.625000 5.810000 2.300000 ;
-      RECT 5.980000 0.705000 6.580000 1.035000 ;
-      RECT 5.990000 1.805000 6.380000 2.135000 ;
-      RECT 6.210000 1.035000 6.580000 1.435000 ;
-      RECT 6.210000 1.435000 6.380000 1.805000 ;
-      RECT 7.225000 1.230000 7.645000 1.560000 ;
-      RECT 7.225000 1.560000 7.450000 2.325000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.205000  0.510000 0.535000 0.825000 ;
+      RECT 0.205000  0.825000 0.455000 1.925000 ;
+      RECT 0.205000  1.925000 1.205000 2.255000 ;
+      RECT 0.205000  2.255000 0.500000 3.075000 ;
+      RECT 0.670000  2.425000 0.895000 3.245000 ;
+      RECT 0.715000  0.085000 1.045000 0.825000 ;
+      RECT 1.065000  2.425000 1.545000 2.905000 ;
+      RECT 1.065000  2.905000 2.425000 3.075000 ;
+      RECT 1.220000  0.510000 1.550000 0.840000 ;
+      RECT 1.375000  0.840000 1.545000 2.425000 ;
+      RECT 1.725000  1.085000 2.180000 1.110000 ;
+      RECT 1.725000  1.110000 2.840000 1.280000 ;
+      RECT 1.725000  1.280000 1.895000 2.385000 ;
+      RECT 1.725000  2.385000 2.085000 2.735000 ;
+      RECT 1.885000  0.640000 2.180000 1.085000 ;
+      RECT 2.255000  2.290000 3.195000 2.460000 ;
+      RECT 2.255000  2.460000 2.425000 2.905000 ;
+      RECT 2.350000  0.085000 2.645000 0.940000 ;
+      RECT 2.590000  1.280000 2.840000 2.025000 ;
+      RECT 2.595000  2.630000 2.855000 3.245000 ;
+      RECT 3.025000  1.125000 3.245000 1.455000 ;
+      RECT 3.025000  1.455000 3.195000 2.290000 ;
+      RECT 3.025000  2.460000 3.195000 2.905000 ;
+      RECT 3.025000  2.905000 4.015000 3.075000 ;
+      RECT 3.160000  0.635000 3.585000 0.955000 ;
+      RECT 3.365000  2.385000 3.585000 2.735000 ;
+      RECT 3.415000  0.955000 3.585000 0.995000 ;
+      RECT 3.415000  0.995000 4.775000 1.165000 ;
+      RECT 3.415000  1.165000 3.585000 2.385000 ;
+      RECT 3.755000  2.135000 4.015000 2.905000 ;
+      RECT 3.985000  1.335000 4.355000 1.925000 ;
+      RECT 4.005000  0.085000 4.335000 0.825000 ;
+      RECT 4.185000  1.925000 4.355000 2.300000 ;
+      RECT 4.185000  2.300000 5.810000 2.325000 ;
+      RECT 4.185000  2.325000 7.450000 2.470000 ;
+      RECT 4.525000  1.165000 4.775000 1.515000 ;
+      RECT 4.525000  2.640000 4.825000 3.245000 ;
+      RECT 4.545000  0.255000 4.875000 0.655000 ;
+      RECT 4.545000  0.655000 5.810000 0.825000 ;
+      RECT 4.995000  2.470000 7.450000 2.495000 ;
+      RECT 4.995000  2.495000 5.215000 3.060000 ;
+      RECT 5.335000  0.085000 5.665000 0.485000 ;
+      RECT 5.385000  2.665000 5.715000 3.245000 ;
+      RECT 5.640000  0.825000 5.810000 1.295000 ;
+      RECT 5.640000  1.295000 6.030000 1.625000 ;
+      RECT 5.640000  1.625000 5.810000 2.300000 ;
+      RECT 5.980000  0.705000 6.580000 1.035000 ;
+      RECT 5.990000  1.805000 6.380000 2.135000 ;
+      RECT 6.210000  1.035000 6.580000 1.435000 ;
+      RECT 6.210000  1.435000 6.380000 1.805000 ;
+      RECT 7.120000  2.665000 7.450000 3.245000 ;
+      RECT 7.225000  0.085000 7.435000 1.060000 ;
+      RECT 7.225000  1.230000 7.645000 1.560000 ;
+      RECT 7.225000  1.560000 7.450000 2.325000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrbp_1
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef
index 10035ca..a99964f 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.magic.lef
@@ -84,35 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.095000  0.085000 0.385000 1.095000 ;
-        RECT 1.000000  0.085000 1.285000 1.095000 ;
-        RECT 2.400000  0.085000 2.730000 0.465000 ;
-        RECT 3.410000  0.085000 3.740000 0.835000 ;
-        RECT 4.880000  0.085000 5.210000 0.970000 ;
-        RECT 6.570000  0.085000 6.900000 0.930000 ;
-        RECT 8.150000  0.085000 8.415000 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 ;
-        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
@@ -121,82 +92,108 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.095000 1.815000 0.385000 3.245000 ;
-        RECT 1.000000 1.815000 1.290000 3.245000 ;
-        RECT 2.460000 2.660000 2.790000 3.245000 ;
-        RECT 3.415000 2.260000 3.745000 3.245000 ;
-        RECT 4.355000 2.055000 4.685000 3.245000 ;
-        RECT 6.355000 2.695000 6.695000 3.245000 ;
-        RECT 8.190000 2.640000 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 ;
-        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 1.000000 1.300000 2.205000 1.630000 ;
-      RECT 1.875000 0.715000 2.205000 1.300000 ;
-      RECT 1.920000 1.630000 2.205000 2.150000 ;
-      RECT 2.775000 1.205000 3.335000 1.535000 ;
-      RECT 3.165000 1.005000 4.570000 1.015000 ;
-      RECT 3.165000 1.015000 4.080000 1.175000 ;
-      RECT 3.165000 1.175000 3.335000 1.205000 ;
-      RECT 3.165000 1.535000 3.335000 1.920000 ;
-      RECT 3.165000 1.920000 4.185000 2.090000 ;
-      RECT 3.910000 0.835000 4.570000 1.005000 ;
-      RECT 3.925000 2.090000 4.185000 3.075000 ;
-      RECT 3.995000 1.715000 5.135000 1.885000 ;
-      RECT 3.995000 1.885000 4.185000 1.920000 ;
-      RECT 4.240000 0.255000 4.570000 0.835000 ;
-      RECT 4.250000 1.185000 5.795000 1.355000 ;
-      RECT 4.250000 1.355000 4.545000 1.535000 ;
-      RECT 4.805000 1.525000 5.135000 1.715000 ;
-      RECT 5.115000 2.055000 5.445000 2.785000 ;
-      RECT 5.115000 2.785000 6.165000 2.955000 ;
-      RECT 5.625000 0.640000 6.000000 0.955000 ;
-      RECT 5.625000 0.955000 5.795000 1.185000 ;
-      RECT 5.625000 1.355000 5.795000 2.275000 ;
-      RECT 5.625000 2.275000 5.825000 2.615000 ;
-      RECT 5.965000 1.125000 6.165000 1.455000 ;
-      RECT 5.995000 1.455000 6.165000 2.355000 ;
-      RECT 5.995000 2.355000 7.035000 2.525000 ;
-      RECT 5.995000 2.525000 6.165000 2.785000 ;
-      RECT 6.335000 1.100000 7.435000 1.270000 ;
-      RECT 6.335000 1.270000 6.595000 2.025000 ;
-      RECT 6.865000 2.525000 7.035000 2.810000 ;
-      RECT 6.865000 2.810000 8.020000 2.980000 ;
-      RECT 7.070000 0.640000 7.330000 1.100000 ;
-      RECT 7.205000 2.300000 7.435000 2.640000 ;
-      RECT 7.265000 1.270000 7.435000 2.300000 ;
-      RECT 7.615000 0.280000 7.980000 0.610000 ;
-      RECT 7.615000 0.610000 7.785000 2.640000 ;
-      RECT 7.615000 2.640000 8.020000 2.810000 ;
-      RECT 7.955000 1.585000 8.135000 2.300000 ;
-      RECT 7.955000 2.300000 9.025000 2.470000 ;
-      RECT 8.585000 0.280000 9.025000 0.610000 ;
-      RECT 8.690000 2.470000 9.025000 3.065000 ;
-      RECT 8.845000 0.610000 9.025000 2.300000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  0.085000 0.385000 1.095000 ;
+      RECT 0.095000  1.815000 0.385000 3.245000 ;
+      RECT 1.000000  0.085000 1.285000 1.095000 ;
+      RECT 1.000000  1.300000 2.205000 1.630000 ;
+      RECT 1.000000  1.815000 1.290000 3.245000 ;
+      RECT 1.875000  0.715000 2.205000 1.300000 ;
+      RECT 1.920000  1.630000 2.205000 2.150000 ;
+      RECT 2.400000  0.085000 2.730000 0.465000 ;
+      RECT 2.460000  2.660000 2.790000 3.245000 ;
+      RECT 2.775000  1.205000 3.335000 1.535000 ;
+      RECT 3.165000  1.005000 4.570000 1.015000 ;
+      RECT 3.165000  1.015000 4.080000 1.175000 ;
+      RECT 3.165000  1.175000 3.335000 1.205000 ;
+      RECT 3.165000  1.535000 3.335000 1.920000 ;
+      RECT 3.165000  1.920000 4.185000 2.090000 ;
+      RECT 3.410000  0.085000 3.740000 0.835000 ;
+      RECT 3.415000  2.260000 3.745000 3.245000 ;
+      RECT 3.910000  0.835000 4.570000 1.005000 ;
+      RECT 3.925000  2.090000 4.185000 3.075000 ;
+      RECT 3.995000  1.715000 5.135000 1.885000 ;
+      RECT 3.995000  1.885000 4.185000 1.920000 ;
+      RECT 4.240000  0.255000 4.570000 0.835000 ;
+      RECT 4.250000  1.185000 5.795000 1.355000 ;
+      RECT 4.250000  1.355000 4.545000 1.535000 ;
+      RECT 4.355000  2.055000 4.685000 3.245000 ;
+      RECT 4.805000  1.525000 5.135000 1.715000 ;
+      RECT 4.880000  0.085000 5.210000 0.970000 ;
+      RECT 5.115000  2.055000 5.445000 2.785000 ;
+      RECT 5.115000  2.785000 6.165000 2.955000 ;
+      RECT 5.625000  0.640000 6.000000 0.955000 ;
+      RECT 5.625000  0.955000 5.795000 1.185000 ;
+      RECT 5.625000  1.355000 5.795000 2.275000 ;
+      RECT 5.625000  2.275000 5.825000 2.615000 ;
+      RECT 5.965000  1.125000 6.165000 1.455000 ;
+      RECT 5.995000  1.455000 6.165000 2.355000 ;
+      RECT 5.995000  2.355000 7.035000 2.525000 ;
+      RECT 5.995000  2.525000 6.165000 2.785000 ;
+      RECT 6.335000  1.100000 7.435000 1.270000 ;
+      RECT 6.335000  1.270000 6.595000 2.025000 ;
+      RECT 6.355000  2.695000 6.695000 3.245000 ;
+      RECT 6.570000  0.085000 6.900000 0.930000 ;
+      RECT 6.865000  2.525000 7.035000 2.810000 ;
+      RECT 6.865000  2.810000 8.020000 2.980000 ;
+      RECT 7.070000  0.640000 7.330000 1.100000 ;
+      RECT 7.205000  2.300000 7.435000 2.640000 ;
+      RECT 7.265000  1.270000 7.435000 2.300000 ;
+      RECT 7.615000  0.280000 7.980000 0.610000 ;
+      RECT 7.615000  0.610000 7.785000 2.640000 ;
+      RECT 7.615000  2.640000 8.020000 2.810000 ;
+      RECT 7.955000  1.585000 8.135000 2.300000 ;
+      RECT 7.955000  2.300000 9.025000 2.470000 ;
+      RECT 8.150000  0.085000 8.415000 0.610000 ;
+      RECT 8.190000  2.640000 8.520000 3.245000 ;
+      RECT 8.585000  0.280000 9.025000 0.610000 ;
+      RECT 8.690000  2.470000 9.025000 3.065000 ;
+      RECT 8.845000  0.610000 9.025000 2.300000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrbp_2
diff --git a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef
index 7b5815d..bfa0086 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.magic.lef
@@ -83,35 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.905000  0.085000  1.235000 1.000000 ;
-        RECT 3.045000  0.085000  3.375000 0.605000 ;
-        RECT 5.430000  0.085000  5.680000 0.685000 ;
-        RECT 6.700000  0.085000  7.030000 0.685000 ;
-        RECT 8.840000  0.085000  9.170000 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
@@ -120,83 +91,109 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.805000 2.865000  1.135000 3.245000 ;
-        RECT 2.905000 2.515000  3.235000 3.245000 ;
-        RECT 5.365000 2.065000  5.695000 3.245000 ;
-        RECT 6.625000 1.715000  6.955000 3.245000 ;
-        RECT 8.840000 1.850000  9.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 ;
-        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.540000 0.445000 1.000000 ;
-      RECT 0.115000 1.000000 0.285000 2.075000 ;
-      RECT 0.115000 2.075000 0.605000 2.515000 ;
-      RECT 0.115000 2.515000 2.155000 2.685000 ;
-      RECT 0.115000 2.685000 0.605000 3.065000 ;
-      RECT 1.335000 2.075000 1.665000 2.165000 ;
-      RECT 1.335000 2.165000 2.975000 2.335000 ;
-      RECT 1.695000 0.540000 2.025000 1.000000 ;
-      RECT 1.825000 2.685000 2.155000 3.065000 ;
-      RECT 1.855000 1.000000 2.025000 2.165000 ;
-      RECT 2.255000 0.265000 2.585000 0.785000 ;
-      RECT 2.255000 0.785000 4.040000 0.955000 ;
-      RECT 2.255000 0.955000 2.425000 1.655000 ;
-      RECT 2.255000 1.655000 2.625000 1.985000 ;
-      RECT 2.645000 1.135000 2.975000 1.345000 ;
-      RECT 2.645000 1.345000 4.000000 1.465000 ;
-      RECT 2.805000 1.465000 4.000000 1.675000 ;
-      RECT 2.805000 1.675000 2.975000 2.165000 ;
-      RECT 3.670000 1.675000 4.000000 2.895000 ;
-      RECT 3.670000 2.895000 4.900000 3.065000 ;
-      RECT 3.710000 0.775000 4.040000 0.785000 ;
-      RECT 3.710000 0.955000 4.040000 1.105000 ;
-      RECT 4.180000 1.815000 4.510000 2.715000 ;
-      RECT 4.220000 0.265000 4.550000 0.515000 ;
-      RECT 4.220000 0.515000 5.250000 0.685000 ;
-      RECT 4.220000 0.685000 4.390000 1.815000 ;
-      RECT 4.570000 0.865000 4.900000 1.195000 ;
-      RECT 4.730000 1.195000 4.900000 2.895000 ;
-      RECT 5.080000 0.685000 5.250000 0.865000 ;
-      RECT 5.080000 0.865000 6.040000 1.035000 ;
-      RECT 5.140000 1.345000 5.470000 1.715000 ;
-      RECT 5.140000 1.715000 6.390000 1.885000 ;
-      RECT 5.710000 1.035000 6.040000 1.535000 ;
-      RECT 5.910000 0.305000 6.390000 0.685000 ;
-      RECT 6.015000 1.885000 6.390000 2.855000 ;
-      RECT 6.220000 0.685000 6.390000 1.365000 ;
-      RECT 6.220000 1.365000 7.265000 1.535000 ;
-      RECT 6.220000 1.535000 6.390000 1.715000 ;
-      RECT 6.935000 0.865000 7.265000 1.365000 ;
-      RECT 8.050000 0.350000 8.380000 0.990000 ;
-      RECT 8.050000 0.990000 9.475000 1.160000 ;
-      RECT 8.310000 1.160000 8.640000 2.890000 ;
-      RECT 9.145000 1.160000 9.475000 1.660000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  0.540000  0.445000 1.000000 ;
+      RECT 0.115000  1.000000  0.285000 2.075000 ;
+      RECT 0.115000  2.075000  0.605000 2.515000 ;
+      RECT 0.115000  2.515000  2.155000 2.685000 ;
+      RECT 0.115000  2.685000  0.605000 3.065000 ;
+      RECT 0.805000  2.865000  1.135000 3.245000 ;
+      RECT 0.905000  0.085000  1.235000 1.000000 ;
+      RECT 1.335000  2.075000  1.665000 2.165000 ;
+      RECT 1.335000  2.165000  2.975000 2.335000 ;
+      RECT 1.695000  0.540000  2.025000 1.000000 ;
+      RECT 1.825000  2.685000  2.155000 3.065000 ;
+      RECT 1.855000  1.000000  2.025000 2.165000 ;
+      RECT 2.255000  0.265000  2.585000 0.785000 ;
+      RECT 2.255000  0.785000  4.040000 0.955000 ;
+      RECT 2.255000  0.955000  2.425000 1.655000 ;
+      RECT 2.255000  1.655000  2.625000 1.985000 ;
+      RECT 2.645000  1.135000  2.975000 1.345000 ;
+      RECT 2.645000  1.345000  4.000000 1.465000 ;
+      RECT 2.805000  1.465000  4.000000 1.675000 ;
+      RECT 2.805000  1.675000  2.975000 2.165000 ;
+      RECT 2.905000  2.515000  3.235000 3.245000 ;
+      RECT 3.045000  0.085000  3.375000 0.605000 ;
+      RECT 3.670000  1.675000  4.000000 2.895000 ;
+      RECT 3.670000  2.895000  4.900000 3.065000 ;
+      RECT 3.710000  0.775000  4.040000 0.785000 ;
+      RECT 3.710000  0.955000  4.040000 1.105000 ;
+      RECT 4.180000  1.815000  4.510000 2.715000 ;
+      RECT 4.220000  0.265000  4.550000 0.515000 ;
+      RECT 4.220000  0.515000  5.250000 0.685000 ;
+      RECT 4.220000  0.685000  4.390000 1.815000 ;
+      RECT 4.570000  0.865000  4.900000 1.195000 ;
+      RECT 4.730000  1.195000  4.900000 2.895000 ;
+      RECT 5.080000  0.685000  5.250000 0.865000 ;
+      RECT 5.080000  0.865000  6.040000 1.035000 ;
+      RECT 5.140000  1.345000  5.470000 1.715000 ;
+      RECT 5.140000  1.715000  6.390000 1.885000 ;
+      RECT 5.365000  2.065000  5.695000 3.245000 ;
+      RECT 5.430000  0.085000  5.680000 0.685000 ;
+      RECT 5.710000  1.035000  6.040000 1.535000 ;
+      RECT 5.910000  0.305000  6.390000 0.685000 ;
+      RECT 6.015000  1.885000  6.390000 2.855000 ;
+      RECT 6.220000  0.685000  6.390000 1.365000 ;
+      RECT 6.220000  1.365000  7.265000 1.535000 ;
+      RECT 6.220000  1.535000  6.390000 1.715000 ;
+      RECT 6.625000  1.715000  6.955000 3.245000 ;
+      RECT 6.700000  0.085000  7.030000 0.685000 ;
+      RECT 6.935000  0.865000  7.265000 1.365000 ;
+      RECT 8.050000  0.350000  8.380000 0.990000 ;
+      RECT 8.050000  0.990000  9.475000 1.160000 ;
+      RECT 8.310000  1.160000  8.640000 2.890000 ;
+      RECT 8.840000  0.085000  9.170000 0.810000 ;
+      RECT 8.840000  1.850000  9.170000 3.245000 ;
+      RECT 9.145000  1.160000  9.475000 1.660000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrbp_lp
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.magic.lef
index fbe40a6..2579b2f 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_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.985000  0.085000 1.205000 0.605000 ;
-        RECT 2.425000  0.085000 2.755000 0.925000 ;
-        RECT 4.225000  0.085000 4.555000 0.895000 ;
-        RECT 5.590000  0.085000 5.920000 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
@@ -101,65 +80,83 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.685000 2.515000 0.895000 3.245000 ;
-        RECT 2.500000 2.655000 2.830000 3.245000 ;
-        RECT 4.295000 2.285000 4.915000 3.245000 ;
-        RECT 4.650000 2.025000 4.915000 2.285000 ;
-        RECT 5.575000 2.640000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.195000 0.300000 0.455000 2.175000 ;
-      RECT 0.195000 2.175000 1.235000 2.345000 ;
-      RECT 0.195000 2.345000 0.465000 2.985000 ;
-      RECT 1.065000 2.345000 1.235000 2.815000 ;
-      RECT 1.065000 2.815000 2.045000 2.985000 ;
-      RECT 1.375000 0.300000 1.705000 0.630000 ;
-      RECT 1.405000 2.305000 1.705000 2.635000 ;
-      RECT 1.495000 0.630000 1.705000 2.305000 ;
-      RECT 1.875000 2.315000 2.990000 2.485000 ;
-      RECT 1.875000 2.485000 2.045000 2.815000 ;
-      RECT 1.915000 0.685000 2.245000 1.095000 ;
-      RECT 1.915000 1.095000 3.460000 1.265000 ;
-      RECT 1.915000 1.265000 2.245000 2.145000 ;
-      RECT 2.660000 1.435000 2.990000 2.315000 ;
-      RECT 2.925000 0.255000 3.890000 0.495000 ;
-      RECT 2.925000 0.495000 3.145000 1.095000 ;
-      RECT 3.200000 1.265000 3.460000 2.075000 ;
-      RECT 3.325000 0.665000 3.800000 0.925000 ;
-      RECT 3.340000 2.245000 3.800000 2.885000 ;
-      RECT 3.630000 0.925000 3.800000 1.065000 ;
-      RECT 3.630000 1.065000 4.905000 1.235000 ;
-      RECT 3.630000 1.235000 3.800000 2.245000 ;
-      RECT 4.100000 1.405000 4.430000 1.685000 ;
-      RECT 4.100000 1.685000 5.255000 1.855000 ;
-      RECT 4.100000 1.855000 4.430000 2.075000 ;
-      RECT 4.655000 1.235000 4.905000 1.515000 ;
-      RECT 4.745000 0.325000 5.255000 0.875000 ;
-      RECT 5.075000 0.875000 5.255000 1.685000 ;
-      RECT 5.085000 1.855000 5.255000 2.300000 ;
-      RECT 5.085000 2.300000 6.200000 2.470000 ;
-      RECT 5.085000 2.470000 5.385000 3.075000 ;
-      RECT 5.950000 1.345000 6.200000 2.300000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.195000  0.300000 0.455000 2.175000 ;
+      RECT 0.195000  2.175000 1.235000 2.345000 ;
+      RECT 0.195000  2.345000 0.465000 2.985000 ;
+      RECT 0.685000  2.515000 0.895000 3.245000 ;
+      RECT 0.985000  0.085000 1.205000 0.605000 ;
+      RECT 1.065000  2.345000 1.235000 2.815000 ;
+      RECT 1.065000  2.815000 2.045000 2.985000 ;
+      RECT 1.375000  0.300000 1.705000 0.630000 ;
+      RECT 1.405000  2.305000 1.705000 2.635000 ;
+      RECT 1.495000  0.630000 1.705000 2.305000 ;
+      RECT 1.875000  2.315000 2.990000 2.485000 ;
+      RECT 1.875000  2.485000 2.045000 2.815000 ;
+      RECT 1.915000  0.685000 2.245000 1.095000 ;
+      RECT 1.915000  1.095000 3.460000 1.265000 ;
+      RECT 1.915000  1.265000 2.245000 2.145000 ;
+      RECT 2.425000  0.085000 2.755000 0.925000 ;
+      RECT 2.500000  2.655000 2.830000 3.245000 ;
+      RECT 2.660000  1.435000 2.990000 2.315000 ;
+      RECT 2.925000  0.255000 3.890000 0.495000 ;
+      RECT 2.925000  0.495000 3.145000 1.095000 ;
+      RECT 3.200000  1.265000 3.460000 2.075000 ;
+      RECT 3.325000  0.665000 3.800000 0.925000 ;
+      RECT 3.340000  2.245000 3.800000 2.885000 ;
+      RECT 3.630000  0.925000 3.800000 1.065000 ;
+      RECT 3.630000  1.065000 4.905000 1.235000 ;
+      RECT 3.630000  1.235000 3.800000 2.245000 ;
+      RECT 4.100000  1.405000 4.430000 1.685000 ;
+      RECT 4.100000  1.685000 5.255000 1.855000 ;
+      RECT 4.100000  1.855000 4.430000 2.075000 ;
+      RECT 4.225000  0.085000 4.555000 0.895000 ;
+      RECT 4.295000  2.285000 4.915000 3.245000 ;
+      RECT 4.650000  2.025000 4.915000 2.285000 ;
+      RECT 4.655000  1.235000 4.905000 1.515000 ;
+      RECT 4.745000  0.325000 5.255000 0.875000 ;
+      RECT 5.075000  0.875000 5.255000 1.685000 ;
+      RECT 5.085000  1.855000 5.255000 2.300000 ;
+      RECT 5.085000  2.300000 6.200000 2.470000 ;
+      RECT 5.085000  2.470000 5.385000 3.075000 ;
+      RECT 5.575000  2.640000 5.905000 3.245000 ;
+      RECT 5.590000  0.085000 5.920000 0.670000 ;
+      RECT 5.950000  1.345000 6.200000 2.300000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrtn_1
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef
index 183b80e..4018a4c 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.magic.lef
@@ -72,28 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.700000  0.085000 0.940000 0.670000 ;
-        RECT 2.315000  0.085000 2.645000 0.955000 ;
-        RECT 4.005000  0.085000 4.335000 1.000000 ;
-        RECT 5.355000  0.085000 5.685000 0.515000 ;
-        RECT 6.285000  0.085000 6.615000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -102,70 +80,89 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.580000 2.300000 0.805000 3.245000 ;
-        RECT 2.400000 2.765000 2.730000 3.245000 ;
-        RECT 4.150000 2.410000 4.855000 3.245000 ;
-        RECT 4.525000 2.060000 4.855000 2.410000 ;
-        RECT 5.405000 2.655000 5.735000 3.245000 ;
-        RECT 6.285000 2.655000 6.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 ;
-        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.395000 0.530000 0.670000 ;
-      RECT 0.115000 0.670000 0.285000 1.960000 ;
-      RECT 0.115000 1.960000 1.145000 2.130000 ;
-      RECT 0.115000 2.130000 0.410000 2.970000 ;
-      RECT 0.975000 2.130000 1.145000 2.810000 ;
-      RECT 0.975000 2.810000 1.985000 2.980000 ;
-      RECT 1.110000 0.340000 1.635000 0.670000 ;
-      RECT 1.325000 2.300000 1.635000 2.630000 ;
-      RECT 1.465000 0.670000 1.635000 1.155000 ;
-      RECT 1.465000 1.155000 1.755000 1.825000 ;
-      RECT 1.465000 1.825000 1.635000 2.300000 ;
-      RECT 1.815000 2.425000 2.910000 2.595000 ;
-      RECT 1.815000 2.595000 1.985000 2.810000 ;
-      RECT 1.820000 1.995000 2.150000 2.255000 ;
-      RECT 1.885000 0.670000 2.145000 0.995000 ;
-      RECT 1.925000 0.995000 2.145000 1.125000 ;
-      RECT 1.925000 1.125000 3.380000 1.295000 ;
-      RECT 1.925000 1.295000 2.150000 1.995000 ;
-      RECT 2.580000 1.515000 2.910000 2.425000 ;
-      RECT 2.815000 0.255000 3.670000 0.500000 ;
-      RECT 2.815000 0.500000 2.985000 1.125000 ;
-      RECT 3.120000 1.295000 3.380000 2.205000 ;
-      RECT 3.175000 0.670000 3.720000 0.955000 ;
-      RECT 3.265000 2.375000 3.720000 3.015000 ;
-      RECT 3.550000 0.955000 3.720000 1.365000 ;
-      RECT 3.550000 1.365000 4.750000 1.550000 ;
-      RECT 3.550000 1.550000 3.720000 2.375000 ;
-      RECT 4.025000 1.720000 5.540000 1.890000 ;
-      RECT 4.025000 1.890000 4.355000 2.190000 ;
-      RECT 4.525000 0.255000 4.775000 1.025000 ;
-      RECT 4.525000 1.025000 5.090000 1.195000 ;
-      RECT 4.920000 1.195000 5.090000 1.720000 ;
-      RECT 5.025000 1.890000 5.540000 2.315000 ;
-      RECT 5.025000 2.315000 6.615000 2.485000 ;
-      RECT 5.025000 2.485000 5.235000 3.075000 ;
-      RECT 6.345000 1.295000 6.615000 2.315000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.115000  0.395000 0.530000 0.670000 ;
+      RECT 0.115000  0.670000 0.285000 1.960000 ;
+      RECT 0.115000  1.960000 1.145000 2.130000 ;
+      RECT 0.115000  2.130000 0.410000 2.970000 ;
+      RECT 0.580000  2.300000 0.805000 3.245000 ;
+      RECT 0.700000  0.085000 0.940000 0.670000 ;
+      RECT 0.975000  2.130000 1.145000 2.810000 ;
+      RECT 0.975000  2.810000 1.985000 2.980000 ;
+      RECT 1.110000  0.340000 1.635000 0.670000 ;
+      RECT 1.325000  2.300000 1.635000 2.630000 ;
+      RECT 1.465000  0.670000 1.635000 1.155000 ;
+      RECT 1.465000  1.155000 1.755000 1.825000 ;
+      RECT 1.465000  1.825000 1.635000 2.300000 ;
+      RECT 1.815000  2.425000 2.910000 2.595000 ;
+      RECT 1.815000  2.595000 1.985000 2.810000 ;
+      RECT 1.820000  1.995000 2.150000 2.255000 ;
+      RECT 1.885000  0.670000 2.145000 0.995000 ;
+      RECT 1.925000  0.995000 2.145000 1.125000 ;
+      RECT 1.925000  1.125000 3.380000 1.295000 ;
+      RECT 1.925000  1.295000 2.150000 1.995000 ;
+      RECT 2.315000  0.085000 2.645000 0.955000 ;
+      RECT 2.400000  2.765000 2.730000 3.245000 ;
+      RECT 2.580000  1.515000 2.910000 2.425000 ;
+      RECT 2.815000  0.255000 3.670000 0.500000 ;
+      RECT 2.815000  0.500000 2.985000 1.125000 ;
+      RECT 3.120000  1.295000 3.380000 2.205000 ;
+      RECT 3.175000  0.670000 3.720000 0.955000 ;
+      RECT 3.265000  2.375000 3.720000 3.015000 ;
+      RECT 3.550000  0.955000 3.720000 1.365000 ;
+      RECT 3.550000  1.365000 4.750000 1.550000 ;
+      RECT 3.550000  1.550000 3.720000 2.375000 ;
+      RECT 4.005000  0.085000 4.335000 1.000000 ;
+      RECT 4.025000  1.720000 5.540000 1.890000 ;
+      RECT 4.025000  1.890000 4.355000 2.190000 ;
+      RECT 4.150000  2.410000 4.855000 3.245000 ;
+      RECT 4.525000  0.255000 4.775000 1.025000 ;
+      RECT 4.525000  1.025000 5.090000 1.195000 ;
+      RECT 4.525000  2.060000 4.855000 2.410000 ;
+      RECT 4.920000  1.195000 5.090000 1.720000 ;
+      RECT 5.025000  1.890000 5.540000 2.315000 ;
+      RECT 5.025000  2.315000 6.615000 2.485000 ;
+      RECT 5.025000  2.485000 5.235000 3.075000 ;
+      RECT 5.355000  0.085000 5.685000 0.515000 ;
+      RECT 5.405000  2.655000 5.735000 3.245000 ;
+      RECT 6.285000  0.085000 6.615000 1.095000 ;
+      RECT 6.285000  2.655000 6.615000 3.245000 ;
+      RECT 6.345000  1.295000 6.615000 2.315000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrtn_2
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef
index d8c20ab..a6ba66a 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.magic.lef
@@ -77,31 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.795000  0.085000 1.125000 0.670000 ;
-        RECT 2.290000  0.085000 2.620000 0.875000 ;
-        RECT 4.070000  0.085000 4.400000 0.895000 ;
-        RECT 5.445000  0.085000 5.775000 0.700000 ;
-        RECT 6.385000  0.085000 6.715000 0.915000 ;
-        RECT 7.245000  0.085000 7.575000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -110,71 +85,93 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.535000 2.660000 0.785000 3.245000 ;
-        RECT 2.325000 2.615000 2.655000 3.245000 ;
-        RECT 4.590000 2.640000 4.920000 3.245000 ;
-        RECT 5.480000 2.640000 5.810000 3.245000 ;
-        RECT 6.385000 2.105000 6.715000 3.245000 ;
-        RECT 7.245000 2.105000 7.575000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.330000 0.625000 0.670000 ;
-      RECT 0.095000 0.670000 0.365000 2.320000 ;
-      RECT 0.095000 2.320000 1.125000 2.490000 ;
-      RECT 0.095000 2.490000 0.365000 3.000000 ;
-      RECT 0.955000 2.490000 1.125000 2.830000 ;
-      RECT 0.955000 2.830000 2.010000 3.000000 ;
-      RECT 1.295000 0.330000 1.495000 1.395000 ;
-      RECT 1.295000 1.395000 1.920000 1.655000 ;
-      RECT 1.295000 1.655000 1.505000 2.660000 ;
-      RECT 1.675000 2.275000 2.835000 2.445000 ;
-      RECT 1.675000 2.445000 2.010000 2.830000 ;
-      RECT 1.745000 1.825000 2.270000 2.105000 ;
-      RECT 1.900000 0.735000 2.110000 1.055000 ;
-      RECT 1.900000 1.055000 3.375000 1.225000 ;
-      RECT 2.100000 1.225000 2.270000 1.825000 ;
-      RECT 2.505000 1.405000 2.835000 2.275000 ;
-      RECT 2.820000 0.255000 3.735000 0.495000 ;
-      RECT 2.820000 0.495000 2.990000 1.055000 ;
-      RECT 3.045000 1.225000 3.375000 2.075000 ;
-      RECT 3.170000 0.665000 3.725000 0.885000 ;
-      RECT 3.190000 2.245000 3.725000 2.885000 ;
-      RECT 3.545000 0.885000 3.725000 1.065000 ;
-      RECT 3.545000 1.065000 4.775000 1.235000 ;
-      RECT 3.545000 1.235000 3.725000 2.245000 ;
-      RECT 3.950000 1.405000 4.280000 2.300000 ;
-      RECT 3.950000 2.300000 5.855000 2.470000 ;
-      RECT 4.525000 1.235000 4.775000 1.515000 ;
-      RECT 4.590000 0.255000 4.920000 0.725000 ;
-      RECT 4.590000 0.725000 5.115000 0.870000 ;
-      RECT 4.590000 0.870000 5.855000 0.895000 ;
-      RECT 4.945000 0.895000 5.855000 1.040000 ;
-      RECT 5.090000 2.470000 5.310000 3.075000 ;
-      RECT 5.685000 1.040000 5.855000 1.425000 ;
-      RECT 5.685000 1.425000 7.175000 1.595000 ;
-      RECT 5.685000 1.595000 5.855000 2.300000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.095000  0.330000 0.625000 0.670000 ;
+      RECT 0.095000  0.670000 0.365000 2.320000 ;
+      RECT 0.095000  2.320000 1.125000 2.490000 ;
+      RECT 0.095000  2.490000 0.365000 3.000000 ;
+      RECT 0.535000  2.660000 0.785000 3.245000 ;
+      RECT 0.795000  0.085000 1.125000 0.670000 ;
+      RECT 0.955000  2.490000 1.125000 2.830000 ;
+      RECT 0.955000  2.830000 2.010000 3.000000 ;
+      RECT 1.295000  0.330000 1.495000 1.395000 ;
+      RECT 1.295000  1.395000 1.920000 1.655000 ;
+      RECT 1.295000  1.655000 1.505000 2.660000 ;
+      RECT 1.675000  2.275000 2.835000 2.445000 ;
+      RECT 1.675000  2.445000 2.010000 2.830000 ;
+      RECT 1.745000  1.825000 2.270000 2.105000 ;
+      RECT 1.900000  0.735000 2.110000 1.055000 ;
+      RECT 1.900000  1.055000 3.375000 1.225000 ;
+      RECT 2.100000  1.225000 2.270000 1.825000 ;
+      RECT 2.290000  0.085000 2.620000 0.875000 ;
+      RECT 2.325000  2.615000 2.655000 3.245000 ;
+      RECT 2.505000  1.405000 2.835000 2.275000 ;
+      RECT 2.820000  0.255000 3.735000 0.495000 ;
+      RECT 2.820000  0.495000 2.990000 1.055000 ;
+      RECT 3.045000  1.225000 3.375000 2.075000 ;
+      RECT 3.170000  0.665000 3.725000 0.885000 ;
+      RECT 3.190000  2.245000 3.725000 2.885000 ;
+      RECT 3.545000  0.885000 3.725000 1.065000 ;
+      RECT 3.545000  1.065000 4.775000 1.235000 ;
+      RECT 3.545000  1.235000 3.725000 2.245000 ;
+      RECT 3.950000  1.405000 4.280000 2.300000 ;
+      RECT 3.950000  2.300000 5.855000 2.470000 ;
+      RECT 4.070000  0.085000 4.400000 0.895000 ;
+      RECT 4.525000  1.235000 4.775000 1.515000 ;
+      RECT 4.590000  0.255000 4.920000 0.725000 ;
+      RECT 4.590000  0.725000 5.115000 0.870000 ;
+      RECT 4.590000  0.870000 5.855000 0.895000 ;
+      RECT 4.590000  2.640000 4.920000 3.245000 ;
+      RECT 4.945000  0.895000 5.855000 1.040000 ;
+      RECT 5.090000  2.470000 5.310000 3.075000 ;
+      RECT 5.445000  0.085000 5.775000 0.700000 ;
+      RECT 5.480000  2.640000 5.810000 3.245000 ;
+      RECT 5.685000  1.040000 5.855000 1.425000 ;
+      RECT 5.685000  1.425000 7.175000 1.595000 ;
+      RECT 5.685000  1.595000 5.855000 2.300000 ;
+      RECT 6.385000  0.085000 6.715000 0.915000 ;
+      RECT 6.385000  2.105000 6.715000 3.245000 ;
+      RECT 7.245000  0.085000 7.575000 0.915000 ;
+      RECT 7.245000  2.105000 7.575000 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_lp__dlrtn_4
diff --git a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef
index 87d699a..35266e2 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.magic.lef
@@ -71,29 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.675000 ;
-        RECT 3.105000  0.085000 3.435000 0.485000 ;
-        RECT 5.175000  0.085000 5.425000 0.675000 ;
-        RECT 6.445000  0.085000 6.775000 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 ;
-        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
@@ -102,66 +79,86 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.765000 2.845000 1.095000 3.245000 ;
-        RECT 2.755000 2.095000 3.005000 3.245000 ;
-        RECT 5.175000 2.055000 5.505000 3.245000 ;
-        RECT 6.395000 2.405000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.265000 0.445000 0.675000 ;
-      RECT 0.110000 0.675000 0.280000 2.055000 ;
-      RECT 0.110000 2.055000 0.565000 2.495000 ;
-      RECT 0.110000 2.495000 1.445000 2.665000 ;
-      RECT 0.110000 2.665000 0.565000 3.065000 ;
-      RECT 1.275000 2.665000 2.575000 2.835000 ;
-      RECT 1.295000 2.055000 1.875000 2.315000 ;
-      RECT 1.570000 0.295000 2.055000 0.485000 ;
-      RECT 1.570000 0.485000 1.875000 2.055000 ;
-      RECT 2.055000 0.665000 4.645000 0.835000 ;
-      RECT 2.055000 0.835000 2.225000 2.485000 ;
-      RECT 2.315000 0.265000 2.645000 0.665000 ;
-      RECT 2.405000 1.585000 3.230000 1.915000 ;
-      RECT 2.405000 1.915000 2.575000 2.665000 ;
-      RECT 2.440000 1.015000 4.130000 1.345000 ;
-      RECT 3.440000 1.585000 4.480000 1.755000 ;
-      RECT 3.440000 1.755000 3.770000 1.915000 ;
-      RECT 3.950000 2.055000 4.995000 2.225000 ;
-      RECT 3.950000 2.225000 4.280000 3.065000 ;
-      RECT 4.035000 0.295000 4.995000 0.485000 ;
-      RECT 4.310000 0.835000 4.645000 1.435000 ;
-      RECT 4.310000 1.435000 4.480000 1.585000 ;
-      RECT 4.825000 0.485000 4.995000 1.425000 ;
-      RECT 4.825000 1.425000 5.705000 1.755000 ;
-      RECT 4.825000 1.755000 4.995000 2.055000 ;
-      RECT 5.175000 0.855000 7.040000 1.025000 ;
-      RECT 5.175000 1.025000 5.505000 1.185000 ;
-      RECT 5.655000 0.265000 5.985000 0.855000 ;
-      RECT 5.865000 2.055000 6.850000 2.225000 ;
-      RECT 5.865000 2.225000 6.195000 3.065000 ;
-      RECT 6.680000 1.025000 7.040000 1.525000 ;
-      RECT 6.680000 1.525000 6.850000 2.055000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.110000  0.265000 0.445000 0.675000 ;
+      RECT 0.110000  0.675000 0.280000 2.055000 ;
+      RECT 0.110000  2.055000 0.565000 2.495000 ;
+      RECT 0.110000  2.495000 1.445000 2.665000 ;
+      RECT 0.110000  2.665000 0.565000 3.065000 ;
+      RECT 0.765000  2.845000 1.095000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.675000 ;
+      RECT 1.275000  2.665000 2.575000 2.835000 ;
+      RECT 1.295000  2.055000 1.875000 2.315000 ;
+      RECT 1.570000  0.295000 2.055000 0.485000 ;
+      RECT 1.570000  0.485000 1.875000 2.055000 ;
+      RECT 2.055000  0.665000 4.645000 0.835000 ;
+      RECT 2.055000  0.835000 2.225000 2.485000 ;
+      RECT 2.315000  0.265000 2.645000 0.665000 ;
+      RECT 2.405000  1.585000 3.230000 1.915000 ;
+      RECT 2.405000  1.915000 2.575000 2.665000 ;
+      RECT 2.440000  1.015000 4.130000 1.345000 ;
+      RECT 2.755000  2.095000 3.005000 3.245000 ;
+      RECT 3.105000  0.085000 3.435000 0.485000 ;
+      RECT 3.440000  1.585000 4.480000 1.755000 ;
+      RECT 3.440000  1.755000 3.770000 1.915000 ;
+      RECT 3.950000  2.055000 4.995000 2.225000 ;
+      RECT 3.950000  2.225000 4.280000 3.065000 ;
+      RECT 4.035000  0.295000 4.995000 0.485000 ;
+      RECT 4.310000  0.835000 4.645000 1.435000 ;
+      RECT 4.310000  1.435000 4.480000 1.585000 ;
+      RECT 4.825000  0.485000 4.995000 1.425000 ;
+      RECT 4.825000  1.425000 5.705000 1.755000 ;
+      RECT 4.825000  1.755000 4.995000 2.055000 ;
+      RECT 5.175000  0.085000 5.425000 0.675000 ;
+      RECT 5.175000  0.855000 7.040000 1.025000 ;
+      RECT 5.175000  1.025000 5.505000 1.185000 ;
+      RECT 5.175000  2.055000 5.505000 3.245000 ;
+      RECT 5.655000  0.265000 5.985000 0.855000 ;
+      RECT 5.865000  2.055000 6.850000 2.225000 ;
+      RECT 5.865000  2.225000 6.195000 3.065000 ;
+      RECT 6.395000  2.405000 6.725000 3.245000 ;
+      RECT 6.445000  0.085000 6.775000 0.675000 ;
+      RECT 6.680000  1.025000 7.040000 1.525000 ;
+      RECT 6.680000  1.525000 6.850000 2.055000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrtn_lp
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef
index 2713a6e..b79da83 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.magic.lef
@@ -73,27 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.715000  0.085000 1.045000 0.670000 ;
-        RECT 2.530000  0.085000 2.810000 0.535000 ;
-        RECT 4.345000  0.085000 4.595000 0.555000 ;
-        RECT 5.775000  0.085000 5.990000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 6.720000 0.245000 ;
     END
@@ -102,72 +81,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.655000 2.300000 0.845000 3.245000 ;
-        RECT 2.590000 2.345000 2.820000 3.245000 ;
-        RECT 4.365000 2.400000 4.915000 2.640000 ;
-        RECT 4.365000 2.640000 5.085000 3.245000 ;
-        RECT 5.725000 2.640000 6.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 ;
-        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.165000 0.390000 0.455000 1.960000 ;
-      RECT 0.165000 1.960000 1.185000 2.130000 ;
-      RECT 0.165000 2.130000 0.455000 2.980000 ;
-      RECT 1.015000 2.130000 1.185000 2.905000 ;
-      RECT 1.015000 2.905000 2.420000 3.075000 ;
-      RECT 1.220000 0.330000 1.725000 0.670000 ;
-      RECT 1.355000 2.405000 1.725000 2.735000 ;
-      RECT 1.545000 0.670000 1.725000 2.405000 ;
-      RECT 1.895000 0.255000 2.360000 0.535000 ;
-      RECT 1.895000 0.535000 2.075000 1.195000 ;
-      RECT 1.895000 1.195000 3.475000 1.365000 ;
-      RECT 1.895000 1.365000 2.080000 2.735000 ;
-      RECT 2.245000 0.705000 3.825000 0.875000 ;
-      RECT 2.245000 0.875000 2.575000 1.025000 ;
-      RECT 2.250000 1.535000 2.810000 2.175000 ;
-      RECT 2.250000 2.175000 2.420000 2.905000 ;
-      RECT 2.990000 1.365000 3.160000 2.905000 ;
-      RECT 2.990000 2.905000 4.050000 3.075000 ;
-      RECT 3.145000 1.045000 3.475000 1.195000 ;
-      RECT 3.340000 1.605000 4.915000 1.775000 ;
-      RECT 3.340000 1.775000 3.510000 2.405000 ;
-      RECT 3.340000 2.405000 3.700000 2.735000 ;
-      RECT 3.380000 0.315000 4.175000 0.535000 ;
-      RECT 3.655000 0.875000 3.825000 1.175000 ;
-      RECT 3.655000 1.175000 4.015000 1.435000 ;
-      RECT 3.690000 1.945000 4.050000 2.205000 ;
-      RECT 3.880000 2.205000 4.050000 2.905000 ;
-      RECT 4.005000 0.535000 4.175000 0.725000 ;
-      RECT 4.005000 0.725000 4.705000 0.895000 ;
-      RECT 4.230000 1.945000 5.255000 2.205000 ;
-      RECT 4.535000 0.895000 4.705000 1.335000 ;
-      RECT 4.535000 1.335000 4.915000 1.605000 ;
-      RECT 4.875000 0.345000 5.255000 1.165000 ;
-      RECT 5.085000 1.165000 5.255000 1.945000 ;
-      RECT 5.085000 2.205000 5.255000 2.300000 ;
-      RECT 5.085000 2.300000 6.090000 2.470000 ;
-      RECT 5.255000 2.470000 5.555000 3.075000 ;
-      RECT 5.920000 1.340000 6.280000 1.670000 ;
-      RECT 5.920000 1.670000 6.090000 2.300000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.165000  0.390000 0.455000 1.960000 ;
+      RECT 0.165000  1.960000 1.185000 2.130000 ;
+      RECT 0.165000  2.130000 0.455000 2.980000 ;
+      RECT 0.655000  2.300000 0.845000 3.245000 ;
+      RECT 0.715000  0.085000 1.045000 0.670000 ;
+      RECT 1.015000  2.130000 1.185000 2.905000 ;
+      RECT 1.015000  2.905000 2.420000 3.075000 ;
+      RECT 1.220000  0.330000 1.725000 0.670000 ;
+      RECT 1.355000  2.405000 1.725000 2.735000 ;
+      RECT 1.545000  0.670000 1.725000 2.405000 ;
+      RECT 1.895000  0.255000 2.360000 0.535000 ;
+      RECT 1.895000  0.535000 2.075000 1.195000 ;
+      RECT 1.895000  1.195000 3.475000 1.365000 ;
+      RECT 1.895000  1.365000 2.080000 2.735000 ;
+      RECT 2.245000  0.705000 3.825000 0.875000 ;
+      RECT 2.245000  0.875000 2.575000 1.025000 ;
+      RECT 2.250000  1.535000 2.810000 2.175000 ;
+      RECT 2.250000  2.175000 2.420000 2.905000 ;
+      RECT 2.530000  0.085000 2.810000 0.535000 ;
+      RECT 2.590000  2.345000 2.820000 3.245000 ;
+      RECT 2.990000  1.365000 3.160000 2.905000 ;
+      RECT 2.990000  2.905000 4.050000 3.075000 ;
+      RECT 3.145000  1.045000 3.475000 1.195000 ;
+      RECT 3.340000  1.605000 4.915000 1.775000 ;
+      RECT 3.340000  1.775000 3.510000 2.405000 ;
+      RECT 3.340000  2.405000 3.700000 2.735000 ;
+      RECT 3.380000  0.315000 4.175000 0.535000 ;
+      RECT 3.655000  0.875000 3.825000 1.175000 ;
+      RECT 3.655000  1.175000 4.015000 1.435000 ;
+      RECT 3.690000  1.945000 4.050000 2.205000 ;
+      RECT 3.880000  2.205000 4.050000 2.905000 ;
+      RECT 4.005000  0.535000 4.175000 0.725000 ;
+      RECT 4.005000  0.725000 4.705000 0.895000 ;
+      RECT 4.230000  1.945000 5.255000 2.205000 ;
+      RECT 4.345000  0.085000 4.595000 0.555000 ;
+      RECT 4.365000  2.400000 4.915000 2.640000 ;
+      RECT 4.365000  2.640000 5.085000 3.245000 ;
+      RECT 4.535000  0.895000 4.705000 1.335000 ;
+      RECT 4.535000  1.335000 4.915000 1.605000 ;
+      RECT 4.875000  0.345000 5.255000 1.165000 ;
+      RECT 5.085000  1.165000 5.255000 1.945000 ;
+      RECT 5.085000  2.205000 5.255000 2.300000 ;
+      RECT 5.085000  2.300000 6.090000 2.470000 ;
+      RECT 5.255000  2.470000 5.555000 3.075000 ;
+      RECT 5.725000  2.640000 6.055000 3.245000 ;
+      RECT 5.775000  0.085000 5.990000 1.170000 ;
+      RECT 5.920000  1.340000 6.280000 1.670000 ;
+      RECT 5.920000  1.670000 6.090000 2.300000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrtp_1
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef
index 651ee24..c30893c 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.magic.lef
@@ -72,29 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.975000  0.085000 1.175000 0.645000 ;
-        RECT 2.465000  0.085000 2.745000 0.535000 ;
-        RECT 4.280000  0.085000 4.480000 0.555000 ;
-        RECT 5.605000  0.085000 5.935000 1.040000 ;
-        RECT 6.735000  0.085000 6.985000 1.225000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -103,76 +80,96 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.600000 2.695000 0.850000 3.245000 ;
-        RECT 2.645000 2.395000 2.835000 3.245000 ;
-        RECT 4.290000 2.440000 4.785000 2.630000 ;
-        RECT 4.290000 2.630000 5.050000 3.245000 ;
-        RECT 5.750000 2.265000 6.080000 3.245000 ;
-        RECT 6.735000 1.815000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 0.315000 0.410000 2.355000 ;
-      RECT 0.160000 2.355000 1.190000 2.525000 ;
-      RECT 0.160000 2.525000 0.430000 3.025000 ;
-      RECT 1.020000 2.525000 1.190000 2.885000 ;
-      RECT 1.020000 2.885000 2.475000 3.055000 ;
-      RECT 1.360000 2.355000 1.715000 2.715000 ;
-      RECT 1.425000 0.330000 1.650000 0.660000 ;
-      RECT 1.480000 0.660000 1.650000 1.885000 ;
-      RECT 1.480000 1.885000 1.715000 2.355000 ;
-      RECT 1.820000 0.255000 2.295000 0.535000 ;
-      RECT 1.820000 0.535000 2.010000 1.535000 ;
-      RECT 1.820000 1.535000 3.175000 1.705000 ;
-      RECT 1.885000 1.705000 2.135000 2.715000 ;
-      RECT 2.180000 0.705000 3.760000 0.875000 ;
-      RECT 2.180000 0.875000 2.510000 1.365000 ;
-      RECT 2.305000 1.895000 2.835000 2.225000 ;
-      RECT 2.305000 2.225000 2.475000 2.885000 ;
-      RECT 3.005000 1.045000 3.410000 1.305000 ;
-      RECT 3.005000 1.305000 3.175000 1.535000 ;
-      RECT 3.005000 1.705000 3.175000 2.825000 ;
-      RECT 3.005000 2.825000 4.070000 2.995000 ;
-      RECT 3.315000 0.255000 4.110000 0.535000 ;
-      RECT 3.355000 1.555000 4.775000 1.725000 ;
-      RECT 3.355000 1.725000 3.525000 2.405000 ;
-      RECT 3.355000 2.405000 3.720000 2.655000 ;
-      RECT 3.590000 0.875000 3.760000 1.125000 ;
-      RECT 3.590000 1.125000 3.950000 1.385000 ;
-      RECT 3.705000 1.905000 4.070000 2.235000 ;
-      RECT 3.900000 2.235000 4.070000 2.825000 ;
-      RECT 3.940000 0.535000 4.110000 0.725000 ;
-      RECT 3.940000 0.725000 4.640000 0.895000 ;
-      RECT 4.240000 1.905000 5.125000 1.925000 ;
-      RECT 4.240000 1.925000 6.215000 2.095000 ;
-      RECT 4.240000 2.095000 5.470000 2.235000 ;
-      RECT 4.470000 0.895000 4.640000 1.335000 ;
-      RECT 4.470000 1.335000 4.775000 1.555000 ;
-      RECT 4.810000 0.345000 5.125000 1.165000 ;
-      RECT 4.955000 1.165000 5.125000 1.905000 ;
-      RECT 4.955000 2.235000 5.470000 2.460000 ;
-      RECT 5.220000 2.460000 5.470000 3.075000 ;
-      RECT 5.965000 1.345000 6.215000 1.925000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.160000  0.315000 0.410000 2.355000 ;
+      RECT 0.160000  2.355000 1.190000 2.525000 ;
+      RECT 0.160000  2.525000 0.430000 3.025000 ;
+      RECT 0.600000  2.695000 0.850000 3.245000 ;
+      RECT 0.975000  0.085000 1.175000 0.645000 ;
+      RECT 1.020000  2.525000 1.190000 2.885000 ;
+      RECT 1.020000  2.885000 2.475000 3.055000 ;
+      RECT 1.360000  2.355000 1.715000 2.715000 ;
+      RECT 1.425000  0.330000 1.650000 0.660000 ;
+      RECT 1.480000  0.660000 1.650000 1.885000 ;
+      RECT 1.480000  1.885000 1.715000 2.355000 ;
+      RECT 1.820000  0.255000 2.295000 0.535000 ;
+      RECT 1.820000  0.535000 2.010000 1.535000 ;
+      RECT 1.820000  1.535000 3.175000 1.705000 ;
+      RECT 1.885000  1.705000 2.135000 2.715000 ;
+      RECT 2.180000  0.705000 3.760000 0.875000 ;
+      RECT 2.180000  0.875000 2.510000 1.365000 ;
+      RECT 2.305000  1.895000 2.835000 2.225000 ;
+      RECT 2.305000  2.225000 2.475000 2.885000 ;
+      RECT 2.465000  0.085000 2.745000 0.535000 ;
+      RECT 2.645000  2.395000 2.835000 3.245000 ;
+      RECT 3.005000  1.045000 3.410000 1.305000 ;
+      RECT 3.005000  1.305000 3.175000 1.535000 ;
+      RECT 3.005000  1.705000 3.175000 2.825000 ;
+      RECT 3.005000  2.825000 4.070000 2.995000 ;
+      RECT 3.315000  0.255000 4.110000 0.535000 ;
+      RECT 3.355000  1.555000 4.775000 1.725000 ;
+      RECT 3.355000  1.725000 3.525000 2.405000 ;
+      RECT 3.355000  2.405000 3.720000 2.655000 ;
+      RECT 3.590000  0.875000 3.760000 1.125000 ;
+      RECT 3.590000  1.125000 3.950000 1.385000 ;
+      RECT 3.705000  1.905000 4.070000 2.235000 ;
+      RECT 3.900000  2.235000 4.070000 2.825000 ;
+      RECT 3.940000  0.535000 4.110000 0.725000 ;
+      RECT 3.940000  0.725000 4.640000 0.895000 ;
+      RECT 4.240000  1.905000 5.125000 1.925000 ;
+      RECT 4.240000  1.925000 6.215000 2.095000 ;
+      RECT 4.240000  2.095000 5.470000 2.235000 ;
+      RECT 4.280000  0.085000 4.480000 0.555000 ;
+      RECT 4.290000  2.440000 4.785000 2.630000 ;
+      RECT 4.290000  2.630000 5.050000 3.245000 ;
+      RECT 4.470000  0.895000 4.640000 1.335000 ;
+      RECT 4.470000  1.335000 4.775000 1.555000 ;
+      RECT 4.810000  0.345000 5.125000 1.165000 ;
+      RECT 4.955000  1.165000 5.125000 1.905000 ;
+      RECT 4.955000  2.235000 5.470000 2.460000 ;
+      RECT 5.220000  2.460000 5.470000 3.075000 ;
+      RECT 5.605000  0.085000 5.935000 1.040000 ;
+      RECT 5.750000  2.265000 6.080000 3.245000 ;
+      RECT 5.965000  1.345000 6.215000 1.925000 ;
+      RECT 6.735000  0.085000 6.985000 1.225000 ;
+      RECT 6.735000  1.815000 7.075000 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_lp__dlrtp_2
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef
index 1793c19..6220c4b 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.magic.lef
@@ -79,32 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.975000  0.085000 1.165000 0.670000 ;
-        RECT 2.540000  0.085000 2.870000 0.485000 ;
-        RECT 4.435000  0.085000 4.740000 0.555000 ;
-        RECT 5.900000  0.085000 6.230000 0.700000 ;
-        RECT 6.795000  0.085000 7.055000 0.895000 ;
-        RECT 7.620000  0.085000 7.950000 0.935000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -113,80 +87,103 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.645000 2.640000 0.895000 3.245000 ;
-        RECT 2.835000 2.335000 3.035000 3.245000 ;
-        RECT 4.960000 2.630000 5.290000 3.245000 ;
-        RECT 5.850000 2.630000 6.180000 3.245000 ;
-        RECT 6.755000 2.085000 7.085000 3.245000 ;
-        RECT 7.615000 2.085000 7.945000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.205000 0.395000 0.455000 2.300000 ;
-      RECT 0.205000 2.300000 1.235000 2.470000 ;
-      RECT 0.205000 2.470000 0.475000 2.970000 ;
-      RECT 1.065000 2.470000 1.235000 2.905000 ;
-      RECT 1.065000 2.905000 2.665000 3.075000 ;
-      RECT 1.335000 0.395000 1.715000 0.670000 ;
-      RECT 1.405000 2.300000 1.715000 2.665000 ;
-      RECT 1.545000 0.670000 1.715000 1.535000 ;
-      RECT 1.545000 1.535000 1.965000 2.155000 ;
-      RECT 1.545000 2.155000 1.715000 2.300000 ;
-      RECT 1.895000 0.285000 2.360000 0.485000 ;
-      RECT 1.895000 0.485000 2.065000 1.195000 ;
-      RECT 1.895000 1.195000 3.535000 1.255000 ;
-      RECT 1.895000 1.255000 3.375000 1.365000 ;
-      RECT 2.030000 2.405000 2.325000 2.735000 ;
-      RECT 2.145000 1.365000 2.325000 2.405000 ;
-      RECT 2.245000 0.655000 3.915000 0.825000 ;
-      RECT 2.245000 0.825000 2.575000 1.025000 ;
-      RECT 2.495000 1.535000 3.025000 2.165000 ;
-      RECT 2.495000 2.165000 2.665000 2.905000 ;
-      RECT 3.205000 0.995000 3.535000 1.195000 ;
-      RECT 3.205000 1.365000 3.375000 2.885000 ;
-      RECT 3.205000 2.885000 4.210000 3.075000 ;
-      RECT 3.440000 0.265000 4.265000 0.485000 ;
-      RECT 3.555000 1.475000 5.055000 1.645000 ;
-      RECT 3.555000 1.645000 3.725000 2.385000 ;
-      RECT 3.555000 2.385000 3.870000 2.715000 ;
-      RECT 3.745000 0.825000 3.915000 1.065000 ;
-      RECT 3.745000 1.065000 4.075000 1.305000 ;
-      RECT 3.895000 1.855000 4.210000 2.185000 ;
-      RECT 4.040000 2.185000 4.210000 2.885000 ;
-      RECT 4.085000 0.485000 4.265000 0.725000 ;
-      RECT 4.085000 0.725000 4.425000 0.895000 ;
-      RECT 4.255000 0.895000 4.425000 1.315000 ;
-      RECT 4.255000 1.315000 5.055000 1.475000 ;
-      RECT 4.380000 1.855000 4.695000 2.290000 ;
-      RECT 4.380000 2.290000 6.225000 2.460000 ;
-      RECT 5.020000 0.360000 5.230000 0.870000 ;
-      RECT 5.020000 0.870000 6.230000 1.040000 ;
-      RECT 5.460000 2.460000 5.660000 3.075000 ;
-      RECT 6.055000 1.040000 6.230000 1.405000 ;
-      RECT 6.055000 1.405000 7.175000 1.575000 ;
-      RECT 6.055000 1.575000 6.225000 2.290000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.205000  0.395000 0.455000 2.300000 ;
+      RECT 0.205000  2.300000 1.235000 2.470000 ;
+      RECT 0.205000  2.470000 0.475000 2.970000 ;
+      RECT 0.645000  2.640000 0.895000 3.245000 ;
+      RECT 0.975000  0.085000 1.165000 0.670000 ;
+      RECT 1.065000  2.470000 1.235000 2.905000 ;
+      RECT 1.065000  2.905000 2.665000 3.075000 ;
+      RECT 1.335000  0.395000 1.715000 0.670000 ;
+      RECT 1.405000  2.300000 1.715000 2.665000 ;
+      RECT 1.545000  0.670000 1.715000 1.535000 ;
+      RECT 1.545000  1.535000 1.965000 2.155000 ;
+      RECT 1.545000  2.155000 1.715000 2.300000 ;
+      RECT 1.895000  0.285000 2.360000 0.485000 ;
+      RECT 1.895000  0.485000 2.065000 1.195000 ;
+      RECT 1.895000  1.195000 3.535000 1.255000 ;
+      RECT 1.895000  1.255000 3.375000 1.365000 ;
+      RECT 2.030000  2.405000 2.325000 2.735000 ;
+      RECT 2.145000  1.365000 2.325000 2.405000 ;
+      RECT 2.245000  0.655000 3.915000 0.825000 ;
+      RECT 2.245000  0.825000 2.575000 1.025000 ;
+      RECT 2.495000  1.535000 3.025000 2.165000 ;
+      RECT 2.495000  2.165000 2.665000 2.905000 ;
+      RECT 2.540000  0.085000 2.870000 0.485000 ;
+      RECT 2.835000  2.335000 3.035000 3.245000 ;
+      RECT 3.205000  0.995000 3.535000 1.195000 ;
+      RECT 3.205000  1.365000 3.375000 2.885000 ;
+      RECT 3.205000  2.885000 4.210000 3.075000 ;
+      RECT 3.440000  0.265000 4.265000 0.485000 ;
+      RECT 3.555000  1.475000 5.055000 1.645000 ;
+      RECT 3.555000  1.645000 3.725000 2.385000 ;
+      RECT 3.555000  2.385000 3.870000 2.715000 ;
+      RECT 3.745000  0.825000 3.915000 1.065000 ;
+      RECT 3.745000  1.065000 4.075000 1.305000 ;
+      RECT 3.895000  1.855000 4.210000 2.185000 ;
+      RECT 4.040000  2.185000 4.210000 2.885000 ;
+      RECT 4.085000  0.485000 4.265000 0.725000 ;
+      RECT 4.085000  0.725000 4.425000 0.895000 ;
+      RECT 4.255000  0.895000 4.425000 1.315000 ;
+      RECT 4.255000  1.315000 5.055000 1.475000 ;
+      RECT 4.380000  1.855000 4.695000 2.290000 ;
+      RECT 4.380000  2.290000 6.225000 2.460000 ;
+      RECT 4.435000  0.085000 4.740000 0.555000 ;
+      RECT 4.960000  2.630000 5.290000 3.245000 ;
+      RECT 5.020000  0.360000 5.230000 0.870000 ;
+      RECT 5.020000  0.870000 6.230000 1.040000 ;
+      RECT 5.460000  2.460000 5.660000 3.075000 ;
+      RECT 5.850000  2.630000 6.180000 3.245000 ;
+      RECT 5.900000  0.085000 6.230000 0.700000 ;
+      RECT 6.055000  1.040000 6.230000 1.405000 ;
+      RECT 6.055000  1.405000 7.175000 1.575000 ;
+      RECT 6.055000  1.575000 6.225000 2.290000 ;
+      RECT 6.755000  2.085000 7.085000 3.245000 ;
+      RECT 6.795000  0.085000 7.055000 0.895000 ;
+      RECT 7.615000  2.085000 7.945000 3.245000 ;
+      RECT 7.620000  0.085000 7.950000 0.935000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrtp_4
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef
index 018305c..cebbf24 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.magic.lef
@@ -71,35 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.115000  0.085000  0.445000 0.725000 ;
-        RECT 2.375000  0.085000  2.705000 0.715000 ;
-        RECT 5.655000  0.085000  5.985000 0.815000 ;
-        RECT 7.915000  0.085000  8.245000 0.465000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -108,87 +79,113 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 0.115000 2.330000  0.445000 3.245000 ;
-        RECT 2.405000 1.940000  2.735000 3.245000 ;
-        RECT 5.945000 2.045000  6.275000 3.245000 ;
-        RECT 7.590000 2.675000  7.840000 3.245000 ;
-        RECT 9.290000 2.165000  9.620000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.905000 0.265000 2.150000 0.435000 ;
-      RECT 0.905000 0.435000 1.235000 0.725000 ;
-      RECT 0.905000 2.330000 1.235000 3.010000 ;
-      RECT 1.065000 0.725000 1.235000 2.330000 ;
-      RECT 1.465000 0.615000 1.800000 3.065000 ;
-      RECT 1.980000 0.435000 2.150000 0.895000 ;
-      RECT 1.980000 0.895000 2.310000 1.590000 ;
-      RECT 1.980000 1.590000 3.320000 1.760000 ;
-      RECT 3.150000 0.895000 3.760000 1.225000 ;
-      RECT 3.150000 1.225000 3.320000 1.590000 ;
-      RECT 3.165000 0.345000 3.495000 0.545000 ;
-      RECT 3.165000 0.545000 4.110000 0.715000 ;
-      RECT 3.500000 1.405000 4.110000 1.575000 ;
-      RECT 3.500000 1.575000 3.750000 2.735000 ;
-      RECT 3.500000 2.735000 5.765000 3.065000 ;
-      RECT 3.940000 0.715000 4.110000 1.405000 ;
-      RECT 3.980000 1.755000 4.310000 2.385000 ;
-      RECT 3.980000 2.385000 5.765000 2.555000 ;
-      RECT 4.290000 0.265000 5.435000 0.435000 ;
-      RECT 4.290000 0.435000 4.620000 0.945000 ;
-      RECT 4.490000 1.345000 7.550000 1.515000 ;
-      RECT 4.490000 1.515000 4.740000 2.205000 ;
-      RECT 4.835000 0.615000 5.085000 1.345000 ;
-      RECT 4.955000 1.695000 6.820000 1.865000 ;
-      RECT 4.955000 1.865000 5.285000 2.155000 ;
-      RECT 5.265000 0.435000 5.435000 0.995000 ;
-      RECT 5.265000 0.995000 6.495000 1.165000 ;
-      RECT 5.515000 2.045000 5.765000 2.385000 ;
-      RECT 6.165000 0.485000 6.495000 0.995000 ;
-      RECT 6.490000 1.865000 6.820000 2.375000 ;
-      RECT 6.675000 0.265000 7.425000 0.645000 ;
-      RECT 6.675000 0.645000 9.245000 0.815000 ;
-      RECT 6.675000 0.815000 7.005000 0.935000 ;
-      RECT 7.080000 1.815000 7.410000 2.325000 ;
-      RECT 7.080000 2.325000 9.060000 2.495000 ;
-      RECT 7.080000 2.495000 7.410000 3.065000 ;
-      RECT 7.220000 0.995000 8.895000 1.165000 ;
-      RECT 7.220000 1.165000 7.550000 1.345000 ;
-      RECT 8.300000 1.815000 9.245000 1.985000 ;
-      RECT 8.300000 1.985000 8.630000 2.145000 ;
-      RECT 8.565000 1.165000 8.895000 1.625000 ;
-      RECT 8.810000 2.165000 9.060000 2.325000 ;
-      RECT 8.810000 2.495000 9.060000 3.065000 ;
-      RECT 9.075000 0.815000 9.245000 1.185000 ;
-      RECT 9.075000 1.185000 9.465000 1.515000 ;
-      RECT 9.075000 1.515000 9.245000 1.815000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.115000  0.085000  0.445000 0.725000 ;
+      RECT 0.115000  2.330000  0.445000 3.245000 ;
+      RECT 0.905000  0.265000  2.150000 0.435000 ;
+      RECT 0.905000  0.435000  1.235000 0.725000 ;
+      RECT 0.905000  2.330000  1.235000 3.010000 ;
+      RECT 1.065000  0.725000  1.235000 2.330000 ;
+      RECT 1.465000  0.615000  1.800000 3.065000 ;
+      RECT 1.980000  0.435000  2.150000 0.895000 ;
+      RECT 1.980000  0.895000  2.310000 1.590000 ;
+      RECT 1.980000  1.590000  3.320000 1.760000 ;
+      RECT 2.375000  0.085000  2.705000 0.715000 ;
+      RECT 2.405000  1.940000  2.735000 3.245000 ;
+      RECT 3.150000  0.895000  3.760000 1.225000 ;
+      RECT 3.150000  1.225000  3.320000 1.590000 ;
+      RECT 3.165000  0.345000  3.495000 0.545000 ;
+      RECT 3.165000  0.545000  4.110000 0.715000 ;
+      RECT 3.500000  1.405000  4.110000 1.575000 ;
+      RECT 3.500000  1.575000  3.750000 2.735000 ;
+      RECT 3.500000  2.735000  5.765000 3.065000 ;
+      RECT 3.940000  0.715000  4.110000 1.405000 ;
+      RECT 3.980000  1.755000  4.310000 2.385000 ;
+      RECT 3.980000  2.385000  5.765000 2.555000 ;
+      RECT 4.290000  0.265000  5.435000 0.435000 ;
+      RECT 4.290000  0.435000  4.620000 0.945000 ;
+      RECT 4.490000  1.345000  7.550000 1.515000 ;
+      RECT 4.490000  1.515000  4.740000 2.205000 ;
+      RECT 4.835000  0.615000  5.085000 1.345000 ;
+      RECT 4.955000  1.695000  6.820000 1.865000 ;
+      RECT 4.955000  1.865000  5.285000 2.155000 ;
+      RECT 5.265000  0.435000  5.435000 0.995000 ;
+      RECT 5.265000  0.995000  6.495000 1.165000 ;
+      RECT 5.515000  2.045000  5.765000 2.385000 ;
+      RECT 5.655000  0.085000  5.985000 0.815000 ;
+      RECT 5.945000  2.045000  6.275000 3.245000 ;
+      RECT 6.165000  0.485000  6.495000 0.995000 ;
+      RECT 6.490000  1.865000  6.820000 2.375000 ;
+      RECT 6.675000  0.265000  7.425000 0.645000 ;
+      RECT 6.675000  0.645000  9.245000 0.815000 ;
+      RECT 6.675000  0.815000  7.005000 0.935000 ;
+      RECT 7.080000  1.815000  7.410000 2.325000 ;
+      RECT 7.080000  2.325000  9.060000 2.495000 ;
+      RECT 7.080000  2.495000  7.410000 3.065000 ;
+      RECT 7.220000  0.995000  8.895000 1.165000 ;
+      RECT 7.220000  1.165000  7.550000 1.345000 ;
+      RECT 7.590000  2.675000  7.840000 3.245000 ;
+      RECT 7.915000  0.085000  8.245000 0.465000 ;
+      RECT 8.300000  1.815000  9.245000 1.985000 ;
+      RECT 8.300000  1.985000  8.630000 2.145000 ;
+      RECT 8.565000  1.165000  8.895000 1.625000 ;
+      RECT 8.810000  2.165000  9.060000 2.325000 ;
+      RECT 8.810000  2.495000  9.060000 3.065000 ;
+      RECT 9.075000  0.815000  9.245000 1.185000 ;
+      RECT 9.075000  1.185000  9.465000 1.515000 ;
+      RECT 9.075000  1.515000  9.245000 1.815000 ;
+      RECT 9.290000  2.165000  9.620000 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 ;
   END
 END sky130_fd_sc_lp__dlrtp_lp
diff --git a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef
index 85a6aed..03ac23f 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.magic.lef
@@ -71,29 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.935000  0.085000 1.265000 1.015000 ;
-        RECT 2.835000  0.085000 3.165000 0.545000 ;
-        RECT 5.050000  0.085000 5.380000 0.675000 ;
-        RECT 6.445000  0.085000 6.775000 0.695000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -102,77 +79,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.645000 2.785000 0.975000 3.245000 ;
-        RECT 2.615000 2.665000 2.945000 3.245000 ;
-        RECT 5.290000 2.075000 5.620000 3.245000 ;
-        RECT 6.430000 2.075000 6.760000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.090000 0.590000 0.445000 1.015000 ;
-      RECT 0.090000 1.015000 0.260000 2.075000 ;
-      RECT 0.090000 2.075000 0.445000 2.435000 ;
-      RECT 0.090000 2.435000 1.985000 2.605000 ;
-      RECT 0.090000 2.605000 0.445000 3.065000 ;
-      RECT 1.255000 2.005000 1.635000 2.255000 ;
-      RECT 1.465000 1.455000 2.540000 1.785000 ;
-      RECT 1.465000 1.785000 1.635000 2.005000 ;
-      RECT 1.805000 0.905000 2.135000 1.455000 ;
-      RECT 1.815000 1.965000 3.040000 2.135000 ;
-      RECT 1.815000 2.135000 1.985000 2.435000 ;
-      RECT 2.045000 0.265000 2.485000 0.675000 ;
-      RECT 2.165000 2.315000 3.985000 2.485000 ;
-      RECT 2.165000 2.485000 2.415000 3.065000 ;
-      RECT 2.315000 0.675000 2.485000 0.725000 ;
-      RECT 2.315000 0.725000 3.860000 0.895000 ;
-      RECT 2.370000 1.075000 3.390000 1.245000 ;
-      RECT 2.370000 1.245000 2.540000 1.455000 ;
-      RECT 2.750000 1.425000 3.040000 1.965000 ;
-      RECT 3.220000 1.245000 3.390000 1.335000 ;
-      RECT 3.220000 1.335000 4.170000 1.665000 ;
-      RECT 3.570000 0.895000 3.860000 0.925000 ;
-      RECT 3.570000 0.925000 4.520000 1.095000 ;
-      RECT 3.795000 0.295000 4.870000 0.545000 ;
-      RECT 3.815000 1.845000 4.760000 2.015000 ;
-      RECT 3.815000 2.015000 3.985000 2.315000 ;
-      RECT 4.165000 2.195000 5.110000 2.365000 ;
-      RECT 4.165000 2.365000 4.495000 3.065000 ;
-      RECT 4.350000 1.095000 4.520000 1.265000 ;
-      RECT 4.350000 1.265000 4.760000 1.845000 ;
-      RECT 4.700000 0.545000 4.870000 0.855000 ;
-      RECT 4.700000 0.855000 5.110000 1.025000 ;
-      RECT 4.940000 1.025000 5.110000 1.425000 ;
-      RECT 4.940000 1.425000 5.720000 1.755000 ;
-      RECT 4.940000 1.755000 5.110000 2.195000 ;
-      RECT 5.290000 0.855000 6.070000 0.875000 ;
-      RECT 5.290000 0.875000 7.105000 1.025000 ;
-      RECT 5.290000 1.025000 5.620000 1.185000 ;
-      RECT 5.625000 0.265000 6.070000 0.855000 ;
-      RECT 5.900000 1.025000 7.105000 1.045000 ;
-      RECT 5.900000 1.045000 6.070000 2.075000 ;
-      RECT 5.900000 2.075000 6.230000 3.065000 ;
-      RECT 6.775000 1.045000 7.105000 1.545000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.090000  0.590000 0.445000 1.015000 ;
+      RECT 0.090000  1.015000 0.260000 2.075000 ;
+      RECT 0.090000  2.075000 0.445000 2.435000 ;
+      RECT 0.090000  2.435000 1.985000 2.605000 ;
+      RECT 0.090000  2.605000 0.445000 3.065000 ;
+      RECT 0.645000  2.785000 0.975000 3.245000 ;
+      RECT 0.935000  0.085000 1.265000 1.015000 ;
+      RECT 1.255000  2.005000 1.635000 2.255000 ;
+      RECT 1.465000  1.455000 2.540000 1.785000 ;
+      RECT 1.465000  1.785000 1.635000 2.005000 ;
+      RECT 1.805000  0.905000 2.135000 1.455000 ;
+      RECT 1.815000  1.965000 3.040000 2.135000 ;
+      RECT 1.815000  2.135000 1.985000 2.435000 ;
+      RECT 2.045000  0.265000 2.485000 0.675000 ;
+      RECT 2.165000  2.315000 3.985000 2.485000 ;
+      RECT 2.165000  2.485000 2.415000 3.065000 ;
+      RECT 2.315000  0.675000 2.485000 0.725000 ;
+      RECT 2.315000  0.725000 3.860000 0.895000 ;
+      RECT 2.370000  1.075000 3.390000 1.245000 ;
+      RECT 2.370000  1.245000 2.540000 1.455000 ;
+      RECT 2.615000  2.665000 2.945000 3.245000 ;
+      RECT 2.750000  1.425000 3.040000 1.965000 ;
+      RECT 2.835000  0.085000 3.165000 0.545000 ;
+      RECT 3.220000  1.245000 3.390000 1.335000 ;
+      RECT 3.220000  1.335000 4.170000 1.665000 ;
+      RECT 3.570000  0.895000 3.860000 0.925000 ;
+      RECT 3.570000  0.925000 4.520000 1.095000 ;
+      RECT 3.795000  0.295000 4.870000 0.545000 ;
+      RECT 3.815000  1.845000 4.760000 2.015000 ;
+      RECT 3.815000  2.015000 3.985000 2.315000 ;
+      RECT 4.165000  2.195000 5.110000 2.365000 ;
+      RECT 4.165000  2.365000 4.495000 3.065000 ;
+      RECT 4.350000  1.095000 4.520000 1.265000 ;
+      RECT 4.350000  1.265000 4.760000 1.845000 ;
+      RECT 4.700000  0.545000 4.870000 0.855000 ;
+      RECT 4.700000  0.855000 5.110000 1.025000 ;
+      RECT 4.940000  1.025000 5.110000 1.425000 ;
+      RECT 4.940000  1.425000 5.720000 1.755000 ;
+      RECT 4.940000  1.755000 5.110000 2.195000 ;
+      RECT 5.050000  0.085000 5.380000 0.675000 ;
+      RECT 5.290000  0.855000 6.070000 0.875000 ;
+      RECT 5.290000  0.875000 7.105000 1.025000 ;
+      RECT 5.290000  1.025000 5.620000 1.185000 ;
+      RECT 5.290000  2.075000 5.620000 3.245000 ;
+      RECT 5.625000  0.265000 6.070000 0.855000 ;
+      RECT 5.900000  1.025000 7.105000 1.045000 ;
+      RECT 5.900000  1.045000 6.070000 2.075000 ;
+      RECT 5.900000  2.075000 6.230000 3.065000 ;
+      RECT 6.430000  2.075000 6.760000 3.245000 ;
+      RECT 6.445000  0.085000 6.775000 0.695000 ;
+      RECT 6.775000  1.045000 7.105000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlrtp_lp2
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef
index a17448f..9eaf77c 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.magic.lef
@@ -71,31 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.675000  0.085000 0.890000 1.035000 ;
-        RECT 2.315000  0.085000 2.645000 0.505000 ;
-        RECT 4.290000  0.085000 4.600000 1.095000 ;
-        RECT 6.065000  0.085000 6.275000 0.905000 ;
-        RECT 7.305000  0.085000 7.635000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -104,78 +79,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.640000 2.455000 0.970000 3.245000 ;
-        RECT 2.350000 2.825000 2.680000 3.245000 ;
-        RECT 4.155000 2.425000 4.755000 3.245000 ;
-        RECT 6.090000 1.805000 6.350000 3.245000 ;
-        RECT 7.305000 1.815000 7.635000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.695000 0.505000 1.035000 ;
-      RECT 0.105000 1.035000 0.275000 2.045000 ;
-      RECT 0.105000 2.045000 0.460000 2.115000 ;
-      RECT 0.105000 2.115000 2.770000 2.285000 ;
-      RECT 0.105000 2.285000 0.460000 2.695000 ;
-      RECT 1.070000 0.845000 1.515000 1.195000 ;
-      RECT 1.070000 1.195000 3.240000 1.365000 ;
-      RECT 1.070000 1.365000 2.200000 1.945000 ;
-      RECT 1.775000 2.455000 3.145000 2.635000 ;
-      RECT 1.775000 2.635000 2.105000 3.075000 ;
-      RECT 1.945000 0.285000 2.135000 0.675000 ;
-      RECT 1.945000 0.675000 3.780000 0.845000 ;
-      RECT 2.440000 1.585000 2.770000 2.115000 ;
-      RECT 2.975000 1.925000 3.580000 2.225000 ;
-      RECT 2.975000 2.225000 3.145000 2.455000 ;
-      RECT 2.980000 1.015000 3.240000 1.195000 ;
-      RECT 2.980000 1.365000 3.240000 1.685000 ;
-      RECT 3.165000 0.275000 4.120000 0.485000 ;
-      RECT 3.315000 2.395000 3.930000 2.565000 ;
-      RECT 3.315000 2.565000 3.730000 3.065000 ;
-      RECT 3.410000 0.845000 3.780000 1.095000 ;
-      RECT 3.410000 1.095000 3.580000 1.925000 ;
-      RECT 3.760000 1.575000 4.120000 1.745000 ;
-      RECT 3.760000 1.745000 3.930000 2.395000 ;
-      RECT 3.950000 0.485000 4.120000 1.275000 ;
-      RECT 3.950000 1.275000 4.845000 1.445000 ;
-      RECT 3.950000 1.445000 4.120000 1.575000 ;
-      RECT 4.100000 1.925000 5.240000 2.255000 ;
-      RECT 4.585000 1.445000 4.845000 1.605000 ;
-      RECT 4.770000 0.255000 5.895000 0.675000 ;
-      RECT 4.770000 0.675000 5.195000 1.095000 ;
-      RECT 4.925000 2.255000 5.240000 3.075000 ;
-      RECT 5.015000 1.095000 5.195000 1.925000 ;
-      RECT 5.365000 0.855000 5.555000 1.415000 ;
-      RECT 5.365000 1.415000 6.615000 1.585000 ;
-      RECT 5.590000 1.585000 6.615000 1.635000 ;
-      RECT 5.590000 1.635000 5.920000 2.485000 ;
-      RECT 5.725000 0.675000 5.895000 1.075000 ;
-      RECT 5.725000 1.075000 6.615000 1.245000 ;
-      RECT 6.445000 0.655000 7.625000 0.825000 ;
-      RECT 6.445000 0.825000 6.615000 1.075000 ;
-      RECT 7.295000 0.825000 7.625000 1.515000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.105000  0.695000 0.505000 1.035000 ;
+      RECT 0.105000  1.035000 0.275000 2.045000 ;
+      RECT 0.105000  2.045000 0.460000 2.115000 ;
+      RECT 0.105000  2.115000 2.770000 2.285000 ;
+      RECT 0.105000  2.285000 0.460000 2.695000 ;
+      RECT 0.640000  2.455000 0.970000 3.245000 ;
+      RECT 0.675000  0.085000 0.890000 1.035000 ;
+      RECT 1.070000  0.845000 1.515000 1.195000 ;
+      RECT 1.070000  1.195000 3.240000 1.365000 ;
+      RECT 1.070000  1.365000 2.200000 1.945000 ;
+      RECT 1.775000  2.455000 3.145000 2.635000 ;
+      RECT 1.775000  2.635000 2.105000 3.075000 ;
+      RECT 1.945000  0.285000 2.135000 0.675000 ;
+      RECT 1.945000  0.675000 3.780000 0.845000 ;
+      RECT 2.315000  0.085000 2.645000 0.505000 ;
+      RECT 2.350000  2.825000 2.680000 3.245000 ;
+      RECT 2.440000  1.585000 2.770000 2.115000 ;
+      RECT 2.975000  1.925000 3.580000 2.225000 ;
+      RECT 2.975000  2.225000 3.145000 2.455000 ;
+      RECT 2.980000  1.015000 3.240000 1.195000 ;
+      RECT 2.980000  1.365000 3.240000 1.685000 ;
+      RECT 3.165000  0.275000 4.120000 0.485000 ;
+      RECT 3.315000  2.395000 3.930000 2.565000 ;
+      RECT 3.315000  2.565000 3.730000 3.065000 ;
+      RECT 3.410000  0.845000 3.780000 1.095000 ;
+      RECT 3.410000  1.095000 3.580000 1.925000 ;
+      RECT 3.760000  1.575000 4.120000 1.745000 ;
+      RECT 3.760000  1.745000 3.930000 2.395000 ;
+      RECT 3.950000  0.485000 4.120000 1.275000 ;
+      RECT 3.950000  1.275000 4.845000 1.445000 ;
+      RECT 3.950000  1.445000 4.120000 1.575000 ;
+      RECT 4.100000  1.925000 5.240000 2.255000 ;
+      RECT 4.155000  2.425000 4.755000 3.245000 ;
+      RECT 4.290000  0.085000 4.600000 1.095000 ;
+      RECT 4.585000  1.445000 4.845000 1.605000 ;
+      RECT 4.770000  0.255000 5.895000 0.675000 ;
+      RECT 4.770000  0.675000 5.195000 1.095000 ;
+      RECT 4.925000  2.255000 5.240000 3.075000 ;
+      RECT 5.015000  1.095000 5.195000 1.925000 ;
+      RECT 5.365000  0.855000 5.555000 1.415000 ;
+      RECT 5.365000  1.415000 6.615000 1.585000 ;
+      RECT 5.590000  1.585000 6.615000 1.635000 ;
+      RECT 5.590000  1.635000 5.920000 2.485000 ;
+      RECT 5.725000  0.675000 5.895000 1.075000 ;
+      RECT 5.725000  1.075000 6.615000 1.245000 ;
+      RECT 6.065000  0.085000 6.275000 0.905000 ;
+      RECT 6.090000  1.805000 6.350000 3.245000 ;
+      RECT 6.445000  0.655000 7.625000 0.825000 ;
+      RECT 6.445000  0.825000 6.615000 1.075000 ;
+      RECT 7.295000  0.825000 7.625000 1.515000 ;
+      RECT 7.305000  0.085000 7.635000 0.485000 ;
+      RECT 7.305000  1.815000 7.635000 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_lp__dlxbn_1
diff --git a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef
index 0fb533c..67d0242 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.magic.lef
@@ -71,33 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.655000  0.085000 0.875000 1.040000 ;
-        RECT 2.220000  0.085000 2.550000 0.455000 ;
-        RECT 4.265000  0.085000 4.595000 0.885000 ;
-        RECT 6.220000  0.085000 6.550000 0.455000 ;
-        RECT 7.275000  0.085000 7.605000 0.455000 ;
-        RECT 8.215000  0.085000 8.545000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,79 +79,103 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.685000 2.495000 1.015000 3.245000 ;
-        RECT 2.340000 2.835000 2.670000 3.245000 ;
-        RECT 4.245000 2.235000 4.835000 3.245000 ;
-        RECT 6.135000 1.795000 6.585000 3.245000 ;
-        RECT 7.265000 2.645000 7.595000 3.245000 ;
-        RECT 8.135000 2.645000 8.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.700000 0.485000 1.040000 ;
-      RECT 0.110000 1.040000 0.280000 2.060000 ;
-      RECT 0.110000 2.060000 0.530000 2.155000 ;
-      RECT 0.110000 2.155000 2.760000 2.325000 ;
-      RECT 0.110000 2.325000 0.515000 2.730000 ;
-      RECT 1.045000 0.820000 1.400000 0.965000 ;
-      RECT 1.045000 0.965000 3.210000 1.090000 ;
-      RECT 1.230000 1.090000 3.210000 1.375000 ;
-      RECT 1.230000 1.375000 2.185000 1.955000 ;
-      RECT 1.230000 1.955000 1.560000 1.985000 ;
-      RECT 1.770000 2.495000 3.100000 2.665000 ;
-      RECT 1.770000 2.665000 2.100000 3.075000 ;
-      RECT 1.780000 0.280000 2.050000 0.625000 ;
-      RECT 1.780000 0.625000 3.620000 0.795000 ;
-      RECT 2.435000 1.625000 2.760000 2.155000 ;
-      RECT 2.930000 1.965000 3.620000 2.220000 ;
-      RECT 2.930000 2.220000 3.100000 2.495000 ;
-      RECT 2.935000 1.375000 3.210000 1.755000 ;
-      RECT 3.150000 0.255000 3.960000 0.455000 ;
-      RECT 3.280000 2.390000 3.960000 2.560000 ;
-      RECT 3.280000 2.560000 3.610000 3.075000 ;
-      RECT 3.380000 0.795000 3.620000 1.965000 ;
-      RECT 3.790000 0.455000 3.960000 1.055000 ;
-      RECT 3.790000 1.055000 4.675000 1.225000 ;
-      RECT 3.790000 1.225000 3.960000 2.390000 ;
-      RECT 4.130000 1.395000 4.335000 1.795000 ;
-      RECT 4.130000 1.795000 5.265000 2.065000 ;
-      RECT 4.505000 1.225000 4.675000 1.295000 ;
-      RECT 4.505000 1.295000 4.915000 1.625000 ;
-      RECT 4.845000 0.255000 6.040000 0.455000 ;
-      RECT 4.845000 0.455000 5.265000 1.125000 ;
-      RECT 5.005000 2.065000 5.265000 3.075000 ;
-      RECT 5.085000 1.125000 5.265000 1.795000 ;
-      RECT 5.670000 0.965000 6.000000 1.295000 ;
-      RECT 5.670000 1.295000 6.585000 1.625000 ;
-      RECT 5.670000 1.625000 5.965000 2.485000 ;
-      RECT 5.710000 0.455000 6.040000 0.625000 ;
-      RECT 5.710000 0.625000 7.445000 0.795000 ;
-      RECT 7.275000 0.795000 7.445000 2.305000 ;
-      RECT 7.275000 2.305000 8.490000 2.475000 ;
-      RECT 8.225000 1.295000 8.490000 2.305000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.110000  0.700000 0.485000 1.040000 ;
+      RECT 0.110000  1.040000 0.280000 2.060000 ;
+      RECT 0.110000  2.060000 0.530000 2.155000 ;
+      RECT 0.110000  2.155000 2.760000 2.325000 ;
+      RECT 0.110000  2.325000 0.515000 2.730000 ;
+      RECT 0.655000  0.085000 0.875000 1.040000 ;
+      RECT 0.685000  2.495000 1.015000 3.245000 ;
+      RECT 1.045000  0.820000 1.400000 0.965000 ;
+      RECT 1.045000  0.965000 3.210000 1.090000 ;
+      RECT 1.230000  1.090000 3.210000 1.375000 ;
+      RECT 1.230000  1.375000 2.185000 1.955000 ;
+      RECT 1.230000  1.955000 1.560000 1.985000 ;
+      RECT 1.770000  2.495000 3.100000 2.665000 ;
+      RECT 1.770000  2.665000 2.100000 3.075000 ;
+      RECT 1.780000  0.280000 2.050000 0.625000 ;
+      RECT 1.780000  0.625000 3.620000 0.795000 ;
+      RECT 2.220000  0.085000 2.550000 0.455000 ;
+      RECT 2.340000  2.835000 2.670000 3.245000 ;
+      RECT 2.435000  1.625000 2.760000 2.155000 ;
+      RECT 2.930000  1.965000 3.620000 2.220000 ;
+      RECT 2.930000  2.220000 3.100000 2.495000 ;
+      RECT 2.935000  1.375000 3.210000 1.755000 ;
+      RECT 3.150000  0.255000 3.960000 0.455000 ;
+      RECT 3.280000  2.390000 3.960000 2.560000 ;
+      RECT 3.280000  2.560000 3.610000 3.075000 ;
+      RECT 3.380000  0.795000 3.620000 1.965000 ;
+      RECT 3.790000  0.455000 3.960000 1.055000 ;
+      RECT 3.790000  1.055000 4.675000 1.225000 ;
+      RECT 3.790000  1.225000 3.960000 2.390000 ;
+      RECT 4.130000  1.395000 4.335000 1.795000 ;
+      RECT 4.130000  1.795000 5.265000 2.065000 ;
+      RECT 4.245000  2.235000 4.835000 3.245000 ;
+      RECT 4.265000  0.085000 4.595000 0.885000 ;
+      RECT 4.505000  1.225000 4.675000 1.295000 ;
+      RECT 4.505000  1.295000 4.915000 1.625000 ;
+      RECT 4.845000  0.255000 6.040000 0.455000 ;
+      RECT 4.845000  0.455000 5.265000 1.125000 ;
+      RECT 5.005000  2.065000 5.265000 3.075000 ;
+      RECT 5.085000  1.125000 5.265000 1.795000 ;
+      RECT 5.670000  0.965000 6.000000 1.295000 ;
+      RECT 5.670000  1.295000 6.585000 1.625000 ;
+      RECT 5.670000  1.625000 5.965000 2.485000 ;
+      RECT 5.710000  0.455000 6.040000 0.625000 ;
+      RECT 5.710000  0.625000 7.445000 0.795000 ;
+      RECT 6.135000  1.795000 6.585000 3.245000 ;
+      RECT 6.220000  0.085000 6.550000 0.455000 ;
+      RECT 7.265000  2.645000 7.595000 3.245000 ;
+      RECT 7.275000  0.085000 7.605000 0.455000 ;
+      RECT 7.275000  0.795000 7.445000 2.305000 ;
+      RECT 7.275000  2.305000 8.490000 2.475000 ;
+      RECT 8.135000  2.645000 8.465000 3.245000 ;
+      RECT 8.215000  0.085000 8.545000 1.125000 ;
+      RECT 8.225000  1.295000 8.490000 2.305000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlxbn_2
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.magic.lef b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.magic.lef
index ce4d84a..b1b4f86 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_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.660000  0.085000 0.915000 0.670000 ;
-        RECT 2.340000  0.085000 2.670000 0.575000 ;
-        RECT 4.075000  0.085000 4.530000 0.805000 ;
-        RECT 5.835000  0.085000 6.135000 1.170000 ;
-        RECT 6.825000  0.085000 7.155000 1.175000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,74 +80,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.725000 2.075000 0.985000 3.245000 ;
-        RECT 2.295000 2.765000 2.555000 3.245000 ;
-        RECT 4.020000 2.355000 4.730000 3.245000 ;
-        RECT 4.400000 2.115000 4.730000 2.355000 ;
-        RECT 5.835000 1.815000 6.135000 3.245000 ;
-        RECT 6.825000 1.845000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.340000 0.490000 0.670000 ;
-      RECT 0.085000 0.670000 0.285000 1.705000 ;
-      RECT 0.085000 1.705000 2.680000 1.905000 ;
-      RECT 0.260000 1.905000 0.555000 2.755000 ;
-      RECT 1.085000 0.365000 1.360000 1.285000 ;
-      RECT 1.085000 1.285000 2.320000 1.365000 ;
-      RECT 1.085000 1.365000 3.140000 1.535000 ;
-      RECT 1.155000 2.075000 3.140000 2.255000 ;
-      RECT 1.155000 2.255000 1.450000 2.755000 ;
-      RECT 1.795000 2.425000 3.510000 2.595000 ;
-      RECT 1.795000 2.595000 2.125000 3.075000 ;
-      RECT 1.945000 0.280000 2.135000 0.745000 ;
-      RECT 1.945000 0.745000 3.310000 0.915000 ;
-      RECT 1.990000 1.085000 2.320000 1.285000 ;
-      RECT 2.890000 1.535000 3.140000 2.075000 ;
-      RECT 3.015000 2.765000 3.850000 3.075000 ;
-      RECT 3.050000 0.915000 3.310000 1.015000 ;
-      RECT 3.050000 1.015000 3.510000 1.185000 ;
-      RECT 3.225000 0.275000 3.650000 0.575000 ;
-      RECT 3.310000 1.185000 3.510000 2.425000 ;
-      RECT 3.480000 0.575000 3.650000 0.665000 ;
-      RECT 3.480000 0.665000 3.850000 0.835000 ;
-      RECT 3.680000 0.835000 3.850000 0.975000 ;
-      RECT 3.680000 0.975000 4.550000 1.145000 ;
-      RECT 3.680000 1.145000 3.850000 2.765000 ;
-      RECT 4.020000 1.315000 4.210000 1.775000 ;
-      RECT 4.020000 1.775000 5.160000 1.945000 ;
-      RECT 4.020000 1.945000 4.210000 1.985000 ;
-      RECT 4.380000 1.145000 4.550000 1.185000 ;
-      RECT 4.380000 1.185000 4.755000 1.515000 ;
-      RECT 4.720000 0.255000 5.105000 1.005000 ;
-      RECT 4.900000 1.945000 5.160000 3.055000 ;
-      RECT 4.935000 1.005000 5.105000 1.265000 ;
-      RECT 4.935000 1.265000 5.315000 1.595000 ;
-      RECT 4.935000 1.595000 5.160000 1.775000 ;
-      RECT 6.305000 0.790000 6.635000 1.345000 ;
-      RECT 6.305000 1.345000 7.155000 1.675000 ;
-      RECT 6.305000 1.675000 6.635000 2.495000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.085000  0.340000 0.490000 0.670000 ;
+      RECT 0.085000  0.670000 0.285000 1.705000 ;
+      RECT 0.085000  1.705000 2.680000 1.905000 ;
+      RECT 0.260000  1.905000 0.555000 2.755000 ;
+      RECT 0.660000  0.085000 0.915000 0.670000 ;
+      RECT 0.725000  2.075000 0.985000 3.245000 ;
+      RECT 1.085000  0.365000 1.360000 1.285000 ;
+      RECT 1.085000  1.285000 2.320000 1.365000 ;
+      RECT 1.085000  1.365000 3.140000 1.535000 ;
+      RECT 1.155000  2.075000 3.140000 2.255000 ;
+      RECT 1.155000  2.255000 1.450000 2.755000 ;
+      RECT 1.795000  2.425000 3.510000 2.595000 ;
+      RECT 1.795000  2.595000 2.125000 3.075000 ;
+      RECT 1.945000  0.280000 2.135000 0.745000 ;
+      RECT 1.945000  0.745000 3.310000 0.915000 ;
+      RECT 1.990000  1.085000 2.320000 1.285000 ;
+      RECT 2.295000  2.765000 2.555000 3.245000 ;
+      RECT 2.340000  0.085000 2.670000 0.575000 ;
+      RECT 2.890000  1.535000 3.140000 2.075000 ;
+      RECT 3.015000  2.765000 3.850000 3.075000 ;
+      RECT 3.050000  0.915000 3.310000 1.015000 ;
+      RECT 3.050000  1.015000 3.510000 1.185000 ;
+      RECT 3.225000  0.275000 3.650000 0.575000 ;
+      RECT 3.310000  1.185000 3.510000 2.425000 ;
+      RECT 3.480000  0.575000 3.650000 0.665000 ;
+      RECT 3.480000  0.665000 3.850000 0.835000 ;
+      RECT 3.680000  0.835000 3.850000 0.975000 ;
+      RECT 3.680000  0.975000 4.550000 1.145000 ;
+      RECT 3.680000  1.145000 3.850000 2.765000 ;
+      RECT 4.020000  1.315000 4.210000 1.775000 ;
+      RECT 4.020000  1.775000 5.160000 1.945000 ;
+      RECT 4.020000  1.945000 4.210000 1.985000 ;
+      RECT 4.020000  2.355000 4.730000 3.245000 ;
+      RECT 4.075000  0.085000 4.530000 0.805000 ;
+      RECT 4.380000  1.145000 4.550000 1.185000 ;
+      RECT 4.380000  1.185000 4.755000 1.515000 ;
+      RECT 4.400000  2.115000 4.730000 2.355000 ;
+      RECT 4.720000  0.255000 5.105000 1.005000 ;
+      RECT 4.900000  1.945000 5.160000 3.055000 ;
+      RECT 4.935000  1.005000 5.105000 1.265000 ;
+      RECT 4.935000  1.265000 5.315000 1.595000 ;
+      RECT 4.935000  1.595000 5.160000 1.775000 ;
+      RECT 5.835000  0.085000 6.135000 1.170000 ;
+      RECT 5.835000  1.815000 6.135000 3.245000 ;
+      RECT 6.305000  0.790000 6.635000 1.345000 ;
+      RECT 6.305000  1.345000 7.155000 1.675000 ;
+      RECT 6.305000  1.675000 6.635000 2.495000 ;
+      RECT 6.825000  0.085000 7.155000 1.175000 ;
+      RECT 6.825000  1.845000 7.155000 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_lp__dlxbp_1
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef
index 4dc0b7f..4925485 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.magic.lef
@@ -74,35 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.905000  0.085000  1.155000 0.995000 ;
-        RECT 3.145000  0.085000  3.475000 0.645000 ;
-        RECT 5.210000  0.085000  5.540000 1.095000 ;
-        RECT 7.350000  0.085000  7.680000 0.745000 ;
-        RECT 8.845000  0.085000  9.175000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -111,86 +82,112 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.895000 2.735000  1.225000 3.245000 ;
-        RECT 3.250000 2.375000  3.580000 3.245000 ;
-        RECT 5.305000 2.545000  5.635000 3.245000 ;
-        RECT 7.425000 2.135000  7.755000 3.245000 ;
-        RECT 8.860000 1.815000  9.190000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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 0.535000 0.445000 0.995000 ;
-      RECT 0.105000 0.995000 0.275000 2.385000 ;
-      RECT 0.105000 2.385000 1.575000 2.555000 ;
-      RECT 0.105000 2.555000 0.435000 3.065000 ;
-      RECT 1.375000 0.265000 2.655000 0.435000 ;
-      RECT 1.375000 0.435000 1.545000 1.175000 ;
-      RECT 1.375000 1.175000 1.740000 1.345000 ;
-      RECT 1.405000 2.555000 1.575000 2.895000 ;
-      RECT 1.405000 2.895000 3.070000 3.065000 ;
-      RECT 1.570000 1.345000 1.740000 2.035000 ;
-      RECT 1.570000 2.035000 2.710000 2.205000 ;
-      RECT 1.725000 0.615000 2.090000 0.995000 ;
-      RECT 1.920000 0.995000 2.090000 1.525000 ;
-      RECT 1.920000 1.525000 2.960000 1.845000 ;
-      RECT 1.920000 1.845000 2.170000 1.855000 ;
-      RECT 2.325000 0.435000 2.655000 0.825000 ;
-      RECT 2.325000 0.825000 4.140000 0.995000 ;
-      RECT 2.380000 2.205000 2.710000 2.715000 ;
-      RECT 2.630000 1.175000 2.960000 1.335000 ;
-      RECT 2.630000 1.335000 4.520000 1.505000 ;
-      RECT 2.630000 1.505000 2.960000 1.525000 ;
-      RECT 2.900000 2.025000 3.735000 2.195000 ;
-      RECT 2.900000 2.195000 3.070000 2.895000 ;
-      RECT 3.405000 1.865000 3.735000 2.025000 ;
-      RECT 3.810000 0.995000 4.140000 1.155000 ;
-      RECT 3.945000 1.505000 4.275000 2.165000 ;
-      RECT 4.045000 0.295000 5.030000 0.645000 ;
-      RECT 4.070000 2.575000 4.625000 2.745000 ;
-      RECT 4.070000 2.745000 4.400000 3.035000 ;
-      RECT 4.350000 0.825000 4.680000 1.155000 ;
-      RECT 4.350000 1.155000 4.520000 1.335000 ;
-      RECT 4.455000 1.685000 5.030000 1.855000 ;
-      RECT 4.455000 1.855000 4.625000 2.575000 ;
-      RECT 4.845000 2.035000 6.425000 2.365000 ;
-      RECT 4.860000 0.645000 5.030000 1.275000 ;
-      RECT 4.860000 1.275000 5.970000 1.605000 ;
-      RECT 4.860000 1.605000 5.030000 1.685000 ;
-      RECT 6.000000 0.265000 6.330000 1.095000 ;
-      RECT 6.095000 1.785000 6.425000 2.035000 ;
-      RECT 6.095000 2.365000 6.425000 3.065000 ;
-      RECT 6.160000 1.095000 6.330000 1.275000 ;
-      RECT 6.160000 1.275000 7.625000 1.605000 ;
-      RECT 6.160000 1.605000 6.425000 1.785000 ;
-      RECT 8.285000 0.635000 8.615000 1.305000 ;
-      RECT 8.285000 1.305000 9.455000 1.635000 ;
-      RECT 8.285000 1.635000 8.650000 2.465000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.105000  0.535000  0.445000 0.995000 ;
+      RECT 0.105000  0.995000  0.275000 2.385000 ;
+      RECT 0.105000  2.385000  1.575000 2.555000 ;
+      RECT 0.105000  2.555000  0.435000 3.065000 ;
+      RECT 0.895000  2.735000  1.225000 3.245000 ;
+      RECT 0.905000  0.085000  1.155000 0.995000 ;
+      RECT 1.375000  0.265000  2.655000 0.435000 ;
+      RECT 1.375000  0.435000  1.545000 1.175000 ;
+      RECT 1.375000  1.175000  1.740000 1.345000 ;
+      RECT 1.405000  2.555000  1.575000 2.895000 ;
+      RECT 1.405000  2.895000  3.070000 3.065000 ;
+      RECT 1.570000  1.345000  1.740000 2.035000 ;
+      RECT 1.570000  2.035000  2.710000 2.205000 ;
+      RECT 1.725000  0.615000  2.090000 0.995000 ;
+      RECT 1.920000  0.995000  2.090000 1.525000 ;
+      RECT 1.920000  1.525000  2.960000 1.845000 ;
+      RECT 1.920000  1.845000  2.170000 1.855000 ;
+      RECT 2.325000  0.435000  2.655000 0.825000 ;
+      RECT 2.325000  0.825000  4.140000 0.995000 ;
+      RECT 2.380000  2.205000  2.710000 2.715000 ;
+      RECT 2.630000  1.175000  2.960000 1.335000 ;
+      RECT 2.630000  1.335000  4.520000 1.505000 ;
+      RECT 2.630000  1.505000  2.960000 1.525000 ;
+      RECT 2.900000  2.025000  3.735000 2.195000 ;
+      RECT 2.900000  2.195000  3.070000 2.895000 ;
+      RECT 3.145000  0.085000  3.475000 0.645000 ;
+      RECT 3.250000  2.375000  3.580000 3.245000 ;
+      RECT 3.405000  1.865000  3.735000 2.025000 ;
+      RECT 3.810000  0.995000  4.140000 1.155000 ;
+      RECT 3.945000  1.505000  4.275000 2.165000 ;
+      RECT 4.045000  0.295000  5.030000 0.645000 ;
+      RECT 4.070000  2.575000  4.625000 2.745000 ;
+      RECT 4.070000  2.745000  4.400000 3.035000 ;
+      RECT 4.350000  0.825000  4.680000 1.155000 ;
+      RECT 4.350000  1.155000  4.520000 1.335000 ;
+      RECT 4.455000  1.685000  5.030000 1.855000 ;
+      RECT 4.455000  1.855000  4.625000 2.575000 ;
+      RECT 4.845000  2.035000  6.425000 2.365000 ;
+      RECT 4.860000  0.645000  5.030000 1.275000 ;
+      RECT 4.860000  1.275000  5.970000 1.605000 ;
+      RECT 4.860000  1.605000  5.030000 1.685000 ;
+      RECT 5.210000  0.085000  5.540000 1.095000 ;
+      RECT 5.305000  2.545000  5.635000 3.245000 ;
+      RECT 6.000000  0.265000  6.330000 1.095000 ;
+      RECT 6.095000  1.785000  6.425000 2.035000 ;
+      RECT 6.095000  2.365000  6.425000 3.065000 ;
+      RECT 6.160000  1.095000  6.330000 1.275000 ;
+      RECT 6.160000  1.275000  7.625000 1.605000 ;
+      RECT 6.160000  1.605000  6.425000 1.785000 ;
+      RECT 7.350000  0.085000  7.680000 0.745000 ;
+      RECT 7.425000  2.135000  7.755000 3.245000 ;
+      RECT 8.285000  0.635000  8.615000 1.305000 ;
+      RECT 8.285000  1.305000  9.455000 1.635000 ;
+      RECT 8.285000  1.635000  8.650000 2.465000 ;
+      RECT 8.845000  0.085000  9.175000 1.125000 ;
+      RECT 8.860000  1.815000  9.190000 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_lp__dlxbp_lp
diff --git a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef
index 6feef2c..1cf8ee9 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.magic.lef
@@ -74,35 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.905000  0.085000  1.235000 0.645000 ;
-        RECT 3.075000  0.085000  3.405000 0.635000 ;
-        RECT 5.035000  0.085000  5.365000 0.715000 ;
-        RECT 7.495000  0.085000  7.825000 0.725000 ;
-        RECT 8.845000  0.085000  9.175000 0.900000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -111,82 +82,108 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.755000 2.885000  1.085000 3.245000 ;
-        RECT 3.030000 2.535000  3.360000 3.245000 ;
-        RECT 5.490000 1.985000  5.820000 3.245000 ;
-        RECT 7.755000 1.815000  8.085000 3.245000 ;
-        RECT 8.845000 2.025000  9.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 ;
-        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.265000 0.445000 0.725000 ;
-      RECT 0.115000 0.725000 0.285000 2.025000 ;
-      RECT 0.115000 2.025000 0.475000 2.535000 ;
-      RECT 0.115000 2.535000 2.280000 2.705000 ;
-      RECT 0.115000 2.705000 0.475000 3.065000 ;
-      RECT 1.215000 0.825000 2.055000 0.995000 ;
-      RECT 1.215000 0.995000 1.385000 2.025000 ;
-      RECT 1.215000 2.025000 1.695000 2.185000 ;
-      RECT 1.215000 2.185000 3.100000 2.355000 ;
-      RECT 1.725000 0.265000 2.055000 0.825000 ;
-      RECT 1.950000 2.705000 2.280000 3.065000 ;
-      RECT 2.285000 0.265000 2.615000 0.815000 ;
-      RECT 2.285000 0.815000 4.505000 0.985000 ;
-      RECT 2.285000 0.985000 2.455000 1.675000 ;
-      RECT 2.285000 1.675000 2.750000 2.005000 ;
-      RECT 2.770000 1.165000 3.100000 1.425000 ;
-      RECT 2.770000 1.425000 4.155000 1.495000 ;
-      RECT 2.930000 1.495000 4.155000 1.755000 ;
-      RECT 2.930000 1.755000 3.100000 2.185000 ;
-      RECT 3.740000 0.985000 4.505000 1.145000 ;
-      RECT 3.975000 0.335000 4.855000 0.635000 ;
-      RECT 4.130000 1.945000 4.460000 2.815000 ;
-      RECT 4.130000 2.815000 5.310000 2.985000 ;
-      RECT 4.335000 1.145000 4.505000 1.475000 ;
-      RECT 4.335000 1.475000 4.960000 1.645000 ;
-      RECT 4.640000 1.645000 4.960000 1.805000 ;
-      RECT 4.685000 0.635000 4.855000 1.125000 ;
-      RECT 4.685000 1.125000 6.350000 1.295000 ;
-      RECT 5.140000 1.295000 5.310000 2.815000 ;
-      RECT 5.490000 1.475000 5.810000 1.635000 ;
-      RECT 5.490000 1.635000 6.760000 1.805000 ;
-      RECT 6.020000 1.295000 6.350000 1.455000 ;
-      RECT 6.145000 0.265000 6.475000 0.775000 ;
-      RECT 6.145000 0.775000 6.760000 0.895000 ;
-      RECT 6.145000 0.895000 6.920000 0.945000 ;
-      RECT 6.275000 1.805000 6.605000 2.985000 ;
-      RECT 6.590000 0.945000 6.920000 1.565000 ;
-      RECT 6.590000 1.565000 6.760000 1.635000 ;
-      RECT 8.285000 0.265000 8.615000 1.590000 ;
-      RECT 8.285000 1.590000 9.195000 1.760000 ;
-      RECT 8.285000 1.760000 8.615000 2.855000 ;
-      RECT 8.865000 1.090000 9.195000 1.590000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  0.265000  0.445000 0.725000 ;
+      RECT 0.115000  0.725000  0.285000 2.025000 ;
+      RECT 0.115000  2.025000  0.475000 2.535000 ;
+      RECT 0.115000  2.535000  2.280000 2.705000 ;
+      RECT 0.115000  2.705000  0.475000 3.065000 ;
+      RECT 0.755000  2.885000  1.085000 3.245000 ;
+      RECT 0.905000  0.085000  1.235000 0.645000 ;
+      RECT 1.215000  0.825000  2.055000 0.995000 ;
+      RECT 1.215000  0.995000  1.385000 2.025000 ;
+      RECT 1.215000  2.025000  1.695000 2.185000 ;
+      RECT 1.215000  2.185000  3.100000 2.355000 ;
+      RECT 1.725000  0.265000  2.055000 0.825000 ;
+      RECT 1.950000  2.705000  2.280000 3.065000 ;
+      RECT 2.285000  0.265000  2.615000 0.815000 ;
+      RECT 2.285000  0.815000  4.505000 0.985000 ;
+      RECT 2.285000  0.985000  2.455000 1.675000 ;
+      RECT 2.285000  1.675000  2.750000 2.005000 ;
+      RECT 2.770000  1.165000  3.100000 1.425000 ;
+      RECT 2.770000  1.425000  4.155000 1.495000 ;
+      RECT 2.930000  1.495000  4.155000 1.755000 ;
+      RECT 2.930000  1.755000  3.100000 2.185000 ;
+      RECT 3.030000  2.535000  3.360000 3.245000 ;
+      RECT 3.075000  0.085000  3.405000 0.635000 ;
+      RECT 3.740000  0.985000  4.505000 1.145000 ;
+      RECT 3.975000  0.335000  4.855000 0.635000 ;
+      RECT 4.130000  1.945000  4.460000 2.815000 ;
+      RECT 4.130000  2.815000  5.310000 2.985000 ;
+      RECT 4.335000  1.145000  4.505000 1.475000 ;
+      RECT 4.335000  1.475000  4.960000 1.645000 ;
+      RECT 4.640000  1.645000  4.960000 1.805000 ;
+      RECT 4.685000  0.635000  4.855000 1.125000 ;
+      RECT 4.685000  1.125000  6.350000 1.295000 ;
+      RECT 5.035000  0.085000  5.365000 0.715000 ;
+      RECT 5.140000  1.295000  5.310000 2.815000 ;
+      RECT 5.490000  1.475000  5.810000 1.635000 ;
+      RECT 5.490000  1.635000  6.760000 1.805000 ;
+      RECT 5.490000  1.985000  5.820000 3.245000 ;
+      RECT 6.020000  1.295000  6.350000 1.455000 ;
+      RECT 6.145000  0.265000  6.475000 0.775000 ;
+      RECT 6.145000  0.775000  6.760000 0.895000 ;
+      RECT 6.145000  0.895000  6.920000 0.945000 ;
+      RECT 6.275000  1.805000  6.605000 2.985000 ;
+      RECT 6.590000  0.945000  6.920000 1.565000 ;
+      RECT 6.590000  1.565000  6.760000 1.635000 ;
+      RECT 7.495000  0.085000  7.825000 0.725000 ;
+      RECT 7.755000  1.815000  8.085000 3.245000 ;
+      RECT 8.285000  0.265000  8.615000 1.590000 ;
+      RECT 8.285000  1.590000  9.195000 1.760000 ;
+      RECT 8.285000  1.760000  8.615000 2.855000 ;
+      RECT 8.845000  0.085000  9.175000 0.900000 ;
+      RECT 8.845000  2.025000  9.175000 3.245000 ;
+      RECT 8.865000  1.090000  9.195000 1.590000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlxbp_lp2
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.magic.lef
index 20671b8..c9cdb7b 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_lp__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.720000  0.085000 0.945000 1.005000 ;
-        RECT 2.825000  0.085000 3.155000 0.485000 ;
-        RECT 4.800000  0.085000 5.110000 1.085000 ;
-        RECT 5.865000  0.085000 6.175000 1.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 ;
-        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,68 +69,86 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.720000 2.385000 0.980000 3.245000 ;
-        RECT 2.440000 2.715000 2.700000 3.245000 ;
-        RECT 4.450000 2.450000 5.190000 3.245000 ;
-        RECT 4.950000 2.305000 5.190000 2.450000 ;
-        RECT 5.865000 1.815000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 0.675000 0.550000 1.005000 ;
-      RECT 0.150000 1.005000 0.330000 1.675000 ;
-      RECT 0.150000 1.675000 2.890000 1.865000 ;
-      RECT 0.150000 1.865000 0.550000 3.065000 ;
-      RECT 1.115000 0.810000 2.275000 0.995000 ;
-      RECT 1.115000 0.995000 3.920000 1.005000 ;
-      RECT 1.150000 2.385000 1.445000 2.905000 ;
-      RECT 1.150000 2.905000 2.270000 3.075000 ;
-      RECT 1.730000 2.035000 3.460000 2.205000 ;
-      RECT 1.730000 2.205000 1.930000 2.735000 ;
-      RECT 1.945000 1.005000 3.920000 1.165000 ;
-      RECT 1.945000 1.165000 2.275000 1.505000 ;
-      RECT 2.100000 2.375000 3.920000 2.545000 ;
-      RECT 2.100000 2.545000 2.270000 2.905000 ;
-      RECT 2.455000 0.295000 2.645000 0.655000 ;
-      RECT 2.455000 0.655000 4.290000 0.825000 ;
-      RECT 2.560000 1.335000 2.890000 1.675000 ;
-      RECT 3.130000 1.535000 3.460000 2.035000 ;
-      RECT 3.255000 2.715000 4.280000 3.065000 ;
-      RECT 3.490000 1.165000 3.920000 1.245000 ;
-      RECT 3.670000 1.245000 3.920000 2.375000 ;
-      RECT 3.725000 0.275000 4.630000 0.465000 ;
-      RECT 4.090000 0.825000 4.290000 1.435000 ;
-      RECT 4.090000 1.615000 5.210000 1.785000 ;
-      RECT 4.090000 1.785000 4.280000 2.715000 ;
-      RECT 4.450000 1.955000 4.780000 1.965000 ;
-      RECT 4.450000 1.965000 5.660000 2.135000 ;
-      RECT 4.450000 2.135000 4.780000 2.215000 ;
-      RECT 4.460000 0.465000 4.630000 1.255000 ;
-      RECT 4.460000 1.255000 5.210000 1.615000 ;
-      RECT 5.280000 0.255000 5.560000 1.075000 ;
-      RECT 5.360000 2.135000 5.660000 3.025000 ;
-      RECT 5.390000 1.075000 5.560000 1.255000 ;
-      RECT 5.390000 1.255000 6.175000 1.585000 ;
-      RECT 5.390000 1.585000 5.660000 1.965000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.150000  0.675000 0.550000 1.005000 ;
+      RECT 0.150000  1.005000 0.330000 1.675000 ;
+      RECT 0.150000  1.675000 2.890000 1.865000 ;
+      RECT 0.150000  1.865000 0.550000 3.065000 ;
+      RECT 0.720000  0.085000 0.945000 1.005000 ;
+      RECT 0.720000  2.385000 0.980000 3.245000 ;
+      RECT 1.115000  0.810000 2.275000 0.995000 ;
+      RECT 1.115000  0.995000 3.920000 1.005000 ;
+      RECT 1.150000  2.385000 1.445000 2.905000 ;
+      RECT 1.150000  2.905000 2.270000 3.075000 ;
+      RECT 1.730000  2.035000 3.460000 2.205000 ;
+      RECT 1.730000  2.205000 1.930000 2.735000 ;
+      RECT 1.945000  1.005000 3.920000 1.165000 ;
+      RECT 1.945000  1.165000 2.275000 1.505000 ;
+      RECT 2.100000  2.375000 3.920000 2.545000 ;
+      RECT 2.100000  2.545000 2.270000 2.905000 ;
+      RECT 2.440000  2.715000 2.700000 3.245000 ;
+      RECT 2.455000  0.295000 2.645000 0.655000 ;
+      RECT 2.455000  0.655000 4.290000 0.825000 ;
+      RECT 2.560000  1.335000 2.890000 1.675000 ;
+      RECT 2.825000  0.085000 3.155000 0.485000 ;
+      RECT 3.130000  1.535000 3.460000 2.035000 ;
+      RECT 3.255000  2.715000 4.280000 3.065000 ;
+      RECT 3.490000  1.165000 3.920000 1.245000 ;
+      RECT 3.670000  1.245000 3.920000 2.375000 ;
+      RECT 3.725000  0.275000 4.630000 0.465000 ;
+      RECT 4.090000  0.825000 4.290000 1.435000 ;
+      RECT 4.090000  1.615000 5.210000 1.785000 ;
+      RECT 4.090000  1.785000 4.280000 2.715000 ;
+      RECT 4.450000  1.955000 4.780000 1.965000 ;
+      RECT 4.450000  1.965000 5.660000 2.135000 ;
+      RECT 4.450000  2.135000 4.780000 2.215000 ;
+      RECT 4.450000  2.450000 5.190000 3.245000 ;
+      RECT 4.460000  0.465000 4.630000 1.255000 ;
+      RECT 4.460000  1.255000 5.210000 1.615000 ;
+      RECT 4.800000  0.085000 5.110000 1.085000 ;
+      RECT 4.950000  2.305000 5.190000 2.450000 ;
+      RECT 5.280000  0.255000 5.560000 1.075000 ;
+      RECT 5.360000  2.135000 5.660000 3.025000 ;
+      RECT 5.390000  1.075000 5.560000 1.255000 ;
+      RECT 5.390000  1.255000 6.175000 1.585000 ;
+      RECT 5.390000  1.585000 5.660000 1.965000 ;
+      RECT 5.865000  0.085000 6.175000 1.085000 ;
+      RECT 5.865000  1.815000 6.175000 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_lp__dlxtn_1
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef
index 5dc0b98..1ff3acf 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.magic.lef
@@ -61,30 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.675000  0.085000 0.845000 0.810000 ;
-        RECT 0.675000  0.810000 1.005000 1.025000 ;
-        RECT 2.890000  0.085000 3.220000 0.475000 ;
-        RECT 4.945000  0.085000 5.170000 1.090000 ;
-        RECT 5.905000  0.085000 6.200000 1.100000 ;
-        RECT 6.805000  0.085000 7.095000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.200000 0.245000 ;
     END
@@ -93,69 +69,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.795000 2.415000 1.045000 3.245000 ;
-        RECT 2.475000 2.715000 2.735000 3.245000 ;
-        RECT 4.475000 2.495000 5.245000 3.245000 ;
-        RECT 5.015000 1.960000 5.245000 2.495000 ;
-        RECT 5.905000 1.815000 6.200000 3.245000 ;
-        RECT 6.805000 1.815000 7.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 ;
-        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.140000 0.695000 0.495000 1.025000 ;
-      RECT 0.140000 1.025000 0.310000 1.660000 ;
-      RECT 0.140000 1.660000 2.925000 1.855000 ;
-      RECT 0.140000 1.855000 0.625000 3.055000 ;
-      RECT 1.185000 0.810000 2.290000 0.995000 ;
-      RECT 1.185000 0.995000 3.925000 1.030000 ;
-      RECT 1.215000 2.395000 1.515000 2.905000 ;
-      RECT 1.215000 2.905000 2.305000 3.075000 ;
-      RECT 1.705000 2.035000 3.495000 2.205000 ;
-      RECT 1.705000 2.205000 1.955000 2.735000 ;
-      RECT 2.025000 1.030000 3.925000 1.165000 ;
-      RECT 2.025000 1.165000 2.340000 1.490000 ;
-      RECT 2.135000 2.375000 3.965000 2.545000 ;
-      RECT 2.135000 2.545000 2.305000 2.905000 ;
-      RECT 2.460000 0.275000 2.720000 0.645000 ;
-      RECT 2.460000 0.645000 4.425000 0.815000 ;
-      RECT 2.595000 1.345000 2.925000 1.660000 ;
-      RECT 3.165000 1.535000 3.495000 2.035000 ;
-      RECT 3.290000 2.715000 4.305000 3.065000 ;
-      RECT 3.705000 1.165000 3.925000 1.915000 ;
-      RECT 3.705000 1.915000 3.965000 2.375000 ;
-      RECT 3.790000 0.255000 4.775000 0.475000 ;
-      RECT 4.095000 0.815000 4.425000 1.100000 ;
-      RECT 4.135000 1.270000 5.355000 1.450000 ;
-      RECT 4.135000 1.450000 4.305000 2.715000 ;
-      RECT 4.485000 1.620000 5.705000 1.790000 ;
-      RECT 4.485000 1.790000 4.815000 2.245000 ;
-      RECT 4.605000 0.475000 4.775000 1.260000 ;
-      RECT 4.605000 1.260000 5.355000 1.270000 ;
-      RECT 5.340000 0.255000 5.705000 1.090000 ;
-      RECT 5.415000 1.790000 5.705000 2.960000 ;
-      RECT 5.535000 1.090000 5.705000 1.270000 ;
-      RECT 5.535000 1.270000 6.165000 1.600000 ;
-      RECT 5.535000 1.600000 5.705000 1.620000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.140000  0.695000 0.495000 1.025000 ;
+      RECT 0.140000  1.025000 0.310000 1.660000 ;
+      RECT 0.140000  1.660000 2.925000 1.855000 ;
+      RECT 0.140000  1.855000 0.625000 3.055000 ;
+      RECT 0.675000  0.085000 0.845000 0.810000 ;
+      RECT 0.675000  0.810000 1.005000 1.025000 ;
+      RECT 0.795000  2.415000 1.045000 3.245000 ;
+      RECT 1.185000  0.810000 2.290000 0.995000 ;
+      RECT 1.185000  0.995000 3.925000 1.030000 ;
+      RECT 1.215000  2.395000 1.515000 2.905000 ;
+      RECT 1.215000  2.905000 2.305000 3.075000 ;
+      RECT 1.705000  2.035000 3.495000 2.205000 ;
+      RECT 1.705000  2.205000 1.955000 2.735000 ;
+      RECT 2.025000  1.030000 3.925000 1.165000 ;
+      RECT 2.025000  1.165000 2.340000 1.490000 ;
+      RECT 2.135000  2.375000 3.965000 2.545000 ;
+      RECT 2.135000  2.545000 2.305000 2.905000 ;
+      RECT 2.460000  0.275000 2.720000 0.645000 ;
+      RECT 2.460000  0.645000 4.425000 0.815000 ;
+      RECT 2.475000  2.715000 2.735000 3.245000 ;
+      RECT 2.595000  1.345000 2.925000 1.660000 ;
+      RECT 2.890000  0.085000 3.220000 0.475000 ;
+      RECT 3.165000  1.535000 3.495000 2.035000 ;
+      RECT 3.290000  2.715000 4.305000 3.065000 ;
+      RECT 3.705000  1.165000 3.925000 1.915000 ;
+      RECT 3.705000  1.915000 3.965000 2.375000 ;
+      RECT 3.790000  0.255000 4.775000 0.475000 ;
+      RECT 4.095000  0.815000 4.425000 1.100000 ;
+      RECT 4.135000  1.270000 5.355000 1.450000 ;
+      RECT 4.135000  1.450000 4.305000 2.715000 ;
+      RECT 4.475000  2.495000 5.245000 3.245000 ;
+      RECT 4.485000  1.620000 5.705000 1.790000 ;
+      RECT 4.485000  1.790000 4.815000 2.245000 ;
+      RECT 4.605000  0.475000 4.775000 1.260000 ;
+      RECT 4.605000  1.260000 5.355000 1.270000 ;
+      RECT 4.945000  0.085000 5.170000 1.090000 ;
+      RECT 5.015000  1.960000 5.245000 2.495000 ;
+      RECT 5.340000  0.255000 5.705000 1.090000 ;
+      RECT 5.415000  1.790000 5.705000 2.960000 ;
+      RECT 5.535000  1.090000 5.705000 1.270000 ;
+      RECT 5.535000  1.270000 6.165000 1.600000 ;
+      RECT 5.535000  1.600000 5.705000 1.620000 ;
+      RECT 5.905000  0.085000 6.200000 1.100000 ;
+      RECT 5.905000  1.815000 6.200000 3.245000 ;
+      RECT 6.805000  0.085000 7.095000 1.180000 ;
+      RECT 6.805000  1.815000 7.095000 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_lp__dlxtn_2
diff --git a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef
index bcd7a8f..e03534b 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.magic.lef
@@ -67,31 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.640000  0.085000 0.885000 1.020000 ;
-        RECT 2.415000  0.085000 2.745000 0.455000 ;
-        RECT 4.470000  0.085000 4.720000 0.885000 ;
-        RECT 5.555000  0.085000 5.800000 1.095000 ;
-        RECT 6.365000  0.085000 6.695000 0.835000 ;
-        RECT 7.265000  0.085000 7.495000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -100,73 +75,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.580000 2.395000 0.835000 3.245000 ;
-        RECT 2.300000 2.740000 2.560000 3.245000 ;
-        RECT 4.205000 2.435000 4.915000 3.245000 ;
-        RECT 4.585000 2.015000 4.915000 2.435000 ;
-        RECT 5.545000 1.815000 5.830000 3.245000 ;
-        RECT 6.395000 2.025000 6.690000 3.245000 ;
-        RECT 7.265000 1.815000 7.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 ;
-        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.090000 0.680000 0.470000 1.010000 ;
-      RECT 0.090000 1.010000 0.260000 1.700000 ;
-      RECT 0.090000 1.700000 2.685000 1.880000 ;
-      RECT 0.090000 1.880000 0.410000 3.055000 ;
-      RECT 1.005000 2.395000 1.305000 2.905000 ;
-      RECT 1.005000 2.905000 2.130000 3.075000 ;
-      RECT 1.055000 0.820000 1.865000 0.965000 ;
-      RECT 1.055000 0.965000 3.410000 1.010000 ;
-      RECT 1.530000 2.050000 3.225000 2.220000 ;
-      RECT 1.530000 2.220000 1.780000 2.735000 ;
-      RECT 1.695000 1.010000 3.410000 1.145000 ;
-      RECT 1.695000 1.145000 2.140000 1.530000 ;
-      RECT 1.960000 2.400000 3.695000 2.570000 ;
-      RECT 1.960000 2.570000 2.130000 2.905000 ;
-      RECT 2.035000 0.255000 2.235000 0.625000 ;
-      RECT 2.035000 0.625000 3.950000 0.795000 ;
-      RECT 2.355000 1.315000 2.685000 1.700000 ;
-      RECT 2.895000 1.675000 3.225000 2.050000 ;
-      RECT 3.020000 2.740000 4.035000 3.020000 ;
-      RECT 3.080000 1.145000 3.410000 1.325000 ;
-      RECT 3.080000 1.325000 3.695000 1.495000 ;
-      RECT 3.250000 0.255000 4.300000 0.455000 ;
-      RECT 3.435000 1.495000 3.695000 2.400000 ;
-      RECT 3.620000 0.795000 3.950000 1.065000 ;
-      RECT 3.865000 1.245000 5.035000 1.415000 ;
-      RECT 3.865000 1.415000 4.035000 2.740000 ;
-      RECT 4.130000 0.455000 4.300000 1.245000 ;
-      RECT 4.205000 1.595000 4.385000 1.675000 ;
-      RECT 4.205000 1.675000 5.375000 1.845000 ;
-      RECT 4.205000 1.845000 4.415000 2.265000 ;
-      RECT 4.705000 1.415000 5.035000 1.505000 ;
-      RECT 4.890000 0.255000 5.385000 1.075000 ;
-      RECT 5.085000 1.845000 5.375000 3.035000 ;
-      RECT 5.205000 1.075000 5.385000 1.345000 ;
-      RECT 5.205000 1.345000 6.695000 1.515000 ;
-      RECT 5.205000 1.515000 5.375000 1.675000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.090000  0.680000 0.470000 1.010000 ;
+      RECT 0.090000  1.010000 0.260000 1.700000 ;
+      RECT 0.090000  1.700000 2.685000 1.880000 ;
+      RECT 0.090000  1.880000 0.410000 3.055000 ;
+      RECT 0.580000  2.395000 0.835000 3.245000 ;
+      RECT 0.640000  0.085000 0.885000 1.020000 ;
+      RECT 1.005000  2.395000 1.305000 2.905000 ;
+      RECT 1.005000  2.905000 2.130000 3.075000 ;
+      RECT 1.055000  0.820000 1.865000 0.965000 ;
+      RECT 1.055000  0.965000 3.410000 1.010000 ;
+      RECT 1.530000  2.050000 3.225000 2.220000 ;
+      RECT 1.530000  2.220000 1.780000 2.735000 ;
+      RECT 1.695000  1.010000 3.410000 1.145000 ;
+      RECT 1.695000  1.145000 2.140000 1.530000 ;
+      RECT 1.960000  2.400000 3.695000 2.570000 ;
+      RECT 1.960000  2.570000 2.130000 2.905000 ;
+      RECT 2.035000  0.255000 2.235000 0.625000 ;
+      RECT 2.035000  0.625000 3.950000 0.795000 ;
+      RECT 2.300000  2.740000 2.560000 3.245000 ;
+      RECT 2.355000  1.315000 2.685000 1.700000 ;
+      RECT 2.415000  0.085000 2.745000 0.455000 ;
+      RECT 2.895000  1.675000 3.225000 2.050000 ;
+      RECT 3.020000  2.740000 4.035000 3.020000 ;
+      RECT 3.080000  1.145000 3.410000 1.325000 ;
+      RECT 3.080000  1.325000 3.695000 1.495000 ;
+      RECT 3.250000  0.255000 4.300000 0.455000 ;
+      RECT 3.435000  1.495000 3.695000 2.400000 ;
+      RECT 3.620000  0.795000 3.950000 1.065000 ;
+      RECT 3.865000  1.245000 5.035000 1.415000 ;
+      RECT 3.865000  1.415000 4.035000 2.740000 ;
+      RECT 4.130000  0.455000 4.300000 1.245000 ;
+      RECT 4.205000  1.595000 4.385000 1.675000 ;
+      RECT 4.205000  1.675000 5.375000 1.845000 ;
+      RECT 4.205000  1.845000 4.415000 2.265000 ;
+      RECT 4.205000  2.435000 4.915000 3.245000 ;
+      RECT 4.470000  0.085000 4.720000 0.885000 ;
+      RECT 4.585000  2.015000 4.915000 2.435000 ;
+      RECT 4.705000  1.415000 5.035000 1.505000 ;
+      RECT 4.890000  0.255000 5.385000 1.075000 ;
+      RECT 5.085000  1.845000 5.375000 3.035000 ;
+      RECT 5.205000  1.075000 5.385000 1.345000 ;
+      RECT 5.205000  1.345000 6.695000 1.515000 ;
+      RECT 5.205000  1.515000 5.375000 1.675000 ;
+      RECT 5.545000  1.815000 5.830000 3.245000 ;
+      RECT 5.555000  0.085000 5.800000 1.095000 ;
+      RECT 6.365000  0.085000 6.695000 0.835000 ;
+      RECT 6.395000  2.025000 6.690000 3.245000 ;
+      RECT 7.265000  0.085000 7.495000 1.095000 ;
+      RECT 7.265000  1.815000 7.585000 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_lp__dlxtn_4
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef
index c0ca1fe..47315e2 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.magic.lef
@@ -61,26 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.705000  0.085000 0.950000 0.605000 ;
-        RECT 2.195000  0.605000 2.570000 0.845000 ;
-        RECT 2.400000  0.085000 2.570000 0.605000 ;
-        RECT 3.900000  0.085000 4.230000 0.625000 ;
-        RECT 4.975000  0.085000 5.215000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -89,61 +69,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.585000 2.135000 0.795000 3.245000 ;
-        RECT 2.070000 2.645000 2.400000 3.245000 ;
-        RECT 3.955000 2.035000 4.285000 3.245000 ;
-        RECT 4.905000 2.035000 5.215000 3.245000 ;
-        RECT 4.975000 1.815000 5.215000 2.035000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.265000 0.535000 0.605000 ;
-      RECT 0.085000 0.605000 0.300000 1.625000 ;
-      RECT 0.085000 1.625000 1.155000 1.795000 ;
-      RECT 0.085000 1.795000 0.365000 2.775000 ;
-      RECT 0.985000 1.365000 2.480000 1.535000 ;
-      RECT 0.985000 1.535000 1.155000 1.625000 ;
-      RECT 1.015000 1.965000 1.690000 2.135000 ;
-      RECT 1.015000 2.135000 1.335000 2.775000 ;
-      RECT 1.120000 0.255000 2.220000 0.435000 ;
-      RECT 1.120000 0.435000 1.425000 0.605000 ;
-      RECT 1.335000 1.705000 1.690000 1.965000 ;
-      RECT 1.545000 2.305000 2.820000 2.475000 ;
-      RECT 1.545000 2.475000 1.875000 2.965000 ;
-      RECT 1.765000 0.675000 2.025000 1.015000 ;
-      RECT 1.765000 1.015000 2.820000 1.185000 ;
-      RECT 2.220000 1.535000 2.480000 1.745000 ;
-      RECT 2.650000 1.185000 2.820000 1.395000 ;
-      RECT 2.650000 1.395000 3.120000 1.725000 ;
-      RECT 2.650000 1.725000 2.820000 2.305000 ;
-      RECT 3.000000 0.795000 4.465000 1.005000 ;
-      RECT 3.015000 2.075000 3.460000 2.745000 ;
-      RECT 3.290000 1.005000 3.460000 2.075000 ;
-      RECT 3.665000 1.185000 3.995000 1.695000 ;
-      RECT 3.665000 1.695000 4.805000 1.865000 ;
-      RECT 4.205000 1.005000 4.465000 1.515000 ;
-      RECT 4.400000 0.285000 4.805000 0.625000 ;
-      RECT 4.455000 1.865000 4.715000 2.950000 ;
-      RECT 4.635000 0.625000 4.805000 1.265000 ;
-      RECT 4.635000 1.265000 5.215000 1.595000 ;
-      RECT 4.635000 1.595000 4.805000 1.695000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.085000  0.265000 0.535000 0.605000 ;
+      RECT 0.085000  0.605000 0.300000 1.625000 ;
+      RECT 0.085000  1.625000 1.155000 1.795000 ;
+      RECT 0.085000  1.795000 0.365000 2.775000 ;
+      RECT 0.585000  2.135000 0.795000 3.245000 ;
+      RECT 0.705000  0.085000 0.950000 0.605000 ;
+      RECT 0.985000  1.365000 2.480000 1.535000 ;
+      RECT 0.985000  1.535000 1.155000 1.625000 ;
+      RECT 1.015000  1.965000 1.690000 2.135000 ;
+      RECT 1.015000  2.135000 1.335000 2.775000 ;
+      RECT 1.120000  0.255000 2.220000 0.435000 ;
+      RECT 1.120000  0.435000 1.425000 0.605000 ;
+      RECT 1.335000  1.705000 1.690000 1.965000 ;
+      RECT 1.545000  2.305000 2.820000 2.475000 ;
+      RECT 1.545000  2.475000 1.875000 2.965000 ;
+      RECT 1.765000  0.675000 2.025000 1.015000 ;
+      RECT 1.765000  1.015000 2.820000 1.185000 ;
+      RECT 2.070000  2.645000 2.400000 3.245000 ;
+      RECT 2.195000  0.605000 2.570000 0.845000 ;
+      RECT 2.220000  1.535000 2.480000 1.745000 ;
+      RECT 2.400000  0.085000 2.570000 0.605000 ;
+      RECT 2.650000  1.185000 2.820000 1.395000 ;
+      RECT 2.650000  1.395000 3.120000 1.725000 ;
+      RECT 2.650000  1.725000 2.820000 2.305000 ;
+      RECT 3.000000  0.795000 4.465000 1.005000 ;
+      RECT 3.015000  2.075000 3.460000 2.745000 ;
+      RECT 3.290000  1.005000 3.460000 2.075000 ;
+      RECT 3.665000  1.185000 3.995000 1.695000 ;
+      RECT 3.665000  1.695000 4.805000 1.865000 ;
+      RECT 3.900000  0.085000 4.230000 0.625000 ;
+      RECT 3.955000  2.035000 4.285000 3.245000 ;
+      RECT 4.205000  1.005000 4.465000 1.515000 ;
+      RECT 4.400000  0.285000 4.805000 0.625000 ;
+      RECT 4.455000  1.865000 4.715000 2.950000 ;
+      RECT 4.635000  0.625000 4.805000 1.265000 ;
+      RECT 4.635000  1.265000 5.215000 1.595000 ;
+      RECT 4.635000  1.595000 4.805000 1.695000 ;
+      RECT 4.905000  2.035000 5.215000 3.245000 ;
+      RECT 4.975000  0.085000 5.215000 1.095000 ;
+      RECT 4.975000  1.815000 5.215000 2.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlxtp_1
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef
index 30766a8..1a6f665 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.magic.lef
@@ -61,30 +61,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.950000 ;
-        RECT 3.285000  0.085000 3.615000 0.545000 ;
-        RECT 5.280000  0.085000 5.610000 0.675000 ;
-        RECT 6.915000  0.085000 7.245000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -93,72 +69,93 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.935000 2.330000 1.265000 3.245000 ;
-        RECT 3.195000 2.825000 3.525000 3.245000 ;
-        RECT 5.565000 1.815000 5.895000 3.245000 ;
-        RECT 6.915000 1.815000 7.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 ;
-        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.490000 0.445000 1.130000 ;
-      RECT 0.115000 1.130000 1.545000 1.300000 ;
-      RECT 0.115000 1.300000 0.365000 3.010000 ;
-      RECT 1.375000 1.300000 1.545000 1.425000 ;
-      RECT 1.375000 1.425000 3.310000 1.585000 ;
-      RECT 1.375000 1.585000 4.270000 1.595000 ;
-      RECT 1.725000 0.490000 2.055000 1.075000 ;
-      RECT 1.725000 1.075000 3.880000 1.245000 ;
-      RECT 1.725000 2.330000 2.055000 3.010000 ;
-      RECT 1.885000 1.965000 3.730000 2.135000 ;
-      RECT 1.885000 2.135000 2.055000 2.330000 ;
-      RECT 2.295000 2.435000 2.625000 2.475000 ;
-      RECT 2.295000 2.475000 4.895000 2.645000 ;
-      RECT 2.295000 2.645000 2.625000 3.065000 ;
-      RECT 2.465000 0.265000 2.795000 0.725000 ;
-      RECT 2.465000 0.725000 4.275000 0.855000 ;
-      RECT 2.465000 0.855000 4.620000 0.895000 ;
-      RECT 2.980000 1.595000 4.270000 1.755000 ;
-      RECT 3.400000 2.135000 3.730000 2.295000 ;
-      RECT 3.550000 1.245000 3.880000 1.405000 ;
-      RECT 3.940000 1.755000 4.270000 1.975000 ;
-      RECT 4.095000 2.825000 5.245000 3.035000 ;
-      RECT 4.105000 0.895000 4.620000 1.185000 ;
-      RECT 4.450000 1.185000 4.620000 2.185000 ;
-      RECT 4.450000 2.185000 4.895000 2.475000 ;
-      RECT 4.455000 0.265000 4.785000 0.505000 ;
-      RECT 4.455000 0.505000 4.970000 0.675000 ;
-      RECT 4.800000 0.675000 4.970000 1.435000 ;
-      RECT 4.800000 1.435000 6.170000 1.605000 ;
-      RECT 5.075000 1.605000 5.245000 2.825000 ;
-      RECT 5.150000 0.925000 6.685000 1.095000 ;
-      RECT 5.150000 1.095000 5.480000 1.255000 ;
-      RECT 5.840000 1.275000 6.170000 1.435000 ;
-      RECT 6.355000 0.265000 6.685000 0.925000 ;
-      RECT 6.355000 1.095000 6.685000 1.305000 ;
-      RECT 6.355000 1.305000 7.525000 1.635000 ;
-      RECT 6.355000 1.635000 6.685000 3.065000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.490000 0.445000 1.130000 ;
+      RECT 0.115000  1.130000 1.545000 1.300000 ;
+      RECT 0.115000  1.300000 0.365000 3.010000 ;
+      RECT 0.905000  0.085000 1.235000 0.950000 ;
+      RECT 0.935000  2.330000 1.265000 3.245000 ;
+      RECT 1.375000  1.300000 1.545000 1.425000 ;
+      RECT 1.375000  1.425000 3.310000 1.585000 ;
+      RECT 1.375000  1.585000 4.270000 1.595000 ;
+      RECT 1.725000  0.490000 2.055000 1.075000 ;
+      RECT 1.725000  1.075000 3.880000 1.245000 ;
+      RECT 1.725000  2.330000 2.055000 3.010000 ;
+      RECT 1.885000  1.965000 3.730000 2.135000 ;
+      RECT 1.885000  2.135000 2.055000 2.330000 ;
+      RECT 2.295000  2.435000 2.625000 2.475000 ;
+      RECT 2.295000  2.475000 4.895000 2.645000 ;
+      RECT 2.295000  2.645000 2.625000 3.065000 ;
+      RECT 2.465000  0.265000 2.795000 0.725000 ;
+      RECT 2.465000  0.725000 4.275000 0.855000 ;
+      RECT 2.465000  0.855000 4.620000 0.895000 ;
+      RECT 2.980000  1.595000 4.270000 1.755000 ;
+      RECT 3.195000  2.825000 3.525000 3.245000 ;
+      RECT 3.285000  0.085000 3.615000 0.545000 ;
+      RECT 3.400000  2.135000 3.730000 2.295000 ;
+      RECT 3.550000  1.245000 3.880000 1.405000 ;
+      RECT 3.940000  1.755000 4.270000 1.975000 ;
+      RECT 4.095000  2.825000 5.245000 3.035000 ;
+      RECT 4.105000  0.895000 4.620000 1.185000 ;
+      RECT 4.450000  1.185000 4.620000 2.185000 ;
+      RECT 4.450000  2.185000 4.895000 2.475000 ;
+      RECT 4.455000  0.265000 4.785000 0.505000 ;
+      RECT 4.455000  0.505000 4.970000 0.675000 ;
+      RECT 4.800000  0.675000 4.970000 1.435000 ;
+      RECT 4.800000  1.435000 6.170000 1.605000 ;
+      RECT 5.075000  1.605000 5.245000 2.825000 ;
+      RECT 5.150000  0.925000 6.685000 1.095000 ;
+      RECT 5.150000  1.095000 5.480000 1.255000 ;
+      RECT 5.280000  0.085000 5.610000 0.675000 ;
+      RECT 5.565000  1.815000 5.895000 3.245000 ;
+      RECT 5.840000  1.275000 6.170000 1.435000 ;
+      RECT 6.355000  0.265000 6.685000 0.925000 ;
+      RECT 6.355000  1.095000 6.685000 1.305000 ;
+      RECT 6.355000  1.305000 7.525000 1.635000 ;
+      RECT 6.355000  1.635000 6.685000 3.065000 ;
+      RECT 6.915000  0.085000 7.245000 1.125000 ;
+      RECT 6.915000  1.815000 7.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 ;
+      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_lp__dlxtp_lp
diff --git a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef
index 3711271..2f45eb2 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.magic.lef
@@ -62,30 +62,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.725000 ;
-        RECT 3.045000  0.085000 3.375000 0.675000 ;
-        RECT 5.410000  0.085000 5.740000 0.675000 ;
-        RECT 6.930000  0.085000 7.260000 0.855000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -94,67 +70,88 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.645000 2.805000 0.975000 3.245000 ;
-        RECT 2.850000 2.935000 3.180000 3.245000 ;
-        RECT 5.410000 2.075000 5.740000 3.245000 ;
-        RECT 6.930000 1.885000 7.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 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.265000 0.445000 0.725000 ;
-      RECT 0.115000 0.725000 0.285000 2.025000 ;
-      RECT 0.115000 2.025000 0.445000 2.455000 ;
-      RECT 0.115000 2.455000 1.325000 2.585000 ;
-      RECT 0.115000 2.585000 3.650000 2.625000 ;
-      RECT 0.115000 2.625000 0.445000 3.065000 ;
-      RECT 1.155000 2.625000 3.650000 2.755000 ;
-      RECT 1.175000 2.025000 2.025000 2.275000 ;
-      RECT 1.695000 0.265000 2.025000 2.025000 ;
-      RECT 2.240000 0.265000 2.585000 0.915000 ;
-      RECT 2.240000 0.915000 4.880000 1.085000 ;
-      RECT 2.240000 1.085000 2.570000 2.405000 ;
-      RECT 2.750000 1.265000 4.400000 1.435000 ;
-      RECT 2.750000 1.435000 3.080000 1.935000 ;
-      RECT 3.320000 1.615000 3.650000 2.585000 ;
-      RECT 3.710000 0.765000 4.880000 0.915000 ;
-      RECT 3.945000 0.295000 5.230000 0.585000 ;
-      RECT 4.070000 1.435000 4.400000 1.665000 ;
-      RECT 4.305000 2.075000 5.230000 2.245000 ;
-      RECT 4.305000 2.245000 4.635000 3.065000 ;
-      RECT 4.610000 1.085000 4.880000 1.895000 ;
-      RECT 5.060000 0.585000 5.230000 0.855000 ;
-      RECT 5.060000 0.855000 6.215000 1.025000 ;
-      RECT 5.060000 1.025000 5.230000 2.075000 ;
-      RECT 5.410000 1.205000 5.675000 1.705000 ;
-      RECT 5.410000 1.705000 6.565000 1.875000 ;
-      RECT 5.885000 1.025000 6.215000 1.525000 ;
-      RECT 6.140000 2.075000 6.565000 3.065000 ;
-      RECT 6.370000 0.265000 6.700000 0.675000 ;
-      RECT 6.395000 0.675000 6.700000 1.035000 ;
-      RECT 6.395000 1.035000 6.965000 1.705000 ;
-      RECT 6.395000 1.875000 6.565000 2.075000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.115000  0.265000 0.445000 0.725000 ;
+      RECT 0.115000  0.725000 0.285000 2.025000 ;
+      RECT 0.115000  2.025000 0.445000 2.455000 ;
+      RECT 0.115000  2.455000 1.325000 2.585000 ;
+      RECT 0.115000  2.585000 3.650000 2.625000 ;
+      RECT 0.115000  2.625000 0.445000 3.065000 ;
+      RECT 0.645000  2.805000 0.975000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.725000 ;
+      RECT 1.155000  2.625000 3.650000 2.755000 ;
+      RECT 1.175000  2.025000 2.025000 2.275000 ;
+      RECT 1.695000  0.265000 2.025000 2.025000 ;
+      RECT 2.240000  0.265000 2.585000 0.915000 ;
+      RECT 2.240000  0.915000 4.880000 1.085000 ;
+      RECT 2.240000  1.085000 2.570000 2.405000 ;
+      RECT 2.750000  1.265000 4.400000 1.435000 ;
+      RECT 2.750000  1.435000 3.080000 1.935000 ;
+      RECT 2.850000  2.935000 3.180000 3.245000 ;
+      RECT 3.045000  0.085000 3.375000 0.675000 ;
+      RECT 3.320000  1.615000 3.650000 2.585000 ;
+      RECT 3.710000  0.765000 4.880000 0.915000 ;
+      RECT 3.945000  0.295000 5.230000 0.585000 ;
+      RECT 4.070000  1.435000 4.400000 1.665000 ;
+      RECT 4.305000  2.075000 5.230000 2.245000 ;
+      RECT 4.305000  2.245000 4.635000 3.065000 ;
+      RECT 4.610000  1.085000 4.880000 1.895000 ;
+      RECT 5.060000  0.585000 5.230000 0.855000 ;
+      RECT 5.060000  0.855000 6.215000 1.025000 ;
+      RECT 5.060000  1.025000 5.230000 2.075000 ;
+      RECT 5.410000  0.085000 5.740000 0.675000 ;
+      RECT 5.410000  1.205000 5.675000 1.705000 ;
+      RECT 5.410000  1.705000 6.565000 1.875000 ;
+      RECT 5.410000  2.075000 5.740000 3.245000 ;
+      RECT 5.885000  1.025000 6.215000 1.525000 ;
+      RECT 6.140000  2.075000 6.565000 3.065000 ;
+      RECT 6.370000  0.265000 6.700000 0.675000 ;
+      RECT 6.395000  0.675000 6.700000 1.035000 ;
+      RECT 6.395000  1.035000 6.965000 1.705000 ;
+      RECT 6.395000  1.875000 6.565000 2.075000 ;
+      RECT 6.930000  0.085000 7.260000 0.855000 ;
+      RECT 6.930000  1.885000 7.260000 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_lp__dlxtp_lp2
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef
index a4e7dbe..e0a4b6c 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.magic.lef
@@ -54,12 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.725000 0.845000 2.895000 ;
-        RECT 2.790000 2.725000 2.960000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 3.770000 2.945000 ;
     END
@@ -68,19 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -89,44 +70,58 @@
     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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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 0.675000  2.725000 0.845000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.725000 2.960000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlybuf4s15kapwr_1
diff --git a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef
index fb34b5d..58aefa3 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-        RECT 3.875000 1.815000 4.125000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.720000 0.845000 2.890000 ;
-        RECT 2.790000 2.720000 2.960000 2.890000 ;
-        RECT 3.875000 2.720000 4.045000 2.890000 ;
       LAYER met1 ;
         RECT 0.070000 2.685000 4.250000 2.940000 ;
     END
@@ -70,21 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,45 +70,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 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 ;
-        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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.125000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.675000  2.720000 0.845000 2.890000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.720000 2.960000 2.890000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.875000  2.720000 4.045000 2.890000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_lp__dlybuf4s15kapwr_2
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef
index 5c7a251..59a9ec2 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.magic.lef
@@ -54,12 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.725000 0.845000 2.895000 ;
-        RECT 2.790000 2.725000 2.960000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 3.770000 2.945000 ;
     END
@@ -68,19 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -89,44 +70,58 @@
     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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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 0.675000  2.725000 0.845000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.725000 2.960000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlybuf4s18kapwr_1
diff --git a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef
index b367902..f5adaa8 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-        RECT 3.875000 1.815000 4.125000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.725000 0.845000 2.895000 ;
-        RECT 2.790000 2.725000 2.960000 2.895000 ;
-        RECT 3.875000 2.725000 4.045000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 4.250000 2.945000 ;
     END
@@ -70,21 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,45 +70,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 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 ;
-        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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.125000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.675000  2.725000 0.845000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.725000 2.960000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.875000  2.725000 4.045000 2.895000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_lp__dlybuf4s18kapwr_2
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef
index 629ff3e..4840e8d 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.magic.lef
@@ -54,12 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.725000 0.845000 2.895000 ;
-        RECT 2.790000 2.725000 2.960000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 3.770000 2.945000 ;
     END
@@ -68,19 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -89,44 +70,58 @@
     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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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 0.675000  2.725000 0.845000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.725000 2.960000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlybuf4s25kapwr_1
diff --git a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef
index 6fd3a43..0d1cc7e 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-        RECT 3.875000 1.815000 4.125000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.725000 0.845000 2.895000 ;
-        RECT 2.790000 2.725000 2.960000 2.895000 ;
-        RECT 3.875000 2.725000 4.045000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 4.250000 2.945000 ;
     END
@@ -70,21 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,45 +70,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 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 ;
-        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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.125000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.675000  2.725000 0.845000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.725000 2.960000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.875000  2.725000 4.045000 2.895000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_lp__dlybuf4s25kapwr_2
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef
index 43b7494..608c493 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.magic.lef
@@ -54,12 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.725000 0.845000 2.895000 ;
-        RECT 2.790000 2.725000 2.960000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 3.770000 2.945000 ;
     END
@@ -68,19 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -89,44 +70,58 @@
     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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 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.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 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 0.675000  2.725000 0.845000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.725000 2.960000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__dlybuf4s50kapwr_1
diff --git a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef
index 46ce106..30b2b5d 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.595000 2.380000 0.925000 3.075000 ;
-        RECT 2.710000 2.165000 3.040000 3.075000 ;
-        RECT 3.875000 1.815000 4.125000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.675000 2.725000 0.845000 2.895000 ;
-        RECT 2.790000 2.725000 2.960000 2.895000 ;
-        RECT 3.875000 2.725000 4.045000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 4.250000 2.945000 ;
     END
@@ -70,21 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.710000  0.085000 3.040000 0.670000 ;
-        RECT 3.875000  0.085000 4.125000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,45 +70,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 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 ;
-        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.095000 0.305000 0.410000 0.820000 ;
-      RECT 0.095000 0.820000 1.265000 1.020000 ;
-      RECT 0.095000 2.030000 1.265000 2.205000 ;
-      RECT 0.095000 2.205000 0.425000 3.075000 ;
-      RECT 0.910000 1.020000 1.265000 1.600000 ;
-      RECT 0.910000 1.600000 1.500000 1.930000 ;
-      RECT 0.910000 1.930000 1.265000 2.030000 ;
-      RECT 1.385000 2.395000 1.840000 3.075000 ;
-      RECT 1.435000 0.270000 1.840000 1.280000 ;
-      RECT 1.445000 2.100000 1.840000 2.395000 ;
-      RECT 1.670000 1.280000 1.840000 1.385000 ;
-      RECT 1.670000 1.385000 2.685000 1.655000 ;
-      RECT 1.670000 1.655000 1.840000 2.100000 ;
-      RECT 2.010000 0.270000 2.260000 0.980000 ;
-      RECT 2.010000 0.980000 3.025000 1.215000 ;
-      RECT 2.010000 2.080000 2.540000 2.250000 ;
-      RECT 2.010000 2.250000 2.260000 3.075000 ;
-      RECT 2.370000 1.825000 3.025000 1.995000 ;
-      RECT 2.370000 1.995000 2.540000 2.080000 ;
-      RECT 2.855000 1.215000 3.025000 1.295000 ;
-      RECT 2.855000 1.295000 3.345000 1.625000 ;
-      RECT 2.855000 1.625000 3.025000 1.825000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.305000 0.410000 0.820000 ;
+      RECT 0.095000  0.820000 1.265000 1.020000 ;
+      RECT 0.095000  2.030000 1.265000 2.205000 ;
+      RECT 0.095000  2.205000 0.425000 3.075000 ;
+      RECT 0.580000  0.085000 0.910000 0.650000 ;
+      RECT 0.595000  2.380000 0.925000 3.075000 ;
+      RECT 0.910000  1.020000 1.265000 1.600000 ;
+      RECT 0.910000  1.600000 1.500000 1.930000 ;
+      RECT 0.910000  1.930000 1.265000 2.030000 ;
+      RECT 1.385000  2.395000 1.840000 3.075000 ;
+      RECT 1.435000  0.270000 1.840000 1.280000 ;
+      RECT 1.445000  2.100000 1.840000 2.395000 ;
+      RECT 1.670000  1.280000 1.840000 1.385000 ;
+      RECT 1.670000  1.385000 2.685000 1.655000 ;
+      RECT 1.670000  1.655000 1.840000 2.100000 ;
+      RECT 2.010000  0.270000 2.260000 0.980000 ;
+      RECT 2.010000  0.980000 3.025000 1.215000 ;
+      RECT 2.010000  2.080000 2.540000 2.250000 ;
+      RECT 2.010000  2.250000 2.260000 3.075000 ;
+      RECT 2.370000  1.825000 3.025000 1.995000 ;
+      RECT 2.370000  1.995000 2.540000 2.080000 ;
+      RECT 2.710000  0.085000 3.040000 0.670000 ;
+      RECT 2.710000  2.165000 3.040000 3.075000 ;
+      RECT 2.855000  1.215000 3.025000 1.295000 ;
+      RECT 2.855000  1.295000 3.345000 1.625000 ;
+      RECT 2.855000  1.625000 3.025000 1.825000 ;
+      RECT 3.875000  0.085000 4.125000 0.645000 ;
+      RECT 3.875000  1.815000 4.125000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.675000  2.725000 0.845000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.790000  2.725000 2.960000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.875000  2.725000 4.045000 2.895000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
   END
 END sky130_fd_sc_lp__dlybuf4s50kapwr_2
diff --git a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.magic.lef b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.magic.lef
index a1dd871..cc32275 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.magic.lef
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_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.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.825000  0.085000 3.155000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.570000 2.380000 0.900000 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.385000 ;
-      RECT 1.475000 1.385000 2.740000 1.655000 ;
-      RECT 1.475000 1.655000 1.720000 2.395000 ;
-      RECT 1.985000 0.710000 2.345000 1.045000 ;
-      RECT 1.985000 1.045000 3.155000 1.215000 ;
-      RECT 1.985000 1.825000 3.155000 1.995000 ;
-      RECT 1.985000 1.995000 2.345000 2.190000 ;
-      RECT 2.910000 1.215000 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.570000  2.380000 0.900000 3.245000 ;
+      RECT 0.580000  0.085000 0.910000 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.385000 ;
+      RECT 1.475000  1.385000 2.740000 1.655000 ;
+      RECT 1.475000  1.655000 1.720000 2.395000 ;
+      RECT 1.985000  0.710000 2.345000 1.045000 ;
+      RECT 1.985000  1.045000 3.155000 1.215000 ;
+      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.875000 ;
+      RECT 2.825000  2.165000 3.155000 3.245000 ;
+      RECT 2.910000  1.215000 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_lp__dlygate4s15_1
diff --git a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.magic.lef b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.magic.lef
index 8ab3b9a..2fa8077 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.magic.lef
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_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.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.825000  0.085000 3.155000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.570000 2.380000 0.900000 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.385000 ;
-      RECT 1.475000 1.385000 2.740000 1.655000 ;
-      RECT 1.475000 1.655000 1.720000 2.395000 ;
-      RECT 1.985000 0.710000 2.345000 1.045000 ;
-      RECT 1.985000 1.045000 3.155000 1.215000 ;
-      RECT 1.985000 1.825000 3.155000 1.995000 ;
-      RECT 1.985000 1.995000 2.345000 2.190000 ;
-      RECT 2.910000 1.215000 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.570000  2.380000 0.900000 3.245000 ;
+      RECT 0.580000  0.085000 0.910000 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.385000 ;
+      RECT 1.475000  1.385000 2.740000 1.655000 ;
+      RECT 1.475000  1.655000 1.720000 2.395000 ;
+      RECT 1.985000  0.710000 2.345000 1.045000 ;
+      RECT 1.985000  1.045000 3.155000 1.215000 ;
+      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.875000 ;
+      RECT 2.825000  2.165000 3.155000 3.245000 ;
+      RECT 2.910000  1.215000 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_lp__dlygate4s18_1
diff --git a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.magic.lef b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.magic.lef
index 01911b9..ac324c7 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.magic.lef
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_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.580000  0.085000 0.910000 0.650000 ;
-        RECT 2.825000  0.085000 3.155000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.570000 2.380000 0.900000 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.385000 ;
-      RECT 1.475000 1.385000 2.740000 1.655000 ;
-      RECT 1.475000 1.655000 1.720000 2.395000 ;
-      RECT 1.985000 0.710000 2.345000 1.045000 ;
-      RECT 1.985000 1.045000 3.155000 1.215000 ;
-      RECT 1.985000 1.825000 3.155000 1.995000 ;
-      RECT 1.985000 1.995000 2.345000 2.190000 ;
-      RECT 2.910000 1.215000 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.570000  2.380000 0.900000 3.245000 ;
+      RECT 0.580000  0.085000 0.910000 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.385000 ;
+      RECT 1.475000  1.385000 2.740000 1.655000 ;
+      RECT 1.475000  1.655000 1.720000 2.395000 ;
+      RECT 1.985000  0.710000 2.345000 1.045000 ;
+      RECT 1.985000  1.045000 3.155000 1.215000 ;
+      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.875000 ;
+      RECT 2.825000  2.165000 3.155000 3.245000 ;
+      RECT 2.910000  1.215000 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_lp__dlygate4s50_1
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef
index 5769de5..7f4050b 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.magic.lef
@@ -45,14 +45,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.060000 1.835000 1.350000 3.075000 ;
-        RECT 1.085000 0.255000 1.350000 1.075000 ;
-        RECT 1.180000 1.075000 1.350000 1.315000 ;
-        RECT 1.180000 1.315000 1.990000 1.605000 ;
-        RECT 1.180000 1.605000 1.350000 1.835000 ;
-      LAYER mcon ;
-        RECT 1.095000 1.950000 1.265000 2.120000 ;
       LAYER met1 ;
         RECT 0.960000 1.920000 1.325000 2.320000 ;
         RECT 0.960000 2.320000 4.205000 2.490000 ;
@@ -62,21 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.805000 ;
-        RECT 2.025000  0.085000 2.355000 0.805000 ;
-        RECT 3.465000  0.085000 3.795000 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
@@ -85,59 +62,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.585000 2.330000 0.880000 3.245000 ;
-        RECT 2.025000 2.330000 2.320000 3.245000 ;
-        RECT 3.465000 2.330000 3.760000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 0.700000 0.390000 0.975000 ;
-      RECT 0.095000 0.975000 0.890000 1.145000 ;
-      RECT 0.095000 1.935000 0.890000 2.160000 ;
-      RECT 0.095000 2.160000 0.425000 2.225000 ;
-      RECT 0.720000 1.145000 0.890000 1.275000 ;
-      RECT 0.720000 1.275000 1.010000 1.605000 ;
-      RECT 0.720000 1.605000 0.890000 1.935000 ;
-      RECT 1.535000 0.700000 1.830000 0.975000 ;
-      RECT 1.535000 0.975000 2.330000 1.145000 ;
-      RECT 1.535000 1.895000 2.330000 2.160000 ;
-      RECT 1.535000 2.160000 1.865000 2.225000 ;
-      RECT 2.160000 1.145000 2.330000 1.275000 ;
-      RECT 2.160000 1.275000 2.450000 1.605000 ;
-      RECT 2.160000 1.605000 2.330000 1.895000 ;
-      RECT 2.500000 1.835000 2.790000 3.075000 ;
-      RECT 2.525000 0.255000 2.790000 1.075000 ;
-      RECT 2.620000 1.075000 2.790000 1.315000 ;
-      RECT 2.620000 1.315000 3.430000 1.605000 ;
-      RECT 2.620000 1.605000 2.790000 1.835000 ;
-      RECT 2.975000 0.700000 3.270000 0.975000 ;
-      RECT 2.975000 0.975000 3.770000 1.145000 ;
-      RECT 2.975000 1.895000 3.770000 2.160000 ;
-      RECT 2.975000 2.160000 3.305000 2.225000 ;
-      RECT 3.600000 1.145000 3.770000 1.275000 ;
-      RECT 3.600000 1.275000 3.890000 1.605000 ;
-      RECT 3.600000 1.605000 3.770000 1.895000 ;
-      RECT 3.940000 1.835000 4.235000 3.075000 ;
-      RECT 3.965000 0.255000 4.235000 1.075000 ;
-      RECT 4.060000 1.075000 4.235000 1.835000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.700000 0.390000 0.975000 ;
+      RECT 0.095000  0.975000 0.890000 1.145000 ;
+      RECT 0.095000  1.935000 0.890000 2.160000 ;
+      RECT 0.095000  2.160000 0.425000 2.225000 ;
+      RECT 0.585000  0.085000 0.915000 0.805000 ;
+      RECT 0.585000  2.330000 0.880000 3.245000 ;
+      RECT 0.720000  1.145000 0.890000 1.275000 ;
+      RECT 0.720000  1.275000 1.010000 1.605000 ;
+      RECT 0.720000  1.605000 0.890000 1.935000 ;
+      RECT 1.060000  1.835000 1.350000 3.075000 ;
+      RECT 1.085000  0.255000 1.350000 1.075000 ;
+      RECT 1.180000  1.075000 1.350000 1.315000 ;
+      RECT 1.180000  1.315000 1.990000 1.605000 ;
+      RECT 1.180000  1.605000 1.350000 1.835000 ;
+      RECT 1.535000  0.700000 1.830000 0.975000 ;
+      RECT 1.535000  0.975000 2.330000 1.145000 ;
+      RECT 1.535000  1.895000 2.330000 2.160000 ;
+      RECT 1.535000  2.160000 1.865000 2.225000 ;
+      RECT 2.025000  0.085000 2.355000 0.805000 ;
+      RECT 2.025000  2.330000 2.320000 3.245000 ;
+      RECT 2.160000  1.145000 2.330000 1.275000 ;
+      RECT 2.160000  1.275000 2.450000 1.605000 ;
+      RECT 2.160000  1.605000 2.330000 1.895000 ;
+      RECT 2.500000  1.835000 2.790000 3.075000 ;
+      RECT 2.525000  0.255000 2.790000 1.075000 ;
+      RECT 2.620000  1.075000 2.790000 1.315000 ;
+      RECT 2.620000  1.315000 3.430000 1.605000 ;
+      RECT 2.620000  1.605000 2.790000 1.835000 ;
+      RECT 2.975000  0.700000 3.270000 0.975000 ;
+      RECT 2.975000  0.975000 3.770000 1.145000 ;
+      RECT 2.975000  1.895000 3.770000 2.160000 ;
+      RECT 2.975000  2.160000 3.305000 2.225000 ;
+      RECT 3.465000  0.085000 3.795000 0.805000 ;
+      RECT 3.465000  2.330000 3.760000 3.245000 ;
+      RECT 3.600000  1.145000 3.770000 1.275000 ;
+      RECT 3.600000  1.275000 3.890000 1.605000 ;
+      RECT 3.600000  1.605000 3.770000 1.895000 ;
+      RECT 3.940000  1.835000 4.235000 3.075000 ;
+      RECT 3.965000  0.255000 4.235000 1.075000 ;
+      RECT 4.060000  1.075000 4.235000 1.835000 ;
     LAYER mcon ;
-      RECT 2.535000 1.950000 2.705000 2.120000 ;
-      RECT 3.975000 1.950000 4.145000 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.095000  1.950000 1.265000 2.120000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.535000  1.950000 2.705000 2.120000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.975000  1.950000 4.145000 2.120000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
     LAYER met1 ;
       RECT 2.400000 1.920000 2.765000 2.150000 ;
       RECT 3.840000 1.920000 4.205000 2.150000 ;
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef
index 481a4f2..5c3e8c8 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.magic.lef
@@ -45,14 +45,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 2.500000 1.835000 2.790000 3.075000 ;
-        RECT 2.525000 0.255000 2.790000 1.075000 ;
-        RECT 2.620000 1.075000 2.790000 1.315000 ;
-        RECT 2.620000 1.315000 3.430000 1.605000 ;
-        RECT 2.620000 1.605000 2.790000 1.835000 ;
-      LAYER mcon ;
-        RECT 2.535000 1.950000 2.705000 2.120000 ;
       LAYER met1 ;
         RECT 0.960000 2.320000 4.205000 2.490000 ;
         RECT 2.400000 1.920000 2.765000 2.320000 ;
@@ -62,21 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.805000 ;
-        RECT 2.025000  0.085000 2.355000 0.805000 ;
-        RECT 3.465000  0.085000 3.795000 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
@@ -85,59 +62,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.585000 2.330000 0.880000 3.245000 ;
-        RECT 2.025000 2.330000 2.320000 3.245000 ;
-        RECT 3.465000 2.330000 3.760000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 0.700000 0.390000 0.975000 ;
-      RECT 0.095000 0.975000 0.890000 1.145000 ;
-      RECT 0.095000 1.935000 0.890000 2.160000 ;
-      RECT 0.095000 2.160000 0.425000 2.225000 ;
-      RECT 0.720000 1.145000 0.890000 1.275000 ;
-      RECT 0.720000 1.275000 1.010000 1.605000 ;
-      RECT 0.720000 1.605000 0.890000 1.935000 ;
-      RECT 1.060000 1.835000 1.350000 3.075000 ;
-      RECT 1.085000 0.255000 1.350000 1.075000 ;
-      RECT 1.180000 1.075000 1.350000 1.315000 ;
-      RECT 1.180000 1.315000 1.990000 1.605000 ;
-      RECT 1.180000 1.605000 1.350000 1.835000 ;
-      RECT 1.535000 0.700000 1.830000 0.975000 ;
-      RECT 1.535000 0.975000 2.330000 1.145000 ;
-      RECT 1.535000 1.895000 2.330000 2.160000 ;
-      RECT 1.535000 2.160000 1.865000 2.225000 ;
-      RECT 2.160000 1.145000 2.330000 1.275000 ;
-      RECT 2.160000 1.275000 2.450000 1.605000 ;
-      RECT 2.160000 1.605000 2.330000 1.895000 ;
-      RECT 2.975000 0.700000 3.270000 0.975000 ;
-      RECT 2.975000 0.975000 3.770000 1.145000 ;
-      RECT 2.975000 1.895000 3.770000 2.160000 ;
-      RECT 2.975000 2.160000 3.305000 2.225000 ;
-      RECT 3.600000 1.145000 3.770000 1.275000 ;
-      RECT 3.600000 1.275000 3.890000 1.605000 ;
-      RECT 3.600000 1.605000 3.770000 1.895000 ;
-      RECT 3.940000 1.835000 4.235000 3.075000 ;
-      RECT 3.965000 0.255000 4.235000 1.075000 ;
-      RECT 4.060000 1.075000 4.235000 1.835000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.700000 0.390000 0.975000 ;
+      RECT 0.095000  0.975000 0.890000 1.145000 ;
+      RECT 0.095000  1.935000 0.890000 2.160000 ;
+      RECT 0.095000  2.160000 0.425000 2.225000 ;
+      RECT 0.585000  0.085000 0.915000 0.805000 ;
+      RECT 0.585000  2.330000 0.880000 3.245000 ;
+      RECT 0.720000  1.145000 0.890000 1.275000 ;
+      RECT 0.720000  1.275000 1.010000 1.605000 ;
+      RECT 0.720000  1.605000 0.890000 1.935000 ;
+      RECT 1.060000  1.835000 1.350000 3.075000 ;
+      RECT 1.085000  0.255000 1.350000 1.075000 ;
+      RECT 1.180000  1.075000 1.350000 1.315000 ;
+      RECT 1.180000  1.315000 1.990000 1.605000 ;
+      RECT 1.180000  1.605000 1.350000 1.835000 ;
+      RECT 1.535000  0.700000 1.830000 0.975000 ;
+      RECT 1.535000  0.975000 2.330000 1.145000 ;
+      RECT 1.535000  1.895000 2.330000 2.160000 ;
+      RECT 1.535000  2.160000 1.865000 2.225000 ;
+      RECT 2.025000  0.085000 2.355000 0.805000 ;
+      RECT 2.025000  2.330000 2.320000 3.245000 ;
+      RECT 2.160000  1.145000 2.330000 1.275000 ;
+      RECT 2.160000  1.275000 2.450000 1.605000 ;
+      RECT 2.160000  1.605000 2.330000 1.895000 ;
+      RECT 2.500000  1.835000 2.790000 3.075000 ;
+      RECT 2.525000  0.255000 2.790000 1.075000 ;
+      RECT 2.620000  1.075000 2.790000 1.315000 ;
+      RECT 2.620000  1.315000 3.430000 1.605000 ;
+      RECT 2.620000  1.605000 2.790000 1.835000 ;
+      RECT 2.975000  0.700000 3.270000 0.975000 ;
+      RECT 2.975000  0.975000 3.770000 1.145000 ;
+      RECT 2.975000  1.895000 3.770000 2.160000 ;
+      RECT 2.975000  2.160000 3.305000 2.225000 ;
+      RECT 3.465000  0.085000 3.795000 0.805000 ;
+      RECT 3.465000  2.330000 3.760000 3.245000 ;
+      RECT 3.600000  1.145000 3.770000 1.275000 ;
+      RECT 3.600000  1.275000 3.890000 1.605000 ;
+      RECT 3.600000  1.605000 3.770000 1.895000 ;
+      RECT 3.940000  1.835000 4.235000 3.075000 ;
+      RECT 3.965000  0.255000 4.235000 1.075000 ;
+      RECT 4.060000  1.075000 4.235000 1.835000 ;
     LAYER mcon ;
-      RECT 1.095000 1.950000 1.265000 2.120000 ;
-      RECT 3.975000 1.950000 4.145000 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.095000  1.950000 1.265000 2.120000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.535000  1.950000 2.705000 2.120000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.975000  1.950000 4.145000 2.120000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
     LAYER met1 ;
       RECT 0.960000 1.920000 1.325000 2.150000 ;
       RECT 3.840000 1.920000 4.205000 2.150000 ;
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef
index 2ddb6fb..b3e8a53 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.magic.lef
@@ -44,12 +44,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.940000 1.835000 4.235000 3.075000 ;
-        RECT 3.965000 0.255000 4.235000 1.075000 ;
-        RECT 4.060000 1.075000 4.235000 1.835000 ;
-      LAYER mcon ;
-        RECT 3.975000 1.950000 4.145000 2.120000 ;
       LAYER met1 ;
         RECT 0.960000 2.320000 4.205000 2.490000 ;
         RECT 3.840000 1.920000 4.205000 2.320000 ;
@@ -59,21 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.805000 ;
-        RECT 2.025000  0.085000 2.355000 0.805000 ;
-        RECT 3.465000  0.085000 3.795000 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
@@ -82,61 +61,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.585000 2.330000 0.880000 3.245000 ;
-        RECT 2.025000 2.330000 2.320000 3.245000 ;
-        RECT 3.465000 2.330000 3.760000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 0.700000 0.390000 0.975000 ;
-      RECT 0.095000 0.975000 0.890000 1.145000 ;
-      RECT 0.095000 1.935000 0.890000 2.160000 ;
-      RECT 0.095000 2.160000 0.425000 2.225000 ;
-      RECT 0.720000 1.145000 0.890000 1.275000 ;
-      RECT 0.720000 1.275000 1.010000 1.605000 ;
-      RECT 0.720000 1.605000 0.890000 1.935000 ;
-      RECT 1.060000 1.835000 1.350000 3.075000 ;
-      RECT 1.085000 0.255000 1.350000 1.075000 ;
-      RECT 1.180000 1.075000 1.350000 1.315000 ;
-      RECT 1.180000 1.315000 1.990000 1.605000 ;
-      RECT 1.180000 1.605000 1.350000 1.835000 ;
-      RECT 1.535000 0.700000 1.830000 0.975000 ;
-      RECT 1.535000 0.975000 2.330000 1.145000 ;
-      RECT 1.535000 1.895000 2.330000 2.160000 ;
-      RECT 1.535000 2.160000 1.865000 2.225000 ;
-      RECT 2.160000 1.145000 2.330000 1.275000 ;
-      RECT 2.160000 1.275000 2.450000 1.605000 ;
-      RECT 2.160000 1.605000 2.330000 1.895000 ;
-      RECT 2.500000 1.835000 2.790000 3.075000 ;
-      RECT 2.525000 0.255000 2.790000 1.075000 ;
-      RECT 2.620000 1.075000 2.790000 1.315000 ;
-      RECT 2.620000 1.315000 3.430000 1.605000 ;
-      RECT 2.620000 1.605000 2.790000 1.835000 ;
-      RECT 2.975000 0.700000 3.270000 0.975000 ;
-      RECT 2.975000 0.975000 3.770000 1.145000 ;
-      RECT 2.975000 1.895000 3.770000 2.160000 ;
-      RECT 2.975000 2.160000 3.305000 2.225000 ;
-      RECT 3.600000 1.145000 3.770000 1.275000 ;
-      RECT 3.600000 1.275000 3.890000 1.605000 ;
-      RECT 3.600000 1.605000 3.770000 1.895000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.700000 0.390000 0.975000 ;
+      RECT 0.095000  0.975000 0.890000 1.145000 ;
+      RECT 0.095000  1.935000 0.890000 2.160000 ;
+      RECT 0.095000  2.160000 0.425000 2.225000 ;
+      RECT 0.585000  0.085000 0.915000 0.805000 ;
+      RECT 0.585000  2.330000 0.880000 3.245000 ;
+      RECT 0.720000  1.145000 0.890000 1.275000 ;
+      RECT 0.720000  1.275000 1.010000 1.605000 ;
+      RECT 0.720000  1.605000 0.890000 1.935000 ;
+      RECT 1.060000  1.835000 1.350000 3.075000 ;
+      RECT 1.085000  0.255000 1.350000 1.075000 ;
+      RECT 1.180000  1.075000 1.350000 1.315000 ;
+      RECT 1.180000  1.315000 1.990000 1.605000 ;
+      RECT 1.180000  1.605000 1.350000 1.835000 ;
+      RECT 1.535000  0.700000 1.830000 0.975000 ;
+      RECT 1.535000  0.975000 2.330000 1.145000 ;
+      RECT 1.535000  1.895000 2.330000 2.160000 ;
+      RECT 1.535000  2.160000 1.865000 2.225000 ;
+      RECT 2.025000  0.085000 2.355000 0.805000 ;
+      RECT 2.025000  2.330000 2.320000 3.245000 ;
+      RECT 2.160000  1.145000 2.330000 1.275000 ;
+      RECT 2.160000  1.275000 2.450000 1.605000 ;
+      RECT 2.160000  1.605000 2.330000 1.895000 ;
+      RECT 2.500000  1.835000 2.790000 3.075000 ;
+      RECT 2.525000  0.255000 2.790000 1.075000 ;
+      RECT 2.620000  1.075000 2.790000 1.315000 ;
+      RECT 2.620000  1.315000 3.430000 1.605000 ;
+      RECT 2.620000  1.605000 2.790000 1.835000 ;
+      RECT 2.975000  0.700000 3.270000 0.975000 ;
+      RECT 2.975000  0.975000 3.770000 1.145000 ;
+      RECT 2.975000  1.895000 3.770000 2.160000 ;
+      RECT 2.975000  2.160000 3.305000 2.225000 ;
+      RECT 3.465000  0.085000 3.795000 0.805000 ;
+      RECT 3.465000  2.330000 3.760000 3.245000 ;
+      RECT 3.600000  1.145000 3.770000 1.275000 ;
+      RECT 3.600000  1.275000 3.890000 1.605000 ;
+      RECT 3.600000  1.605000 3.770000 1.895000 ;
+      RECT 3.940000  1.835000 4.235000 3.075000 ;
+      RECT 3.965000  0.255000 4.235000 1.075000 ;
+      RECT 4.060000  1.075000 4.235000 1.835000 ;
     LAYER mcon ;
-      RECT 1.095000 1.950000 1.265000 2.120000 ;
-      RECT 2.535000 1.950000 2.705000 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.095000  1.950000 1.265000 2.120000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.535000  1.950000 2.705000 2.120000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.975000  1.950000 4.145000 2.120000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
     LAYER met1 ;
       RECT 0.960000 1.920000 1.325000 2.150000 ;
       RECT 2.400000 1.920000 2.765000 2.150000 ;
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef
index 838f124..10b0de8 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.magic.lef
@@ -63,19 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.220000  0.085000 1.550000 1.225000 ;
-        RECT 2.740000  0.085000 3.070000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -84,39 +71,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.190000 1.795000 1.520000 3.245000 ;
-        RECT 2.790000 2.450000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.315000 0.855000 1.455000 ;
-      RECT 0.525000 1.455000 1.860000 1.625000 ;
-      RECT 0.525000 1.625000 0.855000 1.645000 ;
-      RECT 1.690000 1.625000 1.860000 2.905000 ;
-      RECT 1.690000 2.905000 2.620000 3.075000 ;
-      RECT 1.820000 0.255000 2.200000 0.585000 ;
-      RECT 2.030000 0.585000 2.200000 0.640000 ;
-      RECT 2.030000 0.640000 2.570000 1.100000 ;
-      RECT 2.030000 1.100000 2.280000 2.735000 ;
-      RECT 2.450000 2.110000 3.755000 2.280000 ;
-      RECT 2.450000 2.280000 2.620000 2.905000 ;
-      RECT 3.240000 0.640000 3.570000 0.930000 ;
-      RECT 3.240000 0.930000 3.755000 1.100000 ;
-      RECT 3.290000 2.280000 3.755000 2.790000 ;
-      RECT 3.585000 1.100000 3.755000 2.110000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.525000  1.315000 0.855000 1.455000 ;
+      RECT 0.525000  1.455000 1.860000 1.625000 ;
+      RECT 0.525000  1.625000 0.855000 1.645000 ;
+      RECT 1.190000  1.795000 1.520000 3.245000 ;
+      RECT 1.220000  0.085000 1.550000 1.225000 ;
+      RECT 1.690000  1.625000 1.860000 2.905000 ;
+      RECT 1.690000  2.905000 2.620000 3.075000 ;
+      RECT 1.820000  0.255000 2.200000 0.585000 ;
+      RECT 2.030000  0.585000 2.200000 0.640000 ;
+      RECT 2.030000  0.640000 2.570000 1.100000 ;
+      RECT 2.030000  1.100000 2.280000 2.735000 ;
+      RECT 2.450000  2.110000 3.755000 2.280000 ;
+      RECT 2.450000  2.280000 2.620000 2.905000 ;
+      RECT 2.740000  0.085000 3.070000 1.100000 ;
+      RECT 2.790000  2.450000 3.120000 3.245000 ;
+      RECT 3.240000  0.640000 3.570000 0.930000 ;
+      RECT 3.240000  0.930000 3.755000 1.100000 ;
+      RECT 3.290000  2.280000 3.755000 2.790000 ;
+      RECT 3.585000  1.100000 3.755000 2.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 ;
   END
 END sky130_fd_sc_lp__ebufn_1
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.magic.lef
index 6b08e6c..f0173f9 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__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.625000  0.085000 1.875000 0.785000 ;
-        RECT 3.370000  0.085000 3.700000 1.135000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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.545000 2.155000 1.715000 3.245000 ;
-        RECT 3.335000 2.785000 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.255000 1.445000 0.425000 ;
-      RECT 0.115000 0.425000 0.445000 0.785000 ;
-      RECT 0.175000 2.135000 0.505000 2.905000 ;
-      RECT 0.175000 2.905000 1.365000 3.075000 ;
-      RECT 0.740000 1.295000 2.485000 1.625000 ;
-      RECT 1.035000 1.815000 2.145000 1.985000 ;
-      RECT 1.035000 1.985000 1.365000 2.905000 ;
-      RECT 1.115000 0.425000 1.445000 0.955000 ;
-      RECT 1.115000 0.955000 2.375000 1.125000 ;
-      RECT 1.895000 1.985000 2.145000 3.075000 ;
-      RECT 2.045000 0.255000 2.375000 0.955000 ;
-      RECT 2.315000 1.625000 2.485000 2.615000 ;
-      RECT 2.315000 2.615000 3.165000 2.785000 ;
-      RECT 2.605000 0.255000 3.200000 0.585000 ;
-      RECT 2.655000 0.585000 3.200000 1.135000 ;
-      RECT 2.655000 1.135000 2.825000 2.445000 ;
-      RECT 2.995000 2.445000 4.235000 2.615000 ;
-      RECT 3.835000 2.435000 4.235000 2.445000 ;
-      RECT 3.835000 2.615000 4.235000 3.075000 ;
-      RECT 3.870000 0.675000 4.235000 1.135000 ;
-      RECT 4.065000 1.135000 4.235000 2.435000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.255000 1.445000 0.425000 ;
+      RECT 0.115000  0.425000 0.445000 0.785000 ;
+      RECT 0.175000  2.135000 0.505000 2.905000 ;
+      RECT 0.175000  2.905000 1.365000 3.075000 ;
+      RECT 0.740000  1.295000 2.485000 1.625000 ;
+      RECT 1.035000  1.815000 2.145000 1.985000 ;
+      RECT 1.035000  1.985000 1.365000 2.905000 ;
+      RECT 1.115000  0.425000 1.445000 0.955000 ;
+      RECT 1.115000  0.955000 2.375000 1.125000 ;
+      RECT 1.545000  2.155000 1.715000 3.245000 ;
+      RECT 1.625000  0.085000 1.875000 0.785000 ;
+      RECT 1.895000  1.985000 2.145000 3.075000 ;
+      RECT 2.045000  0.255000 2.375000 0.955000 ;
+      RECT 2.315000  1.625000 2.485000 2.615000 ;
+      RECT 2.315000  2.615000 3.165000 2.785000 ;
+      RECT 2.605000  0.255000 3.200000 0.585000 ;
+      RECT 2.655000  0.585000 3.200000 1.135000 ;
+      RECT 2.655000  1.135000 2.825000 2.445000 ;
+      RECT 2.995000  2.445000 4.235000 2.615000 ;
+      RECT 3.335000  2.785000 3.665000 3.245000 ;
+      RECT 3.370000  0.085000 3.700000 1.135000 ;
+      RECT 3.835000  2.435000 4.235000 2.445000 ;
+      RECT 3.835000  2.615000 4.235000 3.075000 ;
+      RECT 3.870000  0.675000 4.235000 1.135000 ;
+      RECT 4.065000  1.135000 4.235000 2.435000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__ebufn_2
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef
index b2fb9d5..a8c7891 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.magic.lef
@@ -70,25 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 2.405000  0.085000 2.735000 0.965000 ;
-        RECT 3.265000  0.085000 3.515000 0.670000 ;
-        RECT 5.280000  0.085000 5.610000 1.135000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -97,60 +78,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 2.545000 2.695000 2.875000 3.245000 ;
-        RECT 3.545000 2.865000 3.875000 3.245000 ;
-        RECT 5.210000 2.525000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 2.225000 0.425000 ;
-      RECT 0.115000 0.425000 0.365000 1.010000 ;
-      RECT 0.115000 1.815000 0.365000 2.905000 ;
-      RECT 0.115000 2.905000 2.375000 3.075000 ;
-      RECT 0.875000 1.315000 1.885000 1.475000 ;
-      RECT 0.875000 1.475000 2.215000 1.645000 ;
-      RECT 1.045000 0.425000 1.375000 0.805000 ;
-      RECT 1.045000 2.155000 1.375000 2.905000 ;
-      RECT 2.045000 1.645000 2.215000 2.015000 ;
-      RECT 2.045000 2.015000 4.495000 2.185000 ;
-      RECT 2.045000 2.355000 3.375000 2.525000 ;
-      RECT 2.045000 2.525000 2.375000 2.905000 ;
-      RECT 2.055000 0.425000 2.225000 1.135000 ;
-      RECT 2.055000 1.135000 3.085000 1.305000 ;
-      RECT 2.915000 0.255000 3.085000 0.840000 ;
-      RECT 2.915000 0.840000 4.025000 1.010000 ;
-      RECT 2.915000 1.010000 3.085000 1.135000 ;
-      RECT 3.045000 2.525000 4.415000 2.695000 ;
-      RECT 3.045000 2.695000 3.375000 3.075000 ;
-      RECT 3.695000 0.255000 4.025000 0.840000 ;
-      RECT 4.085000 2.695000 4.415000 3.075000 ;
-      RECT 4.195000 0.340000 5.110000 1.010000 ;
-      RECT 4.325000 2.185000 6.145000 2.355000 ;
-      RECT 4.665000 1.765000 5.110000 2.015000 ;
-      RECT 4.780000 0.255000 5.110000 0.340000 ;
-      RECT 4.940000 1.010000 5.110000 1.765000 ;
-      RECT 5.710000 1.950000 6.145000 2.185000 ;
-      RECT 5.710000 2.355000 6.145000 3.075000 ;
-      RECT 5.780000 0.255000 6.145000 1.135000 ;
-      RECT 5.975000 1.135000 6.145000 1.950000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.115000  0.255000 2.225000 0.425000 ;
+      RECT 0.115000  0.425000 0.365000 1.010000 ;
+      RECT 0.115000  1.815000 0.365000 2.905000 ;
+      RECT 0.115000  2.905000 2.375000 3.075000 ;
+      RECT 0.875000  1.315000 1.885000 1.475000 ;
+      RECT 0.875000  1.475000 2.215000 1.645000 ;
+      RECT 1.045000  0.425000 1.375000 0.805000 ;
+      RECT 1.045000  2.155000 1.375000 2.905000 ;
+      RECT 2.045000  1.645000 2.215000 2.015000 ;
+      RECT 2.045000  2.015000 4.495000 2.185000 ;
+      RECT 2.045000  2.355000 3.375000 2.525000 ;
+      RECT 2.045000  2.525000 2.375000 2.905000 ;
+      RECT 2.055000  0.425000 2.225000 1.135000 ;
+      RECT 2.055000  1.135000 3.085000 1.305000 ;
+      RECT 2.405000  0.085000 2.735000 0.965000 ;
+      RECT 2.545000  2.695000 2.875000 3.245000 ;
+      RECT 2.915000  0.255000 3.085000 0.840000 ;
+      RECT 2.915000  0.840000 4.025000 1.010000 ;
+      RECT 2.915000  1.010000 3.085000 1.135000 ;
+      RECT 3.045000  2.525000 4.415000 2.695000 ;
+      RECT 3.045000  2.695000 3.375000 3.075000 ;
+      RECT 3.265000  0.085000 3.515000 0.670000 ;
+      RECT 3.545000  2.865000 3.875000 3.245000 ;
+      RECT 3.695000  0.255000 4.025000 0.840000 ;
+      RECT 4.085000  2.695000 4.415000 3.075000 ;
+      RECT 4.195000  0.340000 5.110000 1.010000 ;
+      RECT 4.325000  2.185000 6.145000 2.355000 ;
+      RECT 4.665000  1.765000 5.110000 2.015000 ;
+      RECT 4.780000  0.255000 5.110000 0.340000 ;
+      RECT 4.940000  1.010000 5.110000 1.765000 ;
+      RECT 5.210000  2.525000 5.540000 3.245000 ;
+      RECT 5.280000  0.085000 5.610000 1.135000 ;
+      RECT 5.710000  1.950000 6.145000 2.185000 ;
+      RECT 5.710000  2.355000 6.145000 3.075000 ;
+      RECT 5.780000  0.255000 6.145000 1.135000 ;
+      RECT 5.975000  1.135000 6.145000 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 ;
   END
 END sky130_fd_sc_lp__ebufn_4
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef
index f3bdc71..fb5ab9f 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.magic.lef
@@ -73,35 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 3.985000  0.085000 4.235000 0.965000 ;
-        RECT 4.925000  0.085000 5.095000 0.965000 ;
-        RECT 5.785000  0.085000 5.955000 0.965000 ;
-        RECT 6.645000  0.085000 6.815000 0.965000 ;
-        RECT 8.345000  0.085000 8.515000 0.670000 ;
-        RECT 9.205000  0.085000 9.455000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -110,79 +81,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 3.985000 2.155000 4.235000 3.245000 ;
-        RECT 4.925000 2.155000 5.095000 3.245000 ;
-        RECT 5.785000 2.155000 5.955000 3.245000 ;
-        RECT 6.565000 2.705000 6.815000 3.245000 ;
-        RECT 8.265000 2.655000 8.515000 3.245000 ;
-        RECT 9.205000 1.815000 9.455000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.255000 3.805000 0.425000 ;
-      RECT 0.115000 0.425000 0.365000 1.010000 ;
-      RECT 0.115000 1.815000 0.445000 2.905000 ;
-      RECT 0.115000 2.905000 3.805000 3.075000 ;
-      RECT 0.975000 2.155000 1.225000 2.905000 ;
-      RECT 1.055000 0.425000 1.225000 0.805000 ;
-      RECT 1.095000 1.315000 3.465000 1.475000 ;
-      RECT 1.095000 1.475000 6.725000 1.645000 ;
-      RECT 1.915000 0.425000 2.085000 0.805000 ;
-      RECT 1.915000 2.155000 2.085000 2.905000 ;
-      RECT 2.775000 0.425000 2.945000 0.805000 ;
-      RECT 2.775000 2.155000 2.945000 2.905000 ;
-      RECT 3.635000 0.425000 3.805000 1.135000 ;
-      RECT 3.635000 1.135000 7.245000 1.305000 ;
-      RECT 3.635000 1.815000 6.385000 1.985000 ;
-      RECT 3.635000 1.985000 3.805000 2.905000 ;
-      RECT 4.415000 0.255000 4.745000 1.135000 ;
-      RECT 4.415000 1.985000 4.745000 3.075000 ;
-      RECT 5.275000 0.295000 5.605000 1.135000 ;
-      RECT 5.275000 1.985000 5.605000 3.075000 ;
-      RECT 6.135000 0.255000 6.465000 1.135000 ;
-      RECT 6.135000 1.985000 6.385000 2.365000 ;
-      RECT 6.135000 2.365000 7.325000 2.535000 ;
-      RECT 6.135000 2.535000 6.385000 3.075000 ;
-      RECT 6.555000 1.645000 6.725000 2.025000 ;
-      RECT 6.555000 2.025000 7.665000 2.195000 ;
-      RECT 6.995000 0.255000 7.245000 1.135000 ;
-      RECT 6.995000 2.535000 7.325000 3.075000 ;
-      RECT 7.415000 0.255000 8.165000 1.010000 ;
-      RECT 7.415000 1.010000 7.635000 1.685000 ;
-      RECT 7.415000 1.685000 8.165000 1.855000 ;
-      RECT 7.495000 2.195000 7.665000 2.315000 ;
-      RECT 7.495000 2.315000 9.025000 2.485000 ;
-      RECT 7.835000 1.855000 8.165000 2.145000 ;
-      RECT 8.365000 0.840000 9.025000 1.010000 ;
-      RECT 8.365000 1.010000 8.535000 1.815000 ;
-      RECT 8.365000 1.815000 9.025000 2.315000 ;
-      RECT 8.695000 0.255000 9.025000 0.840000 ;
-      RECT 8.695000 2.485000 9.025000 3.075000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.115000  0.255000 3.805000 0.425000 ;
+      RECT 0.115000  0.425000 0.365000 1.010000 ;
+      RECT 0.115000  1.815000 0.445000 2.905000 ;
+      RECT 0.115000  2.905000 3.805000 3.075000 ;
+      RECT 0.975000  2.155000 1.225000 2.905000 ;
+      RECT 1.055000  0.425000 1.225000 0.805000 ;
+      RECT 1.095000  1.315000 3.465000 1.475000 ;
+      RECT 1.095000  1.475000 6.725000 1.645000 ;
+      RECT 1.915000  0.425000 2.085000 0.805000 ;
+      RECT 1.915000  2.155000 2.085000 2.905000 ;
+      RECT 2.775000  0.425000 2.945000 0.805000 ;
+      RECT 2.775000  2.155000 2.945000 2.905000 ;
+      RECT 3.635000  0.425000 3.805000 1.135000 ;
+      RECT 3.635000  1.135000 7.245000 1.305000 ;
+      RECT 3.635000  1.815000 6.385000 1.985000 ;
+      RECT 3.635000  1.985000 3.805000 2.905000 ;
+      RECT 3.985000  0.085000 4.235000 0.965000 ;
+      RECT 3.985000  2.155000 4.235000 3.245000 ;
+      RECT 4.415000  0.255000 4.745000 1.135000 ;
+      RECT 4.415000  1.985000 4.745000 3.075000 ;
+      RECT 4.925000  0.085000 5.095000 0.965000 ;
+      RECT 4.925000  2.155000 5.095000 3.245000 ;
+      RECT 5.275000  0.295000 5.605000 1.135000 ;
+      RECT 5.275000  1.985000 5.605000 3.075000 ;
+      RECT 5.785000  0.085000 5.955000 0.965000 ;
+      RECT 5.785000  2.155000 5.955000 3.245000 ;
+      RECT 6.135000  0.255000 6.465000 1.135000 ;
+      RECT 6.135000  1.985000 6.385000 2.365000 ;
+      RECT 6.135000  2.365000 7.325000 2.535000 ;
+      RECT 6.135000  2.535000 6.385000 3.075000 ;
+      RECT 6.555000  1.645000 6.725000 2.025000 ;
+      RECT 6.555000  2.025000 7.665000 2.195000 ;
+      RECT 6.565000  2.705000 6.815000 3.245000 ;
+      RECT 6.645000  0.085000 6.815000 0.965000 ;
+      RECT 6.995000  0.255000 7.245000 1.135000 ;
+      RECT 6.995000  2.535000 7.325000 3.075000 ;
+      RECT 7.415000  0.255000 8.165000 1.010000 ;
+      RECT 7.415000  1.010000 7.635000 1.685000 ;
+      RECT 7.415000  1.685000 8.165000 1.855000 ;
+      RECT 7.495000  2.195000 7.665000 2.315000 ;
+      RECT 7.495000  2.315000 9.025000 2.485000 ;
+      RECT 7.835000  1.855000 8.165000 2.145000 ;
+      RECT 8.265000  2.655000 8.515000 3.245000 ;
+      RECT 8.345000  0.085000 8.515000 0.670000 ;
+      RECT 8.365000  0.840000 9.025000 1.010000 ;
+      RECT 8.365000  1.010000 8.535000 1.815000 ;
+      RECT 8.365000  1.815000 9.025000 2.315000 ;
+      RECT 8.695000  0.255000 9.025000 0.840000 ;
+      RECT 8.695000  2.485000 9.025000 3.075000 ;
+      RECT 9.205000  0.085000 9.455000 1.095000 ;
+      RECT 9.205000  1.815000 9.455000 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_lp__ebufn_8
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef
index 69d3184..0f993cf 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.magic.lef
@@ -65,20 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.065000  0.085000 1.395000 1.015000 ;
-        RECT 3.085000  0.085000 3.415000 0.665000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,40 +73,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.345000 2.395000 1.675000 3.245000 ;
-        RECT 2.940000 1.815000 3.270000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.125000 0.635000 0.485000 1.075000 ;
-      RECT 0.125000 1.075000 0.295000 2.395000 ;
-      RECT 0.125000 2.395000 1.175000 2.565000 ;
-      RECT 0.125000 2.565000 0.455000 3.075000 ;
-      RECT 1.005000 1.685000 2.235000 1.855000 ;
-      RECT 1.005000 1.855000 1.175000 2.395000 ;
-      RECT 1.210000 1.185000 1.735000 1.515000 ;
-      RECT 1.565000 0.255000 2.915000 0.425000 ;
-      RECT 1.565000 0.425000 1.735000 1.185000 ;
-      RECT 1.905000 1.345000 2.235000 1.685000 ;
-      RECT 2.745000 0.425000 2.915000 0.835000 ;
-      RECT 2.745000 0.835000 4.205000 1.005000 ;
-      RECT 3.875000 0.255000 4.205000 0.835000 ;
-      RECT 3.875000 1.985000 4.205000 2.665000 ;
-      RECT 4.035000 1.005000 4.205000 1.985000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.125000  0.635000 0.485000 1.075000 ;
+      RECT 0.125000  1.075000 0.295000 2.395000 ;
+      RECT 0.125000  2.395000 1.175000 2.565000 ;
+      RECT 0.125000  2.565000 0.455000 3.075000 ;
+      RECT 1.005000  1.685000 2.235000 1.855000 ;
+      RECT 1.005000  1.855000 1.175000 2.395000 ;
+      RECT 1.065000  0.085000 1.395000 1.015000 ;
+      RECT 1.210000  1.185000 1.735000 1.515000 ;
+      RECT 1.345000  2.395000 1.675000 3.245000 ;
+      RECT 1.565000  0.255000 2.915000 0.425000 ;
+      RECT 1.565000  0.425000 1.735000 1.185000 ;
+      RECT 1.905000  1.345000 2.235000 1.685000 ;
+      RECT 2.745000  0.425000 2.915000 0.835000 ;
+      RECT 2.745000  0.835000 4.205000 1.005000 ;
+      RECT 2.940000  1.815000 3.270000 3.245000 ;
+      RECT 3.085000  0.085000 3.415000 0.665000 ;
+      RECT 3.875000  0.255000 4.205000 0.835000 ;
+      RECT 3.875000  1.985000 4.205000 2.665000 ;
+      RECT 4.035000  1.005000 4.205000 1.985000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__ebufn_lp
diff --git a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef
index cb1aa02..c669a78 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.magic.lef
@@ -64,19 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.055000  0.085000 1.385000 0.545000 ;
-        RECT 2.575000  0.085000 2.905000 1.075000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -85,35 +72,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.645000 2.025000 0.975000 3.245000 ;
-        RECT 2.840000 2.330000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.265000 0.365000 1.675000 ;
-      RECT 0.115000 1.675000 1.490000 1.845000 ;
-      RECT 0.115000 1.845000 0.445000 3.065000 ;
-      RECT 1.160000 0.725000 2.350000 0.895000 ;
-      RECT 1.160000 0.895000 1.490000 1.485000 ;
-      RECT 1.160000 1.845000 1.490000 2.395000 ;
-      RECT 2.180000 0.895000 2.350000 1.255000 ;
-      RECT 2.180000 1.255000 3.725000 1.425000 ;
-      RECT 3.370000 2.330000 3.725000 3.065000 ;
-      RECT 3.395000 0.745000 3.725000 1.255000 ;
-      RECT 3.555000 1.425000 3.725000 2.330000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.265000 0.365000 1.675000 ;
+      RECT 0.115000  1.675000 1.490000 1.845000 ;
+      RECT 0.115000  1.845000 0.445000 3.065000 ;
+      RECT 0.645000  2.025000 0.975000 3.245000 ;
+      RECT 1.055000  0.085000 1.385000 0.545000 ;
+      RECT 1.160000  0.725000 2.350000 0.895000 ;
+      RECT 1.160000  0.895000 1.490000 1.485000 ;
+      RECT 1.160000  1.845000 1.490000 2.395000 ;
+      RECT 2.180000  0.895000 2.350000 1.255000 ;
+      RECT 2.180000  1.255000 3.725000 1.425000 ;
+      RECT 2.575000  0.085000 2.905000 1.075000 ;
+      RECT 2.840000  2.330000 3.170000 3.245000 ;
+      RECT 3.370000  2.330000 3.725000 3.065000 ;
+      RECT 3.395000  0.745000 3.725000 1.255000 ;
+      RECT 3.555000  1.425000 3.725000 2.330000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__ebufn_lp2
diff --git a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef
index 72d95db..021b4c7 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef
+++ b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.magic.lef
@@ -83,46 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.145000  0.085000  0.395000 1.335000 ;
-        RECT  1.565000  0.085000  1.815000 0.705000 ;
-        RECT  5.460000  0.085000  5.790000 0.895000 ;
-        RECT  7.700000  0.085000  8.030000 0.920000 ;
-        RECT 10.430000  0.085000 10.760000 0.365000 ;
-        RECT 12.370000  0.085000 12.700000 0.365000 ;
-        RECT 13.420000  0.085000 13.750000 0.365000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -131,147 +91,183 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.145000 2.385000  0.395000 3.245000 ;
-        RECT  1.920000 2.095000  2.090000 3.245000 ;
-        RECT  5.980000 2.065000  6.230000 3.245000 ;
-        RECT  7.720000 2.310000  7.890000 3.245000 ;
-        RECT 10.870000 2.785000 11.040000 3.245000 ;
-        RECT 12.560000 2.695000 12.890000 3.245000 ;
-        RECT 13.540000 2.695000 13.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 ;
-        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.575000 0.875000  0.905000 1.235000 ;
-      RECT  0.575000 1.235000  2.200000 1.565000 ;
-      RECT  0.575000 1.565000  0.905000 3.065000 ;
-      RECT  1.135000 0.265000  1.385000 0.885000 ;
-      RECT  1.135000 0.885000  2.805000 1.000000 ;
-      RECT  1.135000 1.000000  2.165000 1.055000 ;
-      RECT  1.490000 1.745000  2.440000 1.915000 ;
-      RECT  1.490000 1.915000  1.740000 2.555000 ;
-      RECT  1.995000 0.265000  3.825000 0.435000 ;
-      RECT  1.995000 0.435000  2.325000 0.650000 ;
-      RECT  1.995000 0.830000  2.805000 0.885000 ;
-      RECT  2.270000 1.915000  2.440000 2.735000 ;
-      RECT  2.270000 2.735000  3.310000 2.905000 ;
-      RECT  2.555000 0.615000  2.805000 0.830000 ;
-      RECT  2.630000 1.745000  3.310000 1.915000 ;
-      RECT  2.630000 1.915000  2.880000 2.555000 ;
-      RECT  2.985000 0.615000  3.315000 1.000000 ;
-      RECT  3.060000 2.095000  3.310000 2.735000 ;
-      RECT  3.140000 1.000000  3.315000 1.100000 ;
-      RECT  3.140000 1.100000  4.385000 1.270000 ;
-      RECT  3.140000 1.270000  3.310000 1.745000 ;
-      RECT  3.490000 1.450000  3.820000 1.780000 ;
-      RECT  3.490000 1.780000  3.685000 2.150000 ;
-      RECT  3.495000 0.435000  3.825000 0.920000 ;
-      RECT  3.865000 1.960000  4.035000 2.895000 ;
-      RECT  3.865000 2.895000  5.775000 3.065000 ;
-      RECT  4.055000 0.435000  4.385000 1.100000 ;
-      RECT  4.215000 1.270000  4.385000 2.545000 ;
-      RECT  4.215000 2.545000  5.245000 2.715000 ;
-      RECT  4.565000 0.435000  4.895000 1.075000 ;
-      RECT  4.565000 1.075000  6.300000 1.245000 ;
-      RECT  4.565000 1.245000  4.735000 2.365000 ;
-      RECT  4.915000 1.450000  5.245000 1.780000 ;
-      RECT  4.915000 1.960000  5.245000 2.545000 ;
-      RECT  5.445000 2.265000  5.775000 2.895000 ;
-      RECT  5.520000 1.555000  6.660000 1.885000 ;
-      RECT  5.970000 0.985000  6.300000 1.075000 ;
-      RECT  5.970000 1.245000  6.300000 1.315000 ;
-      RECT  6.085000 0.265000  6.660000 0.805000 ;
-      RECT  6.410000 1.885000  6.660000 2.820000 ;
-      RECT  6.410000 2.820000  7.540000 2.990000 ;
-      RECT  6.490000 0.805000  6.660000 1.555000 ;
-      RECT  6.940000 1.610000  7.520000 1.780000 ;
-      RECT  6.940000 1.780000  7.190000 2.640000 ;
-      RECT  6.965000 0.540000  7.295000 0.750000 ;
-      RECT  6.965000 0.750000  7.520000 0.920000 ;
-      RECT  7.350000 0.920000  7.520000 1.100000 ;
-      RECT  7.350000 1.100000  8.105000 1.270000 ;
-      RECT  7.350000 1.270000  7.520000 1.610000 ;
-      RECT  7.370000 1.960000  8.240000 2.130000 ;
-      RECT  7.370000 2.130000  7.540000 2.820000 ;
-      RECT  7.775000 1.270000  8.105000 1.770000 ;
-      RECT  8.070000 2.130000  8.240000 2.515000 ;
-      RECT  8.070000 2.515000  9.120000 2.685000 ;
-      RECT  8.210000 0.460000  8.540000 0.920000 ;
-      RECT  8.285000 0.920000  8.540000 1.385000 ;
-      RECT  8.285000 1.385000  9.950000 1.555000 ;
-      RECT  8.285000 1.555000  8.670000 1.780000 ;
-      RECT  8.420000 1.780000  8.670000 2.335000 ;
-      RECT  8.870000 2.865000 10.690000 3.065000 ;
-      RECT  8.925000 0.685000  9.255000 0.895000 ;
-      RECT  8.925000 0.895000 11.620000 1.065000 ;
-      RECT  8.925000 1.065000  9.255000 1.145000 ;
-      RECT  8.950000 1.735000 10.520000 1.905000 ;
-      RECT  8.950000 1.905000  9.120000 2.515000 ;
-      RECT  9.300000 2.085000  9.630000 2.435000 ;
-      RECT  9.300000 2.435000 11.390000 2.605000 ;
-      RECT  9.300000 2.605000  9.630000 2.685000 ;
-      RECT  9.470000 0.265000  9.800000 0.545000 ;
-      RECT  9.470000 0.545000 13.865000 0.595000 ;
-      RECT  9.470000 0.595000 11.110000 0.715000 ;
-      RECT  9.620000 1.245000  9.950000 1.385000 ;
-      RECT  9.830000 2.085000 11.820000 2.255000 ;
-      RECT 10.190000 1.345000 10.520000 1.735000 ;
-      RECT 10.360000 2.785000 10.690000 2.865000 ;
-      RECT 10.940000 0.265000 11.970000 0.545000 ;
-      RECT 11.220000 2.605000 11.390000 2.705000 ;
-      RECT 11.220000 2.705000 12.380000 2.875000 ;
-      RECT 11.290000 0.775000 11.620000 0.895000 ;
-      RECT 11.290000 1.065000 11.620000 1.145000 ;
-      RECT 11.565000 1.595000 13.010000 1.655000 ;
-      RECT 11.565000 1.655000 12.355000 1.905000 ;
-      RECT 11.570000 2.255000 11.820000 2.525000 ;
-      RECT 11.800000 0.595000 13.865000 0.715000 ;
-      RECT 11.860000 0.895000 12.190000 1.325000 ;
-      RECT 11.860000 1.325000 13.010000 1.595000 ;
-      RECT 12.020000 1.905000 12.355000 2.165000 ;
-      RECT 12.210000 2.345000 13.865000 2.515000 ;
-      RECT 12.210000 2.515000 12.380000 2.705000 ;
-      RECT 13.540000 0.715000 13.865000 2.345000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.145000  0.085000  0.395000 1.335000 ;
+      RECT  0.145000  2.385000  0.395000 3.245000 ;
+      RECT  0.575000  0.875000  0.905000 1.235000 ;
+      RECT  0.575000  1.235000  2.200000 1.565000 ;
+      RECT  0.575000  1.565000  0.905000 3.065000 ;
+      RECT  1.135000  0.265000  1.385000 0.885000 ;
+      RECT  1.135000  0.885000  2.805000 1.000000 ;
+      RECT  1.135000  1.000000  2.165000 1.055000 ;
+      RECT  1.490000  1.745000  2.440000 1.915000 ;
+      RECT  1.490000  1.915000  1.740000 2.555000 ;
+      RECT  1.565000  0.085000  1.815000 0.705000 ;
+      RECT  1.920000  2.095000  2.090000 3.245000 ;
+      RECT  1.995000  0.265000  3.825000 0.435000 ;
+      RECT  1.995000  0.435000  2.325000 0.650000 ;
+      RECT  1.995000  0.830000  2.805000 0.885000 ;
+      RECT  2.270000  1.915000  2.440000 2.735000 ;
+      RECT  2.270000  2.735000  3.310000 2.905000 ;
+      RECT  2.555000  0.615000  2.805000 0.830000 ;
+      RECT  2.630000  1.745000  3.310000 1.915000 ;
+      RECT  2.630000  1.915000  2.880000 2.555000 ;
+      RECT  2.985000  0.615000  3.315000 1.000000 ;
+      RECT  3.060000  2.095000  3.310000 2.735000 ;
+      RECT  3.140000  1.000000  3.315000 1.100000 ;
+      RECT  3.140000  1.100000  4.385000 1.270000 ;
+      RECT  3.140000  1.270000  3.310000 1.745000 ;
+      RECT  3.490000  1.450000  3.820000 1.780000 ;
+      RECT  3.490000  1.780000  3.685000 2.150000 ;
+      RECT  3.495000  0.435000  3.825000 0.920000 ;
+      RECT  3.865000  1.960000  4.035000 2.895000 ;
+      RECT  3.865000  2.895000  5.775000 3.065000 ;
+      RECT  4.055000  0.435000  4.385000 1.100000 ;
+      RECT  4.215000  1.270000  4.385000 2.545000 ;
+      RECT  4.215000  2.545000  5.245000 2.715000 ;
+      RECT  4.565000  0.435000  4.895000 1.075000 ;
+      RECT  4.565000  1.075000  6.300000 1.245000 ;
+      RECT  4.565000  1.245000  4.735000 2.365000 ;
+      RECT  4.915000  1.450000  5.245000 1.780000 ;
+      RECT  4.915000  1.960000  5.245000 2.545000 ;
+      RECT  5.445000  2.265000  5.775000 2.895000 ;
+      RECT  5.460000  0.085000  5.790000 0.895000 ;
+      RECT  5.520000  1.555000  6.660000 1.885000 ;
+      RECT  5.970000  0.985000  6.300000 1.075000 ;
+      RECT  5.970000  1.245000  6.300000 1.315000 ;
+      RECT  5.980000  2.065000  6.230000 3.245000 ;
+      RECT  6.085000  0.265000  6.660000 0.805000 ;
+      RECT  6.410000  1.885000  6.660000 2.820000 ;
+      RECT  6.410000  2.820000  7.540000 2.990000 ;
+      RECT  6.490000  0.805000  6.660000 1.555000 ;
+      RECT  6.940000  1.610000  7.520000 1.780000 ;
+      RECT  6.940000  1.780000  7.190000 2.640000 ;
+      RECT  6.965000  0.540000  7.295000 0.750000 ;
+      RECT  6.965000  0.750000  7.520000 0.920000 ;
+      RECT  7.350000  0.920000  7.520000 1.100000 ;
+      RECT  7.350000  1.100000  8.105000 1.270000 ;
+      RECT  7.350000  1.270000  7.520000 1.610000 ;
+      RECT  7.370000  1.960000  8.240000 2.130000 ;
+      RECT  7.370000  2.130000  7.540000 2.820000 ;
+      RECT  7.700000  0.085000  8.030000 0.920000 ;
+      RECT  7.720000  2.310000  7.890000 3.245000 ;
+      RECT  7.775000  1.270000  8.105000 1.770000 ;
+      RECT  8.070000  2.130000  8.240000 2.515000 ;
+      RECT  8.070000  2.515000  9.120000 2.685000 ;
+      RECT  8.210000  0.460000  8.540000 0.920000 ;
+      RECT  8.285000  0.920000  8.540000 1.385000 ;
+      RECT  8.285000  1.385000  9.950000 1.555000 ;
+      RECT  8.285000  1.555000  8.670000 1.780000 ;
+      RECT  8.420000  1.780000  8.670000 2.335000 ;
+      RECT  8.870000  2.865000 10.690000 3.065000 ;
+      RECT  8.925000  0.685000  9.255000 0.895000 ;
+      RECT  8.925000  0.895000 11.620000 1.065000 ;
+      RECT  8.925000  1.065000  9.255000 1.145000 ;
+      RECT  8.950000  1.735000 10.520000 1.905000 ;
+      RECT  8.950000  1.905000  9.120000 2.515000 ;
+      RECT  9.300000  2.085000  9.630000 2.435000 ;
+      RECT  9.300000  2.435000 11.390000 2.605000 ;
+      RECT  9.300000  2.605000  9.630000 2.685000 ;
+      RECT  9.470000  0.265000  9.800000 0.545000 ;
+      RECT  9.470000  0.545000 13.865000 0.595000 ;
+      RECT  9.470000  0.595000 11.110000 0.715000 ;
+      RECT  9.620000  1.245000  9.950000 1.385000 ;
+      RECT  9.830000  2.085000 11.820000 2.255000 ;
+      RECT 10.190000  1.345000 10.520000 1.735000 ;
+      RECT 10.360000  2.785000 10.690000 2.865000 ;
+      RECT 10.430000  0.085000 10.760000 0.365000 ;
+      RECT 10.870000  2.785000 11.040000 3.245000 ;
+      RECT 10.940000  0.265000 11.970000 0.545000 ;
+      RECT 11.220000  2.605000 11.390000 2.705000 ;
+      RECT 11.220000  2.705000 12.380000 2.875000 ;
+      RECT 11.290000  0.775000 11.620000 0.895000 ;
+      RECT 11.290000  1.065000 11.620000 1.145000 ;
+      RECT 11.565000  1.595000 13.010000 1.655000 ;
+      RECT 11.565000  1.655000 12.355000 1.905000 ;
+      RECT 11.570000  2.255000 11.820000 2.525000 ;
+      RECT 11.800000  0.595000 13.865000 0.715000 ;
+      RECT 11.860000  0.895000 12.190000 1.325000 ;
+      RECT 11.860000  1.325000 13.010000 1.595000 ;
+      RECT 12.020000  1.905000 12.355000 2.165000 ;
+      RECT 12.210000  2.345000 13.865000 2.515000 ;
+      RECT 12.210000  2.515000 12.380000 2.705000 ;
+      RECT 12.370000  0.085000 12.700000 0.365000 ;
+      RECT 12.560000  2.695000 12.890000 3.245000 ;
+      RECT 13.420000  0.085000 13.750000 0.365000 ;
+      RECT 13.540000  0.715000 13.865000 2.345000 ;
+      RECT 13.540000  2.695000 13.870000 3.245000 ;
     LAYER mcon ;
-      RECT  3.515000 1.950000  3.685000 2.120000 ;
-      RECT  4.955000 1.580000  5.125000 1.750000 ;
-      RECT  8.315000 1.580000  8.485000 1.750000 ;
-      RECT 12.155000 1.950000 12.325000 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  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  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 ;
+      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.950000 12.325000 2.120000 ;
+      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  3.455000 1.920000  3.745000 1.965000 ;
       RECT  3.455000 1.965000 12.385000 2.105000 ;
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef
index 5ec3f70..4b2a734 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_0.magic.lef
@@ -61,15 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.600000  0.775000 1.365000 1.040000 ;
-        RECT 1.195000  0.085000 1.365000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -78,21 +69,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.600000 2.385000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.265000 1.015000 0.595000 ;
-      RECT 0.100000 0.595000 0.430000 2.780000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.100000  0.265000 1.015000 0.595000 ;
+      RECT 0.100000  0.595000 0.430000 2.780000 ;
+      RECT 0.600000  0.775000 1.365000 1.040000 ;
+      RECT 0.600000  2.385000 0.935000 3.245000 ;
+      RECT 1.195000  0.085000 1.365000 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 ;
   END
 END sky130_fd_sc_lp__einvn_0
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef
index 00892ea..3a78e27 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_1.magic.lef
@@ -64,16 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.195000  0.085000 1.610000 0.995000 ;
-        RECT 1.195000  0.995000 1.745000 1.325000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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 +72,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.195000 1.920000 1.630000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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 1.780000 0.265000 2.315000 0.630000 ;
-      RECT 1.800000 1.920000 2.315000 2.565000 ;
-      RECT 1.915000 0.630000 2.315000 1.270000 ;
-      RECT 2.130000 1.270000 2.315000 1.920000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 1.195000  0.085000 1.610000 0.995000 ;
+      RECT 1.195000  0.995000 1.745000 1.325000 ;
+      RECT 1.195000  1.920000 1.630000 3.245000 ;
+      RECT 1.780000  0.265000 2.315000 0.630000 ;
+      RECT 1.800000  1.920000 2.315000 2.565000 ;
+      RECT 1.915000  0.630000 2.315000 1.270000 ;
+      RECT 2.130000  1.270000 2.315000 1.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 ;
   END
 END sky130_fd_sc_lp__einvn_1
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_2.magic.lef
index ea63f09..c75f576 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_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.550000  0.085000 0.880000 0.560000 ;
-        RECT 1.645000  0.085000 1.975000 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 ;
       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.600000 2.020000 0.930000 3.245000 ;
-        RECT 1.505000 2.665000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.355000 0.370000 1.680000 ;
-      RECT 0.100000 1.680000 1.940000 1.850000 ;
-      RECT 0.100000 1.850000 0.430000 2.485000 ;
-      RECT 1.100000 2.020000 1.405000 2.325000 ;
-      RECT 1.100000 2.325000 2.805000 2.495000 ;
-      RECT 1.100000 2.495000 1.335000 3.075000 ;
-      RECT 1.215000 0.255000 1.475000 1.005000 ;
-      RECT 1.215000 1.005000 2.325000 1.175000 ;
-      RECT 1.770000 1.345000 2.100000 1.535000 ;
-      RECT 1.770000 1.535000 1.940000 1.680000 ;
-      RECT 2.145000 0.255000 3.265000 0.425000 ;
-      RECT 2.145000 0.425000 2.325000 1.005000 ;
-      RECT 2.505000 2.495000 2.805000 3.075000 ;
-      RECT 2.540000 2.045000 2.805000 2.325000 ;
-      RECT 3.005000 0.425000 3.265000 1.025000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.100000  0.355000 0.370000 1.680000 ;
+      RECT 0.100000  1.680000 1.940000 1.850000 ;
+      RECT 0.100000  1.850000 0.430000 2.485000 ;
+      RECT 0.550000  0.085000 0.880000 0.560000 ;
+      RECT 0.600000  2.020000 0.930000 3.245000 ;
+      RECT 1.100000  2.020000 1.405000 2.325000 ;
+      RECT 1.100000  2.325000 2.805000 2.495000 ;
+      RECT 1.100000  2.495000 1.335000 3.075000 ;
+      RECT 1.215000  0.255000 1.475000 1.005000 ;
+      RECT 1.215000  1.005000 2.325000 1.175000 ;
+      RECT 1.505000  2.665000 1.835000 3.245000 ;
+      RECT 1.645000  0.085000 1.975000 0.835000 ;
+      RECT 1.770000  1.345000 2.100000 1.535000 ;
+      RECT 1.770000  1.535000 1.940000 1.680000 ;
+      RECT 2.145000  0.255000 3.265000 0.425000 ;
+      RECT 2.145000  0.425000 2.325000 1.005000 ;
+      RECT 2.505000  2.495000 2.805000 3.075000 ;
+      RECT 2.540000  2.045000 2.805000 2.325000 ;
+      RECT 3.005000  0.425000 3.265000 1.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__einvn_2
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef
index b9fdaab..ebc661c 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_4.magic.lef
@@ -68,24 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 3.175000  0.085000 3.505000 0.555000 ;
-        RECT 4.035000  0.085000 4.365000 0.885000 ;
-        RECT 4.895000  0.085000 5.225000 1.115000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,50 +76,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 2.705000 2.095000 3.035000 3.245000 ;
-        RECT 3.565000 2.095000 3.895000 3.245000 ;
-        RECT 4.895000 1.815000 5.180000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.375000 0.255000 2.675000 0.425000 ;
-      RECT 0.375000 0.425000 0.645000 1.205000 ;
-      RECT 0.395000 1.920000 0.665000 2.905000 ;
-      RECT 0.395000 2.905000 2.535000 3.075000 ;
-      RECT 1.335000 0.425000 1.665000 0.895000 ;
-      RECT 1.405000 2.260000 1.675000 2.905000 ;
-      RECT 2.345000 1.755000 4.300000 1.925000 ;
-      RECT 2.345000 1.925000 2.535000 2.905000 ;
-      RECT 2.415000 0.425000 2.675000 0.725000 ;
-      RECT 2.415000 0.725000 3.865000 0.895000 ;
-      RECT 2.415000 0.895000 2.605000 1.265000 ;
-      RECT 2.775000 1.065000 3.105000 1.395000 ;
-      RECT 2.775000 1.395000 5.655000 1.575000 ;
-      RECT 3.205000 1.925000 3.395000 3.075000 ;
-      RECT 3.605000 0.895000 3.865000 1.055000 ;
-      RECT 3.605000 1.055000 4.725000 1.225000 ;
-      RECT 3.675000 0.255000 3.865000 0.725000 ;
-      RECT 4.065000 1.925000 4.300000 3.075000 ;
-      RECT 4.535000 0.255000 4.725000 1.055000 ;
-      RECT 5.350000 1.575000 5.655000 3.075000 ;
-      RECT 5.395000 0.255000 5.655000 1.395000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.375000  0.255000 2.675000 0.425000 ;
+      RECT 0.375000  0.425000 0.645000 1.205000 ;
+      RECT 0.395000  1.920000 0.665000 2.905000 ;
+      RECT 0.395000  2.905000 2.535000 3.075000 ;
+      RECT 1.335000  0.425000 1.665000 0.895000 ;
+      RECT 1.405000  2.260000 1.675000 2.905000 ;
+      RECT 2.345000  1.755000 4.300000 1.925000 ;
+      RECT 2.345000  1.925000 2.535000 2.905000 ;
+      RECT 2.415000  0.425000 2.675000 0.725000 ;
+      RECT 2.415000  0.725000 3.865000 0.895000 ;
+      RECT 2.415000  0.895000 2.605000 1.265000 ;
+      RECT 2.705000  2.095000 3.035000 3.245000 ;
+      RECT 2.775000  1.065000 3.105000 1.395000 ;
+      RECT 2.775000  1.395000 5.655000 1.575000 ;
+      RECT 3.175000  0.085000 3.505000 0.555000 ;
+      RECT 3.205000  1.925000 3.395000 3.075000 ;
+      RECT 3.565000  2.095000 3.895000 3.245000 ;
+      RECT 3.605000  0.895000 3.865000 1.055000 ;
+      RECT 3.605000  1.055000 4.725000 1.225000 ;
+      RECT 3.675000  0.255000 3.865000 0.725000 ;
+      RECT 4.035000  0.085000 4.365000 0.885000 ;
+      RECT 4.065000  1.925000 4.300000 3.075000 ;
+      RECT 4.535000  0.255000 4.725000 1.055000 ;
+      RECT 4.895000  0.085000 5.225000 1.115000 ;
+      RECT 4.895000  1.815000 5.180000 3.245000 ;
+      RECT 5.350000  1.575000 5.655000 3.075000 ;
+      RECT 5.395000  0.255000 5.655000 1.395000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__einvn_4
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef
index 8a0a4c0..9e40a94 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_8.magic.lef
@@ -72,33 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.095000  0.085000 0.390000 1.040000 ;
-        RECT 1.950000  0.085000 2.210000 1.115000 ;
-        RECT 2.810000  0.085000 3.070000 1.115000 ;
-        RECT 3.670000  0.085000 3.930000 1.115000 ;
-        RECT 4.530000  0.085000 4.790000 1.115000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -107,63 +80,87 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.595000 1.815000 0.805000 3.245000 ;
-        RECT 1.915000 2.095000 2.245000 3.245000 ;
-        RECT 2.775000 2.095000 3.105000 3.245000 ;
-        RECT 3.635000 2.095000 3.965000 3.245000 ;
-        RECT 4.495000 2.095000 4.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 ;
-        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.585000 0.265000 0.795000 0.665000 ;
-      RECT 0.585000 0.665000 1.315000 1.040000 ;
-      RECT 0.985000 1.040000 1.315000 3.075000 ;
-      RECT 1.485000 0.255000 1.780000 1.285000 ;
-      RECT 1.485000 1.285000 5.185000 1.505000 ;
-      RECT 1.485000 1.675000 5.185000 1.925000 ;
-      RECT 1.485000 1.925000 1.745000 3.075000 ;
-      RECT 2.380000 0.255000 2.640000 1.285000 ;
-      RECT 2.415000 1.925000 2.605000 3.075000 ;
-      RECT 3.240000 0.255000 3.500000 1.285000 ;
-      RECT 3.275000 1.925000 3.465000 3.075000 ;
-      RECT 4.100000 0.255000 4.360000 1.285000 ;
-      RECT 4.135000 1.925000 4.325000 3.075000 ;
-      RECT 4.960000 0.255000 8.695000 0.425000 ;
-      RECT 4.960000 0.425000 6.975000 0.520000 ;
-      RECT 4.960000 0.520000 5.185000 1.285000 ;
-      RECT 4.995000 1.925000 5.185000 2.905000 ;
-      RECT 4.995000 2.905000 8.695000 3.075000 ;
-      RECT 5.855000 2.055000 6.045000 2.905000 ;
-      RECT 6.645000 0.520000 6.975000 0.970000 ;
-      RECT 6.715000 2.055000 6.905000 2.905000 ;
-      RECT 7.505000 0.425000 7.835000 0.970000 ;
-      RECT 7.575000 2.055000 7.765000 2.905000 ;
-      RECT 8.395000 0.425000 8.695000 1.095000 ;
-      RECT 8.435000 1.825000 8.695000 2.905000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  0.085000 0.390000 1.040000 ;
+      RECT 0.585000  0.265000 0.795000 0.665000 ;
+      RECT 0.585000  0.665000 1.315000 1.040000 ;
+      RECT 0.595000  1.815000 0.805000 3.245000 ;
+      RECT 0.985000  1.040000 1.315000 3.075000 ;
+      RECT 1.485000  0.255000 1.780000 1.285000 ;
+      RECT 1.485000  1.285000 5.185000 1.505000 ;
+      RECT 1.485000  1.675000 5.185000 1.925000 ;
+      RECT 1.485000  1.925000 1.745000 3.075000 ;
+      RECT 1.915000  2.095000 2.245000 3.245000 ;
+      RECT 1.950000  0.085000 2.210000 1.115000 ;
+      RECT 2.380000  0.255000 2.640000 1.285000 ;
+      RECT 2.415000  1.925000 2.605000 3.075000 ;
+      RECT 2.775000  2.095000 3.105000 3.245000 ;
+      RECT 2.810000  0.085000 3.070000 1.115000 ;
+      RECT 3.240000  0.255000 3.500000 1.285000 ;
+      RECT 3.275000  1.925000 3.465000 3.075000 ;
+      RECT 3.635000  2.095000 3.965000 3.245000 ;
+      RECT 3.670000  0.085000 3.930000 1.115000 ;
+      RECT 4.100000  0.255000 4.360000 1.285000 ;
+      RECT 4.135000  1.925000 4.325000 3.075000 ;
+      RECT 4.495000  2.095000 4.825000 3.245000 ;
+      RECT 4.530000  0.085000 4.790000 1.115000 ;
+      RECT 4.960000  0.255000 8.695000 0.425000 ;
+      RECT 4.960000  0.425000 6.975000 0.520000 ;
+      RECT 4.960000  0.520000 5.185000 1.285000 ;
+      RECT 4.995000  1.925000 5.185000 2.905000 ;
+      RECT 4.995000  2.905000 8.695000 3.075000 ;
+      RECT 5.855000  2.055000 6.045000 2.905000 ;
+      RECT 6.645000  0.520000 6.975000 0.970000 ;
+      RECT 6.715000  2.055000 6.905000 2.905000 ;
+      RECT 7.505000  0.425000 7.835000 0.970000 ;
+      RECT 7.575000  2.055000 7.765000 2.905000 ;
+      RECT 8.395000  0.425000 8.695000 1.095000 ;
+      RECT 8.435000  1.825000 8.695000 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_lp__einvn_8
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef
index 5812813..cd00560 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_lp.magic.lef
@@ -63,15 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.910000  0.085000 1.240000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -80,24 +71,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.705000 2.330000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 0.720000 0.450000 1.230000 ;
-      RECT 0.120000 1.230000 1.505000 1.400000 ;
-      RECT 0.120000 1.400000 0.425000 3.065000 ;
-      RECT 1.175000 1.400000 1.505000 1.600000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.120000  0.720000 0.450000 1.230000 ;
+      RECT 0.120000  1.230000 1.505000 1.400000 ;
+      RECT 0.120000  1.400000 0.425000 3.065000 ;
+      RECT 0.705000  2.330000 1.035000 3.245000 ;
+      RECT 0.910000  0.085000 1.240000 1.050000 ;
+      RECT 1.175000  1.400000 1.505000 1.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 ;
   END
 END sky130_fd_sc_lp__einvn_lp
diff --git a/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef b/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef
index e54281c..2eb5362 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_m.magic.lef
@@ -61,15 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.695000  0.855000 1.155000 1.185000 ;
-        RECT 0.985000  0.085000 1.155000 0.855000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -78,23 +69,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.705000 2.845000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.195000 0.855000 0.525000 1.535000 ;
-      RECT 0.195000 1.535000 1.110000 1.705000 ;
-      RECT 0.195000 1.705000 0.525000 2.985000 ;
-      RECT 0.940000 1.705000 1.110000 2.205000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.195000  0.855000 0.525000 1.535000 ;
+      RECT 0.195000  1.535000 1.110000 1.705000 ;
+      RECT 0.195000  1.705000 0.525000 2.985000 ;
+      RECT 0.695000  0.855000 1.155000 1.185000 ;
+      RECT 0.705000  2.845000 1.035000 3.245000 ;
+      RECT 0.940000  1.705000 1.110000 2.205000 ;
+      RECT 0.985000  0.085000 1.155000 0.855000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__einvn_m
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef
index 0480e13..dc8590d 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_0.magic.lef
@@ -64,14 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.550000  0.085000 0.880000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -80,22 +72,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.620000 2.430000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 0.395000 0.380000 1.930000 ;
-      RECT 0.120000 1.930000 1.035000 2.260000 ;
-      RECT 0.120000 2.260000 0.450000 3.015000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.120000  0.395000 0.380000 1.930000 ;
+      RECT 0.120000  1.930000 1.035000 2.260000 ;
+      RECT 0.120000  2.260000 0.450000 3.015000 ;
+      RECT 0.550000  0.085000 0.880000 0.670000 ;
+      RECT 0.620000  2.430000 0.975000 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_lp__einvp_0
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef
index cc0bdc4..b0b24d3 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_1.magic.lef
@@ -64,15 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.035000  0.085000 1.825000 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
@@ -81,24 +72,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.160000 2.035000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.035000 1.560000 1.415000 1.685000 ;
-      RECT 1.035000 1.685000 2.275000 1.865000 ;
-      RECT 1.700000 1.865000 2.030000 2.425000 ;
-      RECT 1.995000 0.700000 2.275000 1.685000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 1.035000  0.085000 1.825000 1.010000 ;
+      RECT 1.035000  1.560000 1.415000 1.685000 ;
+      RECT 1.035000  1.685000 2.275000 1.865000 ;
+      RECT 1.160000  2.035000 1.530000 3.245000 ;
+      RECT 1.700000  1.865000 2.030000 2.425000 ;
+      RECT 1.995000  0.700000 2.275000 1.685000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__einvp_1
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef
index 92b590e..90fe4b8 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_2.magic.lef
@@ -61,18 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.540000  0.085000 0.925000 1.115000 ;
-        RECT 1.495000  0.085000 1.825000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -81,37 +69,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.570000 1.825000 1.095000 2.495000 ;
-        RECT 0.910000 2.495000 1.095000 3.245000 ;
-        RECT 1.635000 2.115000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.720000 0.370000 1.425000 ;
-      RECT 0.110000 1.425000 2.090000 1.595000 ;
-      RECT 0.110000 1.595000 0.400000 2.485000 ;
-      RECT 1.095000 0.255000 1.325000 1.065000 ;
-      RECT 1.095000 1.065000 2.325000 1.235000 ;
-      RECT 1.265000 1.775000 2.325000 1.945000 ;
-      RECT 1.265000 1.945000 1.465000 3.075000 ;
-      RECT 2.065000 0.255000 3.255000 0.425000 ;
-      RECT 2.065000 0.425000 2.325000 1.065000 ;
-      RECT 2.135000 1.945000 2.325000 2.905000 ;
-      RECT 2.135000 2.905000 3.255000 3.075000 ;
-      RECT 2.995000 0.425000 3.255000 1.040000 ;
-      RECT 2.995000 1.920000 3.255000 2.905000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.110000  0.720000 0.370000 1.425000 ;
+      RECT 0.110000  1.425000 2.090000 1.595000 ;
+      RECT 0.110000  1.595000 0.400000 2.485000 ;
+      RECT 0.540000  0.085000 0.925000 1.115000 ;
+      RECT 0.570000  1.825000 1.095000 2.495000 ;
+      RECT 0.910000  2.495000 1.095000 3.245000 ;
+      RECT 1.095000  0.255000 1.325000 1.065000 ;
+      RECT 1.095000  1.065000 2.325000 1.235000 ;
+      RECT 1.265000  1.775000 2.325000 1.945000 ;
+      RECT 1.265000  1.945000 1.465000 3.075000 ;
+      RECT 1.495000  0.085000 1.825000 0.895000 ;
+      RECT 1.635000  2.115000 1.965000 3.245000 ;
+      RECT 2.065000  0.255000 3.255000 0.425000 ;
+      RECT 2.065000  0.425000 2.325000 1.065000 ;
+      RECT 2.135000  1.945000 2.325000 2.905000 ;
+      RECT 2.135000  2.905000 3.255000 3.075000 ;
+      RECT 2.995000  0.425000 3.255000 1.040000 ;
+      RECT 2.995000  1.920000 3.255000 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_lp__einvp_2
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef
index 539d322..d62c5ee 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_4.magic.lef
@@ -71,24 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.600000  0.085000 0.860000 1.115000 ;
-        RECT 1.425000  0.085000 1.755000 0.700000 ;
-        RECT 2.285000  0.085000 2.615000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,50 +79,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.600000 1.815000 0.895000 3.245000 ;
-        RECT 1.895000 2.095000 2.225000 3.245000 ;
-        RECT 2.755000 2.105000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.255000 0.430000 1.420000 ;
-      RECT 0.135000 1.420000 1.345000 1.645000 ;
-      RECT 0.135000 1.645000 0.430000 3.075000 ;
-      RECT 1.030000 0.255000 1.255000 0.870000 ;
-      RECT 1.030000 0.870000 3.190000 0.895000 ;
-      RECT 1.030000 0.895000 2.705000 1.040000 ;
-      RECT 1.065000 1.645000 1.345000 2.245000 ;
-      RECT 1.515000 1.755000 3.535000 1.920000 ;
-      RECT 1.515000 1.920000 3.795000 1.925000 ;
-      RECT 1.515000 1.925000 1.725000 3.075000 ;
-      RECT 1.925000 0.255000 2.115000 0.725000 ;
-      RECT 1.925000 0.725000 3.190000 0.870000 ;
-      RECT 2.395000 1.925000 2.585000 3.075000 ;
-      RECT 2.840000 0.265000 5.195000 0.435000 ;
-      RECT 2.840000 0.435000 3.190000 0.725000 ;
-      RECT 3.255000 1.925000 3.795000 2.905000 ;
-      RECT 3.255000 2.905000 5.665000 3.075000 ;
-      RECT 3.965000 0.435000 4.295000 0.895000 ;
-      RECT 4.435000 2.260000 4.765000 2.905000 ;
-      RECT 4.965000 0.435000 5.195000 1.215000 ;
-      RECT 5.395000 1.815000 5.665000 2.905000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.135000  0.255000 0.430000 1.420000 ;
+      RECT 0.135000  1.420000 1.345000 1.645000 ;
+      RECT 0.135000  1.645000 0.430000 3.075000 ;
+      RECT 0.600000  0.085000 0.860000 1.115000 ;
+      RECT 0.600000  1.815000 0.895000 3.245000 ;
+      RECT 1.030000  0.255000 1.255000 0.870000 ;
+      RECT 1.030000  0.870000 3.190000 0.895000 ;
+      RECT 1.030000  0.895000 2.705000 1.040000 ;
+      RECT 1.065000  1.645000 1.345000 2.245000 ;
+      RECT 1.425000  0.085000 1.755000 0.700000 ;
+      RECT 1.515000  1.755000 3.535000 1.920000 ;
+      RECT 1.515000  1.920000 3.795000 1.925000 ;
+      RECT 1.515000  1.925000 1.725000 3.075000 ;
+      RECT 1.895000  2.095000 2.225000 3.245000 ;
+      RECT 1.925000  0.255000 2.115000 0.725000 ;
+      RECT 1.925000  0.725000 3.190000 0.870000 ;
+      RECT 2.285000  0.085000 2.615000 0.555000 ;
+      RECT 2.395000  1.925000 2.585000 3.075000 ;
+      RECT 2.755000  2.105000 3.085000 3.245000 ;
+      RECT 2.840000  0.265000 5.195000 0.435000 ;
+      RECT 2.840000  0.435000 3.190000 0.725000 ;
+      RECT 3.255000  1.925000 3.795000 2.905000 ;
+      RECT 3.255000  2.905000 5.665000 3.075000 ;
+      RECT 3.965000  0.435000 4.295000 0.895000 ;
+      RECT 4.435000  2.260000 4.765000 2.905000 ;
+      RECT 4.965000  0.435000 5.195000 1.215000 ;
+      RECT 5.395000  1.815000 5.665000 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_lp__einvp_4
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_8.magic.lef
index b1b38df..1c77dab 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__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 0.555000  0.085000 0.855000 1.040000 ;
-        RECT 2.245000  0.085000 2.575000 1.040000 ;
-        RECT 3.105000  0.085000 3.435000 1.040000 ;
-        RECT 3.965000  0.085000 4.295000 1.040000 ;
-        RECT 4.855000  0.085000 5.085000 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,62 +81,86 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.455000 1.920000 0.725000 3.245000 ;
-        RECT 2.245000 1.890000 2.505000 3.245000 ;
-        RECT 3.105000 1.890000 3.370000 3.245000 ;
-        RECT 3.970000 1.890000 4.225000 3.245000 ;
-        RECT 4.830000 1.890000 5.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 ;
-        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.945000 1.855000 1.315000 1.930000 ;
-      RECT 0.945000 1.930000 1.615000 3.075000 ;
-      RECT 1.025000 0.255000 1.315000 1.855000 ;
-      RECT 1.785000 1.550000 5.515000 1.720000 ;
-      RECT 1.785000 1.720000 2.075000 3.075000 ;
-      RECT 1.815000 0.255000 2.075000 1.210000 ;
-      RECT 1.815000 1.210000 5.585000 1.380000 ;
-      RECT 2.675000 1.720000 2.935000 3.075000 ;
-      RECT 2.745000 0.255000 2.935000 1.210000 ;
-      RECT 3.540000 1.720000 3.800000 3.075000 ;
-      RECT 3.605000 0.255000 3.795000 1.210000 ;
-      RECT 4.395000 1.720000 4.660000 3.075000 ;
-      RECT 4.465000 0.255000 4.685000 1.210000 ;
-      RECT 5.255000 0.275000 9.025000 0.445000 ;
-      RECT 5.255000 0.445000 8.165000 0.555000 ;
-      RECT 5.255000 0.555000 5.585000 1.210000 ;
-      RECT 5.260000 1.720000 5.515000 2.905000 ;
-      RECT 5.260000 2.905000 8.995000 3.075000 ;
-      RECT 6.085000 2.105000 6.415000 2.905000 ;
-      RECT 6.945000 2.105000 7.275000 2.905000 ;
-      RECT 7.805000 2.105000 8.135000 2.905000 ;
-      RECT 7.835000 0.555000 8.165000 0.825000 ;
-      RECT 8.705000 1.815000 8.995000 2.905000 ;
-      RECT 8.730000 0.445000 9.025000 1.095000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.455000  1.920000 0.725000 3.245000 ;
+      RECT 0.555000  0.085000 0.855000 1.040000 ;
+      RECT 0.945000  1.855000 1.315000 1.930000 ;
+      RECT 0.945000  1.930000 1.615000 3.075000 ;
+      RECT 1.025000  0.255000 1.315000 1.855000 ;
+      RECT 1.785000  1.550000 5.515000 1.720000 ;
+      RECT 1.785000  1.720000 2.075000 3.075000 ;
+      RECT 1.815000  0.255000 2.075000 1.210000 ;
+      RECT 1.815000  1.210000 5.585000 1.380000 ;
+      RECT 2.245000  0.085000 2.575000 1.040000 ;
+      RECT 2.245000  1.890000 2.505000 3.245000 ;
+      RECT 2.675000  1.720000 2.935000 3.075000 ;
+      RECT 2.745000  0.255000 2.935000 1.210000 ;
+      RECT 3.105000  0.085000 3.435000 1.040000 ;
+      RECT 3.105000  1.890000 3.370000 3.245000 ;
+      RECT 3.540000  1.720000 3.800000 3.075000 ;
+      RECT 3.605000  0.255000 3.795000 1.210000 ;
+      RECT 3.965000  0.085000 4.295000 1.040000 ;
+      RECT 3.970000  1.890000 4.225000 3.245000 ;
+      RECT 4.395000  1.720000 4.660000 3.075000 ;
+      RECT 4.465000  0.255000 4.685000 1.210000 ;
+      RECT 4.830000  1.890000 5.090000 3.245000 ;
+      RECT 4.855000  0.085000 5.085000 1.040000 ;
+      RECT 5.255000  0.275000 9.025000 0.445000 ;
+      RECT 5.255000  0.445000 8.165000 0.555000 ;
+      RECT 5.255000  0.555000 5.585000 1.210000 ;
+      RECT 5.260000  1.720000 5.515000 2.905000 ;
+      RECT 5.260000  2.905000 8.995000 3.075000 ;
+      RECT 6.085000  2.105000 6.415000 2.905000 ;
+      RECT 6.945000  2.105000 7.275000 2.905000 ;
+      RECT 7.805000  2.105000 8.135000 2.905000 ;
+      RECT 7.835000  0.555000 8.165000 0.825000 ;
+      RECT 8.705000  1.815000 8.995000 2.905000 ;
+      RECT 8.730000  0.445000 9.025000 1.095000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__einvp_8
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef
index 3d778f5..a820396 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_lp.magic.lef
@@ -62,15 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.035000  0.085000 1.285000 1.145000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -79,24 +70,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.420000 2.075000 1.750000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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.910000 1.605000 2.280000 1.775000 ;
-      RECT 0.910000 1.775000 1.240000 1.935000 ;
-      RECT 1.950000 1.775000 2.280000 3.065000 ;
-      RECT 1.985000 0.485000 2.280000 1.605000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.910000  1.605000 2.280000 1.775000 ;
+      RECT 0.910000  1.775000 1.240000 1.935000 ;
+      RECT 1.035000  0.085000 1.285000 1.145000 ;
+      RECT 1.420000  2.075000 1.750000 3.245000 ;
+      RECT 1.950000  1.775000 2.280000 3.065000 ;
+      RECT 1.985000  0.485000 2.280000 1.605000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__einvp_lp
diff --git a/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef b/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef
index a923da4..cd10e66 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_m.magic.lef
@@ -61,15 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.680000  0.820000 1.155000 1.030000 ;
-        RECT 0.985000  0.085000 1.155000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -78,23 +69,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.740000 2.785000 0.950000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 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.170000 0.835000 0.500000 1.535000 ;
-      RECT 0.170000 1.535000 1.025000 1.705000 ;
-      RECT 0.170000 1.705000 0.520000 2.985000 ;
-      RECT 0.855000 1.705000 1.025000 2.205000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.170000  0.835000 0.500000 1.535000 ;
+      RECT 0.170000  1.535000 1.025000 1.705000 ;
+      RECT 0.170000  1.705000 0.520000 2.985000 ;
+      RECT 0.680000  0.820000 1.155000 1.030000 ;
+      RECT 0.740000  2.785000 0.950000 3.245000 ;
+      RECT 0.855000  1.705000 1.025000 2.205000 ;
+      RECT 0.985000  0.085000 1.155000 0.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 ;
   END
 END sky130_fd_sc_lp__einvp_m
diff --git a/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef
index 94e287a..dd1b60a 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_0.magic.lef
@@ -92,30 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.665000  0.085000 0.995000 0.955000 ;
-        RECT 2.415000  0.085000 2.745000 0.720000 ;
-        RECT 3.450000  0.085000 3.780000 0.960000 ;
-        RECT 4.360000  0.085000 4.690000 0.855000 ;
-        RECT 6.690000  0.085000 6.985000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -124,62 +100,83 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.595000 2.660000 0.890000 3.245000 ;
-        RECT 2.445000 2.830000 2.775000 3.245000 ;
-        RECT 3.470000 2.325000 3.745000 3.245000 ;
-        RECT 4.360000 2.435000 4.690000 3.245000 ;
-        RECT 6.805000 2.635000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.495000 1.125000 1.520000 1.295000 ;
-      RECT 0.495000 1.295000 0.700000 1.455000 ;
-      RECT 0.530000 1.455000 0.700000 2.195000 ;
-      RECT 0.530000 2.195000 1.230000 2.365000 ;
-      RECT 1.060000 2.365000 1.230000 2.705000 ;
-      RECT 1.060000 2.705000 1.825000 3.035000 ;
-      RECT 1.255000 0.640000 1.745000 0.970000 ;
-      RECT 1.255000 0.970000 1.520000 1.125000 ;
-      RECT 1.915000 0.640000 2.245000 0.890000 ;
-      RECT 1.915000 0.890000 3.235000 1.060000 ;
-      RECT 1.995000 2.490000 3.225000 2.660000 ;
-      RECT 1.995000 2.660000 2.275000 3.035000 ;
-      RECT 2.915000 0.640000 3.235000 0.890000 ;
-      RECT 2.945000 2.660000 3.225000 3.035000 ;
-      RECT 3.915000 2.095000 5.145000 2.265000 ;
-      RECT 3.915000 2.265000 4.190000 2.665000 ;
-      RECT 3.960000 0.630000 4.190000 1.025000 ;
-      RECT 3.960000 1.025000 5.140000 1.195000 ;
-      RECT 4.860000 0.630000 5.140000 1.025000 ;
-      RECT 4.860000 2.265000 5.145000 2.665000 ;
-      RECT 5.310000 0.630000 5.600000 0.835000 ;
-      RECT 5.310000 0.835000 6.520000 0.850000 ;
-      RECT 5.310000 0.850000 7.175000 1.020000 ;
-      RECT 5.315000 2.295000 6.955000 2.465000 ;
-      RECT 5.315000 2.465000 5.645000 2.665000 ;
-      RECT 6.745000 1.020000 7.175000 1.195000 ;
-      RECT 6.745000 1.195000 6.955000 2.295000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.495000  1.125000 1.520000 1.295000 ;
+      RECT 0.495000  1.295000 0.700000 1.455000 ;
+      RECT 0.530000  1.455000 0.700000 2.195000 ;
+      RECT 0.530000  2.195000 1.230000 2.365000 ;
+      RECT 0.595000  2.660000 0.890000 3.245000 ;
+      RECT 0.665000  0.085000 0.995000 0.955000 ;
+      RECT 1.060000  2.365000 1.230000 2.705000 ;
+      RECT 1.060000  2.705000 1.825000 3.035000 ;
+      RECT 1.255000  0.640000 1.745000 0.970000 ;
+      RECT 1.255000  0.970000 1.520000 1.125000 ;
+      RECT 1.915000  0.640000 2.245000 0.890000 ;
+      RECT 1.915000  0.890000 3.235000 1.060000 ;
+      RECT 1.995000  2.490000 3.225000 2.660000 ;
+      RECT 1.995000  2.660000 2.275000 3.035000 ;
+      RECT 2.415000  0.085000 2.745000 0.720000 ;
+      RECT 2.445000  2.830000 2.775000 3.245000 ;
+      RECT 2.915000  0.640000 3.235000 0.890000 ;
+      RECT 2.945000  2.660000 3.225000 3.035000 ;
+      RECT 3.450000  0.085000 3.780000 0.960000 ;
+      RECT 3.470000  2.325000 3.745000 3.245000 ;
+      RECT 3.915000  2.095000 5.145000 2.265000 ;
+      RECT 3.915000  2.265000 4.190000 2.665000 ;
+      RECT 3.960000  0.630000 4.190000 1.025000 ;
+      RECT 3.960000  1.025000 5.140000 1.195000 ;
+      RECT 4.360000  0.085000 4.690000 0.855000 ;
+      RECT 4.360000  2.435000 4.690000 3.245000 ;
+      RECT 4.860000  0.630000 5.140000 1.025000 ;
+      RECT 4.860000  2.265000 5.145000 2.665000 ;
+      RECT 5.310000  0.630000 5.600000 0.835000 ;
+      RECT 5.310000  0.835000 6.520000 0.850000 ;
+      RECT 5.310000  0.850000 7.175000 1.020000 ;
+      RECT 5.315000  2.295000 6.955000 2.465000 ;
+      RECT 5.315000  2.465000 5.645000 2.665000 ;
+      RECT 6.690000  0.085000 6.985000 0.680000 ;
+      RECT 6.745000  1.020000 7.175000 1.195000 ;
+      RECT 6.745000  1.195000 6.955000 2.295000 ;
+      RECT 6.805000  2.635000 7.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 ;
+      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_lp__fa_0
diff --git a/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef
index 2ab00e9..1d84785 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_1.magic.lef
@@ -35,14 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.005000 1.295000 1.345000 2.130000 ;
-        RECT 2.365000 1.865000 2.785000 2.130000 ;
-        RECT 6.820000 1.185000 7.120000 2.130000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.950000 1.285000 2.120000 ;
-        RECT 2.555000 1.950000 2.725000 2.120000 ;
-        RECT 6.875000 1.950000 7.045000 2.120000 ;
       LAYER met1 ;
         RECT 1.055000 1.920000 1.345000 1.965000 ;
         RECT 1.055000 1.965000 7.105000 2.105000 ;
@@ -100,31 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.535000  0.085000 1.200000 1.045000 ;
-        RECT 2.560000  0.085000 2.890000 1.015000 ;
-        RECT 3.635000  0.085000 3.935000 0.795000 ;
-        RECT 4.515000  0.085000 4.845000 0.655000 ;
-        RECT 7.140000  0.085000 7.470000 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 ;
-        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,63 +100,91 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.555000 2.640000 0.885000 3.245000 ;
-        RECT 2.570000 2.640000 2.900000 3.245000 ;
-        RECT 3.885000 2.100000 4.120000 3.245000 ;
-        RECT 4.705000 2.205000 5.035000 2.470000 ;
-        RECT 4.845000 2.470000 5.035000 3.245000 ;
-        RECT 7.285000 2.640000 7.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 ;
-        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.535000 1.215000 0.795000 1.545000 ;
-      RECT 0.555000 1.545000 0.795000 2.300000 ;
-      RECT 0.555000 2.300000 1.920000 2.470000 ;
-      RECT 1.630000 2.470000 1.920000 2.655000 ;
-      RECT 1.700000 0.730000 1.985000 1.525000 ;
-      RECT 1.700000 1.525000 5.700000 1.695000 ;
-      RECT 1.700000 1.695000 1.920000 2.300000 ;
-      RECT 2.090000 2.300000 3.335000 2.470000 ;
-      RECT 2.090000 2.470000 2.390000 2.660000 ;
-      RECT 2.155000 0.730000 2.390000 1.185000 ;
-      RECT 2.155000 1.185000 3.280000 1.355000 ;
-      RECT 3.060000 0.730000 3.280000 1.185000 ;
-      RECT 3.080000 2.470000 3.335000 2.660000 ;
-      RECT 4.105000 0.465000 4.345000 0.825000 ;
-      RECT 4.105000 0.825000 5.495000 0.995000 ;
-      RECT 4.290000 1.865000 5.435000 2.035000 ;
-      RECT 4.290000 2.035000 4.535000 2.430000 ;
-      RECT 5.015000 0.385000 5.495000 0.825000 ;
-      RECT 5.205000 2.035000 5.435000 2.430000 ;
-      RECT 5.605000 2.100000 5.875000 2.300000 ;
-      RECT 5.605000 2.300000 7.625000 2.470000 ;
-      RECT 5.665000 0.665000 6.970000 0.845000 ;
-      RECT 5.665000 0.845000 7.470000 1.015000 ;
-      RECT 7.290000 1.015000 7.470000 1.190000 ;
-      RECT 7.290000 1.190000 7.660000 1.520000 ;
-      RECT 7.290000 1.520000 7.625000 2.300000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.535000  0.085000 1.200000 1.045000 ;
+      RECT 0.535000  1.215000 0.795000 1.545000 ;
+      RECT 0.555000  1.545000 0.795000 2.300000 ;
+      RECT 0.555000  2.300000 1.920000 2.470000 ;
+      RECT 0.555000  2.640000 0.885000 3.245000 ;
+      RECT 1.005000  1.295000 1.345000 2.130000 ;
+      RECT 1.630000  2.470000 1.920000 2.655000 ;
+      RECT 1.700000  0.730000 1.985000 1.525000 ;
+      RECT 1.700000  1.525000 5.700000 1.695000 ;
+      RECT 1.700000  1.695000 1.920000 2.300000 ;
+      RECT 2.090000  2.300000 3.335000 2.470000 ;
+      RECT 2.090000  2.470000 2.390000 2.660000 ;
+      RECT 2.155000  0.730000 2.390000 1.185000 ;
+      RECT 2.155000  1.185000 3.280000 1.355000 ;
+      RECT 2.365000  1.865000 2.785000 2.130000 ;
+      RECT 2.560000  0.085000 2.890000 1.015000 ;
+      RECT 2.570000  2.640000 2.900000 3.245000 ;
+      RECT 3.060000  0.730000 3.280000 1.185000 ;
+      RECT 3.080000  2.470000 3.335000 2.660000 ;
+      RECT 3.635000  0.085000 3.935000 0.795000 ;
+      RECT 3.885000  2.100000 4.120000 3.245000 ;
+      RECT 4.105000  0.465000 4.345000 0.825000 ;
+      RECT 4.105000  0.825000 5.495000 0.995000 ;
+      RECT 4.290000  1.865000 5.435000 2.035000 ;
+      RECT 4.290000  2.035000 4.535000 2.430000 ;
+      RECT 4.515000  0.085000 4.845000 0.655000 ;
+      RECT 4.705000  2.205000 5.035000 2.470000 ;
+      RECT 4.845000  2.470000 5.035000 3.245000 ;
+      RECT 5.015000  0.385000 5.495000 0.825000 ;
+      RECT 5.205000  2.035000 5.435000 2.430000 ;
+      RECT 5.605000  2.100000 5.875000 2.300000 ;
+      RECT 5.605000  2.300000 7.625000 2.470000 ;
+      RECT 5.665000  0.665000 6.970000 0.845000 ;
+      RECT 5.665000  0.845000 7.470000 1.015000 ;
+      RECT 6.820000  1.185000 7.120000 2.130000 ;
+      RECT 7.140000  0.085000 7.470000 0.675000 ;
+      RECT 7.285000  2.640000 7.615000 3.245000 ;
+      RECT 7.290000  1.015000 7.470000 1.190000 ;
+      RECT 7.290000  1.190000 7.660000 1.520000 ;
+      RECT 7.290000  1.520000 7.625000 2.300000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.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  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  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 ;
   END
 END sky130_fd_sc_lp__fa_1
diff --git a/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef
index c7a8ae3..eacd37c 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_2.magic.lef
@@ -100,34 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.115000  0.085000 0.375000 0.555000 ;
-        RECT 1.045000  0.085000 1.325000 0.710000 ;
-        RECT 3.165000  0.085000 3.375000 0.915000 ;
-        RECT 5.105000  0.085000 5.810000 0.825000 ;
-        RECT 6.455000  0.085000 6.785000 0.355000 ;
-        RECT 7.475000  0.085000 7.805000 0.355000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -136,82 +108,106 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.115000 2.660000 0.445000 3.245000 ;
-        RECT 0.975000 2.320000 1.350000 3.245000 ;
-        RECT 3.095000 2.145000 3.425000 3.245000 ;
-        RECT 5.355000 2.640000 5.685000 3.245000 ;
-        RECT 6.240000 2.270000 6.570000 2.665000 ;
-        RECT 6.240000 2.665000 6.935000 3.245000 ;
-        RECT 7.465000 2.665000 7.795000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.505000 1.075000 1.225000 1.245000 ;
-      RECT 0.505000 1.245000 0.685000 1.920000 ;
-      RECT 0.505000 1.920000 2.280000 2.150000 ;
-      RECT 0.855000 1.425000 1.660000 1.595000 ;
-      RECT 1.055000 0.880000 2.475000 1.050000 ;
-      RECT 1.055000 1.050000 1.225000 1.075000 ;
-      RECT 1.490000 1.230000 3.715000 1.255000 ;
-      RECT 1.490000 1.255000 3.040000 1.400000 ;
-      RECT 1.490000 1.400000 1.660000 1.425000 ;
-      RECT 1.520000 2.320000 1.850000 2.820000 ;
-      RECT 1.520000 2.820000 2.915000 2.990000 ;
-      RECT 1.635000 0.370000 2.995000 0.540000 ;
-      RECT 1.635000 0.540000 1.965000 0.710000 ;
-      RECT 2.020000 2.150000 2.280000 2.640000 ;
-      RECT 2.145000 0.710000 2.475000 0.880000 ;
-      RECT 2.585000 2.145000 2.915000 2.820000 ;
-      RECT 2.665000 0.540000 2.995000 0.915000 ;
-      RECT 2.870000 1.085000 3.715000 1.230000 ;
-      RECT 2.870000 1.400000 3.040000 1.785000 ;
-      RECT 2.870000 1.785000 3.775000 1.955000 ;
-      RECT 3.545000 0.640000 4.535000 0.970000 ;
-      RECT 3.545000 0.970000 3.715000 1.085000 ;
-      RECT 3.605000 1.955000 3.775000 2.075000 ;
-      RECT 3.605000 2.075000 4.505000 2.245000 ;
-      RECT 4.245000 2.245000 4.505000 2.745000 ;
-      RECT 4.675000 1.675000 5.125000 2.120000 ;
-      RECT 4.705000 0.640000 4.935000 0.995000 ;
-      RECT 4.705000 0.995000 6.180000 1.165000 ;
-      RECT 4.795000 2.290000 6.070000 2.470000 ;
-      RECT 4.795000 2.470000 5.125000 2.890000 ;
-      RECT 5.810000 2.200000 6.070000 2.290000 ;
-      RECT 5.855000 2.470000 6.070000 2.870000 ;
-      RECT 5.980000 0.705000 6.180000 0.995000 ;
-      RECT 7.465000 1.075000 9.025000 1.245000 ;
-      RECT 7.465000 1.245000 7.645000 1.545000 ;
-      RECT 8.680000 0.865000 9.025000 1.075000 ;
-      RECT 8.680000 1.245000 9.025000 2.495000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.115000  0.085000 0.375000 0.555000 ;
+      RECT 0.115000  2.660000 0.445000 3.245000 ;
+      RECT 0.505000  1.075000 1.225000 1.245000 ;
+      RECT 0.505000  1.245000 0.685000 1.920000 ;
+      RECT 0.505000  1.920000 2.280000 2.150000 ;
+      RECT 0.855000  1.425000 1.660000 1.595000 ;
+      RECT 0.975000  2.320000 1.350000 3.245000 ;
+      RECT 1.045000  0.085000 1.325000 0.710000 ;
+      RECT 1.055000  0.880000 2.475000 1.050000 ;
+      RECT 1.055000  1.050000 1.225000 1.075000 ;
+      RECT 1.490000  1.230000 3.715000 1.255000 ;
+      RECT 1.490000  1.255000 3.040000 1.400000 ;
+      RECT 1.490000  1.400000 1.660000 1.425000 ;
+      RECT 1.520000  2.320000 1.850000 2.820000 ;
+      RECT 1.520000  2.820000 2.915000 2.990000 ;
+      RECT 1.635000  0.370000 2.995000 0.540000 ;
+      RECT 1.635000  0.540000 1.965000 0.710000 ;
+      RECT 2.020000  2.150000 2.280000 2.640000 ;
+      RECT 2.145000  0.710000 2.475000 0.880000 ;
+      RECT 2.585000  2.145000 2.915000 2.820000 ;
+      RECT 2.665000  0.540000 2.995000 0.915000 ;
+      RECT 2.870000  1.085000 3.715000 1.230000 ;
+      RECT 2.870000  1.400000 3.040000 1.785000 ;
+      RECT 2.870000  1.785000 3.775000 1.955000 ;
+      RECT 3.095000  2.145000 3.425000 3.245000 ;
+      RECT 3.165000  0.085000 3.375000 0.915000 ;
+      RECT 3.545000  0.640000 4.535000 0.970000 ;
+      RECT 3.545000  0.970000 3.715000 1.085000 ;
+      RECT 3.605000  1.955000 3.775000 2.075000 ;
+      RECT 3.605000  2.075000 4.505000 2.245000 ;
+      RECT 4.245000  2.245000 4.505000 2.745000 ;
+      RECT 4.675000  1.675000 5.125000 2.120000 ;
+      RECT 4.705000  0.640000 4.935000 0.995000 ;
+      RECT 4.705000  0.995000 6.180000 1.165000 ;
+      RECT 4.795000  2.290000 6.070000 2.470000 ;
+      RECT 4.795000  2.470000 5.125000 2.890000 ;
+      RECT 5.105000  0.085000 5.810000 0.825000 ;
+      RECT 5.355000  2.640000 5.685000 3.245000 ;
+      RECT 5.810000  2.200000 6.070000 2.290000 ;
+      RECT 5.855000  2.470000 6.070000 2.870000 ;
+      RECT 5.980000  0.705000 6.180000 0.995000 ;
+      RECT 6.240000  2.270000 6.570000 2.665000 ;
+      RECT 6.240000  2.665000 6.935000 3.245000 ;
+      RECT 6.455000  0.085000 6.785000 0.355000 ;
+      RECT 7.465000  1.075000 9.025000 1.245000 ;
+      RECT 7.465000  1.245000 7.645000 1.545000 ;
+      RECT 7.465000  2.665000 7.795000 3.245000 ;
+      RECT 7.475000  0.085000 7.805000 0.355000 ;
+      RECT 8.680000  0.865000 9.025000 1.075000 ;
+      RECT 8.680000  1.245000 9.025000 2.495000 ;
     LAYER mcon ;
-      RECT 0.635000 1.950000 0.805000 2.120000 ;
-      RECT 4.955000 1.950000 5.125000 2.120000 ;
-      RECT 8.795000 1.950000 8.965000 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  1.950000 0.805000 2.120000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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  1.950000 8.965000 2.120000 ;
+      RECT 8.795000  3.245000 8.965000 3.415000 ;
     LAYER met1 ;
       RECT 0.575000 1.920000 0.865000 1.965000 ;
       RECT 0.575000 1.965000 9.025000 2.105000 ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef
index c665dab..9f4dc6d 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_4.magic.lef
@@ -101,37 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 0.885000 ;
-        RECT 2.425000  0.085000 2.755000 1.040000 ;
-        RECT 3.445000  0.085000 3.775000 0.865000 ;
-        RECT 5.710000  0.085000 6.040000 0.530000 ;
-        RECT 6.590000  0.085000 6.920000 0.875000 ;
-        RECT 7.450000  0.085000 7.780000 0.875000 ;
-        RECT 8.310000  0.085000 8.640000 0.670000 ;
-        RECT 9.170000  0.085000 9.500000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.600000 0.245000 ;
     END
@@ -140,72 +109,99 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.525000 2.620000 0.855000 3.245000 ;
-        RECT 2.635000 2.105000 2.855000 3.245000 ;
-        RECT 3.480000 2.435000 3.810000 3.245000 ;
-        RECT 5.730000 2.435000 6.060000 3.245000 ;
-        RECT 6.590000 2.105000 6.920000 3.245000 ;
-        RECT 7.450000 2.105000 7.780000 3.245000 ;
-        RECT 8.310000 2.105000 8.640000 3.245000 ;
-        RECT 9.170000 2.105000 9.500000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 2.180000 0.355000 2.280000 ;
-      RECT 0.095000 2.280000 1.320000 2.450000 ;
-      RECT 0.095000 2.450000 0.345000 2.850000 ;
-      RECT 0.205000 0.705000 0.405000 1.065000 ;
-      RECT 0.205000 1.065000 1.415000 1.235000 ;
-      RECT 1.085000 0.810000 1.415000 1.065000 ;
-      RECT 1.110000 2.450000 1.320000 2.610000 ;
-      RECT 1.595000 0.810000 1.945000 1.210000 ;
-      RECT 1.595000 1.210000 2.115000 1.380000 ;
-      RECT 1.840000 2.055000 2.115000 2.725000 ;
-      RECT 1.945000 1.380000 2.115000 2.055000 ;
-      RECT 3.025000 2.095000 4.260000 2.265000 ;
-      RECT 3.025000 2.265000 3.275000 2.765000 ;
-      RECT 3.055000 0.765000 3.265000 1.045000 ;
-      RECT 3.055000 1.045000 4.235000 1.215000 ;
-      RECT 3.980000 2.265000 4.260000 2.765000 ;
-      RECT 4.025000 0.765000 4.235000 1.045000 ;
-      RECT 4.200000 1.385000 4.655000 1.575000 ;
-      RECT 4.430000 2.095000 6.060000 2.265000 ;
-      RECT 4.430000 2.265000 4.745000 2.765000 ;
-      RECT 4.475000 1.200000 4.655000 1.385000 ;
-      RECT 4.495000 0.700000 6.060000 1.030000 ;
-      RECT 5.890000 1.030000 6.060000 1.395000 ;
-      RECT 5.890000 1.395000 7.045000 1.565000 ;
-      RECT 5.890000 1.565000 6.060000 2.095000 ;
-      RECT 7.745000 1.180000 9.095000 1.515000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.095000  2.180000 0.355000 2.280000 ;
+      RECT 0.095000  2.280000 1.320000 2.450000 ;
+      RECT 0.095000  2.450000 0.345000 2.850000 ;
+      RECT 0.205000  0.705000 0.405000 1.065000 ;
+      RECT 0.205000  1.065000 1.415000 1.235000 ;
+      RECT 0.525000  2.620000 0.855000 3.245000 ;
+      RECT 0.575000  0.085000 0.905000 0.885000 ;
+      RECT 1.085000  0.810000 1.415000 1.065000 ;
+      RECT 1.110000  2.450000 1.320000 2.610000 ;
+      RECT 1.595000  0.810000 1.945000 1.210000 ;
+      RECT 1.595000  1.210000 2.115000 1.380000 ;
+      RECT 1.840000  2.055000 2.115000 2.725000 ;
+      RECT 1.945000  1.380000 2.115000 2.055000 ;
+      RECT 2.425000  0.085000 2.755000 1.040000 ;
+      RECT 2.635000  2.105000 2.855000 3.245000 ;
+      RECT 3.025000  2.095000 4.260000 2.265000 ;
+      RECT 3.025000  2.265000 3.275000 2.765000 ;
+      RECT 3.055000  0.765000 3.265000 1.045000 ;
+      RECT 3.055000  1.045000 4.235000 1.215000 ;
+      RECT 3.445000  0.085000 3.775000 0.865000 ;
+      RECT 3.480000  2.435000 3.810000 3.245000 ;
+      RECT 3.980000  2.265000 4.260000 2.765000 ;
+      RECT 4.025000  0.765000 4.235000 1.045000 ;
+      RECT 4.200000  1.385000 4.655000 1.575000 ;
+      RECT 4.430000  2.095000 6.060000 2.265000 ;
+      RECT 4.430000  2.265000 4.745000 2.765000 ;
+      RECT 4.475000  1.200000 4.655000 1.385000 ;
+      RECT 4.495000  0.700000 6.060000 1.030000 ;
+      RECT 5.710000  0.085000 6.040000 0.530000 ;
+      RECT 5.730000  2.435000 6.060000 3.245000 ;
+      RECT 5.890000  1.030000 6.060000 1.395000 ;
+      RECT 5.890000  1.395000 7.045000 1.565000 ;
+      RECT 5.890000  1.565000 6.060000 2.095000 ;
+      RECT 6.590000  0.085000 6.920000 0.875000 ;
+      RECT 6.590000  2.105000 6.920000 3.245000 ;
+      RECT 7.450000  0.085000 7.780000 0.875000 ;
+      RECT 7.450000  2.105000 7.780000 3.245000 ;
+      RECT 7.745000  1.180000 9.095000 1.515000 ;
+      RECT 8.310000  0.085000 8.640000 0.670000 ;
+      RECT 8.310000  2.105000 8.640000 3.245000 ;
+      RECT 9.170000  0.085000 9.500000 0.670000 ;
+      RECT 9.170000  2.105000 9.500000 3.245000 ;
     LAYER mcon ;
-      RECT 4.475000 1.210000 4.645000 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  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.210000 4.645000 1.380000 ;
+      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.210000 8.005000 1.380000 ;
+      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 ;
     LAYER met1 ;
       RECT 1.535000 1.180000 1.825000 1.225000 ;
       RECT 1.535000 1.225000 8.065000 1.365000 ;
diff --git a/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef
index 373c617..cb5d80c 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_lp.magic.lef
@@ -96,38 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 1.005000  0.085000  1.575000 0.865000 ;
-        RECT 1.405000  0.865000  1.575000 1.195000 ;
-        RECT 1.405000  1.195000  2.595000 1.365000 ;
-        RECT 2.265000  0.685000  2.595000 1.195000 ;
-        RECT 4.490000  0.085000  4.820000 0.650000 ;
-        RECT 5.590000  0.085000  5.920000 0.935000 ;
-        RECT 9.270000  0.085000  9.600000 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 ;
-        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,84 +104,113 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 0.645000 1.895000  0.975000 3.245000 ;
-        RECT 1.735000 2.245000  2.065000 3.245000 ;
-        RECT 4.690000 2.515000  5.020000 3.245000 ;
-        RECT 5.750000 2.865000  6.080000 3.245000 ;
-        RECT 9.665000 2.075000  9.915000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.700000 1.045000  1.030000 1.545000 ;
-      RECT 0.700000 1.545000  2.945000 1.715000 ;
-      RECT 1.205000 1.895000  2.415000 2.065000 ;
-      RECT 1.205000 2.065000  1.535000 3.065000 ;
-      RECT 1.755000 0.320000  4.230000 0.490000 ;
-      RECT 1.755000 0.490000  2.085000 1.015000 ;
-      RECT 2.245000 2.065000  2.415000 2.095000 ;
-      RECT 2.245000 2.095000  3.075000 2.265000 ;
-      RECT 2.265000 2.445000  2.595000 2.895000 ;
-      RECT 2.265000 2.895000  4.390000 3.065000 ;
-      RECT 2.775000 0.830000  5.060000 1.000000 ;
-      RECT 2.775000 1.000000  3.605000 1.055000 ;
-      RECT 2.775000 1.055000  2.945000 1.545000 ;
-      RECT 2.775000 1.715000  2.945000 1.745000 ;
-      RECT 2.775000 1.745000  3.425000 1.915000 ;
-      RECT 2.825000 2.265000  3.075000 2.715000 ;
-      RECT 3.250000 0.685000  3.580000 0.830000 ;
-      RECT 3.255000 1.915000  3.425000 2.450000 ;
-      RECT 3.255000 2.450000  3.860000 2.715000 ;
-      RECT 3.900000 0.490000  4.230000 0.650000 ;
-      RECT 4.060000 2.515000  4.390000 2.895000 ;
-      RECT 4.890000 1.000000  5.060000 1.465000 ;
-      RECT 4.890000 1.465000  6.620000 1.635000 ;
-      RECT 5.080000 0.320000  5.410000 0.650000 ;
-      RECT 5.220000 2.515000  7.845000 2.685000 ;
-      RECT 5.220000 2.685000  5.550000 3.065000 ;
-      RECT 5.240000 0.650000  5.410000 1.115000 ;
-      RECT 5.240000 1.115000  6.270000 1.285000 ;
-      RECT 6.100000 0.850000  7.745000 1.020000 ;
-      RECT 6.100000 1.020000  6.270000 1.115000 ;
-      RECT 6.450000 1.200000  7.430000 1.305000 ;
-      RECT 6.450000 1.305000  8.010000 1.370000 ;
-      RECT 6.450000 1.370000  6.620000 1.465000 ;
-      RECT 7.260000 1.370000  8.010000 1.635000 ;
-      RECT 7.415000 0.685000  7.745000 0.850000 ;
-      RECT 7.515000 2.685000  7.845000 3.065000 ;
-      RECT 7.975000 0.685000  8.360000 1.125000 ;
-      RECT 8.045000 2.515000  9.485000 2.685000 ;
-      RECT 8.045000 2.685000  8.375000 3.065000 ;
-      RECT 8.190000 1.125000  8.360000 1.220000 ;
-      RECT 8.190000 1.220000 10.120000 1.390000 ;
-      RECT 9.315000 1.390000  9.485000 2.515000 ;
-      RECT 9.820000 1.390000 10.120000 1.890000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.645000  1.895000  0.975000 3.245000 ;
+      RECT 0.700000  1.045000  1.030000 1.545000 ;
+      RECT 0.700000  1.545000  2.945000 1.715000 ;
+      RECT 1.005000  0.085000  1.575000 0.865000 ;
+      RECT 1.205000  1.895000  2.415000 2.065000 ;
+      RECT 1.205000  2.065000  1.535000 3.065000 ;
+      RECT 1.405000  0.865000  1.575000 1.195000 ;
+      RECT 1.405000  1.195000  2.595000 1.365000 ;
+      RECT 1.735000  2.245000  2.065000 3.245000 ;
+      RECT 1.755000  0.320000  4.230000 0.490000 ;
+      RECT 1.755000  0.490000  2.085000 1.015000 ;
+      RECT 2.245000  2.065000  2.415000 2.095000 ;
+      RECT 2.245000  2.095000  3.075000 2.265000 ;
+      RECT 2.265000  0.685000  2.595000 1.195000 ;
+      RECT 2.265000  2.445000  2.595000 2.895000 ;
+      RECT 2.265000  2.895000  4.390000 3.065000 ;
+      RECT 2.775000  0.830000  5.060000 1.000000 ;
+      RECT 2.775000  1.000000  3.605000 1.055000 ;
+      RECT 2.775000  1.055000  2.945000 1.545000 ;
+      RECT 2.775000  1.715000  2.945000 1.745000 ;
+      RECT 2.775000  1.745000  3.425000 1.915000 ;
+      RECT 2.825000  2.265000  3.075000 2.715000 ;
+      RECT 3.250000  0.685000  3.580000 0.830000 ;
+      RECT 3.255000  1.915000  3.425000 2.450000 ;
+      RECT 3.255000  2.450000  3.860000 2.715000 ;
+      RECT 3.900000  0.490000  4.230000 0.650000 ;
+      RECT 4.060000  2.515000  4.390000 2.895000 ;
+      RECT 4.490000  0.085000  4.820000 0.650000 ;
+      RECT 4.690000  2.515000  5.020000 3.245000 ;
+      RECT 4.890000  1.000000  5.060000 1.465000 ;
+      RECT 4.890000  1.465000  6.620000 1.635000 ;
+      RECT 5.080000  0.320000  5.410000 0.650000 ;
+      RECT 5.220000  2.515000  7.845000 2.685000 ;
+      RECT 5.220000  2.685000  5.550000 3.065000 ;
+      RECT 5.240000  0.650000  5.410000 1.115000 ;
+      RECT 5.240000  1.115000  6.270000 1.285000 ;
+      RECT 5.590000  0.085000  5.920000 0.935000 ;
+      RECT 5.750000  2.865000  6.080000 3.245000 ;
+      RECT 6.100000  0.850000  7.745000 1.020000 ;
+      RECT 6.100000  1.020000  6.270000 1.115000 ;
+      RECT 6.450000  1.200000  7.430000 1.305000 ;
+      RECT 6.450000  1.305000  8.010000 1.370000 ;
+      RECT 6.450000  1.370000  6.620000 1.465000 ;
+      RECT 7.260000  1.370000  8.010000 1.635000 ;
+      RECT 7.415000  0.685000  7.745000 0.850000 ;
+      RECT 7.515000  2.685000  7.845000 3.065000 ;
+      RECT 7.975000  0.685000  8.360000 1.125000 ;
+      RECT 8.045000  2.515000  9.485000 2.685000 ;
+      RECT 8.045000  2.685000  8.375000 3.065000 ;
+      RECT 8.190000  1.125000  8.360000 1.220000 ;
+      RECT 8.190000  1.220000 10.120000 1.390000 ;
+      RECT 9.270000  0.085000  9.600000 0.770000 ;
+      RECT 9.315000  1.390000  9.485000 2.515000 ;
+      RECT 9.665000  2.075000  9.915000 3.245000 ;
+      RECT 9.820000  1.390000 10.120000 1.890000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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_lp__fa_lp
diff --git a/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef b/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef
index d964d9d..712b4bd 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef
+++ b/cells/fa/sky130_fd_sc_lp__fa_m.magic.lef
@@ -86,31 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.740000  0.085000 0.930000 0.935000 ;
-        RECT 2.515000  0.645000 2.845000 0.835000 ;
-        RECT 2.675000  0.085000 2.845000 0.645000 ;
-        RECT 3.820000  0.085000 4.030000 0.905000 ;
-        RECT 4.620000  0.085000 4.950000 0.825000 ;
-        RECT 6.730000  0.085000 6.920000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -119,61 +94,83 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.525000 2.005000 0.855000 3.245000 ;
-        RECT 2.485000 2.065000 2.815000 2.265000 ;
-        RECT 2.485000 2.265000 4.040000 2.425000 ;
-        RECT 2.485000 2.425000 7.000000 2.435000 ;
-        RECT 3.820000 2.065000 4.040000 2.265000 ;
-        RECT 3.870000 2.435000 7.000000 2.595000 ;
-        RECT 4.680000 2.065000 4.890000 2.425000 ;
-        RECT 6.670000 2.125000 7.000000 2.425000 ;
-        RECT 6.830000 2.595000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.205000 0.695000 1.365000 ;
-      RECT 0.525000 1.365000 5.615000 1.535000 ;
-      RECT 1.470000 0.835000 1.800000 1.365000 ;
-      RECT 1.530000 1.535000 1.740000 2.145000 ;
-      RECT 1.960000 1.715000 3.265000 1.885000 ;
-      RECT 1.960000 1.885000 2.170000 2.145000 ;
-      RECT 1.980000 0.835000 2.310000 1.015000 ;
-      RECT 1.980000 1.015000 3.265000 1.185000 ;
-      RECT 3.055000 0.735000 3.265000 1.015000 ;
-      RECT 3.055000 1.885000 3.265000 2.085000 ;
-      RECT 4.250000 0.705000 4.440000 1.005000 ;
-      RECT 4.250000 1.005000 5.320000 1.175000 ;
-      RECT 4.250000 1.715000 5.320000 1.885000 ;
-      RECT 4.250000 1.885000 4.460000 2.245000 ;
-      RECT 5.110000 1.885000 5.320000 2.245000 ;
-      RECT 5.130000 0.705000 5.320000 1.005000 ;
-      RECT 5.580000 0.705000 5.965000 1.035000 ;
-      RECT 5.580000 1.915000 5.965000 2.245000 ;
-      RECT 5.795000 1.035000 5.965000 1.125000 ;
-      RECT 5.795000 1.125000 7.155000 1.295000 ;
-      RECT 5.795000 1.295000 5.965000 1.915000 ;
-      RECT 6.985000 1.295000 7.155000 1.795000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.525000  1.205000 0.695000 1.365000 ;
+      RECT 0.525000  1.365000 5.615000 1.535000 ;
+      RECT 0.525000  2.005000 0.855000 3.245000 ;
+      RECT 0.740000  0.085000 0.930000 0.935000 ;
+      RECT 1.470000  0.835000 1.800000 1.365000 ;
+      RECT 1.530000  1.535000 1.740000 2.145000 ;
+      RECT 1.960000  1.715000 3.265000 1.885000 ;
+      RECT 1.960000  1.885000 2.170000 2.145000 ;
+      RECT 1.980000  0.835000 2.310000 1.015000 ;
+      RECT 1.980000  1.015000 3.265000 1.185000 ;
+      RECT 2.485000  2.065000 2.815000 2.265000 ;
+      RECT 2.485000  2.265000 4.040000 2.425000 ;
+      RECT 2.485000  2.425000 7.000000 2.435000 ;
+      RECT 2.515000  0.645000 2.845000 0.835000 ;
+      RECT 2.675000  0.085000 2.845000 0.645000 ;
+      RECT 3.055000  0.735000 3.265000 1.015000 ;
+      RECT 3.055000  1.885000 3.265000 2.085000 ;
+      RECT 3.820000  0.085000 4.030000 0.905000 ;
+      RECT 3.820000  2.065000 4.040000 2.265000 ;
+      RECT 3.870000  2.435000 7.000000 2.595000 ;
+      RECT 4.250000  0.705000 4.440000 1.005000 ;
+      RECT 4.250000  1.005000 5.320000 1.175000 ;
+      RECT 4.250000  1.715000 5.320000 1.885000 ;
+      RECT 4.250000  1.885000 4.460000 2.245000 ;
+      RECT 4.620000  0.085000 4.950000 0.825000 ;
+      RECT 4.680000  2.065000 4.890000 2.425000 ;
+      RECT 5.110000  1.885000 5.320000 2.245000 ;
+      RECT 5.130000  0.705000 5.320000 1.005000 ;
+      RECT 5.580000  0.705000 5.965000 1.035000 ;
+      RECT 5.580000  1.915000 5.965000 2.245000 ;
+      RECT 5.795000  1.035000 5.965000 1.125000 ;
+      RECT 5.795000  1.125000 7.155000 1.295000 ;
+      RECT 5.795000  1.295000 5.965000 1.915000 ;
+      RECT 6.670000  2.125000 7.000000 2.425000 ;
+      RECT 6.730000  0.085000 6.920000 0.905000 ;
+      RECT 6.830000  2.595000 7.000000 3.245000 ;
+      RECT 6.985000  1.295000 7.155000 1.795000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__fa_m
diff --git a/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef b/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef
index b8ec0ef..134e6d2 100644
--- a/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef
+++ b/cells/fah/sky130_fd_sc_lp__fah_1.magic.lef
@@ -87,42 +87,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.560000 ;
-        RECT  2.270000  0.085000  2.440000 0.670000 ;
-        RECT  7.615000  0.085000  7.865000 0.710000 ;
-        RECT 11.655000  0.085000 11.905000 0.670000 ;
-        RECT 12.645000  0.085000 12.815000 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 ;
-        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
@@ -131,151 +95,183 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  0.625000 2.380000  0.795000 3.245000 ;
-        RECT  2.845000 2.965000  3.175000 3.245000 ;
-        RECT  7.105000 2.310000  7.435000 3.245000 ;
-        RECT 11.620000 2.860000 11.870000 3.245000 ;
-        RECT 12.645000 2.060000 12.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 ;
-        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  1.170000 1.090000  1.665000 1.340000 ;
-      RECT  1.325000 2.075000  1.665000 2.330000 ;
-      RECT  1.325000 2.330000  2.935000 2.500000 ;
-      RECT  1.325000 2.500000  1.665000 2.715000 ;
-      RECT  1.495000 1.340000  1.665000 2.075000 ;
-      RECT  1.865000 0.850000  2.790000 1.020000 ;
-      RECT  1.865000 1.020000  2.195000 1.980000 ;
-      RECT  1.865000 1.980000  3.285000 2.150000 ;
-      RECT  2.375000 1.200000  3.140000 1.370000 ;
-      RECT  2.375000 1.370000  2.705000 1.580000 ;
-      RECT  2.620000 0.265000  4.190000 0.435000 ;
-      RECT  2.620000 0.435000  2.790000 0.850000 ;
-      RECT  2.765000 2.500000  2.935000 2.615000 ;
-      RECT  2.765000 2.615000  3.525000 2.785000 ;
-      RECT  2.970000 0.615000  3.840000 0.785000 ;
-      RECT  2.970000 0.785000  3.140000 1.200000 ;
-      RECT  3.005000 1.550000  3.490000 1.610000 ;
-      RECT  3.005000 1.610000  3.635000 1.780000 ;
-      RECT  3.115000 2.150000  3.285000 2.265000 ;
-      RECT  3.115000 2.265000  4.525000 2.435000 ;
-      RECT  3.320000 0.965000  3.490000 1.550000 ;
-      RECT  3.355000 2.785000  3.525000 2.895000 ;
-      RECT  3.355000 2.895000  6.575000 3.065000 ;
-      RECT  3.465000 1.780000  3.635000 1.915000 ;
-      RECT  3.465000 1.915000  3.980000 2.085000 ;
-      RECT  3.670000 0.785000  3.840000 0.965000 ;
-      RECT  3.670000 0.965000  5.160000 1.135000 ;
-      RECT  3.815000 1.350000  4.330000 1.680000 ;
-      RECT  4.020000 0.435000  4.190000 0.615000 ;
-      RECT  4.020000 0.615000  6.215000 0.785000 ;
-      RECT  4.160000 1.680000  4.330000 1.810000 ;
-      RECT  4.160000 1.810000  4.875000 1.980000 ;
-      RECT  4.195000 2.160000  4.525000 2.265000 ;
-      RECT  4.195000 2.435000  4.525000 2.715000 ;
-      RECT  4.370000 0.265000  7.435000 0.435000 ;
-      RECT  4.705000 1.980000  4.875000 2.680000 ;
-      RECT  4.705000 2.680000  5.680000 2.895000 ;
-      RECT  4.910000 1.135000  5.160000 1.295000 ;
-      RECT  4.990000 1.295000  5.160000 1.405000 ;
-      RECT  4.990000 1.405000  5.225000 1.575000 ;
-      RECT  5.055000 1.575000  5.225000 2.330000 ;
-      RECT  5.055000 2.330000  6.225000 2.500000 ;
-      RECT  5.340000 0.965000  5.670000 1.055000 ;
-      RECT  5.340000 1.055000  6.215000 1.225000 ;
-      RECT  5.405000 1.405000  5.865000 2.150000 ;
-      RECT  5.885000 0.785000  6.215000 0.875000 ;
-      RECT  5.895000 2.500000  6.225000 2.715000 ;
-      RECT  6.045000 1.225000  6.215000 1.960000 ;
-      RECT  6.045000 1.960000  6.575000 2.130000 ;
-      RECT  6.395000 0.615000  6.575000 1.780000 ;
-      RECT  6.405000 2.130000  6.575000 2.895000 ;
-      RECT  6.755000 0.665000  7.085000 1.780000 ;
-      RECT  6.755000 1.960000  7.435000 2.130000 ;
-      RECT  6.755000 2.130000  6.925000 3.065000 ;
-      RECT  7.265000 0.435000  7.435000 0.890000 ;
-      RECT  7.265000 0.890000  8.360000 1.060000 ;
-      RECT  7.265000 1.060000  7.435000 1.960000 ;
-      RECT  8.045000 0.390000  8.360000 0.890000 ;
-      RECT  8.335000 1.240000  8.710000 1.410000 ;
-      RECT  8.335000 1.410000  8.505000 2.875000 ;
-      RECT  8.335000 2.875000 10.070000 3.045000 ;
-      RECT  8.540000 0.265000 11.475000 0.435000 ;
-      RECT  8.540000 0.435000  8.710000 1.240000 ;
-      RECT  8.685000 1.590000  9.060000 1.760000 ;
-      RECT  8.685000 1.760000  9.015000 2.330000 ;
-      RECT  8.685000 2.330000 11.090000 2.500000 ;
-      RECT  8.685000 2.500000  9.015000 2.695000 ;
-      RECT  8.890000 0.615000  9.060000 1.590000 ;
-      RECT  9.195000 1.940000  9.920000 2.150000 ;
-      RECT  9.240000 0.615000  9.570000 1.760000 ;
-      RECT  9.740000 2.680000 11.440000 2.850000 ;
-      RECT  9.740000 2.850000 10.070000 2.875000 ;
-      RECT  9.750000 1.260000 10.500000 1.430000 ;
-      RECT  9.750000 1.430000  9.920000 1.940000 ;
-      RECT  9.785000 0.435000 10.115000 1.080000 ;
-      RECT 10.250000 1.610000 10.915000 1.780000 ;
-      RECT 10.250000 1.780000 10.580000 2.150000 ;
-      RECT 10.330000 0.615000 10.660000 1.255000 ;
-      RECT 10.330000 1.255000 10.500000 1.260000 ;
-      RECT 10.685000 1.550000 10.915000 1.610000 ;
-      RECT 10.760000 1.960000 11.265000 2.130000 ;
-      RECT 10.760000 2.130000 11.090000 2.330000 ;
-      RECT 10.875000 0.615000 11.125000 1.200000 ;
-      RECT 10.875000 1.200000 11.265000 1.370000 ;
-      RECT 11.095000 1.370000 11.265000 1.960000 ;
-      RECT 11.270000 2.510000 12.465000 2.680000 ;
-      RECT 11.305000 0.435000 11.475000 0.850000 ;
-      RECT 11.305000 0.850000 12.465000 1.020000 ;
-      RECT 11.445000 1.200000 13.325000 1.370000 ;
-      RECT 11.445000 1.370000 11.775000 1.675000 ;
-      RECT 12.135000 0.340000 12.465000 0.850000 ;
-      RECT 12.135000 2.060000 12.465000 2.510000 ;
-      RECT 12.135000 2.680000 12.465000 3.065000 ;
-      RECT 12.995000 0.340000 13.325000 1.200000 ;
-      RECT 12.995000 1.370000 13.325000 3.065000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.625000  2.380000  0.795000 3.245000 ;
+      RECT  0.660000  0.085000  0.990000 0.560000 ;
+      RECT  1.170000  1.090000  1.665000 1.340000 ;
+      RECT  1.325000  2.075000  1.665000 2.330000 ;
+      RECT  1.325000  2.330000  2.935000 2.500000 ;
+      RECT  1.325000  2.500000  1.665000 2.715000 ;
+      RECT  1.495000  1.340000  1.665000 2.075000 ;
+      RECT  1.865000  0.850000  2.790000 1.020000 ;
+      RECT  1.865000  1.020000  2.195000 1.980000 ;
+      RECT  1.865000  1.980000  3.285000 2.150000 ;
+      RECT  2.270000  0.085000  2.440000 0.670000 ;
+      RECT  2.375000  1.200000  3.140000 1.370000 ;
+      RECT  2.375000  1.370000  2.705000 1.580000 ;
+      RECT  2.620000  0.265000  4.190000 0.435000 ;
+      RECT  2.620000  0.435000  2.790000 0.850000 ;
+      RECT  2.765000  2.500000  2.935000 2.615000 ;
+      RECT  2.765000  2.615000  3.525000 2.785000 ;
+      RECT  2.845000  2.965000  3.175000 3.245000 ;
+      RECT  2.970000  0.615000  3.840000 0.785000 ;
+      RECT  2.970000  0.785000  3.140000 1.200000 ;
+      RECT  3.005000  1.550000  3.490000 1.610000 ;
+      RECT  3.005000  1.610000  3.635000 1.780000 ;
+      RECT  3.115000  2.150000  3.285000 2.265000 ;
+      RECT  3.115000  2.265000  4.525000 2.435000 ;
+      RECT  3.320000  0.965000  3.490000 1.550000 ;
+      RECT  3.355000  2.785000  3.525000 2.895000 ;
+      RECT  3.355000  2.895000  6.575000 3.065000 ;
+      RECT  3.465000  1.780000  3.635000 1.915000 ;
+      RECT  3.465000  1.915000  3.980000 2.085000 ;
+      RECT  3.670000  0.785000  3.840000 0.965000 ;
+      RECT  3.670000  0.965000  5.160000 1.135000 ;
+      RECT  3.815000  1.350000  4.330000 1.680000 ;
+      RECT  4.020000  0.435000  4.190000 0.615000 ;
+      RECT  4.020000  0.615000  6.215000 0.785000 ;
+      RECT  4.160000  1.680000  4.330000 1.810000 ;
+      RECT  4.160000  1.810000  4.875000 1.980000 ;
+      RECT  4.195000  2.160000  4.525000 2.265000 ;
+      RECT  4.195000  2.435000  4.525000 2.715000 ;
+      RECT  4.370000  0.265000  7.435000 0.435000 ;
+      RECT  4.705000  1.980000  4.875000 2.680000 ;
+      RECT  4.705000  2.680000  5.680000 2.895000 ;
+      RECT  4.910000  1.135000  5.160000 1.295000 ;
+      RECT  4.990000  1.295000  5.160000 1.405000 ;
+      RECT  4.990000  1.405000  5.225000 1.575000 ;
+      RECT  5.055000  1.575000  5.225000 2.330000 ;
+      RECT  5.055000  2.330000  6.225000 2.500000 ;
+      RECT  5.340000  0.965000  5.670000 1.055000 ;
+      RECT  5.340000  1.055000  6.215000 1.225000 ;
+      RECT  5.405000  1.405000  5.865000 2.150000 ;
+      RECT  5.885000  0.785000  6.215000 0.875000 ;
+      RECT  5.895000  2.500000  6.225000 2.715000 ;
+      RECT  6.045000  1.225000  6.215000 1.960000 ;
+      RECT  6.045000  1.960000  6.575000 2.130000 ;
+      RECT  6.395000  0.615000  6.575000 1.780000 ;
+      RECT  6.405000  2.130000  6.575000 2.895000 ;
+      RECT  6.755000  0.665000  7.085000 1.780000 ;
+      RECT  6.755000  1.960000  7.435000 2.130000 ;
+      RECT  6.755000  2.130000  6.925000 3.065000 ;
+      RECT  7.105000  2.310000  7.435000 3.245000 ;
+      RECT  7.265000  0.435000  7.435000 0.890000 ;
+      RECT  7.265000  0.890000  8.360000 1.060000 ;
+      RECT  7.265000  1.060000  7.435000 1.960000 ;
+      RECT  7.615000  0.085000  7.865000 0.710000 ;
+      RECT  8.045000  0.390000  8.360000 0.890000 ;
+      RECT  8.335000  1.240000  8.710000 1.410000 ;
+      RECT  8.335000  1.410000  8.505000 2.875000 ;
+      RECT  8.335000  2.875000 10.070000 3.045000 ;
+      RECT  8.540000  0.265000 11.475000 0.435000 ;
+      RECT  8.540000  0.435000  8.710000 1.240000 ;
+      RECT  8.685000  1.590000  9.060000 1.760000 ;
+      RECT  8.685000  1.760000  9.015000 2.330000 ;
+      RECT  8.685000  2.330000 11.090000 2.500000 ;
+      RECT  8.685000  2.500000  9.015000 2.695000 ;
+      RECT  8.890000  0.615000  9.060000 1.590000 ;
+      RECT  9.195000  1.940000  9.920000 2.150000 ;
+      RECT  9.240000  0.615000  9.570000 1.760000 ;
+      RECT  9.740000  2.680000 11.440000 2.850000 ;
+      RECT  9.740000  2.850000 10.070000 2.875000 ;
+      RECT  9.750000  1.260000 10.500000 1.430000 ;
+      RECT  9.750000  1.430000  9.920000 1.940000 ;
+      RECT  9.785000  0.435000 10.115000 1.080000 ;
+      RECT 10.250000  1.610000 10.915000 1.780000 ;
+      RECT 10.250000  1.780000 10.580000 2.150000 ;
+      RECT 10.330000  0.615000 10.660000 1.255000 ;
+      RECT 10.330000  1.255000 10.500000 1.260000 ;
+      RECT 10.685000  1.550000 10.915000 1.610000 ;
+      RECT 10.760000  1.960000 11.265000 2.130000 ;
+      RECT 10.760000  2.130000 11.090000 2.330000 ;
+      RECT 10.875000  0.615000 11.125000 1.200000 ;
+      RECT 10.875000  1.200000 11.265000 1.370000 ;
+      RECT 11.095000  1.370000 11.265000 1.960000 ;
+      RECT 11.270000  2.510000 12.465000 2.680000 ;
+      RECT 11.305000  0.435000 11.475000 0.850000 ;
+      RECT 11.305000  0.850000 12.465000 1.020000 ;
+      RECT 11.445000  1.200000 13.325000 1.370000 ;
+      RECT 11.445000  1.370000 11.775000 1.675000 ;
+      RECT 11.620000  2.860000 11.870000 3.245000 ;
+      RECT 11.655000  0.085000 11.905000 0.670000 ;
+      RECT 12.135000  0.340000 12.465000 0.850000 ;
+      RECT 12.135000  2.060000 12.465000 2.510000 ;
+      RECT 12.135000  2.680000 12.465000 3.065000 ;
+      RECT 12.645000  0.085000 12.815000 1.020000 ;
+      RECT 12.645000  2.060000 12.815000 3.245000 ;
+      RECT 12.995000  0.340000 13.325000 1.200000 ;
+      RECT 12.995000  1.370000 13.325000 3.065000 ;
     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  9.275000 1.580000  9.445000 1.750000 ;
-      RECT  9.275000 1.950000  9.445000 2.120000 ;
-      RECT 10.715000 1.580000 10.885000 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.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  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  1.580000  9.445000 1.750000 ;
+      RECT  9.275000  1.950000  9.445000 2.120000 ;
+      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 ;
     LAYER met1 ;
       RECT  2.975000 1.550000  3.265000 1.595000 ;
       RECT  2.975000 1.595000  6.625000 1.735000 ;
diff --git a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef
index 7726415..34c5f79 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.magic.lef
@@ -83,39 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.480000 0.085000 ;
-        RECT  0.635000  0.085000  0.805000 0.815000 ;
-        RECT  5.225000  0.085000  5.555000 0.650000 ;
-        RECT  8.245000  0.085000  8.575000 0.900000 ;
-        RECT 11.315000  0.085000 11.645000 1.075000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -124,133 +91,162 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.480000 3.415000 ;
-        RECT  0.555000 2.055000  0.885000 3.245000 ;
-        RECT  5.145000 2.785000  5.475000 3.245000 ;
-        RECT  8.495000 1.940000  8.665000 3.245000 ;
-        RECT 11.690000 1.855000 11.940000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.110000 0.265000  0.455000 0.995000 ;
-      RECT  0.110000 0.995000  1.155000 1.165000 ;
-      RECT  0.110000 1.165000  0.280000 1.960000 ;
-      RECT  0.110000 1.960000  0.375000 3.065000 ;
-      RECT  0.985000 0.265000  2.570000 0.435000 ;
-      RECT  0.985000 0.435000  1.155000 0.995000 ;
-      RECT  0.985000 1.165000  1.155000 1.205000 ;
-      RECT  0.985000 1.205000  1.360000 1.875000 ;
-      RECT  1.065000 1.875000  1.235000 2.895000 ;
-      RECT  1.065000 2.895000  3.675000 3.065000 ;
-      RECT  1.335000 0.615000  1.585000 0.855000 ;
-      RECT  1.335000 0.855000  2.920000 1.025000 ;
-      RECT  1.415000 2.055000  1.665000 2.545000 ;
-      RECT  1.415000 2.545000  2.665000 2.715000 ;
-      RECT  1.565000 1.550000  2.155000 1.780000 ;
-      RECT  1.785000 1.205000  2.155000 1.550000 ;
-      RECT  1.905000 1.780000  2.155000 2.365000 ;
-      RECT  2.320000 0.435000  2.570000 0.675000 ;
-      RECT  2.335000 1.025000  2.665000 2.545000 ;
-      RECT  2.750000 0.265000  3.700000 0.435000 ;
-      RECT  2.750000 0.435000  2.920000 0.855000 ;
-      RECT  2.880000 1.875000  3.270000 1.960000 ;
-      RECT  2.880000 1.960000  4.025000 2.130000 ;
-      RECT  2.880000 2.130000  3.270000 2.715000 ;
-      RECT  3.100000 0.615000  3.270000 1.875000 ;
-      RECT  3.450000 0.435000  3.700000 1.020000 ;
-      RECT  3.450000 1.200000  4.050000 1.370000 ;
-      RECT  3.450000 1.370000  3.780000 1.705000 ;
-      RECT  3.505000 2.310000  3.675000 2.895000 ;
-      RECT  3.855000 2.130000  4.025000 2.895000 ;
-      RECT  3.855000 2.895000  4.965000 3.065000 ;
-      RECT  3.880000 0.265000  5.045000 0.435000 ;
-      RECT  3.880000 0.435000  4.050000 1.200000 ;
-      RECT  3.965000 1.550000  4.480000 1.780000 ;
-      RECT  4.205000 1.780000  4.480000 2.715000 ;
-      RECT  4.230000 0.615000  4.480000 1.550000 ;
-      RECT  4.715000 0.435000  5.045000 0.830000 ;
-      RECT  4.715000 0.830000  5.635000 1.000000 ;
-      RECT  4.715000 1.850000  5.635000 2.020000 ;
-      RECT  4.715000 2.020000  5.045000 2.255000 ;
-      RECT  4.795000 2.435000  6.345000 2.605000 ;
-      RECT  4.795000 2.605000  4.965000 2.895000 ;
-      RECT  5.380000 1.000000  5.635000 1.850000 ;
-      RECT  5.815000 0.295000  6.185000 0.975000 ;
-      RECT  5.815000 0.975000  5.985000 2.255000 ;
-      RECT  6.165000 1.455000  6.345000 2.435000 ;
-      RECT  6.165000 2.605000  6.345000 2.895000 ;
-      RECT  6.165000 2.895000  8.315000 3.065000 ;
-      RECT  6.875000 1.065000  7.140000 1.395000 ;
-      RECT  6.875000 1.395000  7.075000 1.780000 ;
-      RECT  7.265000 1.575000  7.615000 1.745000 ;
-      RECT  7.265000 1.745000  7.435000 2.895000 ;
-      RECT  7.350000 1.115000  7.615000 1.575000 ;
-      RECT  7.615000 1.925000  7.965000 2.715000 ;
-      RECT  7.735000 0.295000  8.065000 0.935000 ;
-      RECT  7.795000 0.935000  7.965000 1.925000 ;
-      RECT  8.145000 1.590000  8.925000 1.760000 ;
-      RECT  8.145000 1.760000  8.315000 2.895000 ;
-      RECT  8.755000 0.265000  9.775000 0.565000 ;
-      RECT  8.755000 0.565000  8.925000 1.590000 ;
-      RECT  8.845000 1.940000  9.290000 2.895000 ;
-      RECT  8.845000 2.895000 11.510000 3.065000 ;
-      RECT  9.120000 0.745000  9.505000 1.335000 ;
-      RECT  9.120000 1.335000  9.290000 1.940000 ;
-      RECT  9.470000 2.385000 11.160000 2.555000 ;
-      RECT  9.470000 2.555000  9.720000 2.715000 ;
-      RECT  9.755000 1.135000 10.205000 1.305000 ;
-      RECT  9.755000 1.305000  9.925000 2.035000 ;
-      RECT  9.755000 2.035000 10.150000 2.205000 ;
-      RECT  9.955000 0.265000 11.135000 0.435000 ;
-      RECT  9.955000 0.435000 10.205000 1.135000 ;
-      RECT 10.105000 1.485000 10.435000 1.815000 ;
-      RECT 10.360000 2.735000 10.690000 2.895000 ;
-      RECT 10.420000 0.615000 10.785000 1.305000 ;
-      RECT 10.615000 1.305000 10.785000 2.205000 ;
-      RECT 10.615000 2.205000 11.160000 2.385000 ;
-      RECT 10.910000 2.555000 11.160000 2.715000 ;
-      RECT 10.965000 0.435000 11.135000 1.255000 ;
-      RECT 10.965000 1.255000 11.940000 1.425000 ;
-      RECT 11.035000 1.605000 11.365000 1.855000 ;
-      RECT 11.035000 1.855000 11.510000 2.025000 ;
-      RECT 11.340000 2.025000 11.510000 2.895000 ;
-      RECT 11.610000 1.425000 11.940000 1.675000 ;
+      RECT  0.000000 -0.085000 12.480000 0.085000 ;
+      RECT  0.000000  3.245000 12.480000 3.415000 ;
+      RECT  0.110000  0.265000  0.455000 0.995000 ;
+      RECT  0.110000  0.995000  1.155000 1.165000 ;
+      RECT  0.110000  1.165000  0.280000 1.960000 ;
+      RECT  0.110000  1.960000  0.375000 3.065000 ;
+      RECT  0.555000  2.055000  0.885000 3.245000 ;
+      RECT  0.635000  0.085000  0.805000 0.815000 ;
+      RECT  0.985000  0.265000  2.570000 0.435000 ;
+      RECT  0.985000  0.435000  1.155000 0.995000 ;
+      RECT  0.985000  1.165000  1.155000 1.205000 ;
+      RECT  0.985000  1.205000  1.360000 1.875000 ;
+      RECT  1.065000  1.875000  1.235000 2.895000 ;
+      RECT  1.065000  2.895000  3.675000 3.065000 ;
+      RECT  1.335000  0.615000  1.585000 0.855000 ;
+      RECT  1.335000  0.855000  2.920000 1.025000 ;
+      RECT  1.415000  2.055000  1.665000 2.545000 ;
+      RECT  1.415000  2.545000  2.665000 2.715000 ;
+      RECT  1.565000  1.550000  2.155000 1.780000 ;
+      RECT  1.785000  1.205000  2.155000 1.550000 ;
+      RECT  1.905000  1.780000  2.155000 2.365000 ;
+      RECT  2.320000  0.435000  2.570000 0.675000 ;
+      RECT  2.335000  1.025000  2.665000 2.545000 ;
+      RECT  2.750000  0.265000  3.700000 0.435000 ;
+      RECT  2.750000  0.435000  2.920000 0.855000 ;
+      RECT  2.880000  1.875000  3.270000 1.960000 ;
+      RECT  2.880000  1.960000  4.025000 2.130000 ;
+      RECT  2.880000  2.130000  3.270000 2.715000 ;
+      RECT  3.100000  0.615000  3.270000 1.875000 ;
+      RECT  3.450000  0.435000  3.700000 1.020000 ;
+      RECT  3.450000  1.200000  4.050000 1.370000 ;
+      RECT  3.450000  1.370000  3.780000 1.705000 ;
+      RECT  3.505000  2.310000  3.675000 2.895000 ;
+      RECT  3.855000  2.130000  4.025000 2.895000 ;
+      RECT  3.855000  2.895000  4.965000 3.065000 ;
+      RECT  3.880000  0.265000  5.045000 0.435000 ;
+      RECT  3.880000  0.435000  4.050000 1.200000 ;
+      RECT  3.965000  1.550000  4.480000 1.780000 ;
+      RECT  4.205000  1.780000  4.480000 2.715000 ;
+      RECT  4.230000  0.615000  4.480000 1.550000 ;
+      RECT  4.715000  0.435000  5.045000 0.830000 ;
+      RECT  4.715000  0.830000  5.635000 1.000000 ;
+      RECT  4.715000  1.850000  5.635000 2.020000 ;
+      RECT  4.715000  2.020000  5.045000 2.255000 ;
+      RECT  4.795000  2.435000  6.345000 2.605000 ;
+      RECT  4.795000  2.605000  4.965000 2.895000 ;
+      RECT  5.145000  2.785000  5.475000 3.245000 ;
+      RECT  5.225000  0.085000  5.555000 0.650000 ;
+      RECT  5.380000  1.000000  5.635000 1.850000 ;
+      RECT  5.815000  0.295000  6.185000 0.975000 ;
+      RECT  5.815000  0.975000  5.985000 2.255000 ;
+      RECT  6.165000  1.455000  6.345000 2.435000 ;
+      RECT  6.165000  2.605000  6.345000 2.895000 ;
+      RECT  6.165000  2.895000  8.315000 3.065000 ;
+      RECT  6.875000  1.065000  7.140000 1.395000 ;
+      RECT  6.875000  1.395000  7.075000 1.780000 ;
+      RECT  7.265000  1.575000  7.615000 1.745000 ;
+      RECT  7.265000  1.745000  7.435000 2.895000 ;
+      RECT  7.350000  1.115000  7.615000 1.575000 ;
+      RECT  7.615000  1.925000  7.965000 2.715000 ;
+      RECT  7.735000  0.295000  8.065000 0.935000 ;
+      RECT  7.795000  0.935000  7.965000 1.925000 ;
+      RECT  8.145000  1.590000  8.925000 1.760000 ;
+      RECT  8.145000  1.760000  8.315000 2.895000 ;
+      RECT  8.245000  0.085000  8.575000 0.900000 ;
+      RECT  8.495000  1.940000  8.665000 3.245000 ;
+      RECT  8.755000  0.265000  9.775000 0.565000 ;
+      RECT  8.755000  0.565000  8.925000 1.590000 ;
+      RECT  8.845000  1.940000  9.290000 2.895000 ;
+      RECT  8.845000  2.895000 11.510000 3.065000 ;
+      RECT  9.120000  0.745000  9.505000 1.335000 ;
+      RECT  9.120000  1.335000  9.290000 1.940000 ;
+      RECT  9.470000  2.385000 11.160000 2.555000 ;
+      RECT  9.470000  2.555000  9.720000 2.715000 ;
+      RECT  9.755000  1.135000 10.205000 1.305000 ;
+      RECT  9.755000  1.305000  9.925000 2.035000 ;
+      RECT  9.755000  2.035000 10.150000 2.205000 ;
+      RECT  9.955000  0.265000 11.135000 0.435000 ;
+      RECT  9.955000  0.435000 10.205000 1.135000 ;
+      RECT 10.105000  1.485000 10.435000 1.815000 ;
+      RECT 10.360000  2.735000 10.690000 2.895000 ;
+      RECT 10.420000  0.615000 10.785000 1.305000 ;
+      RECT 10.615000  1.305000 10.785000 2.205000 ;
+      RECT 10.615000  2.205000 11.160000 2.385000 ;
+      RECT 10.910000  2.555000 11.160000 2.715000 ;
+      RECT 10.965000  0.435000 11.135000 1.255000 ;
+      RECT 10.965000  1.255000 11.940000 1.425000 ;
+      RECT 11.035000  1.605000 11.365000 1.855000 ;
+      RECT 11.035000  1.855000 11.510000 2.025000 ;
+      RECT 11.315000  0.085000 11.645000 1.075000 ;
+      RECT 11.340000  2.025000 11.510000 2.895000 ;
+      RECT 11.610000  1.425000 11.940000 1.675000 ;
+      RECT 11.690000  1.855000 11.940000 3.245000 ;
     LAYER mcon ;
-      RECT  1.595000 1.580000  1.765000 1.750000 ;
-      RECT  3.995000 1.580000  4.165000 1.750000 ;
-      RECT  6.875000 1.580000  7.045000 1.750000 ;
-      RECT 10.235000 1.580000 10.405000 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  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  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  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  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  1.580000 10.405000 1.750000 ;
+      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 ;
     LAYER met1 ;
       RECT  1.535000 1.550000  1.825000 1.595000 ;
       RECT  1.535000 1.595000 10.465000 1.735000 ;
diff --git a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef
index b2cb9ba..8b9cf12 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef
+++ b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.magic.lef
@@ -83,37 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.520000 0.085000 ;
-        RECT  0.670000  0.085000  0.840000 0.815000 ;
-        RECT  4.845000  0.085000  5.095000 1.000000 ;
-        RECT  7.785000  0.085000  8.035000 1.000000 ;
-        RECT 10.610000  0.085000 10.860000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -122,117 +91,144 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.520000 3.415000 ;
-        RECT  0.655000 1.960000  0.985000 3.245000 ;
-        RECT  4.565000 1.775000  4.895000 3.245000 ;
-        RECT  7.320000 1.860000  7.650000 3.245000 ;
-        RECT 10.660000 2.285000 10.910000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.090000 0.375000  0.490000 0.995000 ;
-      RECT  0.090000 0.995000  1.190000 1.165000 ;
-      RECT  0.090000 1.165000  0.260000 1.960000 ;
-      RECT  0.090000 1.960000  0.475000 3.065000 ;
-      RECT  0.985000 1.345000  1.190000 1.675000 ;
-      RECT  1.020000 0.265000  2.705000 0.435000 ;
-      RECT  1.020000 0.435000  1.190000 0.995000 ;
-      RECT  1.020000 1.165000  1.190000 1.345000 ;
-      RECT  1.210000 1.855000  1.540000 2.895000 ;
-      RECT  1.210000 2.895000  3.805000 3.065000 ;
-      RECT  1.370000 0.615000  1.710000 1.235000 ;
-      RECT  1.370000 1.235000  1.540000 1.855000 ;
-      RECT  1.720000 1.415000  2.275000 1.585000 ;
-      RECT  1.720000 1.585000  1.890000 2.545000 ;
-      RECT  1.720000 2.545000  3.260000 2.715000 ;
-      RECT  1.890000 0.615000  2.275000 1.415000 ;
-      RECT  2.070000 1.775000  2.240000 2.195000 ;
-      RECT  2.070000 2.195000  3.260000 2.365000 ;
-      RECT  2.420000 1.765000  2.750000 2.015000 ;
-      RECT  2.455000 0.435000  2.705000 1.765000 ;
-      RECT  2.885000 0.265000  4.665000 0.435000 ;
-      RECT  2.885000 0.435000  3.215000 0.525000 ;
-      RECT  2.930000 0.705000  3.260000 2.195000 ;
-      RECT  3.475000 0.615000  3.910000 1.295000 ;
-      RECT  3.475000 1.295000  3.805000 2.895000 ;
-      RECT  4.055000 1.775000  4.385000 3.065000 ;
-      RECT  4.095000 0.435000  4.665000 1.000000 ;
-      RECT  4.095000 1.000000  4.265000 1.775000 ;
-      RECT  5.145000 1.880000  5.475000 2.920000 ;
-      RECT  5.305000 0.460000  6.125000 0.630000 ;
-      RECT  5.305000 0.630000  5.475000 1.880000 ;
-      RECT  5.655000 0.810000  6.115000 1.040000 ;
-      RECT  5.655000 1.040000  5.855000 1.740000 ;
-      RECT  5.795000 0.265000  6.125000 0.460000 ;
-      RECT  6.385000 1.570000  6.650000 2.150000 ;
-      RECT  6.655000 0.830000  7.045000 1.330000 ;
-      RECT  6.860000 1.510000  7.475000 1.680000 ;
-      RECT  6.860000 1.680000  7.110000 2.920000 ;
-      RECT  7.225000 0.265000  7.475000 1.510000 ;
-      RECT  7.830000 1.815000  8.385000 2.545000 ;
-      RECT  7.830000 2.545000 10.025000 2.715000 ;
-      RECT  7.830000 2.715000  8.160000 3.065000 ;
-      RECT  8.215000 0.265000  8.550000 1.045000 ;
-      RECT  8.215000 1.045000  8.385000 1.815000 ;
-      RECT  8.520000 2.895000 10.455000 3.065000 ;
-      RECT  8.565000 1.225000  8.745000 1.725000 ;
-      RECT  8.565000 1.725000  8.965000 1.895000 ;
-      RECT  8.765000 0.265000 10.375000 0.435000 ;
-      RECT  8.765000 0.435000  9.095000 1.045000 ;
-      RECT  8.765000 1.895000  8.965000 2.150000 ;
-      RECT  8.925000 1.045000  9.095000 1.220000 ;
-      RECT  8.925000 1.220000  9.315000 1.390000 ;
-      RECT  9.145000 1.390000  9.315000 2.365000 ;
-      RECT  9.275000 0.810000  9.675000 1.040000 ;
-      RECT  9.495000 1.040000  9.675000 1.855000 ;
-      RECT  9.495000 2.035000 10.025000 2.545000 ;
-      RECT  9.855000 0.615000 10.025000 1.075000 ;
-      RECT  9.855000 1.075000 10.580000 1.245000 ;
-      RECT  9.855000 1.425000 10.230000 1.755000 ;
-      RECT  9.855000 1.755000 10.025000 2.035000 ;
-      RECT 10.205000 0.435000 10.375000 0.725000 ;
-      RECT 10.205000 0.725000 10.975000 0.895000 ;
-      RECT 10.205000 1.935000 10.580000 2.105000 ;
-      RECT 10.205000 2.105000 10.455000 2.895000 ;
-      RECT 10.410000 1.245000 10.580000 1.935000 ;
-      RECT 10.760000 0.895000 10.975000 1.515000 ;
+      RECT  0.000000 -0.085000 11.520000 0.085000 ;
+      RECT  0.000000  3.245000 11.520000 3.415000 ;
+      RECT  0.090000  0.375000  0.490000 0.995000 ;
+      RECT  0.090000  0.995000  1.190000 1.165000 ;
+      RECT  0.090000  1.165000  0.260000 1.960000 ;
+      RECT  0.090000  1.960000  0.475000 3.065000 ;
+      RECT  0.655000  1.960000  0.985000 3.245000 ;
+      RECT  0.670000  0.085000  0.840000 0.815000 ;
+      RECT  0.985000  1.345000  1.190000 1.675000 ;
+      RECT  1.020000  0.265000  2.705000 0.435000 ;
+      RECT  1.020000  0.435000  1.190000 0.995000 ;
+      RECT  1.020000  1.165000  1.190000 1.345000 ;
+      RECT  1.210000  1.855000  1.540000 2.895000 ;
+      RECT  1.210000  2.895000  3.805000 3.065000 ;
+      RECT  1.370000  0.615000  1.710000 1.235000 ;
+      RECT  1.370000  1.235000  1.540000 1.855000 ;
+      RECT  1.720000  1.415000  2.275000 1.585000 ;
+      RECT  1.720000  1.585000  1.890000 2.545000 ;
+      RECT  1.720000  2.545000  3.260000 2.715000 ;
+      RECT  1.890000  0.615000  2.275000 1.415000 ;
+      RECT  2.070000  1.775000  2.240000 2.195000 ;
+      RECT  2.070000  2.195000  3.260000 2.365000 ;
+      RECT  2.420000  1.765000  2.750000 2.015000 ;
+      RECT  2.455000  0.435000  2.705000 1.765000 ;
+      RECT  2.885000  0.265000  4.665000 0.435000 ;
+      RECT  2.885000  0.435000  3.215000 0.525000 ;
+      RECT  2.930000  0.705000  3.260000 2.195000 ;
+      RECT  3.475000  0.615000  3.910000 1.295000 ;
+      RECT  3.475000  1.295000  3.805000 2.895000 ;
+      RECT  4.055000  1.775000  4.385000 3.065000 ;
+      RECT  4.095000  0.435000  4.665000 1.000000 ;
+      RECT  4.095000  1.000000  4.265000 1.775000 ;
+      RECT  4.565000  1.775000  4.895000 3.245000 ;
+      RECT  4.845000  0.085000  5.095000 1.000000 ;
+      RECT  5.145000  1.880000  5.475000 2.920000 ;
+      RECT  5.305000  0.460000  6.125000 0.630000 ;
+      RECT  5.305000  0.630000  5.475000 1.880000 ;
+      RECT  5.655000  0.810000  6.115000 1.040000 ;
+      RECT  5.655000  1.040000  5.855000 1.740000 ;
+      RECT  5.795000  0.265000  6.125000 0.460000 ;
+      RECT  6.385000  1.570000  6.650000 2.150000 ;
+      RECT  6.655000  0.830000  7.045000 1.330000 ;
+      RECT  6.860000  1.510000  7.475000 1.680000 ;
+      RECT  6.860000  1.680000  7.110000 2.920000 ;
+      RECT  7.225000  0.265000  7.475000 1.510000 ;
+      RECT  7.320000  1.860000  7.650000 3.245000 ;
+      RECT  7.785000  0.085000  8.035000 1.000000 ;
+      RECT  7.830000  1.815000  8.385000 2.545000 ;
+      RECT  7.830000  2.545000 10.025000 2.715000 ;
+      RECT  7.830000  2.715000  8.160000 3.065000 ;
+      RECT  8.215000  0.265000  8.550000 1.045000 ;
+      RECT  8.215000  1.045000  8.385000 1.815000 ;
+      RECT  8.520000  2.895000 10.455000 3.065000 ;
+      RECT  8.565000  1.225000  8.745000 1.725000 ;
+      RECT  8.565000  1.725000  8.965000 1.895000 ;
+      RECT  8.765000  0.265000 10.375000 0.435000 ;
+      RECT  8.765000  0.435000  9.095000 1.045000 ;
+      RECT  8.765000  1.895000  8.965000 2.150000 ;
+      RECT  8.925000  1.045000  9.095000 1.220000 ;
+      RECT  8.925000  1.220000  9.315000 1.390000 ;
+      RECT  9.145000  1.390000  9.315000 2.365000 ;
+      RECT  9.275000  0.810000  9.675000 1.040000 ;
+      RECT  9.495000  1.040000  9.675000 1.855000 ;
+      RECT  9.495000  2.035000 10.025000 2.545000 ;
+      RECT  9.855000  0.615000 10.025000 1.075000 ;
+      RECT  9.855000  1.075000 10.580000 1.245000 ;
+      RECT  9.855000  1.425000 10.230000 1.755000 ;
+      RECT  9.855000  1.755000 10.025000 2.035000 ;
+      RECT 10.205000  0.435000 10.375000 0.725000 ;
+      RECT 10.205000  0.725000 10.975000 0.895000 ;
+      RECT 10.205000  1.935000 10.580000 2.105000 ;
+      RECT 10.205000  2.105000 10.455000 2.895000 ;
+      RECT 10.410000  1.245000 10.580000 1.935000 ;
+      RECT 10.610000  0.085000 10.860000 0.545000 ;
+      RECT 10.660000  2.285000 10.910000 3.245000 ;
+      RECT 10.760000  0.895000 10.975000 1.515000 ;
     LAYER mcon ;
-      RECT 2.075000 0.840000 2.245000 1.010000 ;
-      RECT 3.035000 1.950000 3.205000 2.120000 ;
-      RECT 5.915000 0.840000 6.085000 1.010000 ;
-      RECT 6.395000 1.950000 6.565000 2.120000 ;
-      RECT 6.875000 0.840000 7.045000 1.010000 ;
-      RECT 8.795000 1.950000 8.965000 2.120000 ;
-      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.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  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.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  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.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  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_lp__fill_1.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
index ae1aa4b..4ac4b41 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__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_lp__fill_1
diff --git a/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
index d6d3779..625cd9d 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__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_lp__fill_2
diff --git a/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
index 52c3326..e83ef1b 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__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_lp__fill_4
diff --git a/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef b/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
index 56de434..65a0124 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_lp__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_lp__fill_8
diff --git a/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef
index d9265ed..45d04d1 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_0.magic.lef
@@ -74,22 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.595000  0.085000 0.805000 0.805000 ;
-        RECT 1.940000  0.085000 2.270000 0.545000 ;
-        RECT 3.855000  0.085000 4.185000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -98,43 +82,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.670000 2.435000 1.000000 3.245000 ;
-        RECT 2.330000 2.500000 3.180000 3.245000 ;
-        RECT 3.780000 2.435000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 1.595000 1.145000 2.095000 ;
-      RECT 0.505000 2.095000 1.415000 2.265000 ;
-      RECT 0.975000 0.280000 1.390000 0.610000 ;
-      RECT 0.975000 0.610000 1.145000 1.595000 ;
-      RECT 1.170000 2.265000 1.415000 2.500000 ;
-      RECT 1.170000 2.500000 1.840000 2.830000 ;
-      RECT 1.315000 1.055000 1.575000 1.565000 ;
-      RECT 1.315000 1.565000 3.610000 1.595000 ;
-      RECT 1.315000 1.595000 4.265000 1.735000 ;
-      RECT 1.560000 0.280000 1.770000 0.715000 ;
-      RECT 1.560000 0.715000 2.700000 0.885000 ;
-      RECT 2.440000 0.280000 2.700000 0.715000 ;
-      RECT 3.010000 0.720000 3.610000 1.565000 ;
-      RECT 3.350000 2.500000 3.610000 2.830000 ;
-      RECT 3.440000 1.735000 4.265000 2.265000 ;
-      RECT 3.440000 2.265000 3.610000 2.500000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.505000  1.595000 1.145000 2.095000 ;
+      RECT 0.505000  2.095000 1.415000 2.265000 ;
+      RECT 0.595000  0.085000 0.805000 0.805000 ;
+      RECT 0.670000  2.435000 1.000000 3.245000 ;
+      RECT 0.975000  0.280000 1.390000 0.610000 ;
+      RECT 0.975000  0.610000 1.145000 1.595000 ;
+      RECT 1.170000  2.265000 1.415000 2.500000 ;
+      RECT 1.170000  2.500000 1.840000 2.830000 ;
+      RECT 1.315000  1.055000 1.575000 1.565000 ;
+      RECT 1.315000  1.565000 3.610000 1.595000 ;
+      RECT 1.315000  1.595000 4.265000 1.735000 ;
+      RECT 1.560000  0.280000 1.770000 0.715000 ;
+      RECT 1.560000  0.715000 2.700000 0.885000 ;
+      RECT 1.940000  0.085000 2.270000 0.545000 ;
+      RECT 2.330000  2.500000 3.180000 3.245000 ;
+      RECT 2.440000  0.280000 2.700000 0.715000 ;
+      RECT 3.010000  0.720000 3.610000 1.565000 ;
+      RECT 3.350000  2.500000 3.610000 2.830000 ;
+      RECT 3.440000  1.735000 4.265000 2.265000 ;
+      RECT 3.440000  2.265000 3.610000 2.500000 ;
+      RECT 3.780000  2.435000 4.085000 3.245000 ;
+      RECT 3.855000  0.085000 4.185000 1.050000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__ha_0
diff --git a/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef
index abb1b7a..e042752 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_1.magic.lef
@@ -75,22 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.535000  0.085000 0.855000 1.060000 ;
-        RECT 1.940000  0.085000 2.270000 0.670000 ;
-        RECT 3.790000  0.085000 4.155000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -99,44 +83,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.725000 1.815000 1.025000 3.245000 ;
-        RECT 2.640000 2.270000 3.250000 3.245000 ;
-        RECT 3.850000 1.815000 4.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 ;
-        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.535000 1.230000 1.715000 1.400000 ;
-      RECT 0.535000 1.400000 0.795000 1.560000 ;
-      RECT 1.080000 0.355000 1.370000 1.230000 ;
-      RECT 1.195000 1.600000 1.365000 2.675000 ;
-      RECT 1.195000 2.675000 2.470000 2.885000 ;
-      RECT 1.540000 0.355000 1.770000 0.840000 ;
-      RECT 1.540000 0.840000 2.700000 1.010000 ;
-      RECT 1.545000 1.400000 1.715000 2.175000 ;
-      RECT 1.545000 2.175000 1.880000 2.505000 ;
-      RECT 2.300000 1.930000 3.680000 2.100000 ;
-      RECT 2.300000 2.100000 2.470000 2.675000 ;
-      RECT 2.440000 0.355000 2.700000 0.840000 ;
-      RECT 2.920000 0.755000 3.620000 1.060000 ;
-      RECT 3.420000 2.100000 3.680000 2.505000 ;
-      RECT 3.440000 1.060000 3.620000 1.260000 ;
-      RECT 3.440000 1.260000 4.225000 1.590000 ;
-      RECT 3.440000 1.590000 3.680000 1.930000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.535000  0.085000 0.855000 1.060000 ;
+      RECT 0.535000  1.230000 1.715000 1.400000 ;
+      RECT 0.535000  1.400000 0.795000 1.560000 ;
+      RECT 0.725000  1.815000 1.025000 3.245000 ;
+      RECT 1.080000  0.355000 1.370000 1.230000 ;
+      RECT 1.195000  1.600000 1.365000 2.675000 ;
+      RECT 1.195000  2.675000 2.470000 2.885000 ;
+      RECT 1.540000  0.355000 1.770000 0.840000 ;
+      RECT 1.540000  0.840000 2.700000 1.010000 ;
+      RECT 1.545000  1.400000 1.715000 2.175000 ;
+      RECT 1.545000  2.175000 1.880000 2.505000 ;
+      RECT 1.940000  0.085000 2.270000 0.670000 ;
+      RECT 2.300000  1.930000 3.680000 2.100000 ;
+      RECT 2.300000  2.100000 2.470000 2.675000 ;
+      RECT 2.440000  0.355000 2.700000 0.840000 ;
+      RECT 2.640000  2.270000 3.250000 3.245000 ;
+      RECT 2.920000  0.755000 3.620000 1.060000 ;
+      RECT 3.420000  2.100000 3.680000 2.505000 ;
+      RECT 3.440000  1.060000 3.620000 1.260000 ;
+      RECT 3.440000  1.260000 4.225000 1.590000 ;
+      RECT 3.440000  1.590000 3.680000 1.930000 ;
+      RECT 3.790000  0.085000 4.155000 1.090000 ;
+      RECT 3.850000  1.815000 4.225000 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_lp__ha_1
diff --git a/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef
index 5bf18dd..5c0edcd 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_2.magic.lef
@@ -72,24 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.685000  0.085000 0.935000 0.905000 ;
-        RECT 2.795000  0.085000 3.220000 1.015000 ;
-        RECT 3.895000  0.085000 4.225000 1.015000 ;
-        RECT 4.825000  0.085000 5.155000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -98,47 +80,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.320000 1.975000 0.650000 3.245000 ;
-        RECT 1.780000 2.255000 1.995000 3.245000 ;
-        RECT 2.950000 2.815000 3.280000 3.245000 ;
-        RECT 3.810000 2.815000 4.140000 3.245000 ;
-        RECT 4.815000 1.815000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.185000 0.650000 0.515000 1.075000 ;
-      RECT 0.185000 1.075000 1.315000 1.245000 ;
-      RECT 1.105000 0.650000 1.315000 1.075000 ;
-      RECT 1.110000 1.965000 1.655000 2.135000 ;
-      RECT 1.110000 2.135000 1.390000 2.635000 ;
-      RECT 1.485000 0.650000 1.805000 0.980000 ;
-      RECT 1.485000 0.980000 1.660000 1.685000 ;
-      RECT 1.485000 1.685000 2.335000 1.855000 ;
-      RECT 1.485000 1.855000 1.655000 1.965000 ;
-      RECT 1.840000 1.150000 2.335000 1.185000 ;
-      RECT 1.840000 1.185000 3.280000 1.515000 ;
-      RECT 1.975000 0.700000 2.335000 1.150000 ;
-      RECT 2.165000 1.855000 2.335000 2.475000 ;
-      RECT 2.165000 2.475000 4.140000 2.645000 ;
-      RECT 2.505000 1.515000 2.695000 2.305000 ;
-      RECT 3.970000 1.185000 4.295000 1.515000 ;
-      RECT 3.970000 1.515000 4.140000 2.475000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.185000  0.650000 0.515000 1.075000 ;
+      RECT 0.185000  1.075000 1.315000 1.245000 ;
+      RECT 0.320000  1.975000 0.650000 3.245000 ;
+      RECT 0.685000  0.085000 0.935000 0.905000 ;
+      RECT 1.105000  0.650000 1.315000 1.075000 ;
+      RECT 1.110000  1.965000 1.655000 2.135000 ;
+      RECT 1.110000  2.135000 1.390000 2.635000 ;
+      RECT 1.485000  0.650000 1.805000 0.980000 ;
+      RECT 1.485000  0.980000 1.660000 1.685000 ;
+      RECT 1.485000  1.685000 2.335000 1.855000 ;
+      RECT 1.485000  1.855000 1.655000 1.965000 ;
+      RECT 1.780000  2.255000 1.995000 3.245000 ;
+      RECT 1.840000  1.150000 2.335000 1.185000 ;
+      RECT 1.840000  1.185000 3.280000 1.515000 ;
+      RECT 1.975000  0.700000 2.335000 1.150000 ;
+      RECT 2.165000  1.855000 2.335000 2.475000 ;
+      RECT 2.165000  2.475000 4.140000 2.645000 ;
+      RECT 2.505000  1.515000 2.695000 2.305000 ;
+      RECT 2.795000  0.085000 3.220000 1.015000 ;
+      RECT 2.950000  2.815000 3.280000 3.245000 ;
+      RECT 3.810000  2.815000 4.140000 3.245000 ;
+      RECT 3.895000  0.085000 4.225000 1.015000 ;
+      RECT 3.970000  1.185000 4.295000 1.515000 ;
+      RECT 3.970000  1.515000 4.140000 2.475000 ;
+      RECT 4.815000  1.815000 5.015000 3.245000 ;
+      RECT 4.825000  0.085000 5.155000 1.095000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__ha_2
diff --git a/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef
index ad774e9..5e231c3 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_4.magic.lef
@@ -94,39 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.280000  0.085000  0.610000 0.875000 ;
-        RECT 1.140000  0.085000  1.470000 0.865000 ;
-        RECT 2.000000  0.085000  2.330000 0.670000 ;
-        RECT 2.860000  0.085000  3.190000 0.865000 ;
-        RECT 3.720000  0.085000  4.060000 0.805000 ;
-        RECT 5.605000  0.085000  5.890000 0.915000 ;
-        RECT 6.890000  0.085000  7.220000 0.535000 ;
-        RECT 7.830000  0.085000  8.445000 0.565000 ;
-        RECT 8.245000  0.565000  8.445000 0.755000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,91 +102,120 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.245000 2.095000  0.575000 3.245000 ;
-        RECT 1.105000 2.095000  1.435000 3.245000 ;
-        RECT 2.000000 1.810000  2.255000 3.245000 ;
-        RECT 2.895000 2.095000  3.110000 3.245000 ;
-        RECT 3.685000 2.195000  4.015000 3.245000 ;
-        RECT 4.680000 2.385000  5.010000 3.245000 ;
-        RECT 5.560000 2.385000  5.890000 3.245000 ;
-        RECT 7.340000 2.950000  7.685000 3.245000 ;
-        RECT 8.950000 2.630000  9.520000 3.245000 ;
-        RECT 9.295000 2.105000  9.520000 2.630000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.675000 1.395000 2.245000 1.565000 ;
-      RECT 2.075000 0.840000 2.245000 1.395000 ;
-      RECT 2.775000 1.395000 3.890000 1.565000 ;
-      RECT 3.720000 0.995000 4.920000 1.165000 ;
-      RECT 3.720000 1.165000 3.890000 1.395000 ;
-      RECT 3.720000 1.565000 3.890000 1.855000 ;
-      RECT 3.720000 1.855000 4.365000 2.025000 ;
-      RECT 4.195000 2.025000 4.365000 2.045000 ;
-      RECT 4.195000 2.045000 8.775000 2.100000 ;
-      RECT 4.195000 2.100000 6.470000 2.215000 ;
-      RECT 4.195000 2.215000 4.510000 3.055000 ;
-      RECT 4.230000 0.265000 5.435000 0.435000 ;
-      RECT 4.230000 0.435000 4.560000 0.815000 ;
-      RECT 4.730000 0.605000 4.920000 0.995000 ;
-      RECT 5.105000 0.435000 5.435000 0.825000 ;
-      RECT 5.180000 2.215000 5.390000 3.075000 ;
-      RECT 6.300000 1.930000 8.775000 2.045000 ;
-      RECT 6.380000 0.365000 6.710000 0.725000 ;
-      RECT 6.380000 0.725000 7.660000 0.735000 ;
-      RECT 6.380000 0.735000 8.075000 0.915000 ;
-      RECT 6.380000 2.395000 9.125000 2.440000 ;
-      RECT 6.380000 2.440000 6.820000 2.565000 ;
-      RECT 6.380000 2.565000 6.640000 3.075000 ;
-      RECT 6.650000 2.270000 9.125000 2.395000 ;
-      RECT 6.810000 2.745000 8.270000 2.780000 ;
-      RECT 6.810000 2.780000 7.170000 2.955000 ;
-      RECT 7.000000 2.610000 8.270000 2.745000 ;
-      RECT 7.400000 0.285000 7.660000 0.725000 ;
-      RECT 7.905000 0.915000 8.075000 0.925000 ;
-      RECT 7.905000 0.925000 8.855000 1.095000 ;
-      RECT 7.940000 2.780000 8.270000 2.960000 ;
-      RECT 8.450000 2.440000 9.125000 2.450000 ;
-      RECT 8.450000 2.450000 8.780000 3.075000 ;
-      RECT 8.605000 1.405000 9.170000 1.575000 ;
-      RECT 8.605000 1.575000 8.775000 1.930000 ;
-      RECT 8.665000 0.265000 9.930000 0.435000 ;
-      RECT 8.665000 0.435000 8.855000 0.925000 ;
-      RECT 8.955000 1.755000 9.985000 1.925000 ;
-      RECT 8.955000 1.925000 9.125000 2.270000 ;
-      RECT 9.035000 0.615000 9.510000 1.145000 ;
-      RECT 9.340000 1.145000 9.510000 1.755000 ;
-      RECT 9.680000 0.435000 9.930000 1.185000 ;
-      RECT 9.690000 1.925000 9.985000 3.075000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.245000  2.095000  0.575000 3.245000 ;
+      RECT 0.280000  0.085000  0.610000 0.875000 ;
+      RECT 0.675000  1.395000  2.245000 1.565000 ;
+      RECT 1.105000  2.095000  1.435000 3.245000 ;
+      RECT 1.140000  0.085000  1.470000 0.865000 ;
+      RECT 2.000000  0.085000  2.330000 0.670000 ;
+      RECT 2.000000  1.810000  2.255000 3.245000 ;
+      RECT 2.075000  0.840000  2.245000 1.395000 ;
+      RECT 2.775000  1.395000  3.890000 1.565000 ;
+      RECT 2.860000  0.085000  3.190000 0.865000 ;
+      RECT 2.895000  2.095000  3.110000 3.245000 ;
+      RECT 3.685000  2.195000  4.015000 3.245000 ;
+      RECT 3.720000  0.085000  4.060000 0.805000 ;
+      RECT 3.720000  0.995000  4.920000 1.165000 ;
+      RECT 3.720000  1.165000  3.890000 1.395000 ;
+      RECT 3.720000  1.565000  3.890000 1.855000 ;
+      RECT 3.720000  1.855000  4.365000 2.025000 ;
+      RECT 4.195000  2.025000  4.365000 2.045000 ;
+      RECT 4.195000  2.045000  8.775000 2.100000 ;
+      RECT 4.195000  2.100000  6.470000 2.215000 ;
+      RECT 4.195000  2.215000  4.510000 3.055000 ;
+      RECT 4.230000  0.265000  5.435000 0.435000 ;
+      RECT 4.230000  0.435000  4.560000 0.815000 ;
+      RECT 4.680000  2.385000  5.010000 3.245000 ;
+      RECT 4.730000  0.605000  4.920000 0.995000 ;
+      RECT 5.105000  0.435000  5.435000 0.825000 ;
+      RECT 5.180000  2.215000  5.390000 3.075000 ;
+      RECT 5.560000  2.385000  5.890000 3.245000 ;
+      RECT 5.605000  0.085000  5.890000 0.915000 ;
+      RECT 6.300000  1.930000  8.775000 2.045000 ;
+      RECT 6.380000  0.365000  6.710000 0.725000 ;
+      RECT 6.380000  0.725000  7.660000 0.735000 ;
+      RECT 6.380000  0.735000  8.075000 0.915000 ;
+      RECT 6.380000  2.395000  9.125000 2.440000 ;
+      RECT 6.380000  2.440000  6.820000 2.565000 ;
+      RECT 6.380000  2.565000  6.640000 3.075000 ;
+      RECT 6.650000  2.270000  9.125000 2.395000 ;
+      RECT 6.810000  2.745000  8.270000 2.780000 ;
+      RECT 6.810000  2.780000  7.170000 2.955000 ;
+      RECT 6.890000  0.085000  7.220000 0.535000 ;
+      RECT 7.000000  2.610000  8.270000 2.745000 ;
+      RECT 7.340000  2.950000  7.685000 3.245000 ;
+      RECT 7.400000  0.285000  7.660000 0.725000 ;
+      RECT 7.830000  0.085000  8.445000 0.565000 ;
+      RECT 7.905000  0.915000  8.075000 0.925000 ;
+      RECT 7.905000  0.925000  8.855000 1.095000 ;
+      RECT 7.940000  2.780000  8.270000 2.960000 ;
+      RECT 8.245000  0.565000  8.445000 0.755000 ;
+      RECT 8.450000  2.440000  9.125000 2.450000 ;
+      RECT 8.450000  2.450000  8.780000 3.075000 ;
+      RECT 8.605000  1.405000  9.170000 1.575000 ;
+      RECT 8.605000  1.575000  8.775000 1.930000 ;
+      RECT 8.665000  0.265000  9.930000 0.435000 ;
+      RECT 8.665000  0.435000  8.855000 0.925000 ;
+      RECT 8.950000  2.630000  9.520000 3.245000 ;
+      RECT 8.955000  1.755000  9.985000 1.925000 ;
+      RECT 8.955000  1.925000  9.125000 2.270000 ;
+      RECT 9.035000  0.615000  9.510000 1.145000 ;
+      RECT 9.295000  2.105000  9.520000 2.630000 ;
+      RECT 9.340000  1.145000  9.510000 1.755000 ;
+      RECT 9.680000  0.435000  9.930000 1.185000 ;
+      RECT 9.690000  1.925000  9.985000 3.075000 ;
     LAYER mcon ;
-      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  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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  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 ;
     LAYER met1 ;
       RECT 2.015000 0.810000 2.305000 0.855000 ;
       RECT 2.015000 0.855000 9.505000 0.995000 ;
diff --git a/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef
index 584bedd..61e736f 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_lp.magic.lef
@@ -77,23 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.900000  0.085000 1.150000 1.335000 ;
-        RECT 2.250000  0.085000 2.580000 0.570000 ;
-        RECT 4.050000  0.085000 4.380000 1.045000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -102,44 +85,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 1.175000 2.075000 1.505000 3.245000 ;
-        RECT 3.010000 2.310000 3.340000 3.245000 ;
-        RECT 4.215000 2.075000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.870000 1.565000 1.500000 1.725000 ;
-      RECT 0.870000 1.725000 2.035000 1.895000 ;
-      RECT 1.330000 0.265000 1.640000 0.645000 ;
-      RECT 1.330000 0.645000 1.500000 1.565000 ;
-      RECT 1.680000 1.100000 3.590000 1.225000 ;
-      RECT 1.680000 1.225000 4.685000 1.270000 ;
-      RECT 1.680000 1.270000 1.985000 1.430000 ;
-      RECT 1.705000 1.895000 2.035000 3.065000 ;
-      RECT 1.820000 0.265000 2.070000 0.750000 ;
-      RECT 1.820000 0.750000 3.010000 0.920000 ;
-      RECT 2.760000 0.265000 3.010000 0.750000 ;
-      RECT 3.260000 0.605000 3.590000 1.100000 ;
-      RECT 3.420000 1.270000 4.685000 1.395000 ;
-      RECT 3.590000 2.310000 4.035000 3.065000 ;
-      RECT 3.865000 1.395000 4.035000 2.310000 ;
-      RECT 4.355000 1.395000 4.685000 1.895000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.870000  1.565000 1.500000 1.725000 ;
+      RECT 0.870000  1.725000 2.035000 1.895000 ;
+      RECT 0.900000  0.085000 1.150000 1.335000 ;
+      RECT 1.175000  2.075000 1.505000 3.245000 ;
+      RECT 1.330000  0.265000 1.640000 0.645000 ;
+      RECT 1.330000  0.645000 1.500000 1.565000 ;
+      RECT 1.680000  1.100000 3.590000 1.225000 ;
+      RECT 1.680000  1.225000 4.685000 1.270000 ;
+      RECT 1.680000  1.270000 1.985000 1.430000 ;
+      RECT 1.705000  1.895000 2.035000 3.065000 ;
+      RECT 1.820000  0.265000 2.070000 0.750000 ;
+      RECT 1.820000  0.750000 3.010000 0.920000 ;
+      RECT 2.250000  0.085000 2.580000 0.570000 ;
+      RECT 2.760000  0.265000 3.010000 0.750000 ;
+      RECT 3.010000  2.310000 3.340000 3.245000 ;
+      RECT 3.260000  0.605000 3.590000 1.100000 ;
+      RECT 3.420000  1.270000 4.685000 1.395000 ;
+      RECT 3.590000  2.310000 4.035000 3.065000 ;
+      RECT 3.865000  1.395000 4.035000 2.310000 ;
+      RECT 4.050000  0.085000 4.380000 1.045000 ;
+      RECT 4.215000  2.075000 4.545000 3.245000 ;
+      RECT 4.355000  1.395000 4.685000 1.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__ha_lp
diff --git a/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef b/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef
index e3f1731..2e8b35b 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef
+++ b/cells/ha/sky130_fd_sc_lp__ha_m.magic.lef
@@ -72,22 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.605000  0.085000 0.795000 0.740000 ;
-        RECT 1.990000  0.085000 2.320000 0.415000 ;
-        RECT 3.995000  0.085000 4.185000 0.935000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,42 +80,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 1.270000 2.430000 1.480000 3.245000 ;
-        RECT 2.790000 2.490000 3.120000 3.245000 ;
-        RECT 3.995000 2.125000 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.605000 1.450000 0.775000 1.950000 ;
-      RECT 0.605000 1.950000 1.850000 2.120000 ;
-      RECT 0.975000 0.345000 1.300000 0.675000 ;
-      RECT 0.975000 0.675000 1.145000 1.950000 ;
-      RECT 1.325000 1.060000 1.495000 1.560000 ;
-      RECT 1.325000 1.560000 2.780000 1.730000 ;
-      RECT 1.540000 0.345000 1.750000 0.595000 ;
-      RECT 1.540000 0.595000 2.770000 0.765000 ;
-      RECT 1.680000 2.120000 1.850000 2.360000 ;
-      RECT 1.680000 2.360000 2.125000 2.570000 ;
-      RECT 2.560000 0.345000 2.770000 0.595000 ;
-      RECT 2.610000 0.945000 3.800000 1.115000 ;
-      RECT 2.610000 1.115000 2.780000 1.560000 ;
-      RECT 3.050000 0.795000 3.800000 0.945000 ;
-      RECT 3.470000 1.115000 3.800000 3.025000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.605000  0.085000 0.795000 0.740000 ;
+      RECT 0.605000  1.450000 0.775000 1.950000 ;
+      RECT 0.605000  1.950000 1.850000 2.120000 ;
+      RECT 0.975000  0.345000 1.300000 0.675000 ;
+      RECT 0.975000  0.675000 1.145000 1.950000 ;
+      RECT 1.270000  2.430000 1.480000 3.245000 ;
+      RECT 1.325000  1.060000 1.495000 1.560000 ;
+      RECT 1.325000  1.560000 2.780000 1.730000 ;
+      RECT 1.540000  0.345000 1.750000 0.595000 ;
+      RECT 1.540000  0.595000 2.770000 0.765000 ;
+      RECT 1.680000  2.120000 1.850000 2.360000 ;
+      RECT 1.680000  2.360000 2.125000 2.570000 ;
+      RECT 1.990000  0.085000 2.320000 0.415000 ;
+      RECT 2.560000  0.345000 2.770000 0.595000 ;
+      RECT 2.610000  0.945000 3.800000 1.115000 ;
+      RECT 2.610000  1.115000 2.780000 1.560000 ;
+      RECT 2.790000  2.490000 3.120000 3.245000 ;
+      RECT 3.050000  0.795000 3.800000 0.945000 ;
+      RECT 3.470000  1.115000 3.800000 3.025000 ;
+      RECT 3.995000  0.085000 4.185000 0.935000 ;
+      RECT 3.995000  2.125000 4.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 ;
+      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_lp__ha_m
diff --git a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef
index dac7932..57d5325 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.magic.lef
@@ -61,17 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.440000  0.085000 2.335000 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
@@ -80,28 +69,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.290000 2.490000 0.620000 3.245000 ;
-        RECT 1.990000 2.295000 2.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.650000 0.510000 0.980000 1.055000 ;
-      RECT 0.650000 1.055000 2.685000 1.225000 ;
-      RECT 1.080000 1.955000 2.685000 2.125000 ;
-      RECT 1.080000 2.125000 1.410000 2.820000 ;
-      RECT 2.275000 1.225000 2.685000 1.955000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.290000  2.490000 0.620000 3.245000 ;
+      RECT 0.650000  0.510000 0.980000 1.055000 ;
+      RECT 0.650000  1.055000 2.685000 1.225000 ;
+      RECT 1.080000  1.955000 2.685000 2.125000 ;
+      RECT 1.080000  2.125000 1.410000 2.820000 ;
+      RECT 1.440000  0.085000 2.335000 0.840000 ;
+      RECT 1.990000  2.295000 2.675000 3.245000 ;
+      RECT 2.275000  1.225000 2.685000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__inputiso0n_lp
diff --git a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef
index 795f757..99f767a 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.magic.lef
@@ -61,19 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.895000  0.085000 1.575000 0.840000 ;
-        RECT 2.550000  0.085000 2.885000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -82,33 +69,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.895000 2.445000 1.225000 3.245000 ;
-        RECT 2.525000 2.295000 2.910000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.155000 0.430000 0.375000 2.065000 ;
-      RECT 0.155000 2.065000 1.595000 2.235000 ;
-      RECT 0.155000 2.235000 0.375000 2.855000 ;
-      RECT 1.200000 1.390000 1.595000 2.065000 ;
-      RECT 1.765000 1.955000 3.230000 2.125000 ;
-      RECT 1.765000 2.125000 1.975000 2.855000 ;
-      RECT 2.095000 0.430000 2.305000 1.005000 ;
-      RECT 2.095000 1.005000 3.230000 1.225000 ;
-      RECT 2.820000 1.225000 3.230000 1.955000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.155000  0.430000 0.375000 2.065000 ;
+      RECT 0.155000  2.065000 1.595000 2.235000 ;
+      RECT 0.155000  2.235000 0.375000 2.855000 ;
+      RECT 0.895000  0.085000 1.575000 0.840000 ;
+      RECT 0.895000  2.445000 1.225000 3.245000 ;
+      RECT 1.200000  1.390000 1.595000 2.065000 ;
+      RECT 1.765000  1.955000 3.230000 2.125000 ;
+      RECT 1.765000  2.125000 1.975000 2.855000 ;
+      RECT 2.095000  0.430000 2.305000 1.005000 ;
+      RECT 2.095000  1.005000 3.230000 1.225000 ;
+      RECT 2.525000  2.295000 2.910000 3.245000 ;
+      RECT 2.550000  0.085000 2.885000 0.835000 ;
+      RECT 2.820000  1.225000 3.230000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__inputiso0p_lp
diff --git a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef
index 4f80456..808a1c6 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.magic.lef
@@ -61,19 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.885000  0.085000 1.215000 0.885000 ;
-        RECT 2.525000  0.085000 2.855000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -82,35 +69,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.190000 2.500000 1.520000 3.245000 ;
-        RECT 2.525000 2.295000 2.910000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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 0.430000 0.365000 0.885000 ;
-      RECT 0.125000 0.885000 0.370000 2.160000 ;
-      RECT 0.125000 2.160000 1.700000 2.330000 ;
-      RECT 0.345000 2.330000 0.590000 2.820000 ;
-      RECT 1.370000 1.315000 1.700000 2.160000 ;
-      RECT 1.735000 0.430000 2.065000 0.885000 ;
-      RECT 1.870000 0.885000 2.065000 1.055000 ;
-      RECT 1.870000 1.055000 3.225000 1.225000 ;
-      RECT 2.095000 1.955000 3.225000 2.125000 ;
-      RECT 2.095000 2.125000 2.305000 2.880000 ;
-      RECT 2.895000 1.225000 3.225000 1.955000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.120000  0.430000 0.365000 0.885000 ;
+      RECT 0.125000  0.885000 0.370000 2.160000 ;
+      RECT 0.125000  2.160000 1.700000 2.330000 ;
+      RECT 0.345000  2.330000 0.590000 2.820000 ;
+      RECT 0.885000  0.085000 1.215000 0.885000 ;
+      RECT 1.190000  2.500000 1.520000 3.245000 ;
+      RECT 1.370000  1.315000 1.700000 2.160000 ;
+      RECT 1.735000  0.430000 2.065000 0.885000 ;
+      RECT 1.870000  0.885000 2.065000 1.055000 ;
+      RECT 1.870000  1.055000 3.225000 1.225000 ;
+      RECT 2.095000  1.955000 3.225000 2.125000 ;
+      RECT 2.095000  2.125000 2.305000 2.880000 ;
+      RECT 2.525000  0.085000 2.855000 0.885000 ;
+      RECT 2.525000  2.295000 2.910000 3.245000 ;
+      RECT 2.895000  1.225000 3.225000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__inputiso1n_lp
diff --git a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef
index 0b4a25a..bfe5e22 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.magic.lef
@@ -62,18 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.460000  0.085000 0.760000 0.840000 ;
-        RECT 2.010000  0.085000 2.340000 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
@@ -82,27 +70,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.560000 2.295000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.770000 1.955000 2.685000 2.125000 ;
-      RECT 0.770000 2.125000 1.100000 2.820000 ;
-      RECT 1.280000 0.440000 1.490000 1.010000 ;
-      RECT 1.280000 1.010000 2.685000 1.180000 ;
-      RECT 2.350000 1.180000 2.685000 1.955000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.460000  0.085000 0.760000 0.840000 ;
+      RECT 0.770000  1.955000 2.685000 2.125000 ;
+      RECT 0.770000  2.125000 1.100000 2.820000 ;
+      RECT 1.280000  0.440000 1.490000 1.010000 ;
+      RECT 1.280000  1.010000 2.685000 1.180000 ;
+      RECT 1.560000  2.295000 2.365000 3.245000 ;
+      RECT 2.010000  0.085000 2.340000 0.840000 ;
+      RECT 2.350000  1.180000 2.685000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__inputiso1p_lp
diff --git a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef
index dc23e9c..a300b80 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.magic.lef
@@ -63,28 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.590000  0.085000 0.920000 0.745000 ;
-        RECT 2.970000  0.085000 3.220000 0.775000 ;
-        RECT 4.600000  0.085000 4.850000 0.905000 ;
-        RECT 5.950000  0.085000 6.280000 1.325000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -93,71 +71,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.130000 2.685000 0.460000 3.245000 ;
-        RECT 2.515000 2.125000 2.845000 3.245000 ;
-        RECT 4.775000 2.290000 5.155000 3.245000 ;
-        RECT 5.865000 1.915000 6.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 ;
-        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.160000 0.345000 0.410000 0.915000 ;
-      RECT 0.160000 0.915000 1.355000 1.085000 ;
-      RECT 1.155000 1.950000 1.515000 2.120000 ;
-      RECT 1.155000 2.120000 1.325000 2.905000 ;
-      RECT 1.155000 2.905000 2.345000 3.075000 ;
-      RECT 1.185000 1.085000 1.355000 1.670000 ;
-      RECT 1.185000 1.670000 1.515000 1.950000 ;
-      RECT 1.495000 2.290000 1.855000 2.735000 ;
-      RECT 1.575000 0.345000 1.970000 0.555000 ;
-      RECT 1.575000 0.555000 2.585000 0.725000 ;
-      RECT 1.575000 0.725000 1.745000 1.330000 ;
-      RECT 1.575000 1.330000 1.855000 1.500000 ;
-      RECT 1.685000 1.500000 1.855000 2.290000 ;
-      RECT 1.915000 0.895000 2.245000 1.160000 ;
-      RECT 2.075000 1.160000 2.245000 1.285000 ;
-      RECT 2.075000 1.285000 3.980000 1.445000 ;
-      RECT 2.075000 1.445000 4.185000 1.615000 ;
-      RECT 2.175000 1.785000 3.295000 1.955000 ;
-      RECT 2.175000 1.955000 2.345000 2.905000 ;
-      RECT 2.415000 0.725000 2.585000 0.945000 ;
-      RECT 2.415000 0.945000 3.560000 1.115000 ;
-      RECT 3.045000 1.955000 3.295000 3.075000 ;
-      RECT 3.390000 0.255000 4.320000 0.425000 ;
-      RECT 3.390000 0.425000 3.560000 0.945000 ;
-      RECT 3.515000 1.785000 3.845000 2.905000 ;
-      RECT 3.515000 2.905000 4.605000 3.075000 ;
-      RECT 3.730000 0.595000 3.980000 1.285000 ;
-      RECT 4.015000 1.615000 4.185000 2.055000 ;
-      RECT 4.015000 2.055000 4.265000 2.735000 ;
-      RECT 4.150000 0.425000 4.320000 1.075000 ;
-      RECT 4.150000 1.075000 5.225000 1.245000 ;
-      RECT 4.435000 1.950000 5.665000 2.120000 ;
-      RECT 4.435000 2.120000 4.605000 2.905000 ;
-      RECT 4.895000 1.245000 5.225000 1.745000 ;
-      RECT 5.335000 1.915000 5.665000 1.950000 ;
-      RECT 5.335000 2.120000 5.665000 2.955000 ;
-      RECT 5.460000 0.445000 5.665000 0.775000 ;
-      RECT 5.495000 0.775000 5.665000 1.915000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.130000  2.685000 0.460000 3.245000 ;
+      RECT 0.160000  0.345000 0.410000 0.915000 ;
+      RECT 0.160000  0.915000 1.355000 1.085000 ;
+      RECT 0.590000  0.085000 0.920000 0.745000 ;
+      RECT 1.155000  1.950000 1.515000 2.120000 ;
+      RECT 1.155000  2.120000 1.325000 2.905000 ;
+      RECT 1.155000  2.905000 2.345000 3.075000 ;
+      RECT 1.185000  1.085000 1.355000 1.670000 ;
+      RECT 1.185000  1.670000 1.515000 1.950000 ;
+      RECT 1.495000  2.290000 1.855000 2.735000 ;
+      RECT 1.575000  0.345000 1.970000 0.555000 ;
+      RECT 1.575000  0.555000 2.585000 0.725000 ;
+      RECT 1.575000  0.725000 1.745000 1.330000 ;
+      RECT 1.575000  1.330000 1.855000 1.500000 ;
+      RECT 1.685000  1.500000 1.855000 2.290000 ;
+      RECT 1.915000  0.895000 2.245000 1.160000 ;
+      RECT 2.075000  1.160000 2.245000 1.285000 ;
+      RECT 2.075000  1.285000 3.980000 1.445000 ;
+      RECT 2.075000  1.445000 4.185000 1.615000 ;
+      RECT 2.175000  1.785000 3.295000 1.955000 ;
+      RECT 2.175000  1.955000 2.345000 2.905000 ;
+      RECT 2.415000  0.725000 2.585000 0.945000 ;
+      RECT 2.415000  0.945000 3.560000 1.115000 ;
+      RECT 2.515000  2.125000 2.845000 3.245000 ;
+      RECT 2.970000  0.085000 3.220000 0.775000 ;
+      RECT 3.045000  1.955000 3.295000 3.075000 ;
+      RECT 3.390000  0.255000 4.320000 0.425000 ;
+      RECT 3.390000  0.425000 3.560000 0.945000 ;
+      RECT 3.515000  1.785000 3.845000 2.905000 ;
+      RECT 3.515000  2.905000 4.605000 3.075000 ;
+      RECT 3.730000  0.595000 3.980000 1.285000 ;
+      RECT 4.015000  1.615000 4.185000 2.055000 ;
+      RECT 4.015000  2.055000 4.265000 2.735000 ;
+      RECT 4.150000  0.425000 4.320000 1.075000 ;
+      RECT 4.150000  1.075000 5.225000 1.245000 ;
+      RECT 4.435000  1.950000 5.665000 2.120000 ;
+      RECT 4.435000  2.120000 4.605000 2.905000 ;
+      RECT 4.600000  0.085000 4.850000 0.905000 ;
+      RECT 4.775000  2.290000 5.155000 3.245000 ;
+      RECT 4.895000  1.245000 5.225000 1.745000 ;
+      RECT 5.335000  1.915000 5.665000 1.950000 ;
+      RECT 5.335000  2.120000 5.665000 2.955000 ;
+      RECT 5.460000  0.445000 5.665000 0.775000 ;
+      RECT 5.495000  0.775000 5.665000 1.915000 ;
+      RECT 5.865000  1.915000 6.195000 3.245000 ;
+      RECT 5.950000  0.085000 6.280000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__inputisolatch_lp
diff --git a/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef
index 1d9aa17..e4dccee 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_0.magic.lef
@@ -52,12 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-        RECT 0.105000  0.085000 0.400000 0.725000 ;
-      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
@@ -66,14 +60,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-        RECT 0.105000 2.290000 0.400000 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.105000  0.085000 0.400000 0.725000 ;
+      RECT 0.105000  2.290000 0.400000 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_lp__inv_0
diff --git a/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef
index 0535670..44b7344 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_1.magic.lef
@@ -52,12 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-        RECT 0.105000  0.085000 0.435000 1.040000 ;
-      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
@@ -66,14 +60,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-        RECT 0.105000 1.920000 0.435000 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.105000  0.085000 0.435000 1.040000 ;
+      RECT 0.105000  1.920000 0.435000 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_lp__inv_1
diff --git a/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
index c178eba..84c9313 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.magic.lef
@@ -36,93 +36,6 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT 1.065000 1.335000 1.325000 1.750000 ;
-        RECT 1.925000 1.335000 2.185000 1.750000 ;
-        RECT 2.785000 1.335000 3.045000 1.750000 ;
-        RECT 3.645000 1.335000 3.905000 1.750000 ;
-        RECT 4.505000 1.335000 4.765000 1.750000 ;
-        RECT 5.365000 1.335000 5.625000 1.750000 ;
-        RECT 6.225000 1.335000 6.485000 1.750000 ;
-      LAYER mcon ;
-        RECT 1.110000 1.580000 1.280000 1.750000 ;
-        RECT 1.970000 1.580000 2.140000 1.750000 ;
-        RECT 2.830000 1.580000 3.000000 1.750000 ;
-        RECT 3.690000 1.580000 3.860000 1.750000 ;
-        RECT 4.550000 1.580000 4.720000 1.750000 ;
-        RECT 5.410000 1.580000 5.580000 1.750000 ;
-        RECT 6.270000 1.580000 6.440000 1.750000 ;
-      LAYER met1 ;
-        RECT 1.050000 1.550000 6.500000 1.780000 ;
-    END
-  END A
-  PIN Y
-    ANTENNADIFFAREA  4.704000 ;
-    DIRECTION OUTPUT ;
-    USE SIGNAL ;
-    PORT
-      LAYER li1 ;
-        RECT 0.635000 0.305000 0.895000 3.050000 ;
-        RECT 1.495000 0.305000 1.755000 3.050000 ;
-        RECT 2.355000 0.305000 2.615000 3.050000 ;
-        RECT 3.215000 0.305000 3.475000 3.050000 ;
-        RECT 4.075000 0.305000 4.335000 3.050000 ;
-        RECT 4.935000 0.305000 5.195000 3.050000 ;
-        RECT 5.795000 0.305000 6.055000 3.050000 ;
-        RECT 6.655000 0.305000 6.915000 3.050000 ;
-      LAYER mcon ;
-        RECT 0.680000 1.950000 0.850000 2.120000 ;
-        RECT 1.540000 1.950000 1.710000 2.120000 ;
-        RECT 2.400000 1.950000 2.570000 2.120000 ;
-        RECT 3.260000 1.950000 3.430000 2.120000 ;
-        RECT 4.120000 1.950000 4.290000 2.120000 ;
-        RECT 4.980000 1.950000 5.150000 2.120000 ;
-        RECT 5.840000 1.950000 6.010000 2.120000 ;
-        RECT 6.700000 1.950000 6.870000 2.120000 ;
-      LAYER met1 ;
-        RECT 0.620000 1.920000 6.930000 2.150000 ;
-    END
-  END Y
-  PIN VGND
-    DIRECTION INOUT ;
-    USE GROUND ;
-    PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.170000  0.085000 0.465000 1.005000 ;
-        RECT 1.065000  0.085000 1.325000 1.005000 ;
-        RECT 1.925000  0.085000 2.185000 1.005000 ;
-        RECT 2.785000  0.085000 3.045000 1.005000 ;
-        RECT 3.645000  0.085000 3.905000 1.005000 ;
-        RECT 4.505000  0.085000 4.765000 1.005000 ;
-        RECT 5.365000  0.085000 5.625000 1.005000 ;
-        RECT 6.225000  0.085000 6.485000 1.005000 ;
-        RECT 7.085000  0.085000 7.380000 1.005000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
-  END VGND
-  PIN VPWR
-    DIRECTION INOUT ;
-    USE POWER ;
-    PORT
-      LAYER li1 ;
         RECT 0.000000 3.245000 7.680000 3.415000 ;
         RECT 0.170000 1.920000 0.465000 3.245000 ;
         RECT 1.065000 1.920000 1.325000 3.245000 ;
@@ -150,9 +63,96 @@
         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 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 1.050000 1.550000 6.500000 1.780000 ;
+    END
+  END A
+  PIN Y
+    ANTENNADIFFAREA  4.704000 ;
+    DIRECTION OUTPUT ;
+    USE SIGNAL ;
+    PORT
+      LAYER met1 ;
+        RECT 0.620000 1.920000 6.930000 2.150000 ;
+    END
+  END Y
+  PIN VGND
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.245000 7.680000 0.245000 ;
+    END
+  END VGND
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.800000 0.500000 3.085000 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.170000  0.085000 0.465000 1.005000 ;
+      RECT 0.635000  0.305000 0.895000 3.050000 ;
+      RECT 1.065000  0.085000 1.325000 1.005000 ;
+      RECT 1.065000  1.335000 1.325000 1.750000 ;
+      RECT 1.495000  0.305000 1.755000 3.050000 ;
+      RECT 1.925000  0.085000 2.185000 1.005000 ;
+      RECT 1.925000  1.335000 2.185000 1.750000 ;
+      RECT 2.355000  0.305000 2.615000 3.050000 ;
+      RECT 2.785000  0.085000 3.045000 1.005000 ;
+      RECT 2.785000  1.335000 3.045000 1.750000 ;
+      RECT 3.215000  0.305000 3.475000 3.050000 ;
+      RECT 3.645000  0.085000 3.905000 1.005000 ;
+      RECT 3.645000  1.335000 3.905000 1.750000 ;
+      RECT 4.075000  0.305000 4.335000 3.050000 ;
+      RECT 4.505000  0.085000 4.765000 1.005000 ;
+      RECT 4.505000  1.335000 4.765000 1.750000 ;
+      RECT 4.935000  0.305000 5.195000 3.050000 ;
+      RECT 5.365000  0.085000 5.625000 1.005000 ;
+      RECT 5.365000  1.335000 5.625000 1.750000 ;
+      RECT 5.795000  0.305000 6.055000 3.050000 ;
+      RECT 6.225000  0.085000 6.485000 1.005000 ;
+      RECT 6.225000  1.335000 6.485000 1.750000 ;
+      RECT 6.655000  0.305000 6.915000 3.050000 ;
+      RECT 7.085000  0.085000 7.380000 1.005000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.680000  1.950000 0.850000 2.120000 ;
+      RECT 1.110000  1.580000 1.280000 1.750000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.540000  1.950000 1.710000 2.120000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.970000  1.580000 2.140000 1.750000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.400000  1.950000 2.570000 2.120000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.830000  1.580000 3.000000 1.750000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.260000  1.950000 3.430000 2.120000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.690000  1.580000 3.860000 1.750000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 4.120000  1.950000 4.290000 2.120000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.550000  1.580000 4.720000 1.750000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.980000  1.950000 5.150000 2.120000 ;
+      RECT 5.410000  1.580000 5.580000 1.750000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.840000  1.950000 6.010000 2.120000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 6.270000  1.580000 6.440000 1.750000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.700000  1.950000 6.870000 2.120000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 7.355000 -0.085000 7.525000 0.085000 ;
+  END
 END sky130_fd_sc_lp__inv_16
diff --git a/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef
index 3251f39..bcab4c2 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_2.magic.lef
@@ -52,14 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.105000  0.085000 0.435000 1.040000 ;
-        RECT 1.005000  0.085000 1.295000 1.205000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -68,16 +60,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.105000 1.920000 0.435000 3.245000 ;
-        RECT 1.005000 1.815000 1.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 ;
       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  0.085000 0.435000 1.040000 ;
+      RECT 0.105000  1.920000 0.435000 3.245000 ;
+      RECT 1.005000  0.085000 1.295000 1.205000 ;
+      RECT 1.005000  1.815000 1.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 ;
+  END
 END sky130_fd_sc_lp__inv_2
diff --git a/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef
index 587fc91..f1658b4 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_4.magic.lef
@@ -59,17 +59,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.100000  0.085000 0.395000 1.040000 ;
-        RECT 0.995000  0.085000 1.255000 0.700000 ;
-        RECT 1.855000  0.085000 2.150000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -78,19 +67,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.100000 1.815000 0.390000 3.245000 ;
-        RECT 0.995000 2.095000 1.250000 3.245000 ;
-        RECT 1.855000 2.095000 2.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 ;
       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.100000  0.085000 0.395000 1.040000 ;
+      RECT 0.100000  1.815000 0.390000 3.245000 ;
+      RECT 0.995000  0.085000 1.255000 0.700000 ;
+      RECT 0.995000  2.095000 1.250000 3.245000 ;
+      RECT 1.855000  0.085000 2.150000 0.670000 ;
+      RECT 1.855000  2.095000 2.150000 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_lp__inv_4
diff --git a/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef
index 3a0c087..5415fe7 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_8.magic.lef
@@ -69,23 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.350000  0.085000 0.645000 0.875000 ;
-        RECT 1.245000  0.085000 1.505000 0.875000 ;
-        RECT 2.105000  0.085000 2.365000 0.650000 ;
-        RECT 2.965000  0.085000 3.225000 0.875000 ;
-        RECT 3.825000  0.085000 4.120000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -94,25 +77,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.350000 2.105000 0.645000 3.245000 ;
-        RECT 1.245000 2.095000 1.505000 3.245000 ;
-        RECT 2.105000 2.095000 2.365000 3.245000 ;
-        RECT 2.965000 2.095000 3.225000 3.245000 ;
-        RECT 3.825000 2.095000 4.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 ;
       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.350000  0.085000 0.645000 0.875000 ;
+      RECT 0.350000  2.105000 0.645000 3.245000 ;
+      RECT 1.245000  0.085000 1.505000 0.875000 ;
+      RECT 1.245000  2.095000 1.505000 3.245000 ;
+      RECT 2.105000  0.085000 2.365000 0.650000 ;
+      RECT 2.105000  2.095000 2.365000 3.245000 ;
+      RECT 2.965000  0.085000 3.225000 0.875000 ;
+      RECT 2.965000  2.095000 3.225000 3.245000 ;
+      RECT 3.825000  0.085000 4.120000 0.875000 ;
+      RECT 3.825000  2.095000 4.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 ;
+  END
 END sky130_fd_sc_lp__inv_8
diff --git a/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef
index 74fa12e..d577d71 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_lp.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.165000  0.085000 0.495000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -69,15 +62,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.455000 1.960000 0.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 ;
       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.165000  0.085000 0.495000 0.775000 ;
+      RECT 0.455000  1.960000 0.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 ;
+  END
 END sky130_fd_sc_lp__inv_lp
diff --git a/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef b/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef
index 5f3ec11..0444a6b 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef
+++ b/cells/inv/sky130_fd_sc_lp__inv_m.magic.lef
@@ -53,12 +53,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.960000 0.085000 ;
-        RECT 0.165000  0.085000 0.355000 0.660000 ;
-      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
@@ -67,14 +61,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 0.960000 3.415000 ;
-        RECT 0.165000 2.300000 0.375000 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.165000  0.085000 0.355000 0.660000 ;
+      RECT 0.165000  2.300000 0.375000 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_lp__inv_m
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef
index f2554b9..4bbcc78 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.magic.lef
@@ -54,12 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.155000 2.180000 0.475000 2.945000 ;
-        RECT 1.045000 2.180000 1.345000 2.945000 ;
-      LAYER mcon ;
-        RECT 0.220000 2.725000 0.390000 2.895000 ;
-        RECT 1.090000 2.725000 1.260000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 1.370000 2.945000 ;
     END
@@ -68,13 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 1.015000  0.085000 1.345000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -83,14 +70,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 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 ;
       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.155000  2.180000 0.475000 2.945000 ;
+      RECT 1.015000  0.085000 1.345000 0.670000 ;
+      RECT 1.045000  2.180000 1.345000 2.945000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.220000  2.725000 0.390000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.090000  2.725000 1.260000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+  END
 END sky130_fd_sc_lp__invkapwr_1
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef
index b8c2b6b..eca06e6 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.magic.lef
@@ -57,12 +57,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.580000 2.055000 0.840000 3.075000 ;
-        RECT 1.440000 2.055000 1.695000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.620000 2.725000 0.790000 2.895000 ;
-        RECT 1.480000 2.725000 1.650000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 1.850000 2.945000 ;
     END
@@ -71,15 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.635000  0.085000 0.930000 0.725000 ;
-        RECT 1.495000  0.085000 1.825000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -88,15 +73,28 @@
     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 ;
+      RECT 0.580000  2.055000 0.840000 3.075000 ;
+      RECT 0.635000  0.085000 0.930000 0.725000 ;
+      RECT 1.440000  2.055000 1.695000 3.075000 ;
+      RECT 1.495000  0.085000 1.825000 0.670000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.620000  2.725000 0.790000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.480000  2.725000 1.650000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+  END
 END sky130_fd_sc_lp__invkapwr_2
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef
index 1bf0677..513868b 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.magic.lef
@@ -60,16 +60,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.300000 2.055000 0.560000 3.075000 ;
-        RECT 1.160000 2.055000 1.420000 3.075000 ;
-        RECT 2.020000 2.055000 2.280000 3.075000 ;
-        RECT 2.880000 2.055000 3.135000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.345000 2.725000 0.515000 2.895000 ;
-        RECT 1.210000 2.725000 1.380000 2.895000 ;
-        RECT 2.060000 2.725000 2.230000 2.895000 ;
-        RECT 2.930000 2.725000 3.100000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 3.290000 2.945000 ;
     END
@@ -78,19 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.695000  0.085000 0.990000 0.670000 ;
-        RECT 1.590000  0.085000 1.850000 0.670000 ;
-        RECT 2.445000  0.085000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -99,18 +76,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 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 ;
       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.300000  2.055000 0.560000 3.075000 ;
+      RECT 0.695000  0.085000 0.990000 0.670000 ;
+      RECT 1.160000  2.055000 1.420000 3.075000 ;
+      RECT 1.590000  0.085000 1.850000 0.670000 ;
+      RECT 2.020000  2.055000 2.280000 3.075000 ;
+      RECT 2.445000  0.085000 2.745000 0.670000 ;
+      RECT 2.880000  2.055000 3.135000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.345000  2.725000 0.515000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.210000  2.725000 1.380000 2.895000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.060000  2.725000 2.230000 2.895000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.930000  2.725000 3.100000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+  END
 END sky130_fd_sc_lp__invkapwr_4
diff --git a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef
index d0971b2..482ea76 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.magic.lef
@@ -65,22 +65,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.200000 2.055000 0.460000 3.075000 ;
-        RECT 1.060000 2.055000 1.320000 3.075000 ;
-        RECT 1.920000 2.055000 2.180000 3.075000 ;
-        RECT 2.780000 2.055000 3.040000 3.075000 ;
-        RECT 3.640000 2.055000 3.900000 3.075000 ;
-        RECT 4.500000 2.055000 4.760000 3.075000 ;
-        RECT 5.360000 2.055000 5.615000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.245000 2.725000 0.415000 2.895000 ;
-        RECT 1.100000 2.725000 1.270000 2.895000 ;
-        RECT 1.970000 2.725000 2.140000 2.895000 ;
-        RECT 2.825000 2.725000 2.995000 2.895000 ;
-        RECT 3.690000 2.725000 3.860000 2.895000 ;
-        RECT 4.550000 2.725000 4.720000 2.895000 ;
-        RECT 5.410000 2.725000 5.580000 2.895000 ;
       LAYER met1 ;
         RECT 0.070000 2.690000 5.690000 2.945000 ;
     END
@@ -89,26 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 1.025000  0.085000 1.320000 0.670000 ;
-        RECT 1.920000  0.085000 2.180000 0.670000 ;
-        RECT 2.780000  0.085000 3.040000 0.670000 ;
-        RECT 3.640000  0.085000 3.900000 0.670000 ;
-        RECT 4.500000  0.085000 4.795000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -117,23 +81,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 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 ;
-        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.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.200000  2.055000 0.460000 3.075000 ;
+      RECT 1.025000  0.085000 1.320000 0.670000 ;
+      RECT 1.060000  2.055000 1.320000 3.075000 ;
+      RECT 1.920000  0.085000 2.180000 0.670000 ;
+      RECT 1.920000  2.055000 2.180000 3.075000 ;
+      RECT 2.780000  0.085000 3.040000 0.670000 ;
+      RECT 2.780000  2.055000 3.040000 3.075000 ;
+      RECT 3.640000  0.085000 3.900000 0.670000 ;
+      RECT 3.640000  2.055000 3.900000 3.075000 ;
+      RECT 4.500000  0.085000 4.795000 0.670000 ;
+      RECT 4.500000  2.055000 4.760000 3.075000 ;
+      RECT 5.360000  2.055000 5.615000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.245000  2.725000 0.415000 2.895000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.100000  2.725000 1.270000 2.895000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.970000  2.725000 2.140000 2.895000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.825000  2.725000 2.995000 2.895000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.690000  2.725000 3.860000 2.895000 ;
+      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.550000  2.725000 4.720000 2.895000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 5.410000  2.725000 5.580000 2.895000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+  END
 END sky130_fd_sc_lp__invkapwr_8
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef
index 89b0d72..eae1239 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_0.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.165000  0.085000 0.495000 0.900000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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,15 +62,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.165000 2.320000 0.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 ;
       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.165000  0.085000 0.495000 0.900000 ;
+      RECT 0.165000  2.320000 0.495000 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_lp__invlp_0
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_1.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_1.magic.lef
index 32a68f8..00f6444 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_1.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_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.165000  0.085000 0.495000 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
@@ -67,15 +60,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.195000 1.815000 0.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 ;
       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.165000  0.085000 0.495000 1.010000 ;
+      RECT 0.195000  1.815000 0.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 ;
+  END
 END sky130_fd_sc_lp__invlp_1
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef
index c27d485..86fdd65 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_2.magic.lef
@@ -52,16 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 1.010000 ;
-        RECT 1.995000  0.085000 2.245000 1.135000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -70,27 +60,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.125000 1.815000 0.455000 3.245000 ;
-        RECT 1.915000 1.815000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.635000 0.255000 1.815000 0.425000 ;
-      RECT 0.635000 0.425000 0.805000 1.135000 ;
-      RECT 0.635000 1.815000 0.805000 2.905000 ;
-      RECT 0.635000 2.905000 1.745000 3.075000 ;
-      RECT 1.485000 0.425000 1.815000 1.135000 ;
-      RECT 1.495000 1.815000 1.745000 2.905000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.125000  0.085000 0.455000 1.010000 ;
+      RECT 0.125000  1.815000 0.455000 3.245000 ;
+      RECT 0.635000  0.255000 1.815000 0.425000 ;
+      RECT 0.635000  0.425000 0.805000 1.135000 ;
+      RECT 0.635000  1.815000 0.805000 2.905000 ;
+      RECT 0.635000  2.905000 1.745000 3.075000 ;
+      RECT 1.485000  0.425000 1.815000 1.135000 ;
+      RECT 1.495000  1.815000 1.745000 2.905000 ;
+      RECT 1.915000  1.815000 2.245000 3.245000 ;
+      RECT 1.995000  0.085000 2.245000 1.135000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__invlp_2
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef
index 3a18d2b..fa1067d 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_4.magic.lef
@@ -62,21 +62,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.125000 ;
-        RECT 1.045000  0.085000 1.375000 0.495000 ;
-        RECT 3.915000  0.085000 4.165000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -85,40 +70,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.135000 1.815000 0.385000 3.245000 ;
-        RECT 0.995000 2.630000 1.245000 3.245000 ;
-        RECT 3.855000 1.845000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.255000 0.875000 0.665000 ;
-      RECT 0.545000 0.665000 1.875000 0.835000 ;
-      RECT 0.545000 0.835000 0.875000 1.010000 ;
-      RECT 0.565000 1.815000 0.815000 2.290000 ;
-      RECT 0.565000 2.290000 1.755000 2.460000 ;
-      RECT 0.565000 2.460000 0.815000 3.075000 ;
-      RECT 1.425000 2.460000 1.755000 2.905000 ;
-      RECT 1.425000 2.905000 3.685000 3.075000 ;
-      RECT 1.545000 0.255000 3.735000 0.425000 ;
-      RECT 1.545000 0.425000 1.875000 0.665000 ;
-      RECT 2.405000 0.425000 2.735000 0.835000 ;
-      RECT 2.425000 2.290000 2.755000 2.905000 ;
-      RECT 3.405000 0.425000 3.735000 1.125000 ;
-      RECT 3.435000 1.845000 3.685000 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.365000 1.125000 ;
+      RECT 0.135000  1.815000 0.385000 3.245000 ;
+      RECT 0.545000  0.255000 0.875000 0.665000 ;
+      RECT 0.545000  0.665000 1.875000 0.835000 ;
+      RECT 0.545000  0.835000 0.875000 1.010000 ;
+      RECT 0.565000  1.815000 0.815000 2.290000 ;
+      RECT 0.565000  2.290000 1.755000 2.460000 ;
+      RECT 0.565000  2.460000 0.815000 3.075000 ;
+      RECT 0.995000  2.630000 1.245000 3.245000 ;
+      RECT 1.045000  0.085000 1.375000 0.495000 ;
+      RECT 1.425000  2.460000 1.755000 2.905000 ;
+      RECT 1.425000  2.905000 3.685000 3.075000 ;
+      RECT 1.545000  0.255000 3.735000 0.425000 ;
+      RECT 1.545000  0.425000 1.875000 0.665000 ;
+      RECT 2.405000  0.425000 2.735000 0.835000 ;
+      RECT 2.425000  2.290000 2.755000 2.905000 ;
+      RECT 3.405000  0.425000 3.735000 1.125000 ;
+      RECT 3.435000  1.845000 3.685000 2.905000 ;
+      RECT 3.855000  1.845000 4.185000 3.245000 ;
+      RECT 3.915000  0.085000 4.165000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__invlp_4
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef
index c7adbbc..49a3e42 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_8.magic.lef
@@ -67,30 +67,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.125000 ;
-        RECT 0.975000  0.085000 1.305000 0.495000 ;
-        RECT 1.835000  0.085000 2.165000 0.495000 ;
-        RECT 2.695000  0.085000 3.025000 0.495000 ;
-        RECT 7.285000  0.085000 7.535000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -99,57 +75,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.115000 1.815000 0.365000 3.245000 ;
-        RECT 0.975000 2.630000 1.305000 3.245000 ;
-        RECT 1.835000 2.630000 2.085000 3.245000 ;
-        RECT 2.765000 2.630000 3.095000 3.245000 ;
-        RECT 7.205000 1.845000 7.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 ;
-        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.255000 0.795000 0.665000 ;
-      RECT 0.545000 0.665000 3.375000 0.835000 ;
-      RECT 0.545000 0.835000 0.795000 1.125000 ;
-      RECT 0.545000 1.950000 0.795000 2.290000 ;
-      RECT 0.545000 2.290000 3.595000 2.460000 ;
-      RECT 0.545000 2.460000 0.795000 3.075000 ;
-      RECT 1.485000 0.255000 1.655000 0.665000 ;
-      RECT 1.485000 2.460000 1.655000 3.075000 ;
-      RECT 2.265000 2.460000 2.595000 3.075000 ;
-      RECT 2.345000 0.255000 2.515000 0.665000 ;
-      RECT 3.205000 0.255000 7.105000 0.425000 ;
-      RECT 3.205000 0.425000 3.375000 0.665000 ;
-      RECT 3.265000 2.460000 3.595000 2.905000 ;
-      RECT 3.265000 2.905000 7.025000 3.075000 ;
-      RECT 3.985000 0.425000 4.315000 0.835000 ;
-      RECT 4.125000 2.185000 4.455000 2.905000 ;
-      RECT 4.925000 0.425000 5.095000 0.835000 ;
-      RECT 4.985000 2.185000 5.315000 2.905000 ;
-      RECT 5.775000 0.425000 6.105000 0.835000 ;
-      RECT 5.845000 2.185000 6.175000 2.905000 ;
-      RECT 6.775000 0.425000 7.105000 1.125000 ;
-      RECT 6.855000 1.845000 7.025000 2.905000 ;
+      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.125000 ;
+      RECT 0.115000  1.815000 0.365000 3.245000 ;
+      RECT 0.545000  0.255000 0.795000 0.665000 ;
+      RECT 0.545000  0.665000 3.375000 0.835000 ;
+      RECT 0.545000  0.835000 0.795000 1.125000 ;
+      RECT 0.545000  1.950000 0.795000 2.290000 ;
+      RECT 0.545000  2.290000 3.595000 2.460000 ;
+      RECT 0.545000  2.460000 0.795000 3.075000 ;
+      RECT 0.975000  0.085000 1.305000 0.495000 ;
+      RECT 0.975000  2.630000 1.305000 3.245000 ;
+      RECT 1.485000  0.255000 1.655000 0.665000 ;
+      RECT 1.485000  2.460000 1.655000 3.075000 ;
+      RECT 1.835000  0.085000 2.165000 0.495000 ;
+      RECT 1.835000  2.630000 2.085000 3.245000 ;
+      RECT 2.265000  2.460000 2.595000 3.075000 ;
+      RECT 2.345000  0.255000 2.515000 0.665000 ;
+      RECT 2.695000  0.085000 3.025000 0.495000 ;
+      RECT 2.765000  2.630000 3.095000 3.245000 ;
+      RECT 3.205000  0.255000 7.105000 0.425000 ;
+      RECT 3.205000  0.425000 3.375000 0.665000 ;
+      RECT 3.265000  2.460000 3.595000 2.905000 ;
+      RECT 3.265000  2.905000 7.025000 3.075000 ;
+      RECT 3.985000  0.425000 4.315000 0.835000 ;
+      RECT 4.125000  2.185000 4.455000 2.905000 ;
+      RECT 4.925000  0.425000 5.095000 0.835000 ;
+      RECT 4.985000  2.185000 5.315000 2.905000 ;
+      RECT 5.775000  0.425000 6.105000 0.835000 ;
+      RECT 5.845000  2.185000 6.175000 2.905000 ;
+      RECT 6.775000  0.425000 7.105000 1.125000 ;
+      RECT 6.855000  1.845000 7.025000 2.905000 ;
+      RECT 7.205000  1.845000 7.535000 3.245000 ;
+      RECT 7.285000  0.085000 7.535000 1.125000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__invlp_8
diff --git a/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef b/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef
index 233fb07..5777695 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_m.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.165000  0.085000 0.495000 0.900000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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,15 +62,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.165000 2.430000 0.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 ;
       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.165000  0.085000 0.495000 0.900000 ;
+      RECT 0.165000  2.430000 0.495000 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_lp__invlp_m
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
index 380d2d7..4c2a10a 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.magic.lef
@@ -60,11 +60,6 @@
   PIN KAGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 1.440000 0.390000 2.275000 0.840000 ;
-      LAYER mcon ;
-        RECT 1.545000 0.470000 1.715000 0.640000 ;
-        RECT 2.025000 0.470000 2.195000 0.640000 ;
       LAYER met1 ;
         RECT 0.070000 0.440000 3.290000 0.670000 ;
     END
@@ -73,16 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -91,28 +76,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.290000 2.490000 0.620000 3.245000 ;
-        RECT 1.990000 2.295000 2.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.650000 0.510000 0.980000 1.055000 ;
-      RECT 0.650000 1.055000 2.685000 1.225000 ;
-      RECT 1.080000 1.955000 2.685000 2.125000 ;
-      RECT 1.080000 2.125000 1.410000 2.820000 ;
-      RECT 2.275000 1.225000 2.685000 1.955000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.290000  2.490000 0.620000 3.245000 ;
+      RECT 0.650000  0.510000 0.980000 1.055000 ;
+      RECT 0.650000  1.055000 2.685000 1.225000 ;
+      RECT 1.080000  1.955000 2.685000 2.125000 ;
+      RECT 1.080000  2.125000 1.410000 2.820000 ;
+      RECT 1.440000  0.390000 2.275000 0.840000 ;
+      RECT 1.990000  2.295000 2.675000 3.245000 ;
+      RECT 2.275000  1.225000 2.685000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.545000  0.470000 1.715000 0.640000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.025000  0.470000 2.195000 0.640000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__iso0n_lp
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
index f6f5508..2865679 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.magic.lef
@@ -62,10 +62,6 @@
   PIN KAGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 1.085000 0.305000 1.455000 0.765000 ;
-      LAYER mcon ;
-        RECT 1.115000 0.470000 1.285000 0.640000 ;
       LAYER met1 ;
         RECT 0.070000 0.440000 2.330000 0.670000 ;
     END
@@ -74,14 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -90,27 +78,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.140000 2.025000 0.470000 3.245000 ;
-        RECT 1.265000 2.025000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.305000 0.305000 0.635000 0.595000 ;
-      RECT 0.305000 0.595000 0.820000 0.765000 ;
-      RECT 0.650000 0.765000 0.820000 0.945000 ;
-      RECT 0.650000 0.945000 1.720000 1.275000 ;
-      RECT 0.650000 1.275000 0.820000 2.025000 ;
-      RECT 0.650000 2.025000 1.065000 3.065000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.140000  2.025000 0.470000 3.245000 ;
+      RECT 0.305000  0.305000 0.635000 0.595000 ;
+      RECT 0.305000  0.595000 0.820000 0.765000 ;
+      RECT 0.650000  0.765000 0.820000 0.945000 ;
+      RECT 0.650000  0.945000 1.720000 1.275000 ;
+      RECT 0.650000  1.275000 0.820000 2.025000 ;
+      RECT 0.650000  2.025000 1.065000 3.065000 ;
+      RECT 1.085000  0.305000 1.455000 0.765000 ;
+      RECT 1.265000  2.025000 1.595000 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  0.470000 1.285000 0.640000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__iso0n_lp2
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef
index c796c00..323ba0a 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.magic.lef
@@ -61,12 +61,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.895000 2.445000 1.225000 2.920000 ;
-        RECT 2.525000 2.295000 2.910000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.975000 2.690000 1.145000 2.860000 ;
-        RECT 2.615000 2.690000 2.785000 2.860000 ;
       LAYER met1 ;
         RECT 0.070000 2.660000 3.770000 2.890000 ;
     END
@@ -75,19 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.895000  0.085000 1.575000 0.840000 ;
-        RECT 2.550000  0.085000 2.885000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -96,31 +77,45 @@
     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.155000 0.430000 0.375000 2.065000 ;
-      RECT 0.155000 2.065000 1.595000 2.235000 ;
-      RECT 0.155000 2.235000 0.375000 2.855000 ;
-      RECT 1.200000 1.390000 1.595000 2.065000 ;
-      RECT 1.765000 1.955000 3.230000 2.125000 ;
-      RECT 1.765000 2.125000 1.975000 2.855000 ;
-      RECT 2.095000 0.430000 2.305000 1.005000 ;
-      RECT 2.095000 1.005000 3.230000 1.225000 ;
-      RECT 2.820000 1.225000 3.230000 1.955000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.155000  0.430000 0.375000 2.065000 ;
+      RECT 0.155000  2.065000 1.595000 2.235000 ;
+      RECT 0.155000  2.235000 0.375000 2.855000 ;
+      RECT 0.895000  0.085000 1.575000 0.840000 ;
+      RECT 0.895000  2.445000 1.225000 2.920000 ;
+      RECT 1.200000  1.390000 1.595000 2.065000 ;
+      RECT 1.765000  1.955000 3.230000 2.125000 ;
+      RECT 1.765000  2.125000 1.975000 2.855000 ;
+      RECT 2.095000  0.430000 2.305000 1.005000 ;
+      RECT 2.095000  1.005000 3.230000 1.225000 ;
+      RECT 2.525000  2.295000 2.910000 3.075000 ;
+      RECT 2.550000  0.085000 2.885000 0.835000 ;
+      RECT 2.820000  1.225000 3.230000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.975000  2.690000 1.145000 2.860000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.615000  2.690000 2.785000 2.860000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__iso0p_lp
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef
index c05c5fb..8c46a01 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.magic.lef
@@ -61,14 +61,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.635000 2.290000 1.485000 3.075000 ;
-        RECT 2.235000 2.295000 3.145000 3.075000 ;
-      LAYER mcon ;
-        RECT 0.715000 2.690000 0.885000 2.860000 ;
-        RECT 1.235000 2.690000 1.405000 2.860000 ;
-        RECT 2.315000 2.690000 2.485000 2.860000 ;
-        RECT 2.895000 2.690000 3.065000 2.860000 ;
       LAYER met1 ;
         RECT 0.070000 2.660000 3.770000 2.890000 ;
     END
@@ -77,19 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.895000  0.085000 1.575000 0.840000 ;
-        RECT 2.550000  0.085000 2.885000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -98,31 +77,47 @@
     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.155000 0.430000 0.375000 1.950000 ;
-      RECT 0.155000 1.950000 1.595000 2.120000 ;
-      RECT 0.155000 2.120000 0.375000 3.075000 ;
-      RECT 1.200000 1.010000 1.595000 1.950000 ;
-      RECT 1.765000 1.955000 3.230000 2.125000 ;
-      RECT 1.765000 2.125000 1.975000 3.075000 ;
-      RECT 2.095000 0.430000 2.305000 1.005000 ;
-      RECT 2.095000 1.005000 3.230000 1.225000 ;
-      RECT 2.925000 1.225000 3.230000 1.955000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.155000  0.430000 0.375000 1.950000 ;
+      RECT 0.155000  1.950000 1.595000 2.120000 ;
+      RECT 0.155000  2.120000 0.375000 3.075000 ;
+      RECT 0.635000  2.290000 1.485000 3.075000 ;
+      RECT 0.895000  0.085000 1.575000 0.840000 ;
+      RECT 1.200000  1.010000 1.595000 1.950000 ;
+      RECT 1.765000  1.955000 3.230000 2.125000 ;
+      RECT 1.765000  2.125000 1.975000 3.075000 ;
+      RECT 2.095000  0.430000 2.305000 1.005000 ;
+      RECT 2.095000  1.005000 3.230000 1.225000 ;
+      RECT 2.235000  2.295000 3.145000 3.075000 ;
+      RECT 2.550000  0.085000 2.885000 0.835000 ;
+      RECT 2.925000  1.225000 3.230000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.715000  2.690000 0.885000 2.860000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.235000  2.690000 1.405000 2.860000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.315000  2.690000 2.485000 2.860000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.895000  2.690000 3.065000 2.860000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__iso0p_lp2
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
index ef0958b..5aba064 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.magic.lef
@@ -60,14 +60,6 @@
   PIN KAGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.885000 0.430000 1.515000 0.885000 ;
-        RECT 2.525000 0.430000 3.155000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.935000 0.470000 1.105000 0.640000 ;
-        RECT 1.295000 0.470000 1.465000 0.640000 ;
-        RECT 2.575000 0.470000 2.745000 0.640000 ;
-        RECT 2.935000 0.470000 3.105000 0.640000 ;
       LAYER met1 ;
         RECT 0.070000 0.440000 3.770000 0.670000 ;
     END
@@ -76,17 +68,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
@@ -95,35 +76,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.190000 2.500000 1.520000 3.245000 ;
-        RECT 2.525000 2.295000 2.910000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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 0.430000 0.365000 0.885000 ;
-      RECT 0.125000 0.885000 0.370000 2.160000 ;
-      RECT 0.125000 2.160000 1.700000 2.330000 ;
-      RECT 0.345000 2.330000 0.590000 2.820000 ;
-      RECT 1.370000 1.315000 1.700000 2.160000 ;
-      RECT 1.735000 0.430000 2.065000 0.885000 ;
-      RECT 1.870000 0.885000 2.065000 1.055000 ;
-      RECT 1.870000 1.055000 3.225000 1.225000 ;
-      RECT 2.095000 1.955000 3.225000 2.125000 ;
-      RECT 2.095000 2.125000 2.305000 2.880000 ;
-      RECT 2.895000 1.225000 3.225000 1.955000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.120000  0.430000 0.365000 0.885000 ;
+      RECT 0.125000  0.885000 0.370000 2.160000 ;
+      RECT 0.125000  2.160000 1.700000 2.330000 ;
+      RECT 0.345000  2.330000 0.590000 2.820000 ;
+      RECT 0.885000  0.430000 1.515000 0.885000 ;
+      RECT 1.190000  2.500000 1.520000 3.245000 ;
+      RECT 1.370000  1.315000 1.700000 2.160000 ;
+      RECT 1.735000  0.430000 2.065000 0.885000 ;
+      RECT 1.870000  0.885000 2.065000 1.055000 ;
+      RECT 1.870000  1.055000 3.225000 1.225000 ;
+      RECT 2.095000  1.955000 3.225000 2.125000 ;
+      RECT 2.095000  2.125000 2.305000 2.880000 ;
+      RECT 2.525000  0.430000 3.155000 0.885000 ;
+      RECT 2.525000  2.295000 2.910000 3.245000 ;
+      RECT 2.895000  1.225000 3.225000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.935000  0.470000 1.105000 0.640000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.295000  0.470000 1.465000 0.640000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.575000  0.470000 2.745000 0.640000 ;
+      RECT 2.935000  0.470000 3.105000 0.640000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__iso1n_lp
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
index 31e6521..1e58c48 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.magic.lef
@@ -62,15 +62,6 @@
   PIN KAGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.755000 0.265000 3.075000 0.435000 ;
-        RECT 0.755000 0.435000 1.385000 0.985000 ;
-        RECT 2.445000 0.435000 3.075000 0.985000 ;
-      LAYER mcon ;
-        RECT 0.805000 0.470000 0.975000 0.640000 ;
-        RECT 1.165000 0.470000 1.335000 0.640000 ;
-        RECT 2.495000 0.470000 2.665000 0.640000 ;
-        RECT 2.855000 0.470000 3.025000 0.640000 ;
       LAYER met1 ;
         RECT 0.070000 0.440000 3.770000 0.670000 ;
     END
@@ -79,17 +70,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
@@ -98,34 +78,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.905000 2.025000 1.235000 3.245000 ;
-        RECT 2.855000 2.025000 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 ;
-        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.525000 0.445000 1.165000 ;
-      RECT 0.115000 1.165000 1.500000 1.335000 ;
-      RECT 0.115000 1.335000 0.285000 2.025000 ;
-      RECT 0.115000 2.025000 0.625000 3.065000 ;
-      RECT 1.170000 1.335000 1.500000 1.835000 ;
-      RECT 1.695000 0.615000 2.055000 0.985000 ;
-      RECT 1.695000 0.985000 1.865000 1.675000 ;
-      RECT 1.695000 1.675000 3.265000 1.845000 ;
-      RECT 1.695000 1.845000 2.295000 3.065000 ;
-      RECT 2.935000 1.175000 3.265000 1.675000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.525000 0.445000 1.165000 ;
+      RECT 0.115000  1.165000 1.500000 1.335000 ;
+      RECT 0.115000  1.335000 0.285000 2.025000 ;
+      RECT 0.115000  2.025000 0.625000 3.065000 ;
+      RECT 0.755000  0.265000 3.075000 0.435000 ;
+      RECT 0.755000  0.435000 1.385000 0.985000 ;
+      RECT 0.905000  2.025000 1.235000 3.245000 ;
+      RECT 1.170000  1.335000 1.500000 1.835000 ;
+      RECT 1.695000  0.615000 2.055000 0.985000 ;
+      RECT 1.695000  0.985000 1.865000 1.675000 ;
+      RECT 1.695000  1.675000 3.265000 1.845000 ;
+      RECT 1.695000  1.845000 2.295000 3.065000 ;
+      RECT 2.445000  0.435000 3.075000 0.985000 ;
+      RECT 2.855000  2.025000 3.185000 3.245000 ;
+      RECT 2.935000  1.175000 3.265000 1.675000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.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.805000  0.470000 0.975000 0.640000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.165000  0.470000 1.335000 0.640000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.495000  0.470000 2.665000 0.640000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.855000  0.470000 3.025000 0.640000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__iso1n_lp2
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef
index aad86c6..295f6b4 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.magic.lef
@@ -62,11 +62,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.560000 2.295000 2.365000 3.075000 ;
-      LAYER mcon ;
-        RECT 1.640000 2.690000 1.810000 2.860000 ;
-        RECT 2.070000 2.690000 2.240000 2.860000 ;
       LAYER met1 ;
         RECT 0.070000 2.660000 3.290000 2.890000 ;
     END
@@ -75,18 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.460000  0.085000 0.760000 0.840000 ;
-        RECT 2.010000  0.085000 2.340000 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
@@ -95,26 +78,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.770000 1.955000 2.685000 2.125000 ;
-      RECT 0.770000 2.125000 1.100000 2.820000 ;
-      RECT 1.280000 0.440000 1.490000 1.010000 ;
-      RECT 1.280000 1.010000 2.685000 1.180000 ;
-      RECT 2.350000 1.180000 2.685000 1.955000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.460000  0.085000 0.760000 0.840000 ;
+      RECT 0.770000  1.955000 2.685000 2.125000 ;
+      RECT 0.770000  2.125000 1.100000 2.820000 ;
+      RECT 1.280000  0.440000 1.490000 1.010000 ;
+      RECT 1.280000  1.010000 2.685000 1.180000 ;
+      RECT 1.560000  2.295000 2.365000 3.075000 ;
+      RECT 2.010000  0.085000 2.340000 0.840000 ;
+      RECT 2.350000  1.180000 2.685000 1.955000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.640000  2.690000 1.810000 2.860000 ;
+      RECT 2.070000  2.690000 2.240000 2.860000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__iso1p_lp
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef
index f1ad3e1..21fc837 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.magic.lef
@@ -63,14 +63,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.345000 2.660000 2.335000 2.890000 ;
-        RECT 1.635000 2.025000 2.335000 2.660000 ;
-        RECT 1.635000 2.890000 2.335000 3.065000 ;
-      LAYER mcon ;
-        RECT 1.395000 2.690000 1.565000 2.860000 ;
-        RECT 1.755000 2.690000 1.925000 2.860000 ;
-        RECT 2.115000 2.690000 2.285000 2.860000 ;
       LAYER met1 ;
         RECT 0.070000 2.660000 3.290000 2.890000 ;
     END
@@ -79,18 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.280000  0.085000 0.610000 0.725000 ;
-        RECT 1.890000  0.085000 2.220000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -99,27 +79,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.645000 2.025000 1.270000 2.195000 ;
-      RECT 0.645000 2.195000 0.975000 3.065000 ;
-      RECT 1.100000 0.265000 1.430000 0.820000 ;
-      RECT 1.100000 0.820000 2.525000 0.990000 ;
-      RECT 1.100000 0.990000 1.270000 2.025000 ;
-      RECT 2.195000 0.990000 2.525000 1.535000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.280000  0.085000 0.610000 0.725000 ;
+      RECT 0.645000  2.025000 1.270000 2.195000 ;
+      RECT 0.645000  2.195000 0.975000 3.065000 ;
+      RECT 1.100000  0.265000 1.430000 0.820000 ;
+      RECT 1.100000  0.820000 2.525000 0.990000 ;
+      RECT 1.100000  0.990000 1.270000 2.025000 ;
+      RECT 1.345000  2.660000 2.335000 2.890000 ;
+      RECT 1.635000  2.025000 2.335000 2.660000 ;
+      RECT 1.635000  2.890000 2.335000 3.065000 ;
+      RECT 1.890000  0.085000 2.220000 0.640000 ;
+      RECT 2.195000  0.990000 2.525000 1.535000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.395000  2.690000 1.565000 2.860000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.755000  2.690000 1.925000 2.860000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.115000  2.690000 2.285000 2.860000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__iso1p_lp2
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.magic.lef b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.magic.lef
index dc1ea3a..26629f8 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_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.795000  0.085000 1.220000 0.915000 ;
-        RECT 1.820000  0.085000 2.150000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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 0.960000 2.310000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.355000 0.285000 0.625000 1.085000 ;
-      RECT 0.355000 1.085000 1.885000 1.255000 ;
-      RECT 0.420000 1.920000 1.755000 2.140000 ;
-      RECT 1.585000 1.255000 1.885000 1.515000 ;
-      RECT 1.585000 1.515000 1.755000 1.920000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.355000  0.285000 0.625000 1.085000 ;
+      RECT 0.355000  1.085000 1.885000 1.255000 ;
+      RECT 0.420000  1.920000 1.755000 2.140000 ;
+      RECT 0.795000  0.085000 1.220000 0.915000 ;
+      RECT 0.960000  2.310000 1.290000 3.245000 ;
+      RECT 1.585000  1.255000 1.885000 1.515000 ;
+      RECT 1.585000  1.515000 1.755000 1.920000 ;
+      RECT 1.820000  0.085000 2.150000 0.575000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__isobufsrc_1
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef
index 7cc309c..c57bccf 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.magic.lef
@@ -68,20 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.620000  0.085000 1.265000 0.885000 ;
-        RECT 0.620000  0.885000 0.895000 1.015000 ;
-        RECT 1.865000  0.085000 2.195000 0.565000 ;
-        RECT 2.725000  0.085000 3.055000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -90,30 +76,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.865000 2.025000 1.250000 3.245000 ;
-        RECT 2.680000 2.365000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 0.700000 0.430000 1.685000 ;
-      RECT 0.160000 1.685000 2.275000 1.855000 ;
-      RECT 0.160000 1.855000 0.695000 2.210000 ;
-      RECT 1.420000 2.025000 1.650000 2.895000 ;
-      RECT 1.420000 2.895000 2.510000 3.075000 ;
-      RECT 1.945000 1.415000 2.275000 1.685000 ;
-      RECT 2.320000 2.365000 2.510000 2.895000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.160000  0.700000 0.430000 1.685000 ;
+      RECT 0.160000  1.685000 2.275000 1.855000 ;
+      RECT 0.160000  1.855000 0.695000 2.210000 ;
+      RECT 0.620000  0.085000 1.265000 0.885000 ;
+      RECT 0.620000  0.885000 0.895000 1.015000 ;
+      RECT 0.865000  2.025000 1.250000 3.245000 ;
+      RECT 1.420000  2.025000 1.650000 2.895000 ;
+      RECT 1.420000  2.895000 2.510000 3.075000 ;
+      RECT 1.865000  0.085000 2.195000 0.565000 ;
+      RECT 1.945000  1.415000 2.275000 1.685000 ;
+      RECT 2.320000  2.365000 2.510000 2.895000 ;
+      RECT 2.680000  2.365000 3.010000 3.245000 ;
+      RECT 2.725000  0.085000 3.055000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__isobufsrc_2
diff --git a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef
index 3f0a0f4..8731b77 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.magic.lef
@@ -74,24 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.690000  0.085000 1.020000 0.835000 ;
-        RECT 1.700000  0.085000 1.890000 0.575000 ;
-        RECT 2.560000  0.085000 2.750000 0.575000 ;
-        RECT 3.420000  0.085000 3.680000 0.575000 ;
-        RECT 4.210000  0.085000 4.540000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -100,41 +82,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.750000 2.270000 1.080000 2.425000 ;
-        RECT 0.750000 2.425000 2.820000 2.655000 ;
-        RECT 0.750000 2.655000 1.030000 3.245000 ;
-        RECT 4.210000 2.375000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.260000 0.255000 0.520000 1.005000 ;
-      RECT 0.260000 1.005000 0.785000 1.085000 ;
-      RECT 0.260000 1.085000 3.635000 1.175000 ;
-      RECT 0.260000 1.930000 0.785000 2.100000 ;
-      RECT 0.260000 2.100000 0.530000 3.075000 ;
-      RECT 0.615000 1.175000 3.635000 1.255000 ;
-      RECT 0.615000 1.255000 0.785000 1.930000 ;
-      RECT 1.200000 2.825000 3.190000 2.885000 ;
-      RECT 1.200000 2.885000 4.040000 3.065000 ;
-      RECT 1.565000 1.255000 1.895000 1.515000 ;
-      RECT 2.990000 2.375000 3.190000 2.825000 ;
-      RECT 3.375000 1.255000 3.635000 1.515000 ;
-      RECT 3.840000 2.375000 4.040000 2.885000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.260000  0.255000 0.520000 1.005000 ;
+      RECT 0.260000  1.005000 0.785000 1.085000 ;
+      RECT 0.260000  1.085000 3.635000 1.175000 ;
+      RECT 0.260000  1.930000 0.785000 2.100000 ;
+      RECT 0.260000  2.100000 0.530000 3.075000 ;
+      RECT 0.615000  1.175000 3.635000 1.255000 ;
+      RECT 0.615000  1.255000 0.785000 1.930000 ;
+      RECT 0.690000  0.085000 1.020000 0.835000 ;
+      RECT 0.750000  2.270000 1.080000 2.425000 ;
+      RECT 0.750000  2.425000 2.820000 2.655000 ;
+      RECT 0.750000  2.655000 1.030000 3.245000 ;
+      RECT 1.200000  2.825000 3.190000 2.885000 ;
+      RECT 1.200000  2.885000 4.040000 3.065000 ;
+      RECT 1.565000  1.255000 1.895000 1.515000 ;
+      RECT 1.700000  0.085000 1.890000 0.575000 ;
+      RECT 2.560000  0.085000 2.750000 0.575000 ;
+      RECT 2.990000  2.375000 3.190000 2.825000 ;
+      RECT 3.375000  1.255000 3.635000 1.515000 ;
+      RECT 3.420000  0.085000 3.680000 0.575000 ;
+      RECT 3.840000  2.375000 4.040000 2.885000 ;
+      RECT 4.210000  0.085000 4.540000 0.835000 ;
+      RECT 4.210000  2.375000 4.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 ;
   END
 END sky130_fd_sc_lp__isobufsrc_4
diff --git a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef
index 80c22e0..05dcf41 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.magic.lef
@@ -54,14 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 2.515000 2.125000 2.845000 3.075000 ;
-        RECT 4.775000 2.290000 5.155000 2.905000 ;
-        RECT 5.865000 1.915000 6.195000 2.955000 ;
-      LAYER mcon ;
-        RECT 2.555000 2.735000 2.725000 2.905000 ;
-        RECT 4.955000 2.735000 5.125000 2.905000 ;
-        RECT 5.915000 2.735000 6.085000 2.905000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 7.130000 2.945000 ;
     END
@@ -79,28 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.590000  0.085000 0.920000 0.745000 ;
-        RECT 2.970000  0.085000 3.220000 0.775000 ;
-        RECT 4.600000  0.085000 4.850000 0.905000 ;
-        RECT 5.950000  0.085000 6.280000 1.325000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -109,68 +79,93 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.130000 2.685000 0.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 0.160000 0.345000 0.410000 0.915000 ;
-      RECT 0.160000 0.915000 1.355000 1.085000 ;
-      RECT 1.155000 1.950000 1.515000 2.120000 ;
-      RECT 1.155000 2.120000 1.325000 2.905000 ;
-      RECT 1.155000 2.905000 2.345000 3.075000 ;
-      RECT 1.185000 1.085000 1.355000 1.670000 ;
-      RECT 1.185000 1.670000 1.515000 1.950000 ;
-      RECT 1.495000 2.290000 1.855000 2.735000 ;
-      RECT 1.575000 0.345000 1.970000 0.555000 ;
-      RECT 1.575000 0.555000 2.585000 0.725000 ;
-      RECT 1.575000 0.725000 1.745000 1.330000 ;
-      RECT 1.575000 1.330000 1.855000 1.500000 ;
-      RECT 1.685000 1.500000 1.855000 2.290000 ;
-      RECT 1.915000 0.895000 2.245000 1.160000 ;
-      RECT 2.075000 1.160000 2.245000 1.285000 ;
-      RECT 2.075000 1.285000 3.980000 1.445000 ;
-      RECT 2.075000 1.445000 4.185000 1.615000 ;
-      RECT 2.175000 1.785000 3.295000 1.955000 ;
-      RECT 2.175000 1.955000 2.345000 2.905000 ;
-      RECT 2.415000 0.725000 2.585000 0.945000 ;
-      RECT 2.415000 0.945000 3.560000 1.115000 ;
-      RECT 3.045000 1.955000 3.295000 3.075000 ;
-      RECT 3.390000 0.255000 4.320000 0.425000 ;
-      RECT 3.390000 0.425000 3.560000 0.945000 ;
-      RECT 3.515000 1.785000 3.845000 2.905000 ;
-      RECT 3.515000 2.905000 4.605000 3.075000 ;
-      RECT 3.730000 0.595000 3.980000 1.285000 ;
-      RECT 4.015000 1.615000 4.185000 2.055000 ;
-      RECT 4.015000 2.055000 4.265000 2.735000 ;
-      RECT 4.150000 0.425000 4.320000 1.075000 ;
-      RECT 4.150000 1.075000 5.225000 1.245000 ;
-      RECT 4.435000 1.950000 5.665000 2.120000 ;
-      RECT 4.435000 2.120000 4.605000 2.905000 ;
-      RECT 4.895000 1.245000 5.225000 1.745000 ;
-      RECT 5.335000 1.915000 5.665000 1.950000 ;
-      RECT 5.335000 2.120000 5.665000 2.955000 ;
-      RECT 5.460000 0.445000 5.665000 0.775000 ;
-      RECT 5.495000 0.775000 5.665000 1.915000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.130000  2.685000 0.460000 3.245000 ;
+      RECT 0.160000  0.345000 0.410000 0.915000 ;
+      RECT 0.160000  0.915000 1.355000 1.085000 ;
+      RECT 0.590000  0.085000 0.920000 0.745000 ;
+      RECT 1.155000  1.950000 1.515000 2.120000 ;
+      RECT 1.155000  2.120000 1.325000 2.905000 ;
+      RECT 1.155000  2.905000 2.345000 3.075000 ;
+      RECT 1.185000  1.085000 1.355000 1.670000 ;
+      RECT 1.185000  1.670000 1.515000 1.950000 ;
+      RECT 1.495000  2.290000 1.855000 2.735000 ;
+      RECT 1.575000  0.345000 1.970000 0.555000 ;
+      RECT 1.575000  0.555000 2.585000 0.725000 ;
+      RECT 1.575000  0.725000 1.745000 1.330000 ;
+      RECT 1.575000  1.330000 1.855000 1.500000 ;
+      RECT 1.685000  1.500000 1.855000 2.290000 ;
+      RECT 1.915000  0.895000 2.245000 1.160000 ;
+      RECT 2.075000  1.160000 2.245000 1.285000 ;
+      RECT 2.075000  1.285000 3.980000 1.445000 ;
+      RECT 2.075000  1.445000 4.185000 1.615000 ;
+      RECT 2.175000  1.785000 3.295000 1.955000 ;
+      RECT 2.175000  1.955000 2.345000 2.905000 ;
+      RECT 2.415000  0.725000 2.585000 0.945000 ;
+      RECT 2.415000  0.945000 3.560000 1.115000 ;
+      RECT 2.515000  2.125000 2.845000 3.075000 ;
+      RECT 2.970000  0.085000 3.220000 0.775000 ;
+      RECT 3.045000  1.955000 3.295000 3.075000 ;
+      RECT 3.390000  0.255000 4.320000 0.425000 ;
+      RECT 3.390000  0.425000 3.560000 0.945000 ;
+      RECT 3.515000  1.785000 3.845000 2.905000 ;
+      RECT 3.515000  2.905000 4.605000 3.075000 ;
+      RECT 3.730000  0.595000 3.980000 1.285000 ;
+      RECT 4.015000  1.615000 4.185000 2.055000 ;
+      RECT 4.015000  2.055000 4.265000 2.735000 ;
+      RECT 4.150000  0.425000 4.320000 1.075000 ;
+      RECT 4.150000  1.075000 5.225000 1.245000 ;
+      RECT 4.435000  1.950000 5.665000 2.120000 ;
+      RECT 4.435000  2.120000 4.605000 2.905000 ;
+      RECT 4.600000  0.085000 4.850000 0.905000 ;
+      RECT 4.775000  2.290000 5.155000 2.905000 ;
+      RECT 4.895000  1.245000 5.225000 1.745000 ;
+      RECT 5.335000  1.915000 5.665000 1.950000 ;
+      RECT 5.335000  2.120000 5.665000 2.955000 ;
+      RECT 5.460000  0.445000 5.665000 0.775000 ;
+      RECT 5.495000  0.775000 5.665000 1.915000 ;
+      RECT 5.865000  1.915000 6.195000 2.955000 ;
+      RECT 5.950000  0.085000 6.280000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  2.735000 2.725000 2.905000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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  2.735000 5.125000 2.905000 ;
+      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  2.735000 6.085000 2.905000 ;
+      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_lp__isolatch_lp
diff --git a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
index f33ec02..15d5c82 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.magic.lef
@@ -54,21 +54,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 6.575000 4.800000 6.745000 ;
-        RECT 1.715000 5.695000 2.045000 6.575000 ;
-        RECT 3.105000 5.500000 3.435000 6.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 6.575000 0.325000 6.745000 ;
-        RECT 0.635000 6.575000 0.805000 6.745000 ;
-        RECT 1.115000 6.575000 1.285000 6.745000 ;
-        RECT 1.595000 6.575000 1.765000 6.745000 ;
-        RECT 2.075000 6.575000 2.245000 6.745000 ;
-        RECT 2.555000 6.575000 2.725000 6.745000 ;
-        RECT 3.035000 6.575000 3.205000 6.745000 ;
-        RECT 3.515000 6.575000 3.685000 6.745000 ;
-        RECT 3.995000 6.575000 4.165000 6.745000 ;
-        RECT 4.475000 6.575000 4.645000 6.745000 ;
       LAYER met1 ;
         RECT 0.000000 6.415000 4.800000 6.905000 ;
     END
@@ -86,26 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.995000 3.415000 ;
-        RECT 0.090000 1.890000 0.390000 3.245000 ;
-        RECT 0.090000 3.415000 0.390000 4.770000 ;
-        RECT 0.575000 2.305000 0.905000 3.245000 ;
-        RECT 1.715000 3.415000 1.995000 4.480000 ;
-        RECT 2.505000 3.245000 4.800000 3.415000 ;
-        RECT 3.105000 3.415000 3.435000 4.230000 ;
-        RECT 4.410000 1.890000 4.710000 3.245000 ;
-        RECT 4.410000 3.415000 4.710000 4.770000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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
@@ -123,51 +88,81 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 1.175000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.925000 3.585000 1.205000 4.650000 ;
-      RECT 0.925000 4.650000 2.040000 4.820000 ;
-      RECT 0.925000 4.820000 1.180000 5.435000 ;
-      RECT 0.925000 5.435000 1.275000 6.405000 ;
-      RECT 1.350000 4.990000 1.680000 5.265000 ;
-      RECT 1.365000 0.265000 1.715000 1.360000 ;
-      RECT 1.415000 1.360000 1.715000 2.435000 ;
-      RECT 1.415000 2.435000 2.335000 2.605000 ;
-      RECT 1.510000 5.265000 1.680000 5.355000 ;
-      RECT 1.510000 5.355000 2.835000 5.525000 ;
-      RECT 1.870000 4.820000 2.040000 5.010000 ;
-      RECT 1.870000 5.010000 2.280000 5.185000 ;
-      RECT 2.165000 2.605000 2.335000 4.310000 ;
-      RECT 2.165000 4.310000 2.380000 4.480000 ;
-      RECT 2.210000 4.480000 2.380000 4.610000 ;
-      RECT 2.210000 4.610000 2.595000 4.740000 ;
-      RECT 2.210000 4.740000 2.820000 4.840000 ;
-      RECT 2.450000 4.840000 2.820000 4.990000 ;
-      RECT 2.505000 3.585000 2.935000 4.140000 ;
-      RECT 2.505000 5.525000 2.835000 6.395000 ;
-      RECT 2.550000 4.140000 2.935000 4.400000 ;
-      RECT 2.550000 4.400000 3.160000 4.440000 ;
-      RECT 2.665000 5.160000 3.160000 5.330000 ;
-      RECT 2.665000 5.330000 2.835000 5.355000 ;
-      RECT 2.765000 4.440000 3.160000 4.570000 ;
-      RECT 2.990000 4.570000 3.160000 5.160000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 1.995000 3.415000 ;
+      RECT 0.000000  6.575000 4.800000 6.745000 ;
+      RECT 0.090000  1.890000 0.390000 3.245000 ;
+      RECT 0.090000  3.415000 0.390000 4.770000 ;
+      RECT 0.575000  0.085000 0.905000 1.175000 ;
+      RECT 0.575000  2.305000 0.905000 3.245000 ;
+      RECT 0.925000  3.585000 1.205000 4.650000 ;
+      RECT 0.925000  4.650000 2.040000 4.820000 ;
+      RECT 0.925000  4.820000 1.180000 5.435000 ;
+      RECT 0.925000  5.435000 1.275000 6.405000 ;
+      RECT 1.350000  4.990000 1.680000 5.265000 ;
+      RECT 1.365000  0.265000 1.715000 1.360000 ;
+      RECT 1.415000  1.360000 1.715000 2.435000 ;
+      RECT 1.415000  2.435000 2.335000 2.605000 ;
+      RECT 1.510000  5.265000 1.680000 5.355000 ;
+      RECT 1.510000  5.355000 2.835000 5.525000 ;
+      RECT 1.715000  3.415000 1.995000 4.480000 ;
+      RECT 1.715000  5.695000 2.045000 6.575000 ;
+      RECT 1.870000  4.820000 2.040000 5.010000 ;
+      RECT 1.870000  5.010000 2.280000 5.185000 ;
+      RECT 2.165000  2.605000 2.335000 4.310000 ;
+      RECT 2.165000  4.310000 2.380000 4.480000 ;
+      RECT 2.210000  4.480000 2.380000 4.610000 ;
+      RECT 2.210000  4.610000 2.595000 4.740000 ;
+      RECT 2.210000  4.740000 2.820000 4.840000 ;
+      RECT 2.450000  4.840000 2.820000 4.990000 ;
+      RECT 2.505000  3.245000 4.800000 3.415000 ;
+      RECT 2.505000  3.585000 2.935000 4.140000 ;
+      RECT 2.505000  5.525000 2.835000 6.395000 ;
+      RECT 2.550000  4.140000 2.935000 4.400000 ;
+      RECT 2.550000  4.400000 3.160000 4.440000 ;
+      RECT 2.665000  5.160000 3.160000 5.330000 ;
+      RECT 2.665000  5.330000 2.835000 5.355000 ;
+      RECT 2.765000  4.440000 3.160000 4.570000 ;
+      RECT 2.990000  4.570000 3.160000 5.160000 ;
+      RECT 3.105000  3.415000 3.435000 4.230000 ;
+      RECT 3.105000  5.500000 3.435000 6.575000 ;
+      RECT 4.410000  1.890000 4.710000 3.245000 ;
+      RECT 4.410000  3.415000 4.710000 4.770000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.155000  6.575000 0.325000 6.745000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.635000  6.575000 0.805000 6.745000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.115000  6.575000 1.285000 6.745000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.595000  6.575000 1.765000 6.745000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  6.575000 2.245000 6.745000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 2.555000  6.575000 2.725000 6.745000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.035000  6.575000 3.205000 6.745000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.515000  6.575000 3.685000 6.745000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 3.995000  6.575000 4.165000 6.745000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.475000  6.575000 4.645000 6.745000 ;
   END
 END sky130_fd_sc_lp__lsbuf_lp
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
index ea8d403..5e8629f 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.magic.lef
@@ -66,25 +66,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 6.575000 6.720000 6.745000 ;
-        RECT 3.570000 5.420000 3.740000 6.575000 ;
-        RECT 5.040000 5.420000 5.355000 6.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 6.575000 0.325000 6.745000 ;
-        RECT 0.635000 6.575000 0.805000 6.745000 ;
-        RECT 1.115000 6.575000 1.285000 6.745000 ;
-        RECT 1.595000 6.575000 1.765000 6.745000 ;
-        RECT 2.075000 6.575000 2.245000 6.745000 ;
-        RECT 2.555000 6.575000 2.725000 6.745000 ;
-        RECT 3.035000 6.575000 3.205000 6.745000 ;
-        RECT 3.515000 6.575000 3.685000 6.745000 ;
-        RECT 3.995000 6.575000 4.165000 6.745000 ;
-        RECT 4.475000 6.575000 4.645000 6.745000 ;
-        RECT 4.955000 6.575000 5.125000 6.745000 ;
-        RECT 5.435000 6.575000 5.605000 6.745000 ;
-        RECT 5.915000 6.575000 6.085000 6.745000 ;
-        RECT 6.395000 6.575000 6.565000 6.745000 ;
       LAYER met1 ;
         RECT 0.000000 6.415000 6.720000 6.905000 ;
     END
@@ -102,30 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.145000 3.415000 ;
-        RECT 0.090000 1.890000 0.390000 3.245000 ;
-        RECT 0.090000 3.415000 0.390000 4.770000 ;
-        RECT 0.575000 2.305000 0.905000 3.245000 ;
-        RECT 2.700000 3.245000 6.720000 3.415000 ;
-        RECT 2.700000 3.415000 3.030000 4.240000 ;
-        RECT 2.710000 2.430000 3.040000 3.245000 ;
-        RECT 5.025000 3.415000 5.355000 3.880000 ;
-        RECT 6.330000 1.890000 6.630000 3.245000 ;
-        RECT 6.330000 3.415000 6.630000 4.770000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 3.035000 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.075000 6.720000 3.565000 ;
     END
@@ -143,65 +100,103 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 1.175000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.575000 3.585000 0.855000 4.650000 ;
-      RECT 0.575000 4.650000 1.690000 4.820000 ;
-      RECT 0.575000 4.820000 0.830000 5.435000 ;
-      RECT 0.575000 5.435000 0.925000 6.405000 ;
-      RECT 1.000000 4.990000 1.330000 5.265000 ;
-      RECT 1.160000 5.265000 1.330000 5.355000 ;
-      RECT 1.160000 5.355000 2.325000 5.465000 ;
-      RECT 1.160000 5.465000 2.485000 5.525000 ;
-      RECT 1.365000 0.265000 1.715000 1.360000 ;
-      RECT 1.365000 3.585000 2.485000 3.755000 ;
-      RECT 1.365000 3.755000 1.645000 4.480000 ;
-      RECT 1.365000 5.695000 1.695000 6.235000 ;
-      RECT 1.365000 6.235000 3.390000 6.405000 ;
-      RECT 1.415000 1.360000 1.715000 2.435000 ;
-      RECT 1.415000 2.435000 2.145000 2.605000 ;
-      RECT 1.520000 4.820000 1.690000 5.010000 ;
-      RECT 1.520000 5.010000 1.930000 5.185000 ;
-      RECT 1.815000 2.605000 2.145000 3.075000 ;
-      RECT 2.155000 4.070000 2.485000 4.400000 ;
-      RECT 2.155000 4.400000 2.325000 5.355000 ;
-      RECT 2.155000 5.525000 2.485000 6.055000 ;
-      RECT 2.315000 2.330000 2.530000 3.090000 ;
-      RECT 2.315000 3.090000 2.485000 3.585000 ;
-      RECT 2.495000 4.935000 2.665000 5.080000 ;
-      RECT 2.495000 5.080000 4.160000 5.250000 ;
-      RECT 2.495000 5.250000 2.745000 5.295000 ;
-      RECT 3.060000 5.465000 3.390000 6.235000 ;
-      RECT 3.490000 3.585000 4.080000 3.915000 ;
-      RECT 3.490000 3.915000 3.820000 4.240000 ;
-      RECT 3.590000 4.240000 3.815000 4.740000 ;
-      RECT 3.590000 4.740000 4.530000 4.910000 ;
-      RECT 3.990000 5.250000 4.160000 6.235000 ;
-      RECT 3.990000 6.235000 4.870000 6.405000 ;
-      RECT 4.330000 4.910000 4.530000 6.055000 ;
-      RECT 4.700000 4.660000 5.580000 4.990000 ;
-      RECT 4.700000 4.990000 4.870000 6.235000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 2.145000 3.415000 ;
+      RECT 0.000000  6.575000 6.720000 6.745000 ;
+      RECT 0.090000  1.890000 0.390000 3.245000 ;
+      RECT 0.090000  3.415000 0.390000 4.770000 ;
+      RECT 0.575000  0.085000 0.905000 1.175000 ;
+      RECT 0.575000  2.305000 0.905000 3.245000 ;
+      RECT 0.575000  3.585000 0.855000 4.650000 ;
+      RECT 0.575000  4.650000 1.690000 4.820000 ;
+      RECT 0.575000  4.820000 0.830000 5.435000 ;
+      RECT 0.575000  5.435000 0.925000 6.405000 ;
+      RECT 1.000000  4.990000 1.330000 5.265000 ;
+      RECT 1.160000  5.265000 1.330000 5.355000 ;
+      RECT 1.160000  5.355000 2.325000 5.465000 ;
+      RECT 1.160000  5.465000 2.485000 5.525000 ;
+      RECT 1.365000  0.265000 1.715000 1.360000 ;
+      RECT 1.365000  3.585000 2.485000 3.755000 ;
+      RECT 1.365000  3.755000 1.645000 4.480000 ;
+      RECT 1.365000  5.695000 1.695000 6.235000 ;
+      RECT 1.365000  6.235000 3.390000 6.405000 ;
+      RECT 1.415000  1.360000 1.715000 2.435000 ;
+      RECT 1.415000  2.435000 2.145000 2.605000 ;
+      RECT 1.520000  4.820000 1.690000 5.010000 ;
+      RECT 1.520000  5.010000 1.930000 5.185000 ;
+      RECT 1.815000  2.605000 2.145000 3.075000 ;
+      RECT 2.155000  4.070000 2.485000 4.400000 ;
+      RECT 2.155000  4.400000 2.325000 5.355000 ;
+      RECT 2.155000  5.525000 2.485000 6.055000 ;
+      RECT 2.315000  2.330000 2.530000 3.090000 ;
+      RECT 2.315000  3.090000 2.485000 3.585000 ;
+      RECT 2.495000  4.935000 2.665000 5.080000 ;
+      RECT 2.495000  5.080000 4.160000 5.250000 ;
+      RECT 2.495000  5.250000 2.745000 5.295000 ;
+      RECT 2.700000  3.245000 6.720000 3.415000 ;
+      RECT 2.700000  3.415000 3.030000 4.240000 ;
+      RECT 2.710000  2.430000 3.040000 3.245000 ;
+      RECT 3.060000  5.465000 3.390000 6.235000 ;
+      RECT 3.490000  3.585000 4.080000 3.915000 ;
+      RECT 3.490000  3.915000 3.820000 4.240000 ;
+      RECT 3.570000  5.420000 3.740000 6.575000 ;
+      RECT 3.590000  4.240000 3.815000 4.740000 ;
+      RECT 3.590000  4.740000 4.530000 4.910000 ;
+      RECT 3.990000  5.250000 4.160000 6.235000 ;
+      RECT 3.990000  6.235000 4.870000 6.405000 ;
+      RECT 4.330000  4.910000 4.530000 6.055000 ;
+      RECT 4.700000  4.660000 5.580000 4.990000 ;
+      RECT 4.700000  4.990000 4.870000 6.235000 ;
+      RECT 5.025000  3.415000 5.355000 3.880000 ;
+      RECT 5.040000  5.420000 5.355000 6.575000 ;
+      RECT 6.330000  1.890000 6.630000 3.245000 ;
+      RECT 6.330000  3.415000 6.630000 4.770000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.155000  6.575000 0.325000 6.745000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.635000  6.575000 0.805000 6.745000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.115000  6.575000 1.285000 6.745000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.595000  6.575000 1.765000 6.745000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  6.575000 2.245000 6.745000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  6.575000 2.725000 6.745000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.035000  6.575000 3.205000 6.745000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.515000  6.575000 3.685000 6.745000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 3.995000  6.575000 4.165000 6.745000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.475000  6.575000 4.645000 6.745000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 4.955000  6.575000 5.125000 6.745000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.435000  6.575000 5.605000 6.745000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 5.915000  6.575000 6.085000 6.745000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.395000  6.575000 6.565000 6.745000 ;
   END
 END sky130_fd_sc_lp__lsbufiso0p_lp
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
index acabf86..31d3bb1 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.magic.lef
@@ -66,26 +66,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 6.575000 7.200000 6.745000 ;
-        RECT 3.210000 5.455000 3.380000 6.575000 ;
-        RECT 5.500000 5.760000 5.830000 6.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 6.575000 0.325000 6.745000 ;
-        RECT 0.635000 6.575000 0.805000 6.745000 ;
-        RECT 1.115000 6.575000 1.285000 6.745000 ;
-        RECT 1.595000 6.575000 1.765000 6.745000 ;
-        RECT 2.075000 6.575000 2.245000 6.745000 ;
-        RECT 2.555000 6.575000 2.725000 6.745000 ;
-        RECT 3.035000 6.575000 3.205000 6.745000 ;
-        RECT 3.515000 6.575000 3.685000 6.745000 ;
-        RECT 3.995000 6.575000 4.165000 6.745000 ;
-        RECT 4.475000 6.575000 4.645000 6.745000 ;
-        RECT 4.955000 6.575000 5.125000 6.745000 ;
-        RECT 5.435000 6.575000 5.605000 6.745000 ;
-        RECT 5.915000 6.575000 6.085000 6.745000 ;
-        RECT 6.395000 6.575000 6.565000 6.745000 ;
-        RECT 6.875000 6.575000 7.045000 6.745000 ;
       LAYER met1 ;
         RECT 0.000000 6.415000 7.200000 6.905000 ;
     END
@@ -103,31 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.145000 3.415000 ;
-        RECT 0.090000 1.890000 0.390000 3.245000 ;
-        RECT 0.090000 3.415000 0.390000 4.770000 ;
-        RECT 0.575000 2.305000 0.905000 3.245000 ;
-        RECT 2.700000 2.430000 3.040000 3.245000 ;
-        RECT 2.700000 3.245000 7.200000 3.415000 ;
-        RECT 2.700000 3.415000 3.030000 4.240000 ;
-        RECT 5.500000 3.415000 5.830000 4.230000 ;
-        RECT 6.810000 1.890000 7.110000 3.245000 ;
-        RECT 6.810000 3.415000 7.110000 4.770000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 3.035000 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.870000 3.245000 7.040000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.075000 7.200000 3.565000 ;
     END
@@ -145,65 +100,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 1.175000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.575000 3.585000 0.855000 4.650000 ;
-      RECT 0.575000 4.650000 1.690000 4.820000 ;
-      RECT 0.575000 4.820000 0.830000 5.435000 ;
-      RECT 0.575000 5.435000 0.925000 6.405000 ;
-      RECT 1.000000 4.990000 1.330000 5.265000 ;
-      RECT 1.160000 5.265000 1.330000 5.355000 ;
-      RECT 1.160000 5.355000 2.325000 5.465000 ;
-      RECT 1.160000 5.465000 2.485000 5.525000 ;
-      RECT 1.365000 0.265000 1.715000 1.360000 ;
-      RECT 1.365000 3.585000 2.485000 3.755000 ;
-      RECT 1.365000 3.755000 1.645000 4.480000 ;
-      RECT 1.365000 5.695000 1.695000 6.235000 ;
-      RECT 1.365000 6.235000 3.030000 6.405000 ;
-      RECT 1.415000 1.360000 1.715000 2.435000 ;
-      RECT 1.415000 2.435000 2.145000 2.605000 ;
-      RECT 1.520000 4.820000 1.690000 5.010000 ;
-      RECT 1.520000 5.010000 1.930000 5.185000 ;
-      RECT 1.815000 2.605000 2.145000 3.075000 ;
-      RECT 2.155000 4.070000 2.485000 4.400000 ;
-      RECT 2.155000 4.400000 2.325000 5.355000 ;
-      RECT 2.155000 5.525000 2.485000 6.055000 ;
-      RECT 2.315000 2.330000 2.530000 3.090000 ;
-      RECT 2.315000 3.090000 2.485000 3.585000 ;
-      RECT 2.495000 4.935000 2.665000 5.080000 ;
-      RECT 2.495000 5.080000 3.800000 5.285000 ;
-      RECT 2.700000 5.465000 3.030000 6.235000 ;
-      RECT 3.490000 3.585000 4.080000 3.915000 ;
-      RECT 3.490000 3.915000 3.820000 4.240000 ;
-      RECT 3.590000 4.240000 3.815000 4.740000 ;
-      RECT 3.590000 4.740000 4.170000 4.910000 ;
-      RECT 3.630000 5.285000 3.800000 6.235000 ;
-      RECT 3.630000 6.235000 4.515000 6.405000 ;
-      RECT 3.970000 4.910000 4.170000 6.055000 ;
-      RECT 4.340000 4.865000 6.055000 5.195000 ;
-      RECT 4.340000 5.195000 4.515000 6.235000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 2.145000 3.415000 ;
+      RECT 0.000000  6.575000 7.200000 6.745000 ;
+      RECT 0.090000  1.890000 0.390000 3.245000 ;
+      RECT 0.090000  3.415000 0.390000 4.770000 ;
+      RECT 0.575000  0.085000 0.905000 1.175000 ;
+      RECT 0.575000  2.305000 0.905000 3.245000 ;
+      RECT 0.575000  3.585000 0.855000 4.650000 ;
+      RECT 0.575000  4.650000 1.690000 4.820000 ;
+      RECT 0.575000  4.820000 0.830000 5.435000 ;
+      RECT 0.575000  5.435000 0.925000 6.405000 ;
+      RECT 1.000000  4.990000 1.330000 5.265000 ;
+      RECT 1.160000  5.265000 1.330000 5.355000 ;
+      RECT 1.160000  5.355000 2.325000 5.465000 ;
+      RECT 1.160000  5.465000 2.485000 5.525000 ;
+      RECT 1.365000  0.265000 1.715000 1.360000 ;
+      RECT 1.365000  3.585000 2.485000 3.755000 ;
+      RECT 1.365000  3.755000 1.645000 4.480000 ;
+      RECT 1.365000  5.695000 1.695000 6.235000 ;
+      RECT 1.365000  6.235000 3.030000 6.405000 ;
+      RECT 1.415000  1.360000 1.715000 2.435000 ;
+      RECT 1.415000  2.435000 2.145000 2.605000 ;
+      RECT 1.520000  4.820000 1.690000 5.010000 ;
+      RECT 1.520000  5.010000 1.930000 5.185000 ;
+      RECT 1.815000  2.605000 2.145000 3.075000 ;
+      RECT 2.155000  4.070000 2.485000 4.400000 ;
+      RECT 2.155000  4.400000 2.325000 5.355000 ;
+      RECT 2.155000  5.525000 2.485000 6.055000 ;
+      RECT 2.315000  2.330000 2.530000 3.090000 ;
+      RECT 2.315000  3.090000 2.485000 3.585000 ;
+      RECT 2.495000  4.935000 2.665000 5.080000 ;
+      RECT 2.495000  5.080000 3.800000 5.285000 ;
+      RECT 2.700000  2.430000 3.040000 3.245000 ;
+      RECT 2.700000  3.245000 7.200000 3.415000 ;
+      RECT 2.700000  3.415000 3.030000 4.240000 ;
+      RECT 2.700000  5.465000 3.030000 6.235000 ;
+      RECT 3.210000  5.455000 3.380000 6.575000 ;
+      RECT 3.490000  3.585000 4.080000 3.915000 ;
+      RECT 3.490000  3.915000 3.820000 4.240000 ;
+      RECT 3.590000  4.240000 3.815000 4.740000 ;
+      RECT 3.590000  4.740000 4.170000 4.910000 ;
+      RECT 3.630000  5.285000 3.800000 6.235000 ;
+      RECT 3.630000  6.235000 4.515000 6.405000 ;
+      RECT 3.970000  4.910000 4.170000 6.055000 ;
+      RECT 4.340000  4.865000 6.055000 5.195000 ;
+      RECT 4.340000  5.195000 4.515000 6.235000 ;
+      RECT 5.500000  3.415000 5.830000 4.230000 ;
+      RECT 5.500000  5.760000 5.830000 6.575000 ;
+      RECT 6.810000  1.890000 7.110000 3.245000 ;
+      RECT 6.810000  3.415000 7.110000 4.770000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.155000  6.575000 0.325000 6.745000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 0.635000  6.575000 0.805000 6.745000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.115000  6.575000 1.285000 6.745000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 1.595000  6.575000 1.765000 6.745000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  6.575000 2.245000 6.745000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  6.575000 2.725000 6.745000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  3.245000 3.205000 3.415000 ;
+      RECT 3.035000  6.575000 3.205000 6.745000 ;
+      RECT 3.515000 -0.085000 3.685000 0.085000 ;
+      RECT 3.515000  3.245000 3.685000 3.415000 ;
+      RECT 3.515000  6.575000 3.685000 6.745000 ;
+      RECT 3.995000 -0.085000 4.165000 0.085000 ;
+      RECT 3.995000  3.245000 4.165000 3.415000 ;
+      RECT 3.995000  6.575000 4.165000 6.745000 ;
+      RECT 4.475000 -0.085000 4.645000 0.085000 ;
+      RECT 4.475000  3.245000 4.645000 3.415000 ;
+      RECT 4.475000  6.575000 4.645000 6.745000 ;
+      RECT 4.955000 -0.085000 5.125000 0.085000 ;
+      RECT 4.955000  3.245000 5.125000 3.415000 ;
+      RECT 4.955000  6.575000 5.125000 6.745000 ;
+      RECT 5.435000 -0.085000 5.605000 0.085000 ;
+      RECT 5.435000  3.245000 5.605000 3.415000 ;
+      RECT 5.435000  6.575000 5.605000 6.745000 ;
+      RECT 5.915000 -0.085000 6.085000 0.085000 ;
+      RECT 5.915000  3.245000 6.085000 3.415000 ;
+      RECT 5.915000  6.575000 6.085000 6.745000 ;
+      RECT 6.395000 -0.085000 6.565000 0.085000 ;
+      RECT 6.395000  3.245000 6.565000 3.415000 ;
+      RECT 6.395000  6.575000 6.565000 6.745000 ;
+      RECT 6.870000  3.245000 7.040000 3.415000 ;
+      RECT 6.875000 -0.085000 7.045000 0.085000 ;
+      RECT 6.875000  6.575000 7.045000 6.745000 ;
   END
 END sky130_fd_sc_lp__lsbufiso1p_lp
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef
index 7bb8fac..3f600a9 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_0.magic.lef
@@ -71,19 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.110000  0.085000 1.440000 0.725000 ;
-        RECT 2.720000  0.085000 2.970000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,33 +79,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.025000 2.135000 1.355000 3.245000 ;
-        RECT 2.840000 2.105000 3.275000 2.480000 ;
-        RECT 3.105000 2.480000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 0.265000 0.620000 0.725000 ;
-      RECT 0.120000 0.725000 0.290000 1.755000 ;
-      RECT 0.120000 1.755000 3.285000 1.925000 ;
-      RECT 0.120000 1.925000 0.450000 2.595000 ;
-      RECT 1.695000 0.265000 2.260000 0.725000 ;
-      RECT 1.695000 0.725000 1.865000 1.755000 ;
-      RECT 1.930000 1.925000 2.260000 2.595000 ;
-      RECT 2.955000 1.105000 3.285000 1.755000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.120000  0.265000 0.620000 0.725000 ;
+      RECT 0.120000  0.725000 0.290000 1.755000 ;
+      RECT 0.120000  1.755000 3.285000 1.925000 ;
+      RECT 0.120000  1.925000 0.450000 2.595000 ;
+      RECT 1.025000  2.135000 1.355000 3.245000 ;
+      RECT 1.110000  0.085000 1.440000 0.725000 ;
+      RECT 1.695000  0.265000 2.260000 0.725000 ;
+      RECT 1.695000  0.725000 1.865000 1.755000 ;
+      RECT 1.930000  1.925000 2.260000 2.595000 ;
+      RECT 2.720000  0.085000 2.970000 0.725000 ;
+      RECT 2.840000  2.105000 3.275000 2.480000 ;
+      RECT 2.955000  1.105000 3.285000 1.755000 ;
+      RECT 3.105000  2.480000 3.275000 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_lp__maj3_0
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef
index eb883cf..0b2e23f 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_1.magic.lef
@@ -71,19 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.070000  0.085000 1.400000 0.595000 ;
-        RECT 2.845000  0.085000 3.175000 1.145000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,35 +79,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.920000 1.935000 1.250000 3.245000 ;
-        RECT 2.965000 1.835000 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.130000 0.265000 0.380000 0.775000 ;
-      RECT 0.130000 0.775000 2.625000 0.945000 ;
-      RECT 0.130000 0.945000 0.300000 1.935000 ;
-      RECT 0.130000 1.935000 0.460000 2.395000 ;
-      RECT 0.560000 0.265000 0.890000 0.595000 ;
-      RECT 1.825000 1.925000 2.625000 2.095000 ;
-      RECT 1.825000 2.095000 2.155000 2.395000 ;
-      RECT 1.940000 0.265000 2.625000 0.775000 ;
-      RECT 2.455000 0.945000 2.625000 1.325000 ;
-      RECT 2.455000 1.325000 3.295000 1.655000 ;
-      RECT 2.455000 1.655000 2.625000 1.925000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.130000  0.265000 0.380000 0.775000 ;
+      RECT 0.130000  0.775000 2.625000 0.945000 ;
+      RECT 0.130000  0.945000 0.300000 1.935000 ;
+      RECT 0.130000  1.935000 0.460000 2.395000 ;
+      RECT 0.560000  0.265000 0.890000 0.595000 ;
+      RECT 0.920000  1.935000 1.250000 3.245000 ;
+      RECT 1.070000  0.085000 1.400000 0.595000 ;
+      RECT 1.825000  1.925000 2.625000 2.095000 ;
+      RECT 1.825000  2.095000 2.155000 2.395000 ;
+      RECT 1.940000  0.265000 2.625000 0.775000 ;
+      RECT 2.455000  0.945000 2.625000 1.325000 ;
+      RECT 2.455000  1.325000 3.295000 1.655000 ;
+      RECT 2.455000  1.655000 2.625000 1.925000 ;
+      RECT 2.845000  0.085000 3.175000 1.145000 ;
+      RECT 2.965000  1.835000 3.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 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__maj3_1
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef
index c15624c..3be681e 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_2.magic.lef
@@ -74,21 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.135000  0.085000 1.465000 0.685000 ;
-        RECT 2.775000  0.085000 3.105000 0.685000 ;
-        RECT 3.955000  0.085000 4.205000 1.105000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,35 +82,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.095000 2.765000 1.425000 3.245000 ;
-        RECT 2.735000 2.415000 3.065000 3.245000 ;
-        RECT 3.955000 1.795000 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.090000 0.865000 3.105000 1.035000 ;
-      RECT 0.090000 1.035000 0.260000 2.415000 ;
-      RECT 0.090000 2.415000 2.245000 2.585000 ;
-      RECT 0.090000 2.585000 0.605000 3.065000 ;
-      RECT 0.315000 0.265000 0.645000 0.865000 ;
-      RECT 1.915000 2.585000 2.245000 3.065000 ;
-      RECT 1.955000 0.265000 2.285000 0.865000 ;
-      RECT 2.935000 1.035000 3.105000 1.285000 ;
-      RECT 2.935000 1.285000 3.425000 1.615000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.090000  0.865000 3.105000 1.035000 ;
+      RECT 0.090000  1.035000 0.260000 2.415000 ;
+      RECT 0.090000  2.415000 2.245000 2.585000 ;
+      RECT 0.090000  2.585000 0.605000 3.065000 ;
+      RECT 0.315000  0.265000 0.645000 0.865000 ;
+      RECT 1.095000  2.765000 1.425000 3.245000 ;
+      RECT 1.135000  0.085000 1.465000 0.685000 ;
+      RECT 1.915000  2.585000 2.245000 3.065000 ;
+      RECT 1.955000  0.265000 2.285000 0.865000 ;
+      RECT 2.735000  2.415000 3.065000 3.245000 ;
+      RECT 2.775000  0.085000 3.105000 0.685000 ;
+      RECT 2.935000  1.035000 3.105000 1.285000 ;
+      RECT 2.935000  1.285000 3.425000 1.615000 ;
+      RECT 3.955000  0.085000 4.205000 1.105000 ;
+      RECT 3.955000  1.795000 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_lp__maj3_2
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef
index a4c6ad3..cc7b6b7 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_4.magic.lef
@@ -80,24 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 1.135000  0.085000 1.465000 0.650000 ;
-        RECT 2.775000  0.085000 3.105000 0.650000 ;
-        RECT 3.860000  0.085000 4.110000 0.745000 ;
-        RECT 4.835000  0.085000 5.165000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.280000 0.245000 ;
     END
@@ -106,38 +88,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 1.135000 2.575000 1.465000 3.245000 ;
-        RECT 2.835000 1.795000 3.165000 3.245000 ;
-        RECT 3.855000 2.135000 4.185000 3.245000 ;
-        RECT 4.875000 2.135000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.830000 3.330000 1.000000 ;
-      RECT 0.090000 1.000000 0.260000 1.795000 ;
-      RECT 0.090000 1.795000 0.555000 3.065000 ;
-      RECT 0.315000 0.265000 0.645000 0.830000 ;
-      RECT 1.625000 1.000000 1.795000 1.795000 ;
-      RECT 1.625000 1.795000 2.285000 2.045000 ;
-      RECT 1.955000 0.295000 2.285000 0.830000 ;
-      RECT 3.160000 1.000000 3.330000 1.275000 ;
-      RECT 3.160000 1.275000 4.670000 1.605000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.090000  0.830000 3.330000 1.000000 ;
+      RECT 0.090000  1.000000 0.260000 1.795000 ;
+      RECT 0.090000  1.795000 0.555000 3.065000 ;
+      RECT 0.315000  0.265000 0.645000 0.830000 ;
+      RECT 1.135000  0.085000 1.465000 0.650000 ;
+      RECT 1.135000  2.575000 1.465000 3.245000 ;
+      RECT 1.625000  1.000000 1.795000 1.795000 ;
+      RECT 1.625000  1.795000 2.285000 2.045000 ;
+      RECT 1.955000  0.295000 2.285000 0.830000 ;
+      RECT 2.775000  0.085000 3.105000 0.650000 ;
+      RECT 2.835000  1.795000 3.165000 3.245000 ;
+      RECT 3.160000  1.000000 3.330000 1.275000 ;
+      RECT 3.160000  1.275000 4.670000 1.605000 ;
+      RECT 3.855000  2.135000 4.185000 3.245000 ;
+      RECT 3.860000  0.085000 4.110000 0.745000 ;
+      RECT 4.835000  0.085000 5.165000 0.745000 ;
+      RECT 4.875000  2.135000 5.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 ;
   END
 END sky130_fd_sc_lp__maj3_4
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef
index 3568f98..4e6c9d3 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_lp.magic.lef
@@ -76,20 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.215000  0.085000 1.545000 0.650000 ;
-        RECT 3.085000  0.085000 3.415000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,40 +84,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.195000 2.680000 1.525000 3.245000 ;
-        RECT 3.215000 2.095000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.875000 1.665000 0.895000 ;
-      RECT 0.090000 0.895000 3.695000 0.985000 ;
-      RECT 0.090000 0.985000 3.860000 1.000000 ;
-      RECT 0.090000 1.000000 0.645000 1.045000 ;
-      RECT 0.090000 1.045000 0.260000 2.075000 ;
-      RECT 0.090000 2.075000 0.455000 2.330000 ;
-      RECT 0.090000 2.330000 2.515000 2.500000 ;
-      RECT 0.090000 2.500000 0.455000 3.065000 ;
-      RECT 0.315000 0.605000 0.645000 0.830000 ;
-      RECT 0.315000 0.830000 1.665000 0.875000 ;
-      RECT 1.495000 1.000000 3.860000 1.065000 ;
-      RECT 2.185000 2.095000 2.515000 2.330000 ;
-      RECT 2.185000 2.500000 2.515000 3.065000 ;
-      RECT 2.195000 0.320000 2.525000 0.895000 ;
-      RECT 3.525000 1.065000 3.860000 1.655000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.090000  0.875000 1.665000 0.895000 ;
+      RECT 0.090000  0.895000 3.695000 0.985000 ;
+      RECT 0.090000  0.985000 3.860000 1.000000 ;
+      RECT 0.090000  1.000000 0.645000 1.045000 ;
+      RECT 0.090000  1.045000 0.260000 2.075000 ;
+      RECT 0.090000  2.075000 0.455000 2.330000 ;
+      RECT 0.090000  2.330000 2.515000 2.500000 ;
+      RECT 0.090000  2.500000 0.455000 3.065000 ;
+      RECT 0.315000  0.605000 0.645000 0.830000 ;
+      RECT 0.315000  0.830000 1.665000 0.875000 ;
+      RECT 1.195000  2.680000 1.525000 3.245000 ;
+      RECT 1.215000  0.085000 1.545000 0.650000 ;
+      RECT 1.495000  1.000000 3.860000 1.065000 ;
+      RECT 2.185000  2.095000 2.515000 2.330000 ;
+      RECT 2.185000  2.500000 2.515000 3.065000 ;
+      RECT 2.195000  0.320000 2.525000 0.895000 ;
+      RECT 3.085000  0.085000 3.415000 0.715000 ;
+      RECT 3.215000  2.095000 3.545000 3.245000 ;
+      RECT 3.525000  1.065000 3.860000 1.655000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__maj3_lp
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef b/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef
index 7b98253..3606846 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_m.magic.lef
@@ -71,19 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.970000  0.085000 1.300000 0.725000 ;
-        RECT 2.805000  0.085000 3.135000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,33 +79,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.970000 2.105000 1.300000 3.245000 ;
-        RECT 2.965000 2.105000 3.215000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.150000 0.265000 0.480000 0.725000 ;
-      RECT 0.150000 0.725000 0.320000 1.755000 ;
-      RECT 0.150000 1.755000 3.215000 1.925000 ;
-      RECT 0.150000 1.925000 0.480000 2.565000 ;
-      RECT 1.790000 0.265000 2.120000 0.555000 ;
-      RECT 1.790000 0.555000 2.625000 0.725000 ;
-      RECT 1.790000 1.925000 2.120000 2.565000 ;
-      RECT 2.455000 0.725000 2.625000 1.755000 ;
-      RECT 2.885000 1.255000 3.215000 1.755000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.150000  0.265000 0.480000 0.725000 ;
+      RECT 0.150000  0.725000 0.320000 1.755000 ;
+      RECT 0.150000  1.755000 3.215000 1.925000 ;
+      RECT 0.150000  1.925000 0.480000 2.565000 ;
+      RECT 0.970000  0.085000 1.300000 0.725000 ;
+      RECT 0.970000  2.105000 1.300000 3.245000 ;
+      RECT 1.790000  0.265000 2.120000 0.555000 ;
+      RECT 1.790000  0.555000 2.625000 0.725000 ;
+      RECT 1.790000  1.925000 2.120000 2.565000 ;
+      RECT 2.455000  0.725000 2.625000 1.755000 ;
+      RECT 2.805000  0.085000 3.135000 0.725000 ;
+      RECT 2.885000  1.255000 3.215000 1.755000 ;
+      RECT 2.965000  2.105000 3.215000 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_lp__maj3_m
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef
index 8153eba..b128e5c 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_0.magic.lef
@@ -79,19 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.830000  0.085000 1.160000 0.700000 ;
-        RECT 2.735000  0.085000 3.065000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -100,36 +87,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.640000 2.435000 0.990000 3.245000 ;
-        RECT 2.975000 2.660000 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.525000 0.870000 2.115000 1.040000 ;
-      RECT 0.525000 1.040000 0.780000 1.670000 ;
-      RECT 1.565000 1.815000 2.115000 1.985000 ;
-      RECT 1.565000 1.985000 1.895000 2.735000 ;
-      RECT 1.845000 0.670000 2.115000 0.870000 ;
-      RECT 1.945000 1.040000 2.115000 1.815000 ;
-      RECT 2.635000 1.175000 3.735000 1.345000 ;
-      RECT 2.635000 1.345000 2.815000 1.845000 ;
-      RECT 3.235000 0.795000 3.565000 1.035000 ;
-      RECT 3.235000 1.035000 3.735000 1.175000 ;
-      RECT 3.345000 2.660000 3.735000 2.940000 ;
-      RECT 3.565000 1.345000 3.735000 2.660000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.525000  0.870000 2.115000 1.040000 ;
+      RECT 0.525000  1.040000 0.780000 1.670000 ;
+      RECT 0.640000  2.435000 0.990000 3.245000 ;
+      RECT 0.830000  0.085000 1.160000 0.700000 ;
+      RECT 1.565000  1.815000 2.115000 1.985000 ;
+      RECT 1.565000  1.985000 1.895000 2.735000 ;
+      RECT 1.845000  0.670000 2.115000 0.870000 ;
+      RECT 1.945000  1.040000 2.115000 1.815000 ;
+      RECT 2.635000  1.175000 3.735000 1.345000 ;
+      RECT 2.635000  1.345000 2.815000 1.845000 ;
+      RECT 2.735000  0.085000 3.065000 0.985000 ;
+      RECT 2.975000  2.660000 3.175000 3.245000 ;
+      RECT 3.235000  0.795000 3.565000 1.035000 ;
+      RECT 3.235000  1.035000 3.735000 1.175000 ;
+      RECT 3.345000  2.660000 3.735000 2.940000 ;
+      RECT 3.565000  1.345000 3.735000 2.660000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2_0
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef
index fa4bfda..b8d1553 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_1.magic.lef
@@ -74,20 +74,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.820000 ;
-        RECT 2.905000  0.085000 3.495000 1.035000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -96,34 +82,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.710000 1.815000 1.020000 3.245000 ;
-        RECT 3.245000 2.300000 3.475000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.640000 0.990000 2.290000 1.160000 ;
-      RECT 0.640000 1.160000 0.900000 1.520000 ;
-      RECT 1.775000 0.705000 2.105000 0.990000 ;
-      RECT 2.070000 1.160000 2.290000 2.540000 ;
-      RECT 2.980000 1.220000 4.060000 1.380000 ;
-      RECT 2.980000 1.380000 4.200000 1.550000 ;
-      RECT 3.645000 2.300000 4.200000 2.570000 ;
-      RECT 3.665000 0.705000 4.060000 1.220000 ;
-      RECT 4.030000 1.550000 4.200000 2.300000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.640000  0.990000 2.290000 1.160000 ;
+      RECT 0.640000  1.160000 0.900000 1.520000 ;
+      RECT 0.650000  0.085000 0.980000 0.820000 ;
+      RECT 0.710000  1.815000 1.020000 3.245000 ;
+      RECT 1.775000  0.705000 2.105000 0.990000 ;
+      RECT 2.070000  1.160000 2.290000 2.540000 ;
+      RECT 2.905000  0.085000 3.495000 1.035000 ;
+      RECT 2.980000  1.220000 4.060000 1.380000 ;
+      RECT 2.980000  1.380000 4.200000 1.550000 ;
+      RECT 3.245000  2.300000 3.475000 3.245000 ;
+      RECT 3.645000  2.300000 4.200000 2.570000 ;
+      RECT 3.665000  0.705000 4.060000 1.220000 ;
+      RECT 4.030000  1.550000 4.200000 2.300000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2_1
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_2.magic.lef
index eb8411e..d7a19bd 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_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.125000  0.085000 0.410000 1.095000 ;
-        RECT 1.045000  0.085000 1.375000 0.425000 ;
-        RECT 2.905000  0.085000 3.235000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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 +82,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.125000 1.815000 0.410000 3.245000 ;
-        RECT 0.985000 2.855000 1.315000 3.245000 ;
-        RECT 2.985000 2.515000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.930000 1.275000 1.175000 1.605000 ;
-      RECT 1.005000 0.595000 2.190000 0.765000 ;
-      RECT 1.005000 0.765000 1.175000 1.275000 ;
-      RECT 1.005000 1.605000 1.175000 2.515000 ;
-      RECT 1.005000 2.515000 2.415000 2.685000 ;
-      RECT 1.420000 1.395000 1.750000 2.175000 ;
-      RECT 1.420000 2.175000 3.745000 2.345000 ;
-      RECT 1.930000 0.255000 2.190000 0.595000 ;
-      RECT 2.085000 2.685000 2.415000 2.845000 ;
-      RECT 3.445000 0.275000 3.745000 2.175000 ;
-      RECT 3.485000 2.345000 3.745000 2.895000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.125000  0.085000 0.410000 1.095000 ;
+      RECT 0.125000  1.815000 0.410000 3.245000 ;
+      RECT 0.930000  1.275000 1.175000 1.605000 ;
+      RECT 0.985000  2.855000 1.315000 3.245000 ;
+      RECT 1.005000  0.595000 2.190000 0.765000 ;
+      RECT 1.005000  0.765000 1.175000 1.275000 ;
+      RECT 1.005000  1.605000 1.175000 2.515000 ;
+      RECT 1.005000  2.515000 2.415000 2.685000 ;
+      RECT 1.045000  0.085000 1.375000 0.425000 ;
+      RECT 1.420000  1.395000 1.750000 2.175000 ;
+      RECT 1.420000  2.175000 3.745000 2.345000 ;
+      RECT 1.930000  0.255000 2.190000 0.595000 ;
+      RECT 2.085000  2.685000 2.415000 2.845000 ;
+      RECT 2.905000  0.085000 3.235000 0.615000 ;
+      RECT 2.985000  2.515000 3.315000 3.245000 ;
+      RECT 3.445000  0.275000 3.745000 2.175000 ;
+      RECT 3.485000  2.345000 3.745000 2.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2_2
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_4.magic.lef
index 728057e..5d5aca2 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_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.870000  0.085000 1.330000 0.815000 ;
-        RECT 2.875000  0.085000 3.595000 0.690000 ;
-        RECT 4.145000  0.085000 4.475000 0.895000 ;
-        RECT 5.040000  0.085000 5.265000 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 ;
-        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,50 +87,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.595000 2.035000 0.925000 3.245000 ;
-        RECT 3.355000 2.445000 3.685000 3.245000 ;
-        RECT 4.215000 2.095000 4.545000 3.245000 ;
-        RECT 5.075000 2.095000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.700000 0.985000 ;
-      RECT 0.090000 0.985000 1.415000 1.155000 ;
-      RECT 0.090000 1.155000 0.260000 2.035000 ;
-      RECT 0.090000 2.035000 0.425000 3.075000 ;
-      RECT 1.085000 1.155000 1.415000 1.525000 ;
-      RECT 1.095000 2.035000 1.355000 2.905000 ;
-      RECT 1.095000 2.905000 2.735000 3.075000 ;
-      RECT 1.545000 2.035000 1.805000 2.505000 ;
-      RECT 1.545000 2.505000 3.185000 2.675000 ;
-      RECT 1.545000 2.675000 1.795000 2.735000 ;
-      RECT 1.975000 2.035000 3.650000 2.215000 ;
-      RECT 1.975000 2.215000 2.305000 2.335000 ;
-      RECT 2.085000 0.255000 2.530000 0.860000 ;
-      RECT 2.085000 0.860000 3.595000 1.030000 ;
-      RECT 2.405000 2.845000 2.735000 2.905000 ;
-      RECT 2.925000 2.385000 3.185000 2.505000 ;
-      RECT 2.925000 2.675000 3.185000 3.075000 ;
-      RECT 3.425000 1.030000 3.595000 1.405000 ;
-      RECT 3.425000 1.405000 5.280000 1.585000 ;
-      RECT 3.425000 1.585000 3.650000 2.035000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.090000  0.255000 0.700000 0.985000 ;
+      RECT 0.090000  0.985000 1.415000 1.155000 ;
+      RECT 0.090000  1.155000 0.260000 2.035000 ;
+      RECT 0.090000  2.035000 0.425000 3.075000 ;
+      RECT 0.595000  2.035000 0.925000 3.245000 ;
+      RECT 0.870000  0.085000 1.330000 0.815000 ;
+      RECT 1.085000  1.155000 1.415000 1.525000 ;
+      RECT 1.095000  2.035000 1.355000 2.905000 ;
+      RECT 1.095000  2.905000 2.735000 3.075000 ;
+      RECT 1.545000  2.035000 1.805000 2.505000 ;
+      RECT 1.545000  2.505000 3.185000 2.675000 ;
+      RECT 1.545000  2.675000 1.795000 2.735000 ;
+      RECT 1.975000  2.035000 3.650000 2.215000 ;
+      RECT 1.975000  2.215000 2.305000 2.335000 ;
+      RECT 2.085000  0.255000 2.530000 0.860000 ;
+      RECT 2.085000  0.860000 3.595000 1.030000 ;
+      RECT 2.405000  2.845000 2.735000 2.905000 ;
+      RECT 2.875000  0.085000 3.595000 0.690000 ;
+      RECT 2.925000  2.385000 3.185000 2.505000 ;
+      RECT 2.925000  2.675000 3.185000 3.075000 ;
+      RECT 3.355000  2.445000 3.685000 3.245000 ;
+      RECT 3.425000  1.030000 3.595000 1.405000 ;
+      RECT 3.425000  1.405000 5.280000 1.585000 ;
+      RECT 3.425000  1.585000 3.650000 2.035000 ;
+      RECT 4.145000  0.085000 4.475000 0.895000 ;
+      RECT 4.215000  2.095000 4.545000 3.245000 ;
+      RECT 5.040000  0.085000 5.265000 0.895000 ;
+      RECT 5.075000  2.095000 5.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  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2_4
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef
index 8f829f1..2b696a1 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_8.magic.lef
@@ -47,14 +47,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.475000 1.025000 4.805000 1.355000 ;
-        RECT 4.475000 1.355000 4.645000 1.780000 ;
-        RECT 6.355000 1.550000 6.595000 1.565000 ;
-        RECT 6.355000 1.565000 7.095000 1.925000 ;
-      LAYER mcon ;
-        RECT 4.475000 1.580000 4.645000 1.750000 ;
-        RECT 6.395000 1.580000 6.565000 1.750000 ;
       LAYER met1 ;
         RECT 4.415000 1.550000 4.705000 1.595000 ;
         RECT 4.415000 1.595000 6.625000 1.735000 ;
@@ -68,18 +60,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.965000 1.605000 4.305000 1.980000 ;
-        RECT 3.965000 1.980000 4.565000 2.065000 ;
-        RECT 3.965000 2.065000 5.685000 2.150000 ;
-        RECT 4.395000 2.150000 5.685000 2.235000 ;
-        RECT 5.355000 1.555000 5.685000 2.065000 ;
-        RECT 7.805000 1.920000 8.035000 2.150000 ;
-        RECT 7.865000 1.345000 8.370000 1.675000 ;
-        RECT 7.865000 1.675000 8.035000 1.920000 ;
-      LAYER mcon ;
-        RECT 5.435000 1.950000 5.605000 2.120000 ;
-        RECT 7.835000 1.950000 8.005000 2.120000 ;
       LAYER met1 ;
         RECT 5.375000 1.920000 5.665000 1.965000 ;
         RECT 5.375000 1.965000 8.065000 2.105000 ;
@@ -111,34 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 0.115000  0.085000 0.375000 1.115000 ;
-        RECT 1.055000  0.085000 1.225000 0.755000 ;
-        RECT 1.915000  0.085000 2.085000 0.755000 ;
-        RECT 2.775000  0.085000 3.025000 0.755000 ;
-        RECT 3.705000  0.085000 3.955000 1.095000 ;
-        RECT 5.680000  0.085000 6.010000 0.515000 ;
-        RECT 7.665000  0.085000 7.995000 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 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -147,75 +99,116 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 0.115000 1.795000 0.365000 3.245000 ;
-        RECT 1.055000 2.155000 1.225000 3.245000 ;
-        RECT 1.915000 2.155000 2.085000 3.245000 ;
-        RECT 2.775000 2.155000 2.945000 3.245000 ;
-        RECT 3.555000 2.660000 3.885000 3.245000 ;
-        RECT 5.690000 2.775000 6.020000 3.245000 ;
-        RECT 7.745000 2.660000 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 1.120000 1.265000 4.305000 1.435000 ;
-      RECT 1.120000 1.435000 3.795000 1.595000 ;
-      RECT 3.625000 1.595000 3.795000 2.320000 ;
-      RECT 3.625000 2.320000 4.225000 2.405000 ;
-      RECT 3.625000 2.405000 5.860000 2.435000 ;
-      RECT 3.625000 2.435000 7.020000 2.490000 ;
-      RECT 4.055000 2.490000 7.020000 2.575000 ;
-      RECT 4.135000 0.685000 6.950000 0.855000 ;
-      RECT 4.135000 0.855000 4.305000 1.265000 ;
-      RECT 4.170000 0.255000 5.500000 0.425000 ;
-      RECT 4.170000 0.425000 4.500000 0.515000 ;
-      RECT 4.190000 2.745000 4.520000 2.905000 ;
-      RECT 4.190000 2.905000 5.520000 3.075000 ;
-      RECT 4.670000 0.595000 5.000000 0.685000 ;
-      RECT 4.690000 2.575000 5.020000 2.735000 ;
-      RECT 5.170000 0.425000 5.500000 0.515000 ;
-      RECT 5.190000 2.745000 5.520000 2.905000 ;
-      RECT 5.690000 2.575000 7.020000 2.605000 ;
-      RECT 5.895000 1.555000 6.185000 2.095000 ;
-      RECT 5.895000 2.095000 7.535000 2.235000 ;
-      RECT 6.030000 2.235000 7.535000 2.265000 ;
-      RECT 6.190000 0.295000 7.450000 0.465000 ;
-      RECT 6.190000 2.775000 6.520000 2.905000 ;
-      RECT 6.190000 2.905000 7.520000 3.075000 ;
-      RECT 6.620000 0.635000 6.950000 0.685000 ;
-      RECT 6.690000 2.605000 7.020000 2.735000 ;
-      RECT 7.120000 0.465000 7.450000 0.835000 ;
-      RECT 7.190000 2.660000 7.520000 2.905000 ;
-      RECT 7.365000 1.005000 8.495000 1.175000 ;
-      RECT 7.365000 1.175000 7.695000 1.515000 ;
-      RECT 7.365000 1.515000 7.535000 2.095000 ;
-      RECT 7.365000 2.265000 7.535000 2.320000 ;
-      RECT 7.365000 2.320000 8.505000 2.490000 ;
-      RECT 8.165000 0.255000 8.495000 1.005000 ;
-      RECT 8.255000 1.845000 8.505000 2.320000 ;
-      RECT 8.255000 2.490000 8.505000 3.075000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.115000  0.085000 0.375000 1.115000 ;
+      RECT 0.115000  1.795000 0.365000 3.245000 ;
+      RECT 1.055000  0.085000 1.225000 0.755000 ;
+      RECT 1.055000  2.155000 1.225000 3.245000 ;
+      RECT 1.120000  1.265000 4.305000 1.435000 ;
+      RECT 1.120000  1.435000 3.795000 1.595000 ;
+      RECT 1.915000  0.085000 2.085000 0.755000 ;
+      RECT 1.915000  2.155000 2.085000 3.245000 ;
+      RECT 2.775000  0.085000 3.025000 0.755000 ;
+      RECT 2.775000  2.155000 2.945000 3.245000 ;
+      RECT 3.555000  2.660000 3.885000 3.245000 ;
+      RECT 3.625000  1.595000 3.795000 2.320000 ;
+      RECT 3.625000  2.320000 4.225000 2.405000 ;
+      RECT 3.625000  2.405000 5.860000 2.435000 ;
+      RECT 3.625000  2.435000 7.020000 2.490000 ;
+      RECT 3.705000  0.085000 3.955000 1.095000 ;
+      RECT 3.965000  1.605000 4.305000 1.980000 ;
+      RECT 3.965000  1.980000 4.565000 2.065000 ;
+      RECT 3.965000  2.065000 5.685000 2.150000 ;
+      RECT 4.055000  2.490000 7.020000 2.575000 ;
+      RECT 4.135000  0.685000 6.950000 0.855000 ;
+      RECT 4.135000  0.855000 4.305000 1.265000 ;
+      RECT 4.170000  0.255000 5.500000 0.425000 ;
+      RECT 4.170000  0.425000 4.500000 0.515000 ;
+      RECT 4.190000  2.745000 4.520000 2.905000 ;
+      RECT 4.190000  2.905000 5.520000 3.075000 ;
+      RECT 4.395000  2.150000 5.685000 2.235000 ;
+      RECT 4.475000  1.025000 4.805000 1.355000 ;
+      RECT 4.475000  1.355000 4.645000 1.780000 ;
+      RECT 4.670000  0.595000 5.000000 0.685000 ;
+      RECT 4.690000  2.575000 5.020000 2.735000 ;
+      RECT 5.170000  0.425000 5.500000 0.515000 ;
+      RECT 5.190000  2.745000 5.520000 2.905000 ;
+      RECT 5.355000  1.555000 5.685000 2.065000 ;
+      RECT 5.680000  0.085000 6.010000 0.515000 ;
+      RECT 5.690000  2.575000 7.020000 2.605000 ;
+      RECT 5.690000  2.775000 6.020000 3.245000 ;
+      RECT 5.895000  1.555000 6.185000 2.095000 ;
+      RECT 5.895000  2.095000 7.535000 2.235000 ;
+      RECT 6.030000  2.235000 7.535000 2.265000 ;
+      RECT 6.190000  0.295000 7.450000 0.465000 ;
+      RECT 6.190000  2.775000 6.520000 2.905000 ;
+      RECT 6.190000  2.905000 7.520000 3.075000 ;
+      RECT 6.355000  1.550000 6.595000 1.565000 ;
+      RECT 6.355000  1.565000 7.095000 1.925000 ;
+      RECT 6.620000  0.635000 6.950000 0.685000 ;
+      RECT 6.690000  2.605000 7.020000 2.735000 ;
+      RECT 7.120000  0.465000 7.450000 0.835000 ;
+      RECT 7.190000  2.660000 7.520000 2.905000 ;
+      RECT 7.365000  1.005000 8.495000 1.175000 ;
+      RECT 7.365000  1.175000 7.695000 1.515000 ;
+      RECT 7.365000  1.515000 7.535000 2.095000 ;
+      RECT 7.365000  2.265000 7.535000 2.320000 ;
+      RECT 7.365000  2.320000 8.505000 2.490000 ;
+      RECT 7.665000  0.085000 7.995000 0.835000 ;
+      RECT 7.745000  2.660000 8.075000 3.245000 ;
+      RECT 7.805000  1.920000 8.035000 2.150000 ;
+      RECT 7.865000  1.345000 8.370000 1.675000 ;
+      RECT 7.865000  1.675000 8.035000 1.920000 ;
+      RECT 8.165000  0.255000 8.495000 1.005000 ;
+      RECT 8.255000  1.845000 8.505000 2.320000 ;
+      RECT 8.255000  2.490000 8.505000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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  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  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 ;
   END
 END sky130_fd_sc_lp__mux2_8
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef
index 5b74ffb..a9a787d 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp.magic.lef
@@ -74,20 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.685000 ;
-        RECT 3.065000  0.085000 3.395000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -96,37 +82,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.950000 2.715000 1.280000 3.245000 ;
-        RECT 2.590000 2.615000 2.920000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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 0.885000 2.230000 1.025000 ;
-      RECT 0.525000 1.025000 0.855000 1.555000 ;
-      RECT 0.660000 1.555000 0.830000 2.375000 ;
-      RECT 0.660000 2.375000 2.100000 2.545000 ;
-      RECT 0.685000 0.855000 2.230000 0.885000 ;
-      RECT 1.000000 1.835000 1.330000 2.035000 ;
-      RECT 1.000000 2.035000 4.185000 2.205000 ;
-      RECT 1.770000 2.545000 2.100000 3.075000 ;
-      RECT 1.900000 0.255000 2.230000 0.855000 ;
-      RECT 3.845000 2.205000 4.185000 3.075000 ;
-      RECT 3.855000 0.255000 4.185000 0.715000 ;
-      RECT 4.015000 0.715000 4.185000 2.035000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.525000  0.885000 2.230000 1.025000 ;
+      RECT 0.525000  1.025000 0.855000 1.555000 ;
+      RECT 0.660000  1.555000 0.830000 2.375000 ;
+      RECT 0.660000  2.375000 2.100000 2.545000 ;
+      RECT 0.685000  0.855000 2.230000 0.885000 ;
+      RECT 0.905000  0.085000 1.235000 0.685000 ;
+      RECT 0.950000  2.715000 1.280000 3.245000 ;
+      RECT 1.000000  1.835000 1.330000 2.035000 ;
+      RECT 1.000000  2.035000 4.185000 2.205000 ;
+      RECT 1.770000  2.545000 2.100000 3.075000 ;
+      RECT 1.900000  0.255000 2.230000 0.855000 ;
+      RECT 2.590000  2.615000 2.920000 3.245000 ;
+      RECT 3.065000  0.085000 3.395000 0.715000 ;
+      RECT 3.845000  2.205000 4.185000 3.075000 ;
+      RECT 3.855000  0.255000 4.185000 0.715000 ;
+      RECT 4.015000  0.715000 4.185000 2.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2_lp
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef
index 09bba9d..3223fa2 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.magic.lef
@@ -74,21 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.910000  0.085000 1.240000 0.725000 ;
-        RECT 3.425000  0.085000 3.755000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -97,39 +82,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.645000 2.765000 0.975000 3.245000 ;
-        RECT 3.055000 2.765000 3.385000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.630000 0.905000 1.590000 1.235000 ;
-      RECT 0.910000 1.515000 1.240000 2.415000 ;
-      RECT 0.910000 2.415000 3.915000 2.585000 ;
-      RECT 1.420000 0.345000 2.825000 0.515000 ;
-      RECT 1.420000 0.515000 1.590000 0.905000 ;
-      RECT 1.420000 1.235000 1.590000 2.065000 ;
-      RECT 1.420000 2.065000 2.325000 2.235000 ;
-      RECT 2.495000 0.515000 2.825000 0.725000 ;
-      RECT 3.585000 1.985000 4.545000 2.155000 ;
-      RECT 3.585000 2.155000 3.915000 2.415000 ;
-      RECT 3.585000 2.585000 3.915000 3.025000 ;
-      RECT 4.215000 0.265000 4.545000 0.725000 ;
-      RECT 4.375000 0.725000 4.545000 1.985000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.630000  0.905000 1.590000 1.235000 ;
+      RECT 0.645000  2.765000 0.975000 3.245000 ;
+      RECT 0.910000  0.085000 1.240000 0.725000 ;
+      RECT 0.910000  1.515000 1.240000 2.415000 ;
+      RECT 0.910000  2.415000 3.915000 2.585000 ;
+      RECT 1.420000  0.345000 2.825000 0.515000 ;
+      RECT 1.420000  0.515000 1.590000 0.905000 ;
+      RECT 1.420000  1.235000 1.590000 2.065000 ;
+      RECT 1.420000  2.065000 2.325000 2.235000 ;
+      RECT 2.495000  0.515000 2.825000 0.725000 ;
+      RECT 3.055000  2.765000 3.385000 3.245000 ;
+      RECT 3.425000  0.085000 3.755000 0.725000 ;
+      RECT 3.585000  1.985000 4.545000 2.155000 ;
+      RECT 3.585000  2.155000 3.915000 2.415000 ;
+      RECT 3.585000  2.585000 3.915000 3.025000 ;
+      RECT 4.215000  0.265000 4.545000 0.725000 ;
+      RECT 4.375000  0.725000 4.545000 1.985000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2_lp2
diff --git a/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef b/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef
index 11b7ce7..c74e4ec 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_m.magic.lef
@@ -80,19 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.790000  0.085000 1.120000 0.875000 ;
-        RECT 2.645000  0.085000 2.975000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -101,34 +88,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.940000 2.675000 1.270000 3.245000 ;
-        RECT 2.880000 2.695000 3.210000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.695000 1.095000 2.115000 1.265000 ;
-      RECT 0.695000 1.265000 0.865000 2.015000 ;
-      RECT 1.640000 0.795000 1.970000 1.095000 ;
-      RECT 1.945000 1.265000 2.115000 2.525000 ;
-      RECT 1.945000 2.525000 2.310000 2.715000 ;
-      RECT 2.655000 1.155000 3.720000 1.325000 ;
-      RECT 2.655000 1.325000 2.825000 1.485000 ;
-      RECT 3.240000 0.795000 3.570000 1.155000 ;
-      RECT 3.390000 2.670000 3.720000 2.880000 ;
-      RECT 3.550000 1.325000 3.720000 2.670000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.695000  1.095000 2.115000 1.265000 ;
+      RECT 0.695000  1.265000 0.865000 2.015000 ;
+      RECT 0.790000  0.085000 1.120000 0.875000 ;
+      RECT 0.940000  2.675000 1.270000 3.245000 ;
+      RECT 1.640000  0.795000 1.970000 1.095000 ;
+      RECT 1.945000  1.265000 2.115000 2.525000 ;
+      RECT 1.945000  2.525000 2.310000 2.715000 ;
+      RECT 2.645000  0.085000 2.975000 0.875000 ;
+      RECT 2.655000  1.155000 3.720000 1.325000 ;
+      RECT 2.655000  1.325000 2.825000 1.485000 ;
+      RECT 2.880000  2.695000 3.210000 3.245000 ;
+      RECT 3.240000  0.795000 3.570000 1.155000 ;
+      RECT 3.390000  2.670000 3.720000 2.880000 ;
+      RECT 3.550000  1.325000 3.720000 2.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  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2_m
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef
index da7017c..17c333c 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.magic.lef
@@ -80,18 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.705000  0.085000 1.035000 0.615000 ;
-        RECT 2.870000  0.085000 3.135000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,27 +88,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.900000 2.435000 1.230000 3.245000 ;
-        RECT 2.725000 2.845000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.265000 0.525000 0.785000 ;
-      RECT 0.085000 0.785000 1.220000 1.360000 ;
-      RECT 0.085000 1.360000 0.365000 2.415000 ;
-      RECT 0.085000 2.415000 0.705000 3.055000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.085000  0.265000 0.525000 0.785000 ;
+      RECT 0.085000  0.785000 1.220000 1.360000 ;
+      RECT 0.085000  1.360000 0.365000 2.415000 ;
+      RECT 0.085000  2.415000 0.705000 3.055000 ;
+      RECT 0.705000  0.085000 1.035000 0.615000 ;
+      RECT 0.900000  2.435000 1.230000 3.245000 ;
+      RECT 2.725000  2.845000 3.055000 3.245000 ;
+      RECT 2.870000  0.085000 3.135000 0.615000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__mux2i_0
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef
index dc16bfd..975ef56 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.magic.lef
@@ -73,19 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 2.085000  0.085000 2.305000 0.905000 ;
-        RECT 3.415000  0.085000 3.745000 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
@@ -94,41 +81,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.795000 2.155000 2.125000 3.245000 ;
-        RECT 3.375000 1.920000 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.105000 0.255000 1.915000 0.425000 ;
-      RECT 0.105000 0.425000 0.385000 1.175000 ;
-      RECT 0.200000 1.930000 0.470000 2.310000 ;
-      RECT 0.200000 2.310000 1.625000 2.550000 ;
-      RECT 0.200000 2.550000 0.530000 3.075000 ;
-      RECT 1.055000 0.595000 1.385000 1.075000 ;
-      RECT 1.055000 1.075000 2.775000 1.245000 ;
-      RECT 1.455000 1.840000 2.595000 1.985000 ;
-      RECT 1.455000 1.985000 1.625000 2.310000 ;
-      RECT 1.470000 1.815000 2.595000 1.840000 ;
-      RECT 1.520000 1.415000 3.205000 1.585000 ;
-      RECT 1.585000 0.425000 1.915000 0.905000 ;
-      RECT 2.295000 1.985000 2.595000 3.075000 ;
-      RECT 2.490000 0.255000 2.775000 1.075000 ;
-      RECT 2.945000 1.585000 3.205000 3.075000 ;
-      RECT 2.985000 0.360000 3.245000 1.095000 ;
-      RECT 2.985000 1.095000 3.205000 1.415000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.105000  0.255000 1.915000 0.425000 ;
+      RECT 0.105000  0.425000 0.385000 1.175000 ;
+      RECT 0.200000  1.930000 0.470000 2.310000 ;
+      RECT 0.200000  2.310000 1.625000 2.550000 ;
+      RECT 0.200000  2.550000 0.530000 3.075000 ;
+      RECT 1.055000  0.595000 1.385000 1.075000 ;
+      RECT 1.055000  1.075000 2.775000 1.245000 ;
+      RECT 1.455000  1.840000 2.595000 1.985000 ;
+      RECT 1.455000  1.985000 1.625000 2.310000 ;
+      RECT 1.470000  1.815000 2.595000 1.840000 ;
+      RECT 1.520000  1.415000 3.205000 1.585000 ;
+      RECT 1.585000  0.425000 1.915000 0.905000 ;
+      RECT 1.795000  2.155000 2.125000 3.245000 ;
+      RECT 2.085000  0.085000 2.305000 0.905000 ;
+      RECT 2.295000  1.985000 2.595000 3.075000 ;
+      RECT 2.490000  0.255000 2.775000 1.075000 ;
+      RECT 2.945000  1.585000 3.205000 3.075000 ;
+      RECT 2.985000  0.360000 3.245000 1.095000 ;
+      RECT 2.985000  1.095000 3.205000 1.415000 ;
+      RECT 3.375000  1.920000 3.705000 3.245000 ;
+      RECT 3.415000  0.085000 3.745000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2i_1
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef
index 8550720..c7dc1b2 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.magic.lef
@@ -82,24 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.800000  0.085000 1.130000 0.815000 ;
-        RECT 1.700000  0.085000 1.920000 0.675000 ;
-        RECT 1.700000  0.675000 2.850000 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 ;
-        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,50 +90,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.710000 2.290000 1.040000 3.245000 ;
-        RECT 1.740000 2.940000 2.070000 3.245000 ;
-        RECT 2.795000 2.940000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.180000 0.255000 0.630000 0.985000 ;
-      RECT 0.180000 0.985000 1.130000 1.155000 ;
-      RECT 0.180000 1.155000 0.440000 3.075000 ;
-      RECT 0.960000 1.155000 1.130000 1.415000 ;
-      RECT 0.960000 1.415000 1.435000 1.585000 ;
-      RECT 1.230000 2.290000 1.560000 2.600000 ;
-      RECT 1.230000 2.600000 3.475000 2.770000 ;
-      RECT 1.230000 2.770000 1.560000 2.970000 ;
-      RECT 1.300000 0.255000 1.530000 1.065000 ;
-      RECT 1.300000 1.065000 3.210000 1.235000 ;
-      RECT 2.090000 0.255000 5.160000 0.435000 ;
-      RECT 2.090000 0.435000 2.420000 0.505000 ;
-      RECT 2.250000 1.840000 2.580000 2.260000 ;
-      RECT 2.250000 2.260000 4.070000 2.430000 ;
-      RECT 3.020000 0.605000 4.140000 0.795000 ;
-      RECT 3.020000 0.795000 3.210000 1.065000 ;
-      RECT 3.305000 2.770000 3.475000 2.905000 ;
-      RECT 3.305000 2.905000 4.965000 3.075000 ;
-      RECT 3.810000 2.430000 4.070000 2.735000 ;
-      RECT 4.740000 2.270000 4.965000 2.905000 ;
-      RECT 4.830000 0.435000 5.160000 0.905000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.180000  0.255000 0.630000 0.985000 ;
+      RECT 0.180000  0.985000 1.130000 1.155000 ;
+      RECT 0.180000  1.155000 0.440000 3.075000 ;
+      RECT 0.710000  2.290000 1.040000 3.245000 ;
+      RECT 0.800000  0.085000 1.130000 0.815000 ;
+      RECT 0.960000  1.155000 1.130000 1.415000 ;
+      RECT 0.960000  1.415000 1.435000 1.585000 ;
+      RECT 1.230000  2.290000 1.560000 2.600000 ;
+      RECT 1.230000  2.600000 3.475000 2.770000 ;
+      RECT 1.230000  2.770000 1.560000 2.970000 ;
+      RECT 1.300000  0.255000 1.530000 1.065000 ;
+      RECT 1.300000  1.065000 3.210000 1.235000 ;
+      RECT 1.700000  0.085000 1.920000 0.675000 ;
+      RECT 1.700000  0.675000 2.850000 0.895000 ;
+      RECT 1.740000  2.940000 2.070000 3.245000 ;
+      RECT 2.090000  0.255000 5.160000 0.435000 ;
+      RECT 2.090000  0.435000 2.420000 0.505000 ;
+      RECT 2.250000  1.840000 2.580000 2.260000 ;
+      RECT 2.250000  2.260000 4.070000 2.430000 ;
+      RECT 2.795000  2.940000 3.125000 3.245000 ;
+      RECT 3.020000  0.605000 4.140000 0.795000 ;
+      RECT 3.020000  0.795000 3.210000 1.065000 ;
+      RECT 3.305000  2.770000 3.475000 2.905000 ;
+      RECT 3.305000  2.905000 4.965000 3.075000 ;
+      RECT 3.810000  2.430000 4.070000 2.735000 ;
+      RECT 4.740000  2.270000 4.965000 2.905000 ;
+      RECT 4.830000  0.435000 5.160000 0.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_lp__mux2i_2
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef
index 5eccef5..bf786d1 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.magic.lef
@@ -84,34 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 5.135000  0.085000 5.325000 0.565000 ;
-        RECT 5.995000  0.085000 6.185000 0.565000 ;
-        RECT 6.855000  0.085000 7.115000 0.905000 ;
-        RECT 7.645000  0.085000 7.975000 0.805000 ;
-        RECT 8.505000  0.085000 8.835000 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 ;
-        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
@@ -120,72 +92,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 4.940000 2.970000 5.270000 3.245000 ;
-        RECT 5.915000 2.845000 6.245000 3.245000 ;
-        RECT 6.795000 2.845000 7.125000 3.245000 ;
-        RECT 7.735000 2.455000 8.065000 3.245000 ;
-        RECT 8.745000 2.125000 9.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 ;
-        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.525000 0.255000 1.795000 0.455000 ;
-      RECT 0.525000 0.455000 0.855000 0.905000 ;
-      RECT 0.665000 2.280000 0.875000 2.780000 ;
-      RECT 0.665000 2.780000 1.735000 2.950000 ;
-      RECT 1.525000 2.280000 6.615000 2.335000 ;
-      RECT 1.525000 2.335000 4.615000 2.460000 ;
-      RECT 1.525000 2.460000 1.735000 2.780000 ;
-      RECT 1.535000 0.455000 1.795000 0.625000 ;
-      RECT 1.535000 0.625000 4.615000 0.795000 ;
-      RECT 2.385000 2.630000 7.565000 2.675000 ;
-      RECT 2.385000 2.675000 4.965000 2.800000 ;
-      RECT 2.385000 2.800000 3.455000 3.075000 ;
-      RECT 2.405000 0.255000 4.965000 0.455000 ;
-      RECT 4.445000 0.795000 4.615000 1.075000 ;
-      RECT 4.445000 1.075000 8.335000 1.245000 ;
-      RECT 4.445000 2.005000 6.615000 2.280000 ;
-      RECT 4.795000 0.455000 4.965000 0.735000 ;
-      RECT 4.795000 0.735000 6.685000 0.905000 ;
-      RECT 4.795000 2.505000 7.565000 2.630000 ;
-      RECT 5.495000 0.345000 5.825000 0.735000 ;
-      RECT 6.355000 0.255000 6.685000 0.735000 ;
-      RECT 6.880000 2.115000 8.575000 2.285000 ;
-      RECT 6.880000 2.285000 7.565000 2.505000 ;
-      RECT 7.225000 1.415000 8.675000 1.605000 ;
-      RECT 7.285000 0.255000 7.475000 1.075000 ;
-      RECT 7.295000 2.675000 7.565000 3.065000 ;
-      RECT 8.145000 0.255000 8.335000 1.075000 ;
-      RECT 8.235000 2.285000 8.575000 3.065000 ;
-      RECT 8.505000 0.985000 9.510000 1.165000 ;
-      RECT 8.505000 1.165000 8.675000 1.415000 ;
-      RECT 9.005000 0.255000 9.205000 0.985000 ;
-      RECT 9.195000 1.845000 9.510000 3.075000 ;
-      RECT 9.340000 1.165000 9.510000 1.845000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.525000  0.255000 1.795000 0.455000 ;
+      RECT 0.525000  0.455000 0.855000 0.905000 ;
+      RECT 0.665000  2.280000 0.875000 2.780000 ;
+      RECT 0.665000  2.780000 1.735000 2.950000 ;
+      RECT 1.525000  2.280000 6.615000 2.335000 ;
+      RECT 1.525000  2.335000 4.615000 2.460000 ;
+      RECT 1.525000  2.460000 1.735000 2.780000 ;
+      RECT 1.535000  0.455000 1.795000 0.625000 ;
+      RECT 1.535000  0.625000 4.615000 0.795000 ;
+      RECT 2.385000  2.630000 7.565000 2.675000 ;
+      RECT 2.385000  2.675000 4.965000 2.800000 ;
+      RECT 2.385000  2.800000 3.455000 3.075000 ;
+      RECT 2.405000  0.255000 4.965000 0.455000 ;
+      RECT 4.445000  0.795000 4.615000 1.075000 ;
+      RECT 4.445000  1.075000 8.335000 1.245000 ;
+      RECT 4.445000  2.005000 6.615000 2.280000 ;
+      RECT 4.795000  0.455000 4.965000 0.735000 ;
+      RECT 4.795000  0.735000 6.685000 0.905000 ;
+      RECT 4.795000  2.505000 7.565000 2.630000 ;
+      RECT 4.940000  2.970000 5.270000 3.245000 ;
+      RECT 5.135000  0.085000 5.325000 0.565000 ;
+      RECT 5.495000  0.345000 5.825000 0.735000 ;
+      RECT 5.915000  2.845000 6.245000 3.245000 ;
+      RECT 5.995000  0.085000 6.185000 0.565000 ;
+      RECT 6.355000  0.255000 6.685000 0.735000 ;
+      RECT 6.795000  2.845000 7.125000 3.245000 ;
+      RECT 6.855000  0.085000 7.115000 0.905000 ;
+      RECT 6.880000  2.115000 8.575000 2.285000 ;
+      RECT 6.880000  2.285000 7.565000 2.505000 ;
+      RECT 7.225000  1.415000 8.675000 1.605000 ;
+      RECT 7.285000  0.255000 7.475000 1.075000 ;
+      RECT 7.295000  2.675000 7.565000 3.065000 ;
+      RECT 7.645000  0.085000 7.975000 0.805000 ;
+      RECT 7.735000  2.455000 8.065000 3.245000 ;
+      RECT 8.145000  0.255000 8.335000 1.075000 ;
+      RECT 8.235000  2.285000 8.575000 3.065000 ;
+      RECT 8.505000  0.085000 8.835000 0.815000 ;
+      RECT 8.505000  0.985000 9.510000 1.165000 ;
+      RECT 8.505000  1.165000 8.675000 1.415000 ;
+      RECT 8.745000  2.125000 9.025000 3.245000 ;
+      RECT 9.005000  0.255000 9.205000 0.985000 ;
+      RECT 9.195000  1.845000 9.510000 3.075000 ;
+      RECT 9.340000  1.165000 9.510000 1.845000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2i_4
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.magic.lef
index 8ea018b..a41d27c 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.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.645000 ;
-        RECT 2.060000  0.085000 2.390000 0.605000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,26 +90,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.170000 2.615000 0.500000 3.245000 ;
-        RECT 2.095000 2.785000 2.425000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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 1.275000 3.240000 1.605000 ;
-      RECT 2.885000 1.605000 3.240000 3.075000 ;
-      RECT 2.910000 0.255000 3.240000 1.275000 ;
+      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.645000 ;
+      RECT 0.170000  2.615000 0.500000 3.245000 ;
+      RECT 1.825000  1.275000 3.240000 1.605000 ;
+      RECT 2.060000  0.085000 2.390000 0.605000 ;
+      RECT 2.095000  2.785000 2.425000 3.245000 ;
+      RECT 2.885000  1.605000 3.240000 3.075000 ;
+      RECT 2.910000  0.255000 3.240000 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 ;
   END
 END sky130_fd_sc_lp__mux2i_lp
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef
index ee9a8ec..86905d7 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.magic.lef
@@ -83,19 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.350000  0.085000 0.680000 0.545000 ;
-        RECT 2.580000  0.085000 2.910000 0.535000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,27 +91,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.175000 2.275000 0.425000 3.245000 ;
-        RECT 2.705000 2.075000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 2.480000 1.335000 3.710000 1.665000 ;
-      RECT 3.275000 1.665000 3.710000 3.065000 ;
-      RECT 3.380000 0.265000 3.710000 1.335000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.175000  2.275000 0.425000 3.245000 ;
+      RECT 0.350000  0.085000 0.680000 0.545000 ;
+      RECT 2.480000  1.335000 3.710000 1.665000 ;
+      RECT 2.580000  0.085000 2.910000 0.535000 ;
+      RECT 2.705000  2.075000 3.035000 3.245000 ;
+      RECT 3.275000  1.665000 3.710000 3.065000 ;
+      RECT 3.380000  0.265000 3.710000 1.335000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux2i_lp2
diff --git a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef
index a9c9d16..d9c81c9 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.magic.lef
@@ -84,18 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.745000  0.085000 1.075000 0.875000 ;
-        RECT 2.600000  0.085000 2.930000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,28 +92,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.825000 2.655000 1.155000 3.245000 ;
-        RECT 2.790000 2.675000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.795000 0.565000 1.005000 ;
-      RECT 0.170000 1.005000 0.340000 1.425000 ;
-      RECT 0.170000 1.425000 1.170000 1.755000 ;
-      RECT 0.170000 1.755000 0.340000 2.650000 ;
-      RECT 0.170000 2.650000 0.645000 2.860000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.170000  0.795000 0.565000 1.005000 ;
+      RECT 0.170000  1.005000 0.340000 1.425000 ;
+      RECT 0.170000  1.425000 1.170000 1.755000 ;
+      RECT 0.170000  1.755000 0.340000 2.650000 ;
+      RECT 0.170000  2.650000 0.645000 2.860000 ;
+      RECT 0.745000  0.085000 1.075000 0.875000 ;
+      RECT 0.825000  2.655000 1.155000 3.245000 ;
+      RECT 2.600000  0.085000 2.930000 0.875000 ;
+      RECT 2.790000  2.675000 3.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 ;
   END
 END sky130_fd_sc_lp__mux2i_m
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef
index 4a66ba7..5477241 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_0.magic.lef
@@ -100,29 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.895000  0.085000 1.225000 0.865000 ;
-        RECT 2.655000  0.085000 2.985000 0.970000 ;
-        RECT 4.335000  0.085000 4.665000 0.970000 ;
-        RECT 6.860000  0.085000 7.115000 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 ;
-        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
@@ -131,82 +108,101 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.615000 2.700000 0.945000 3.245000 ;
-        RECT 2.670000 2.640000 2.920000 3.245000 ;
-        RECT 4.300000 2.670000 4.630000 3.245000 ;
-        RECT 6.800000 1.995000 7.095000 2.615000 ;
-        RECT 6.880000 2.615000 7.095000 2.675000 ;
-        RECT 6.915000 2.675000 7.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 ;
-        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.025000 0.725000 1.035000 ;
-      RECT 0.115000 1.035000 1.655000 1.195000 ;
-      RECT 0.115000 1.195000 1.820000 1.205000 ;
-      RECT 0.115000 1.205000 0.300000 2.360000 ;
-      RECT 0.115000 2.360000 1.305000 2.530000 ;
-      RECT 0.115000 2.530000 0.445000 2.905000 ;
-      RECT 0.465000 0.640000 0.725000 1.025000 ;
-      RECT 1.135000 2.530000 1.305000 2.905000 ;
-      RECT 1.135000 2.905000 2.500000 3.075000 ;
-      RECT 1.485000 1.205000 1.820000 1.365000 ;
-      RECT 1.560000 2.475000 2.160000 2.735000 ;
-      RECT 1.630000 1.365000 1.820000 1.685000 ;
-      RECT 1.825000 0.640000 2.325000 0.970000 ;
-      RECT 1.990000 0.970000 2.325000 1.015000 ;
-      RECT 1.990000 1.015000 2.160000 2.475000 ;
-      RECT 2.330000 2.300000 3.535000 2.470000 ;
-      RECT 2.330000 2.470000 2.500000 2.905000 ;
-      RECT 3.275000 1.930000 4.900000 2.160000 ;
-      RECT 3.275000 2.160000 3.535000 2.300000 ;
-      RECT 3.455000 2.640000 3.875000 2.920000 ;
-      RECT 3.545000 0.640000 4.035000 0.970000 ;
-      RECT 3.705000 2.330000 5.250000 2.500000 ;
-      RECT 3.705000 2.500000 3.875000 2.640000 ;
-      RECT 3.865000 0.970000 4.035000 1.560000 ;
-      RECT 3.865000 1.560000 5.250000 1.730000 ;
-      RECT 4.920000 2.500000 5.250000 2.840000 ;
-      RECT 4.950000 0.670000 5.250000 1.560000 ;
-      RECT 5.080000 1.730000 5.250000 2.330000 ;
-      RECT 5.145000 0.255000 6.690000 0.500000 ;
-      RECT 5.420000 0.670000 5.640000 1.005000 ;
-      RECT 5.420000 1.005000 5.610000 2.905000 ;
-      RECT 5.420000 2.905000 6.745000 3.075000 ;
-      RECT 5.780000 1.175000 6.140000 1.345000 ;
-      RECT 5.780000 1.345000 5.950000 2.460000 ;
-      RECT 5.780000 2.460000 6.110000 2.735000 ;
-      RECT 5.810000 0.670000 6.140000 1.175000 ;
-      RECT 6.120000 1.525000 6.490000 1.855000 ;
-      RECT 6.300000 1.855000 6.490000 2.060000 ;
-      RECT 6.300000 2.060000 6.630000 2.390000 ;
-      RECT 6.310000 0.500000 6.690000 0.610000 ;
-      RECT 6.310000 0.610000 6.490000 1.525000 ;
-      RECT 6.415000 2.780000 6.745000 2.905000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.115000  1.025000 0.725000 1.035000 ;
+      RECT 0.115000  1.035000 1.655000 1.195000 ;
+      RECT 0.115000  1.195000 1.820000 1.205000 ;
+      RECT 0.115000  1.205000 0.300000 2.360000 ;
+      RECT 0.115000  2.360000 1.305000 2.530000 ;
+      RECT 0.115000  2.530000 0.445000 2.905000 ;
+      RECT 0.465000  0.640000 0.725000 1.025000 ;
+      RECT 0.615000  2.700000 0.945000 3.245000 ;
+      RECT 0.895000  0.085000 1.225000 0.865000 ;
+      RECT 1.135000  2.530000 1.305000 2.905000 ;
+      RECT 1.135000  2.905000 2.500000 3.075000 ;
+      RECT 1.485000  1.205000 1.820000 1.365000 ;
+      RECT 1.560000  2.475000 2.160000 2.735000 ;
+      RECT 1.630000  1.365000 1.820000 1.685000 ;
+      RECT 1.825000  0.640000 2.325000 0.970000 ;
+      RECT 1.990000  0.970000 2.325000 1.015000 ;
+      RECT 1.990000  1.015000 2.160000 2.475000 ;
+      RECT 2.330000  2.300000 3.535000 2.470000 ;
+      RECT 2.330000  2.470000 2.500000 2.905000 ;
+      RECT 2.655000  0.085000 2.985000 0.970000 ;
+      RECT 2.670000  2.640000 2.920000 3.245000 ;
+      RECT 3.275000  1.930000 4.900000 2.160000 ;
+      RECT 3.275000  2.160000 3.535000 2.300000 ;
+      RECT 3.455000  2.640000 3.875000 2.920000 ;
+      RECT 3.545000  0.640000 4.035000 0.970000 ;
+      RECT 3.705000  2.330000 5.250000 2.500000 ;
+      RECT 3.705000  2.500000 3.875000 2.640000 ;
+      RECT 3.865000  0.970000 4.035000 1.560000 ;
+      RECT 3.865000  1.560000 5.250000 1.730000 ;
+      RECT 4.300000  2.670000 4.630000 3.245000 ;
+      RECT 4.335000  0.085000 4.665000 0.970000 ;
+      RECT 4.920000  2.500000 5.250000 2.840000 ;
+      RECT 4.950000  0.670000 5.250000 1.560000 ;
+      RECT 5.080000  1.730000 5.250000 2.330000 ;
+      RECT 5.145000  0.255000 6.690000 0.500000 ;
+      RECT 5.420000  0.670000 5.640000 1.005000 ;
+      RECT 5.420000  1.005000 5.610000 2.905000 ;
+      RECT 5.420000  2.905000 6.745000 3.075000 ;
+      RECT 5.780000  1.175000 6.140000 1.345000 ;
+      RECT 5.780000  1.345000 5.950000 2.460000 ;
+      RECT 5.780000  2.460000 6.110000 2.735000 ;
+      RECT 5.810000  0.670000 6.140000 1.175000 ;
+      RECT 6.120000  1.525000 6.490000 1.855000 ;
+      RECT 6.300000  1.855000 6.490000 2.060000 ;
+      RECT 6.300000  2.060000 6.630000 2.390000 ;
+      RECT 6.310000  0.500000 6.690000 0.610000 ;
+      RECT 6.310000  0.610000 6.490000 1.525000 ;
+      RECT 6.415000  2.780000 6.745000 2.905000 ;
+      RECT 6.800000  1.995000 7.095000 2.615000 ;
+      RECT 6.860000  0.085000 7.115000 0.610000 ;
+      RECT 6.880000  2.615000 7.095000 2.675000 ;
+      RECT 6.915000  2.675000 7.095000 3.245000 ;
     LAYER mcon ;
-      RECT 2.075000 0.840000 2.245000 1.010000 ;
-      RECT 5.915000 0.840000 6.085000 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  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  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 ;
     LAYER met1 ;
       RECT 2.015000 0.810000 2.305000 0.855000 ;
       RECT 2.015000 0.855000 6.145000 0.995000 ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef
index 5e4b713..d130ad9 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_1.magic.lef
@@ -97,35 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.555000  0.085000  0.885000 0.645000 ;
-        RECT 2.990000  0.085000  3.320000 0.955000 ;
-        RECT 5.390000  0.085000  5.720000 0.475000 ;
-        RECT 6.490000  0.085000  6.820000 0.845000 ;
-        RECT 9.225000  0.085000  9.555000 1.175000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -134,102 +105,127 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.525000 2.685000  0.855000 3.245000 ;
-        RECT 3.345000 2.515000  3.645000 3.245000 ;
-        RECT 5.285000 2.615000  5.535000 3.245000 ;
-        RECT 6.410000 2.375000  6.750000 3.245000 ;
-        RECT 9.225000 1.845000  9.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 ;
-        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.095000 2.345000 1.735000 2.515000 ;
-      RECT 0.095000 2.515000 0.355000 2.970000 ;
-      RECT 0.125000 0.450000 0.385000 0.815000 ;
-      RECT 0.125000 0.815000 1.225000 0.985000 ;
-      RECT 1.025000 2.685000 1.285000 2.865000 ;
-      RECT 1.025000 2.865000 2.665000 3.035000 ;
-      RECT 1.055000 0.265000 2.225000 0.435000 ;
-      RECT 1.055000 0.435000 1.225000 0.815000 ;
-      RECT 1.395000 0.615000 1.725000 0.835000 ;
-      RECT 1.395000 0.835000 2.075000 1.005000 ;
-      RECT 1.475000 2.515000 1.735000 2.675000 ;
-      RECT 1.895000 0.435000 2.225000 0.665000 ;
-      RECT 1.905000 1.005000 2.075000 1.940000 ;
-      RECT 1.905000 1.940000 2.305000 2.170000 ;
-      RECT 1.905000 2.170000 2.235000 2.670000 ;
-      RECT 2.255000 1.100000 2.820000 1.770000 ;
-      RECT 2.405000 2.340000 2.665000 2.865000 ;
-      RECT 2.560000 0.640000 2.820000 1.100000 ;
-      RECT 2.650000 1.770000 2.820000 1.975000 ;
-      RECT 2.650000 1.975000 4.435000 2.145000 ;
-      RECT 2.885000 2.145000 3.175000 2.845000 ;
-      RECT 3.510000 0.255000 5.220000 0.445000 ;
-      RECT 3.510000 0.445000 3.805000 0.955000 ;
-      RECT 3.955000 2.545000 4.205000 2.905000 ;
-      RECT 3.955000 2.905000 5.115000 3.075000 ;
-      RECT 3.975000 0.625000 4.200000 1.015000 ;
-      RECT 3.975000 1.015000 4.775000 1.185000 ;
-      RECT 4.175000 1.365000 4.435000 1.975000 ;
-      RECT 4.370000 0.615000 4.700000 0.645000 ;
-      RECT 4.370000 0.645000 6.160000 0.845000 ;
-      RECT 4.385000 2.525000 4.775000 2.735000 ;
-      RECT 4.605000 1.185000 4.775000 1.935000 ;
-      RECT 4.605000 1.935000 6.615000 2.035000 ;
-      RECT 4.605000 2.035000 7.600000 2.105000 ;
-      RECT 4.605000 2.105000 4.775000 2.525000 ;
-      RECT 4.890000 0.445000 5.220000 0.475000 ;
-      RECT 4.945000 2.275000 6.005000 2.445000 ;
-      RECT 4.945000 2.445000 5.115000 2.905000 ;
-      RECT 5.705000 2.445000 6.005000 2.880000 ;
-      RECT 5.890000 0.275000 6.160000 0.645000 ;
-      RECT 6.225000 1.015000 7.250000 1.185000 ;
-      RECT 6.225000 1.185000 6.555000 1.765000 ;
-      RECT 6.445000 2.105000 7.600000 2.205000 ;
-      RECT 6.920000 2.375000 7.250000 2.780000 ;
-      RECT 6.920000 2.780000 7.650000 3.075000 ;
-      RECT 7.000000 0.640000 7.250000 1.015000 ;
-      RECT 7.430000 0.790000 7.710000 1.120000 ;
-      RECT 7.430000 1.120000 7.600000 2.035000 ;
-      RECT 7.430000 2.205000 7.600000 2.380000 ;
-      RECT 7.430000 2.380000 8.850000 2.610000 ;
-      RECT 7.780000 1.880000 8.050000 2.210000 ;
-      RECT 7.880000 0.390000 8.910000 0.620000 ;
-      RECT 7.880000 0.620000 8.050000 1.880000 ;
-      RECT 8.220000 0.790000 8.445000 1.345000 ;
-      RECT 8.220000 1.345000 9.555000 1.675000 ;
-      RECT 8.220000 1.675000 8.440000 2.210000 ;
-      RECT 8.610000 1.880000 8.850000 2.380000 ;
-      RECT 8.615000 0.620000 8.910000 1.120000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.095000  2.345000  1.735000 2.515000 ;
+      RECT 0.095000  2.515000  0.355000 2.970000 ;
+      RECT 0.125000  0.450000  0.385000 0.815000 ;
+      RECT 0.125000  0.815000  1.225000 0.985000 ;
+      RECT 0.525000  2.685000  0.855000 3.245000 ;
+      RECT 0.555000  0.085000  0.885000 0.645000 ;
+      RECT 1.025000  2.685000  1.285000 2.865000 ;
+      RECT 1.025000  2.865000  2.665000 3.035000 ;
+      RECT 1.055000  0.265000  2.225000 0.435000 ;
+      RECT 1.055000  0.435000  1.225000 0.815000 ;
+      RECT 1.395000  0.615000  1.725000 0.835000 ;
+      RECT 1.395000  0.835000  2.075000 1.005000 ;
+      RECT 1.475000  2.515000  1.735000 2.675000 ;
+      RECT 1.895000  0.435000  2.225000 0.665000 ;
+      RECT 1.905000  1.005000  2.075000 1.940000 ;
+      RECT 1.905000  1.940000  2.305000 2.170000 ;
+      RECT 1.905000  2.170000  2.235000 2.670000 ;
+      RECT 2.255000  1.100000  2.820000 1.770000 ;
+      RECT 2.405000  2.340000  2.665000 2.865000 ;
+      RECT 2.560000  0.640000  2.820000 1.100000 ;
+      RECT 2.650000  1.770000  2.820000 1.975000 ;
+      RECT 2.650000  1.975000  4.435000 2.145000 ;
+      RECT 2.885000  2.145000  3.175000 2.845000 ;
+      RECT 2.990000  0.085000  3.320000 0.955000 ;
+      RECT 3.345000  2.515000  3.645000 3.245000 ;
+      RECT 3.510000  0.255000  5.220000 0.445000 ;
+      RECT 3.510000  0.445000  3.805000 0.955000 ;
+      RECT 3.955000  2.545000  4.205000 2.905000 ;
+      RECT 3.955000  2.905000  5.115000 3.075000 ;
+      RECT 3.975000  0.625000  4.200000 1.015000 ;
+      RECT 3.975000  1.015000  4.775000 1.185000 ;
+      RECT 4.175000  1.365000  4.435000 1.975000 ;
+      RECT 4.370000  0.615000  4.700000 0.645000 ;
+      RECT 4.370000  0.645000  6.160000 0.845000 ;
+      RECT 4.385000  2.525000  4.775000 2.735000 ;
+      RECT 4.605000  1.185000  4.775000 1.935000 ;
+      RECT 4.605000  1.935000  6.615000 2.035000 ;
+      RECT 4.605000  2.035000  7.600000 2.105000 ;
+      RECT 4.605000  2.105000  4.775000 2.525000 ;
+      RECT 4.890000  0.445000  5.220000 0.475000 ;
+      RECT 4.945000  2.275000  6.005000 2.445000 ;
+      RECT 4.945000  2.445000  5.115000 2.905000 ;
+      RECT 5.285000  2.615000  5.535000 3.245000 ;
+      RECT 5.390000  0.085000  5.720000 0.475000 ;
+      RECT 5.705000  2.445000  6.005000 2.880000 ;
+      RECT 5.890000  0.275000  6.160000 0.645000 ;
+      RECT 6.225000  1.015000  7.250000 1.185000 ;
+      RECT 6.225000  1.185000  6.555000 1.765000 ;
+      RECT 6.410000  2.375000  6.750000 3.245000 ;
+      RECT 6.445000  2.105000  7.600000 2.205000 ;
+      RECT 6.490000  0.085000  6.820000 0.845000 ;
+      RECT 6.920000  2.375000  7.250000 2.780000 ;
+      RECT 6.920000  2.780000  7.650000 3.075000 ;
+      RECT 7.000000  0.640000  7.250000 1.015000 ;
+      RECT 7.430000  0.790000  7.710000 1.120000 ;
+      RECT 7.430000  1.120000  7.600000 2.035000 ;
+      RECT 7.430000  2.205000  7.600000 2.380000 ;
+      RECT 7.430000  2.380000  8.850000 2.610000 ;
+      RECT 7.780000  1.880000  8.050000 2.210000 ;
+      RECT 7.880000  0.390000  8.910000 0.620000 ;
+      RECT 7.880000  0.620000  8.050000 1.880000 ;
+      RECT 8.220000  0.790000  8.445000 1.345000 ;
+      RECT 8.220000  1.345000  9.555000 1.675000 ;
+      RECT 8.220000  1.675000  8.440000 2.210000 ;
+      RECT 8.610000  1.880000  8.850000 2.380000 ;
+      RECT 8.615000  0.620000  8.910000 1.120000 ;
+      RECT 9.225000  0.085000  9.555000 1.175000 ;
+      RECT 9.225000  1.845000  9.555000 3.245000 ;
     LAYER mcon ;
-      RECT 2.075000 1.950000 2.245000 2.120000 ;
-      RECT 7.835000 1.950000 8.005000 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  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 ;
     LAYER met1 ;
       RECT 2.015000 1.920000 2.305000 1.965000 ;
       RECT 2.015000 1.965000 8.065000 2.105000 ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef
index 6191436..a906c2e 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_2.magic.lef
@@ -97,31 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.640000 0.085000 ;
-        RECT 2.485000  0.085000 2.815000 0.355000 ;
-        RECT 3.425000  0.085000 4.015000 0.975000 ;
-        RECT 5.485000  0.085000 5.815000 0.825000 ;
-        RECT 7.350000  0.085000 7.680000 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 ;
-        RECT 8.315000 -0.085000 8.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -130,74 +105,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 2.525000 2.785000 2.855000 3.245000 ;
-        RECT 3.385000 2.785000 3.715000 3.245000 ;
-        RECT 5.210000 2.075000 5.540000 2.290000 ;
-        RECT 5.210000 2.290000 5.990000 3.245000 ;
-        RECT 7.485000 2.085000 7.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 ;
-        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.670000 0.385000 2.815000 ;
-      RECT 0.095000 2.815000 1.635000 2.985000 ;
-      RECT 0.555000 0.325000 1.635000 0.495000 ;
-      RECT 0.555000 0.495000 0.775000 2.635000 ;
-      RECT 0.955000 0.665000 1.285000 0.895000 ;
-      RECT 0.955000 0.895000 1.125000 1.995000 ;
-      RECT 0.955000 1.995000 1.295000 2.575000 ;
-      RECT 1.295000 1.065000 2.155000 1.115000 ;
-      RECT 1.295000 1.115000 1.895000 1.825000 ;
-      RECT 1.465000 0.495000 1.635000 0.525000 ;
-      RECT 1.465000 0.525000 2.855000 0.695000 ;
-      RECT 1.465000 2.435000 4.750000 2.605000 ;
-      RECT 1.465000 2.605000 1.635000 2.815000 ;
-      RECT 1.565000 1.825000 1.895000 2.265000 ;
-      RECT 1.725000 0.865000 2.155000 1.065000 ;
-      RECT 2.605000 0.695000 2.855000 1.515000 ;
-      RECT 4.345000 0.565000 4.790000 0.825000 ;
-      RECT 4.345000 0.825000 4.515000 2.075000 ;
-      RECT 4.345000 2.075000 4.750000 2.435000 ;
-      RECT 4.420000 2.605000 4.750000 2.745000 ;
-      RECT 4.695000 0.995000 6.155000 1.165000 ;
-      RECT 4.695000 1.165000 5.025000 1.400000 ;
-      RECT 5.985000 0.265000 7.130000 0.435000 ;
-      RECT 5.985000 0.435000 6.155000 0.995000 ;
-      RECT 6.335000 0.605000 6.780000 0.815000 ;
-      RECT 6.335000 0.815000 6.515000 2.075000 ;
-      RECT 6.335000 2.075000 6.830000 2.745000 ;
-      RECT 6.685000 0.985000 8.470000 1.155000 ;
-      RECT 6.685000 1.155000 7.130000 1.400000 ;
-      RECT 6.960000 0.435000 7.130000 0.985000 ;
-      RECT 7.850000 0.640000 8.110000 0.985000 ;
-      RECT 7.985000 2.075000 8.470000 2.745000 ;
-      RECT 8.300000 1.155000 8.470000 2.075000 ;
+      RECT 0.000000 -0.085000 8.640000 0.085000 ;
+      RECT 0.000000  3.245000 8.640000 3.415000 ;
+      RECT 0.095000  0.670000 0.385000 2.815000 ;
+      RECT 0.095000  2.815000 1.635000 2.985000 ;
+      RECT 0.555000  0.325000 1.635000 0.495000 ;
+      RECT 0.555000  0.495000 0.775000 2.635000 ;
+      RECT 0.955000  0.665000 1.285000 0.895000 ;
+      RECT 0.955000  0.895000 1.125000 1.995000 ;
+      RECT 0.955000  1.995000 1.295000 2.575000 ;
+      RECT 1.295000  1.065000 2.155000 1.115000 ;
+      RECT 1.295000  1.115000 1.895000 1.825000 ;
+      RECT 1.465000  0.495000 1.635000 0.525000 ;
+      RECT 1.465000  0.525000 2.855000 0.695000 ;
+      RECT 1.465000  2.435000 4.750000 2.605000 ;
+      RECT 1.465000  2.605000 1.635000 2.815000 ;
+      RECT 1.565000  1.825000 1.895000 2.265000 ;
+      RECT 1.725000  0.865000 2.155000 1.065000 ;
+      RECT 2.485000  0.085000 2.815000 0.355000 ;
+      RECT 2.525000  2.785000 2.855000 3.245000 ;
+      RECT 2.605000  0.695000 2.855000 1.515000 ;
+      RECT 3.385000  2.785000 3.715000 3.245000 ;
+      RECT 3.425000  0.085000 4.015000 0.975000 ;
+      RECT 4.345000  0.565000 4.790000 0.825000 ;
+      RECT 4.345000  0.825000 4.515000 2.075000 ;
+      RECT 4.345000  2.075000 4.750000 2.435000 ;
+      RECT 4.420000  2.605000 4.750000 2.745000 ;
+      RECT 4.695000  0.995000 6.155000 1.165000 ;
+      RECT 4.695000  1.165000 5.025000 1.400000 ;
+      RECT 5.210000  2.075000 5.540000 2.290000 ;
+      RECT 5.210000  2.290000 5.990000 3.245000 ;
+      RECT 5.485000  0.085000 5.815000 0.825000 ;
+      RECT 5.985000  0.265000 7.130000 0.435000 ;
+      RECT 5.985000  0.435000 6.155000 0.995000 ;
+      RECT 6.335000  0.605000 6.780000 0.815000 ;
+      RECT 6.335000  0.815000 6.515000 2.075000 ;
+      RECT 6.335000  2.075000 6.830000 2.745000 ;
+      RECT 6.685000  0.985000 8.470000 1.155000 ;
+      RECT 6.685000  1.155000 7.130000 1.400000 ;
+      RECT 6.960000  0.435000 7.130000 0.985000 ;
+      RECT 7.350000  0.085000 7.680000 0.815000 ;
+      RECT 7.485000  2.085000 7.815000 3.245000 ;
+      RECT 7.850000  0.640000 8.110000 0.985000 ;
+      RECT 7.985000  2.075000 8.470000 2.745000 ;
+      RECT 8.300000  1.155000 8.470000 2.075000 ;
     LAYER mcon ;
-      RECT 1.115000 2.320000 1.285000 2.490000 ;
-      RECT 6.395000 2.320000 6.565000 2.490000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  2.320000 1.285000 2.490000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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  2.320000 6.565000 2.490000 ;
+      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 1.055000 2.290000 1.345000 2.335000 ;
       RECT 1.055000 2.335000 6.625000 2.475000 ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef
index 066629c..16e6013 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_4.magic.lef
@@ -103,34 +103,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 2.555000  0.085000 2.745000 0.545000 ;
-        RECT 3.395000  0.085000 3.605000 0.545000 ;
-        RECT 4.255000  0.085000 4.465000 0.885000 ;
-        RECT 5.965000  0.085000 6.295000 0.700000 ;
-        RECT 8.070000  0.085000 8.400000 0.845000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -139,81 +111,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 2.325000 2.725000 2.655000 3.245000 ;
-        RECT 3.185000 2.725000 3.515000 3.245000 ;
-        RECT 4.395000 2.345000 4.725000 3.245000 ;
-        RECT 6.270000 2.485000 6.600000 3.245000 ;
-        RECT 8.490000 2.425000 8.700000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.155000 0.470000 0.365000 2.660000 ;
-      RECT 0.605000 0.290000 2.375000 0.460000 ;
-      RECT 0.605000 0.460000 0.795000 2.660000 ;
-      RECT 1.035000 0.640000 1.245000 2.370000 ;
-      RECT 1.035000 2.370000 4.215000 2.540000 ;
-      RECT 1.035000 2.540000 1.245000 2.670000 ;
-      RECT 1.425000 1.150000 1.895000 1.820000 ;
-      RECT 1.565000 1.820000 1.895000 2.190000 ;
-      RECT 1.725000 0.640000 2.025000 0.970000 ;
-      RECT 1.725000 0.970000 1.895000 1.150000 ;
-      RECT 2.205000 0.460000 2.375000 0.835000 ;
-      RECT 2.205000 0.835000 2.785000 1.005000 ;
-      RECT 2.615000 1.005000 2.785000 1.265000 ;
-      RECT 2.615000 1.265000 3.640000 1.435000 ;
-      RECT 4.045000 1.995000 5.075000 2.165000 ;
-      RECT 4.045000 2.165000 4.215000 2.370000 ;
-      RECT 4.905000 0.625000 5.345000 0.955000 ;
-      RECT 4.905000 0.955000 5.075000 1.995000 ;
-      RECT 4.905000 2.165000 5.075000 2.440000 ;
-      RECT 4.905000 2.440000 5.600000 2.770000 ;
-      RECT 5.255000 1.135000 5.695000 1.305000 ;
-      RECT 5.255000 1.305000 5.425000 2.090000 ;
-      RECT 5.255000 2.090000 7.620000 2.260000 ;
-      RECT 5.525000 0.880000 7.525000 0.905000 ;
-      RECT 5.525000 0.905000 6.645000 1.050000 ;
-      RECT 5.525000 1.050000 5.695000 1.135000 ;
-      RECT 5.605000 1.485000 6.045000 1.815000 ;
-      RECT 5.875000 1.230000 8.615000 1.295000 ;
-      RECT 5.875000 1.295000 7.655000 1.400000 ;
-      RECT 5.875000 1.400000 6.045000 1.485000 ;
-      RECT 6.475000 0.735000 7.525000 0.880000 ;
-      RECT 7.230000 0.470000 7.525000 0.735000 ;
-      RECT 7.410000 2.260000 7.620000 2.760000 ;
-      RECT 7.485000 1.125000 8.615000 1.230000 ;
-      RECT 7.485000 1.400000 7.655000 1.795000 ;
-      RECT 8.445000 1.295000 8.615000 1.975000 ;
-      RECT 8.445000 1.975000 9.495000 2.145000 ;
-      RECT 8.920000 2.145000 9.130000 2.745000 ;
-      RECT 9.165000 0.765000 9.495000 1.975000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.155000  0.470000 0.365000 2.660000 ;
+      RECT 0.605000  0.290000 2.375000 0.460000 ;
+      RECT 0.605000  0.460000 0.795000 2.660000 ;
+      RECT 1.035000  0.640000 1.245000 2.370000 ;
+      RECT 1.035000  2.370000 4.215000 2.540000 ;
+      RECT 1.035000  2.540000 1.245000 2.670000 ;
+      RECT 1.425000  1.150000 1.895000 1.820000 ;
+      RECT 1.565000  1.820000 1.895000 2.190000 ;
+      RECT 1.725000  0.640000 2.025000 0.970000 ;
+      RECT 1.725000  0.970000 1.895000 1.150000 ;
+      RECT 2.205000  0.460000 2.375000 0.835000 ;
+      RECT 2.205000  0.835000 2.785000 1.005000 ;
+      RECT 2.325000  2.725000 2.655000 3.245000 ;
+      RECT 2.555000  0.085000 2.745000 0.545000 ;
+      RECT 2.615000  1.005000 2.785000 1.265000 ;
+      RECT 2.615000  1.265000 3.640000 1.435000 ;
+      RECT 3.185000  2.725000 3.515000 3.245000 ;
+      RECT 3.395000  0.085000 3.605000 0.545000 ;
+      RECT 4.045000  1.995000 5.075000 2.165000 ;
+      RECT 4.045000  2.165000 4.215000 2.370000 ;
+      RECT 4.255000  0.085000 4.465000 0.885000 ;
+      RECT 4.395000  2.345000 4.725000 3.245000 ;
+      RECT 4.905000  0.625000 5.345000 0.955000 ;
+      RECT 4.905000  0.955000 5.075000 1.995000 ;
+      RECT 4.905000  2.165000 5.075000 2.440000 ;
+      RECT 4.905000  2.440000 5.600000 2.770000 ;
+      RECT 5.255000  1.135000 5.695000 1.305000 ;
+      RECT 5.255000  1.305000 5.425000 2.090000 ;
+      RECT 5.255000  2.090000 7.620000 2.260000 ;
+      RECT 5.525000  0.880000 7.525000 0.905000 ;
+      RECT 5.525000  0.905000 6.645000 1.050000 ;
+      RECT 5.525000  1.050000 5.695000 1.135000 ;
+      RECT 5.605000  1.485000 6.045000 1.815000 ;
+      RECT 5.875000  1.230000 8.615000 1.295000 ;
+      RECT 5.875000  1.295000 7.655000 1.400000 ;
+      RECT 5.875000  1.400000 6.045000 1.485000 ;
+      RECT 5.965000  0.085000 6.295000 0.700000 ;
+      RECT 6.270000  2.485000 6.600000 3.245000 ;
+      RECT 6.475000  0.735000 7.525000 0.880000 ;
+      RECT 7.230000  0.470000 7.525000 0.735000 ;
+      RECT 7.410000  2.260000 7.620000 2.760000 ;
+      RECT 7.485000  1.125000 8.615000 1.230000 ;
+      RECT 7.485000  1.400000 7.655000 1.795000 ;
+      RECT 8.070000  0.085000 8.400000 0.845000 ;
+      RECT 8.445000  1.295000 8.615000 1.975000 ;
+      RECT 8.445000  1.975000 9.495000 2.145000 ;
+      RECT 8.490000  2.425000 8.700000 3.245000 ;
+      RECT 8.920000  2.145000 9.130000 2.745000 ;
+      RECT 9.165000  0.765000 9.495000 1.975000 ;
     LAYER mcon ;
-      RECT 7.355000 0.470000 7.525000 0.640000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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  0.470000 7.525000 0.640000 ;
+      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 ;
     LAYER met1 ;
       RECT 0.095000 0.440000 0.385000 0.485000 ;
       RECT 0.095000 0.485000 7.585000 0.625000 ;
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef
index 02ca1d3..dc2de74 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_lp.magic.lef
@@ -111,34 +111,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.905000  0.085000  1.235000 0.465000 ;
-        RECT 3.755000  0.085000  4.005000 0.945000 ;
-        RECT 6.615000  0.085000  6.865000 0.550000 ;
-        RECT 8.845000  0.085000  9.175000 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 ;
-        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
@@ -147,84 +119,109 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.645000 2.330000  0.975000 3.245000 ;
-        RECT 3.855000 2.865000  4.185000 3.245000 ;
-        RECT 6.580000 2.290000  6.910000 3.245000 ;
-        RECT 8.985000 2.680000  9.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 ;
-        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.625000 0.645000 1.795000 0.815000 ;
-      RECT 0.625000 0.815000 0.795000 1.980000 ;
-      RECT 0.625000 1.980000 1.455000 2.150000 ;
-      RECT 0.975000 0.995000 2.155000 1.260000 ;
-      RECT 1.205000 2.150000 1.455000 2.895000 ;
-      RECT 1.205000 2.895000 3.285000 3.065000 ;
-      RECT 1.465000 0.265000 1.795000 0.645000 ;
-      RECT 1.975000 0.265000 2.145000 0.995000 ;
-      RECT 1.985000 1.260000 2.155000 2.365000 ;
-      RECT 2.325000 0.265000 3.565000 0.435000 ;
-      RECT 2.325000 0.435000 2.655000 0.725000 ;
-      RECT 2.335000 0.990000 3.215000 1.320000 ;
-      RECT 2.685000 2.165000 3.765000 2.335000 ;
-      RECT 2.685000 2.335000 2.935000 2.715000 ;
-      RECT 2.885000 0.615000 3.215000 0.990000 ;
-      RECT 3.045000 1.320000 3.215000 1.655000 ;
-      RECT 3.045000 1.655000 3.415000 1.985000 ;
-      RECT 3.115000 2.515000 5.285000 2.685000 ;
-      RECT 3.115000 2.685000 3.285000 2.895000 ;
-      RECT 3.395000 0.435000 3.565000 1.125000 ;
-      RECT 3.395000 1.125000 4.355000 1.295000 ;
-      RECT 3.595000 1.295000 3.765000 2.165000 ;
-      RECT 4.185000 0.265000 6.435000 0.435000 ;
-      RECT 4.185000 0.435000 4.355000 1.125000 ;
-      RECT 4.535000 0.615000 5.355000 0.865000 ;
-      RECT 4.535000 0.865000 4.705000 2.515000 ;
-      RECT 4.885000 1.585000 5.215000 1.745000 ;
-      RECT 4.885000 1.745000 5.635000 1.915000 ;
-      RECT 4.955000 2.095000 5.285000 2.515000 ;
-      RECT 4.955000 2.685000 5.285000 3.065000 ;
-      RECT 5.465000 1.915000 5.635000 1.940000 ;
-      RECT 5.465000 1.940000 7.260000 2.110000 ;
-      RECT 6.265000 0.435000 6.435000 0.730000 ;
-      RECT 6.265000 0.730000 7.960000 0.900000 ;
-      RECT 7.090000 2.110000 7.260000 2.895000 ;
-      RECT 7.090000 2.895000 8.805000 3.065000 ;
-      RECT 7.545000 0.265000 7.960000 0.730000 ;
-      RECT 7.790000 0.900000 7.960000 2.365000 ;
-      RECT 8.140000 0.765000 8.470000 0.860000 ;
-      RECT 8.140000 0.860000 9.970000 1.030000 ;
-      RECT 8.635000 2.330000 9.970000 2.500000 ;
-      RECT 8.635000 2.500000 8.805000 2.895000 ;
-      RECT 9.515000 2.500000 9.970000 3.065000 ;
-      RECT 9.635000 0.265000 9.970000 0.860000 ;
-      RECT 9.800000 1.030000 9.970000 2.330000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.625000  0.645000  1.795000 0.815000 ;
+      RECT 0.625000  0.815000  0.795000 1.980000 ;
+      RECT 0.625000  1.980000  1.455000 2.150000 ;
+      RECT 0.645000  2.330000  0.975000 3.245000 ;
+      RECT 0.905000  0.085000  1.235000 0.465000 ;
+      RECT 0.975000  0.995000  2.155000 1.260000 ;
+      RECT 1.205000  2.150000  1.455000 2.895000 ;
+      RECT 1.205000  2.895000  3.285000 3.065000 ;
+      RECT 1.465000  0.265000  1.795000 0.645000 ;
+      RECT 1.975000  0.265000  2.145000 0.995000 ;
+      RECT 1.985000  1.260000  2.155000 2.365000 ;
+      RECT 2.325000  0.265000  3.565000 0.435000 ;
+      RECT 2.325000  0.435000  2.655000 0.725000 ;
+      RECT 2.335000  0.990000  3.215000 1.320000 ;
+      RECT 2.685000  2.165000  3.765000 2.335000 ;
+      RECT 2.685000  2.335000  2.935000 2.715000 ;
+      RECT 2.885000  0.615000  3.215000 0.990000 ;
+      RECT 3.045000  1.320000  3.215000 1.655000 ;
+      RECT 3.045000  1.655000  3.415000 1.985000 ;
+      RECT 3.115000  2.515000  5.285000 2.685000 ;
+      RECT 3.115000  2.685000  3.285000 2.895000 ;
+      RECT 3.395000  0.435000  3.565000 1.125000 ;
+      RECT 3.395000  1.125000  4.355000 1.295000 ;
+      RECT 3.595000  1.295000  3.765000 2.165000 ;
+      RECT 3.755000  0.085000  4.005000 0.945000 ;
+      RECT 3.855000  2.865000  4.185000 3.245000 ;
+      RECT 4.185000  0.265000  6.435000 0.435000 ;
+      RECT 4.185000  0.435000  4.355000 1.125000 ;
+      RECT 4.535000  0.615000  5.355000 0.865000 ;
+      RECT 4.535000  0.865000  4.705000 2.515000 ;
+      RECT 4.885000  1.585000  5.215000 1.745000 ;
+      RECT 4.885000  1.745000  5.635000 1.915000 ;
+      RECT 4.955000  2.095000  5.285000 2.515000 ;
+      RECT 4.955000  2.685000  5.285000 3.065000 ;
+      RECT 5.465000  1.915000  5.635000 1.940000 ;
+      RECT 5.465000  1.940000  7.260000 2.110000 ;
+      RECT 6.265000  0.435000  6.435000 0.730000 ;
+      RECT 6.265000  0.730000  7.960000 0.900000 ;
+      RECT 6.580000  2.290000  6.910000 3.245000 ;
+      RECT 6.615000  0.085000  6.865000 0.550000 ;
+      RECT 7.090000  2.110000  7.260000 2.895000 ;
+      RECT 7.090000  2.895000  8.805000 3.065000 ;
+      RECT 7.545000  0.265000  7.960000 0.730000 ;
+      RECT 7.790000  0.900000  7.960000 2.365000 ;
+      RECT 8.140000  0.765000  8.470000 0.860000 ;
+      RECT 8.140000  0.860000  9.970000 1.030000 ;
+      RECT 8.635000  2.330000  9.970000 2.500000 ;
+      RECT 8.635000  2.500000  8.805000 2.895000 ;
+      RECT 8.845000  0.085000  9.175000 0.675000 ;
+      RECT 8.985000  2.680000  9.315000 3.245000 ;
+      RECT 9.515000  2.500000  9.970000 3.065000 ;
+      RECT 9.635000  0.265000  9.970000 0.860000 ;
+      RECT 9.800000  1.030000  9.970000 2.330000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__mux4_lp
diff --git a/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef b/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef
index 78c7b68..476d35d 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_m.magic.lef
@@ -98,30 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.880000  0.085000 1.210000 0.880000 ;
-        RECT 2.705000  0.085000 2.895000 0.920000 ;
-        RECT 4.265000  0.085000 4.475000 0.940000 ;
-        RECT 7.385000  0.085000 7.575000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -130,74 +106,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.745000 2.425000 0.935000 3.245000 ;
-        RECT 2.495000 2.525000 2.825000 3.245000 ;
-        RECT 4.575000 2.425000 4.745000 3.245000 ;
-        RECT 7.365000 2.745000 7.575000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.315000 0.820000 0.700000 1.135000 ;
-      RECT 0.315000 1.135000 1.825000 1.305000 ;
-      RECT 0.315000 1.305000 0.525000 2.625000 ;
-      RECT 1.520000 0.275000 2.525000 0.445000 ;
-      RECT 1.520000 0.445000 1.690000 1.135000 ;
-      RECT 1.520000 1.305000 1.825000 1.830000 ;
-      RECT 1.760000 2.175000 3.175000 2.345000 ;
-      RECT 1.760000 2.345000 2.005000 2.625000 ;
-      RECT 1.870000 0.625000 2.175000 0.955000 ;
-      RECT 2.005000 0.955000 2.175000 2.175000 ;
-      RECT 2.355000 0.445000 2.525000 1.100000 ;
-      RECT 2.355000 1.100000 3.695000 1.270000 ;
-      RECT 3.005000 2.345000 3.175000 2.745000 ;
-      RECT 3.005000 2.745000 4.395000 2.915000 ;
-      RECT 3.415000 0.710000 4.045000 0.920000 ;
-      RECT 3.525000 1.270000 3.695000 1.880000 ;
-      RECT 3.570000 2.355000 4.045000 2.565000 ;
-      RECT 3.875000 0.920000 4.045000 1.725000 ;
-      RECT 3.875000 1.725000 5.445000 1.895000 ;
-      RECT 3.875000 1.895000 4.045000 2.355000 ;
-      RECT 4.225000 2.075000 5.095000 2.245000 ;
-      RECT 4.225000 2.245000 4.395000 2.745000 ;
-      RECT 4.925000 2.245000 5.095000 2.805000 ;
-      RECT 4.925000 2.805000 6.595000 2.975000 ;
-      RECT 5.255000 0.965000 5.445000 1.725000 ;
-      RECT 5.275000 1.895000 5.445000 2.625000 ;
-      RECT 5.590000 0.265000 7.145000 0.435000 ;
-      RECT 5.625000 0.615000 6.595000 0.785000 ;
-      RECT 5.625000 0.785000 5.795000 2.805000 ;
-      RECT 5.975000 0.965000 6.165000 1.535000 ;
-      RECT 5.975000 1.535000 7.615000 1.705000 ;
-      RECT 5.975000 1.705000 6.165000 2.625000 ;
-      RECT 6.345000 1.885000 7.145000 2.055000 ;
-      RECT 6.385000 0.785000 6.595000 1.165000 ;
-      RECT 6.385000 2.425000 6.595000 2.805000 ;
-      RECT 6.935000 0.435000 7.145000 0.595000 ;
-      RECT 6.935000 2.055000 7.145000 2.945000 ;
-      RECT 7.445000 1.190000 7.615000 1.535000 ;
-      RECT 7.445000 1.705000 7.615000 1.860000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.315000  0.820000 0.700000 1.135000 ;
+      RECT 0.315000  1.135000 1.825000 1.305000 ;
+      RECT 0.315000  1.305000 0.525000 2.625000 ;
+      RECT 0.745000  2.425000 0.935000 3.245000 ;
+      RECT 0.880000  0.085000 1.210000 0.880000 ;
+      RECT 1.520000  0.275000 2.525000 0.445000 ;
+      RECT 1.520000  0.445000 1.690000 1.135000 ;
+      RECT 1.520000  1.305000 1.825000 1.830000 ;
+      RECT 1.760000  2.175000 3.175000 2.345000 ;
+      RECT 1.760000  2.345000 2.005000 2.625000 ;
+      RECT 1.870000  0.625000 2.175000 0.955000 ;
+      RECT 2.005000  0.955000 2.175000 2.175000 ;
+      RECT 2.355000  0.445000 2.525000 1.100000 ;
+      RECT 2.355000  1.100000 3.695000 1.270000 ;
+      RECT 2.495000  2.525000 2.825000 3.245000 ;
+      RECT 2.705000  0.085000 2.895000 0.920000 ;
+      RECT 3.005000  2.345000 3.175000 2.745000 ;
+      RECT 3.005000  2.745000 4.395000 2.915000 ;
+      RECT 3.415000  0.710000 4.045000 0.920000 ;
+      RECT 3.525000  1.270000 3.695000 1.880000 ;
+      RECT 3.570000  2.355000 4.045000 2.565000 ;
+      RECT 3.875000  0.920000 4.045000 1.725000 ;
+      RECT 3.875000  1.725000 5.445000 1.895000 ;
+      RECT 3.875000  1.895000 4.045000 2.355000 ;
+      RECT 4.225000  2.075000 5.095000 2.245000 ;
+      RECT 4.225000  2.245000 4.395000 2.745000 ;
+      RECT 4.265000  0.085000 4.475000 0.940000 ;
+      RECT 4.575000  2.425000 4.745000 3.245000 ;
+      RECT 4.925000  2.245000 5.095000 2.805000 ;
+      RECT 4.925000  2.805000 6.595000 2.975000 ;
+      RECT 5.255000  0.965000 5.445000 1.725000 ;
+      RECT 5.275000  1.895000 5.445000 2.625000 ;
+      RECT 5.590000  0.265000 7.145000 0.435000 ;
+      RECT 5.625000  0.615000 6.595000 0.785000 ;
+      RECT 5.625000  0.785000 5.795000 2.805000 ;
+      RECT 5.975000  0.965000 6.165000 1.535000 ;
+      RECT 5.975000  1.535000 7.615000 1.705000 ;
+      RECT 5.975000  1.705000 6.165000 2.625000 ;
+      RECT 6.345000  1.885000 7.145000 2.055000 ;
+      RECT 6.385000  0.785000 6.595000 1.165000 ;
+      RECT 6.385000  2.425000 6.595000 2.805000 ;
+      RECT 6.935000  0.435000 7.145000 0.595000 ;
+      RECT 6.935000  2.055000 7.145000 2.945000 ;
+      RECT 7.365000  2.745000 7.575000 3.245000 ;
+      RECT 7.385000  0.085000 7.575000 0.545000 ;
+      RECT 7.445000  1.190000 7.615000 1.535000 ;
+      RECT 7.445000  1.705000 7.615000 1.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 ;
+      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_lp__mux4_m
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef
index d28d015..f53ab82 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_0.magic.lef
@@ -62,13 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.165000  0.085000 0.435000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -77,16 +70,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.125000 2.290000 0.435000 3.245000 ;
-        RECT 0.985000 2.290000 1.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 ;
       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.125000  2.290000 0.435000 3.245000 ;
+      RECT 0.165000  0.085000 0.435000 0.610000 ;
+      RECT 0.985000  2.290000 1.315000 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_lp__nand2_0
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef
index 86b4c91..ab7a93b 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_1.magic.lef
@@ -62,13 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.105000  0.085000 0.435000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -77,16 +70,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.105000 1.920000 0.435000 3.245000 ;
-        RECT 0.985000 1.920000 1.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 ;
       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  0.085000 0.435000 1.040000 ;
+      RECT 0.105000  1.920000 0.435000 3.245000 ;
+      RECT 0.985000  1.920000 1.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 ;
+  END
 END sky130_fd_sc_lp__nand2_1
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_2.magic.lef
index c36ba90..21ca57c 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__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.525000  0.085000 0.855000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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.095000 1.925000 0.425000 3.245000 ;
-        RECT 0.955000 2.270000 1.285000 3.245000 ;
-        RECT 1.815000 2.260000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.355000 1.075000 ;
-      RECT 0.095000 1.075000 1.205000 1.245000 ;
-      RECT 1.035000 0.265000 2.225000 0.435000 ;
-      RECT 1.035000 0.435000 1.205000 1.075000 ;
-      RECT 1.895000 0.435000 2.225000 0.895000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.095000  0.305000 0.355000 1.075000 ;
+      RECT 0.095000  1.075000 1.205000 1.245000 ;
+      RECT 0.095000  1.925000 0.425000 3.245000 ;
+      RECT 0.525000  0.085000 0.855000 0.905000 ;
+      RECT 0.955000  2.270000 1.285000 3.245000 ;
+      RECT 1.035000  0.265000 2.225000 0.435000 ;
+      RECT 1.035000  0.435000 1.205000 1.075000 ;
+      RECT 1.815000  2.260000 2.145000 3.245000 ;
+      RECT 1.895000  0.435000 2.225000 0.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__nand2_2
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef
index 7565a95..09d82ba 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_4.magic.lef
@@ -69,20 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.705000  0.085000 1.035000 0.915000 ;
-        RECT 1.565000  0.085000 1.895000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -91,35 +77,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.125000 1.805000 0.465000 3.245000 ;
-        RECT 1.135000 2.310000 1.465000 3.245000 ;
-        RECT 1.995000 2.310000 2.325000 3.245000 ;
-        RECT 2.920000 2.310000 3.250000 3.245000 ;
-        RECT 3.940000 1.815000 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.285000 0.305000 0.535000 1.085000 ;
-      RECT 0.285000 1.085000 2.255000 1.255000 ;
-      RECT 1.205000 0.305000 1.395000 1.085000 ;
-      RECT 2.065000 0.265000 4.205000 0.435000 ;
-      RECT 2.065000 0.435000 2.255000 1.085000 ;
-      RECT 2.935000 0.435000 3.265000 0.905000 ;
-      RECT 3.945000 0.435000 4.205000 1.185000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.125000  1.805000 0.465000 3.245000 ;
+      RECT 0.285000  0.305000 0.535000 1.085000 ;
+      RECT 0.285000  1.085000 2.255000 1.255000 ;
+      RECT 0.705000  0.085000 1.035000 0.915000 ;
+      RECT 1.135000  2.310000 1.465000 3.245000 ;
+      RECT 1.205000  0.305000 1.395000 1.085000 ;
+      RECT 1.565000  0.085000 1.895000 0.915000 ;
+      RECT 1.995000  2.310000 2.325000 3.245000 ;
+      RECT 2.065000  0.265000 4.205000 0.435000 ;
+      RECT 2.065000  0.435000 2.255000 1.085000 ;
+      RECT 2.920000  2.310000 3.250000 3.245000 ;
+      RECT 2.935000  0.435000 3.265000 0.905000 ;
+      RECT 3.940000  1.815000 4.205000 3.245000 ;
+      RECT 3.945000  0.435000 4.205000 1.185000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand2_4
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef
index ca8dd79..cf016a2 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_8.magic.lef
@@ -87,29 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.905000 ;
-        RECT 1.385000  0.085000 1.715000 0.905000 ;
-        RECT 2.245000  0.085000 2.575000 0.905000 ;
-        RECT 3.105000  0.085000 3.435000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -118,51 +95,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.095000 1.820000 0.425000 3.245000 ;
-        RECT 0.955000 2.105000 1.285000 3.245000 ;
-        RECT 1.815000 2.270000 2.145000 3.245000 ;
-        RECT 2.675000 2.270000 3.005000 3.245000 ;
-        RECT 3.535000 2.115000 3.865000 3.245000 ;
-        RECT 4.430000 2.270000 4.760000 3.245000 ;
-        RECT 5.430000 2.270000 5.760000 3.245000 ;
-        RECT 6.355000 2.095000 6.685000 3.245000 ;
-        RECT 7.275000 1.815000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.680000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.305000 0.355000 1.075000 ;
-      RECT 0.095000 1.075000 3.795000 1.245000 ;
-      RECT 1.025000 0.305000 1.205000 1.075000 ;
-      RECT 1.885000 0.305000 2.075000 1.075000 ;
-      RECT 2.745000 0.305000 2.935000 1.075000 ;
-      RECT 3.605000 0.255000 7.545000 0.425000 ;
-      RECT 3.605000 0.425000 3.795000 1.075000 ;
-      RECT 4.465000 0.425000 4.795000 0.915000 ;
-      RECT 5.465000 0.425000 7.545000 0.435000 ;
-      RECT 5.465000 0.435000 5.795000 0.905000 ;
-      RECT 6.390000 0.435000 6.615000 0.985000 ;
-      RECT 7.285000 0.435000 7.545000 1.190000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.095000  0.305000 0.355000 1.075000 ;
+      RECT 0.095000  1.075000 3.795000 1.245000 ;
+      RECT 0.095000  1.820000 0.425000 3.245000 ;
+      RECT 0.525000  0.085000 0.855000 0.905000 ;
+      RECT 0.955000  2.105000 1.285000 3.245000 ;
+      RECT 1.025000  0.305000 1.205000 1.075000 ;
+      RECT 1.385000  0.085000 1.715000 0.905000 ;
+      RECT 1.815000  2.270000 2.145000 3.245000 ;
+      RECT 1.885000  0.305000 2.075000 1.075000 ;
+      RECT 2.245000  0.085000 2.575000 0.905000 ;
+      RECT 2.675000  2.270000 3.005000 3.245000 ;
+      RECT 2.745000  0.305000 2.935000 1.075000 ;
+      RECT 3.105000  0.085000 3.435000 0.905000 ;
+      RECT 3.535000  2.115000 3.865000 3.245000 ;
+      RECT 3.605000  0.255000 7.545000 0.425000 ;
+      RECT 3.605000  0.425000 3.795000 1.075000 ;
+      RECT 4.430000  2.270000 4.760000 3.245000 ;
+      RECT 4.465000  0.425000 4.795000 0.915000 ;
+      RECT 5.430000  2.270000 5.760000 3.245000 ;
+      RECT 5.465000  0.425000 7.545000 0.435000 ;
+      RECT 5.465000  0.435000 5.795000 0.905000 ;
+      RECT 6.355000  2.095000 6.685000 3.245000 ;
+      RECT 6.390000  0.435000 6.615000 0.985000 ;
+      RECT 7.275000  1.815000 7.485000 3.245000 ;
+      RECT 7.285000  0.435000 7.545000 1.190000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand2_8
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
index cb0bf88..6ad6c43 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.magic.lef
@@ -62,13 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.150000  0.085000 0.400000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -77,15 +70,22 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.580000 2.505000 0.910000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 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.150000  0.085000 0.400000 0.725000 ;
+      RECT 0.580000  2.505000 0.910000 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_lp__nand2_lp
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef
index e84d288..c82dd10 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.magic.lef
@@ -65,14 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.300000  0.085000 0.630000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -81,17 +73,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.200000 2.025000 0.530000 3.245000 ;
-        RECT 1.260000 2.050000 1.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 ;
       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.200000  2.025000 0.530000 3.245000 ;
+      RECT 0.300000  0.085000 0.630000 0.725000 ;
+      RECT 1.260000  2.050000 1.590000 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_lp__nand2_lp2
diff --git a/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef b/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef
index 80b0a0c..d709b62 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_m.magic.lef
@@ -62,13 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.225000  0.085000 0.435000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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
@@ -77,16 +70,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.185000 2.300000 0.395000 3.245000 ;
-        RECT 1.045000 2.300000 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 ;
       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.185000  2.300000 0.395000 3.245000 ;
+      RECT 0.225000  0.085000 0.435000 0.545000 ;
+      RECT 1.045000  2.300000 1.255000 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_lp__nand2_m
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.magic.lef
index a70268c..760be92 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__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.810000  0.085000 1.140000 0.505000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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 +72,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.685000 2.035000 0.945000 3.245000 ;
-        RECT 1.545000 2.285000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 1.695000 1.635000 1.775000 ;
-      RECT 0.160000 1.775000 0.780000 1.865000 ;
-      RECT 0.160000 1.865000 0.490000 2.210000 ;
-      RECT 0.380000 0.280000 0.640000 0.675000 ;
-      RECT 0.380000 0.675000 1.625000 0.845000 ;
-      RECT 0.610000 1.605000 1.635000 1.695000 ;
-      RECT 1.455000 0.845000 1.625000 1.275000 ;
-      RECT 1.455000 1.275000 1.900000 1.605000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.160000  1.695000 1.635000 1.775000 ;
+      RECT 0.160000  1.775000 0.780000 1.865000 ;
+      RECT 0.160000  1.865000 0.490000 2.210000 ;
+      RECT 0.380000  0.280000 0.640000 0.675000 ;
+      RECT 0.380000  0.675000 1.625000 0.845000 ;
+      RECT 0.610000  1.605000 1.635000 1.695000 ;
+      RECT 0.685000  2.035000 0.945000 3.245000 ;
+      RECT 0.810000  0.085000 1.140000 0.505000 ;
+      RECT 1.455000  0.845000 1.625000 1.275000 ;
+      RECT 1.455000  1.275000 1.900000 1.605000 ;
+      RECT 1.545000  2.285000 1.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  3.245000 2.245000 3.415000 ;
   END
 END sky130_fd_sc_lp__nand2b_1
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef
index 4245541..744614e 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.magic.lef
@@ -70,19 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.525000  0.085000 0.950000 0.905000 ;
-        RECT 0.525000  0.905000 0.855000 0.995000 ;
-        RECT 2.560000  0.085000 2.820000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -91,31 +78,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.675000 2.035000 1.060000 3.245000 ;
-        RECT 1.630000 2.375000 1.960000 3.245000 ;
-        RECT 2.490000 2.290000 2.820000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.090000 0.685000 0.355000 1.015000 ;
-      RECT 0.090000 1.015000 0.260000 1.695000 ;
-      RECT 0.090000 1.695000 1.800000 1.865000 ;
-      RECT 0.090000 1.865000 0.505000 2.210000 ;
-      RECT 1.120000 0.255000 2.390000 0.485000 ;
-      RECT 1.120000 0.485000 1.450000 0.905000 ;
-      RECT 1.470000 1.415000 1.800000 1.695000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.090000  0.685000 0.355000 1.015000 ;
+      RECT 0.090000  1.015000 0.260000 1.695000 ;
+      RECT 0.090000  1.695000 1.800000 1.865000 ;
+      RECT 0.090000  1.865000 0.505000 2.210000 ;
+      RECT 0.525000  0.085000 0.950000 0.905000 ;
+      RECT 0.525000  0.905000 0.855000 0.995000 ;
+      RECT 0.675000  2.035000 1.060000 3.245000 ;
+      RECT 1.120000  0.255000 2.390000 0.485000 ;
+      RECT 1.120000  0.485000 1.450000 0.905000 ;
+      RECT 1.470000  1.415000 1.800000 1.695000 ;
+      RECT 1.630000  2.375000 1.960000 3.245000 ;
+      RECT 2.490000  2.290000 2.820000 3.245000 ;
+      RECT 2.560000  0.085000 2.820000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nand2b_2
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef
index a3140f7..38e1d58 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.magic.lef
@@ -73,23 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.855000 ;
-        RECT 3.335000  0.085000 3.665000 0.915000 ;
-        RECT 4.195000  0.085000 4.525000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -98,46 +81,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.525000 2.270000 1.265000 3.245000 ;
-        RECT 1.005000 1.800000 1.265000 2.270000 ;
-        RECT 1.865000 2.105000 2.195000 3.245000 ;
-        RECT 2.835000 2.290000 3.165000 3.245000 ;
-        RECT 3.860000 2.270000 4.125000 3.245000 ;
-        RECT 4.685000 1.930000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.345000 1.025000 ;
-      RECT 0.095000 1.025000 0.835000 1.195000 ;
-      RECT 0.095000 1.930000 0.835000 2.100000 ;
-      RECT 0.095000 2.100000 0.355000 3.075000 ;
-      RECT 0.665000 1.195000 0.835000 1.425000 ;
-      RECT 0.665000 1.425000 2.450000 1.595000 ;
-      RECT 0.665000 1.595000 0.835000 1.930000 ;
-      RECT 1.045000 0.255000 3.165000 0.425000 ;
-      RECT 1.045000 0.425000 1.305000 1.185000 ;
-      RECT 1.975000 0.425000 2.305000 0.915000 ;
-      RECT 2.975000 0.425000 3.165000 1.085000 ;
-      RECT 2.975000 1.085000 4.955000 1.255000 ;
-      RECT 3.835000 0.285000 4.025000 1.075000 ;
-      RECT 3.835000 1.075000 4.955000 1.085000 ;
-      RECT 4.695000 0.305000 4.955000 1.075000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  0.255000 0.345000 1.025000 ;
+      RECT 0.095000  1.025000 0.835000 1.195000 ;
+      RECT 0.095000  1.930000 0.835000 2.100000 ;
+      RECT 0.095000  2.100000 0.355000 3.075000 ;
+      RECT 0.525000  0.085000 0.855000 0.855000 ;
+      RECT 0.525000  2.270000 1.265000 3.245000 ;
+      RECT 0.665000  1.195000 0.835000 1.425000 ;
+      RECT 0.665000  1.425000 2.450000 1.595000 ;
+      RECT 0.665000  1.595000 0.835000 1.930000 ;
+      RECT 1.005000  1.800000 1.265000 2.270000 ;
+      RECT 1.045000  0.255000 3.165000 0.425000 ;
+      RECT 1.045000  0.425000 1.305000 1.185000 ;
+      RECT 1.865000  2.105000 2.195000 3.245000 ;
+      RECT 1.975000  0.425000 2.305000 0.915000 ;
+      RECT 2.835000  2.290000 3.165000 3.245000 ;
+      RECT 2.975000  0.425000 3.165000 1.085000 ;
+      RECT 2.975000  1.085000 4.955000 1.255000 ;
+      RECT 3.335000  0.085000 3.665000 0.915000 ;
+      RECT 3.835000  0.285000 4.025000 1.075000 ;
+      RECT 3.835000  1.075000 4.955000 1.085000 ;
+      RECT 3.860000  2.270000 4.125000 3.245000 ;
+      RECT 4.195000  0.085000 4.525000 0.905000 ;
+      RECT 4.685000  1.930000 5.015000 3.245000 ;
+      RECT 4.695000  0.305000 4.955000 1.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand2b_4
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef
index 2314a99..59d14ef 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.magic.lef
@@ -65,15 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.930000  0.085000 1.260000 0.695000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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 +73,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.790000 2.075000 1.120000 3.245000 ;
-        RECT 1.915000 2.330000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.265000 0.470000 0.875000 ;
-      RECT 0.135000 0.875000 1.955000 1.045000 ;
-      RECT 0.135000 1.045000 0.305000 2.075000 ;
-      RECT 0.135000 2.075000 0.590000 3.065000 ;
-      RECT 1.625000 1.045000 1.955000 1.545000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.135000  0.265000 0.470000 0.875000 ;
+      RECT 0.135000  0.875000 1.955000 1.045000 ;
+      RECT 0.135000  1.045000 0.305000 2.075000 ;
+      RECT 0.135000  2.075000 0.590000 3.065000 ;
+      RECT 0.790000  2.075000 1.120000 3.245000 ;
+      RECT 0.930000  0.085000 1.260000 0.695000 ;
+      RECT 1.625000  1.045000 1.955000 1.545000 ;
+      RECT 1.915000  2.330000 2.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 ;
   END
 END sky130_fd_sc_lp__nand2b_lp
diff --git a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef
index 7b99550..eabeb43 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.magic.lef
@@ -64,15 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.985000  0.085000 1.195000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -81,26 +72,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.905000 2.770000 1.115000 3.245000 ;
-        RECT 1.705000 2.830000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.250000 0.380000 0.440000 2.300000 ;
-      RECT 0.250000 2.300000 1.155000 2.470000 ;
-      RECT 0.475000 2.470000 0.685000 2.970000 ;
-      RECT 0.985000 2.130000 1.870000 2.300000 ;
-      RECT 1.540000 1.790000 1.870000 2.130000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.250000  0.380000 0.440000 2.300000 ;
+      RECT 0.250000  2.300000 1.155000 2.470000 ;
+      RECT 0.475000  2.470000 0.685000 2.970000 ;
+      RECT 0.905000  2.770000 1.115000 3.245000 ;
+      RECT 0.985000  0.085000 1.195000 0.580000 ;
+      RECT 0.985000  2.130000 1.870000 2.300000 ;
+      RECT 1.540000  1.790000 1.870000 2.130000 ;
+      RECT 1.705000  2.830000 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 ;
   END
 END sky130_fd_sc_lp__nand2b_m
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef
index 9131cc3..2328398 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_0.magic.lef
@@ -74,14 +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 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -90,17 +82,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.120000 2.290000 0.415000 3.245000 ;
-        RECT 1.010000 2.290000 1.270000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 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.120000  2.290000 0.415000 3.245000 ;
+      RECT 0.130000  0.085000 0.460000 0.610000 ;
+      RECT 1.010000  2.290000 1.270000 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_lp__nand3_0
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_1.magic.lef
index 1724b24..a07431b 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_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.250000  0.085000 0.580000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -90,18 +81,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.215000 1.920000 0.465000 3.245000 ;
-        RECT 1.165000 2.290000 1.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 ;
       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.215000  1.920000 0.465000 3.245000 ;
+      RECT 0.250000  0.085000 0.580000 1.030000 ;
+      RECT 1.165000  2.290000 1.495000 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_lp__nand3_1
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef
index 4d95024..3d1bcab 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_2.magic.lef
@@ -79,17 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.985000  0.085000 2.315000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,33 +87,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.175000 1.920000 0.505000 3.245000 ;
-        RECT 1.055000 2.630000 1.385000 3.245000 ;
-        RECT 1.955000 2.660000 2.285000 3.245000 ;
-        RECT 2.915000 1.815000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 1.315000 0.425000 ;
-      RECT 0.175000 0.425000 0.435000 1.040000 ;
-      RECT 1.105000 0.425000 1.315000 1.085000 ;
-      RECT 1.105000 1.085000 3.245000 1.255000 ;
-      RECT 1.485000 0.285000 1.815000 0.745000 ;
-      RECT 1.485000 0.745000 2.815000 0.915000 ;
-      RECT 2.485000 0.285000 2.815000 0.745000 ;
-      RECT 2.985000 0.305000 3.245000 1.085000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.175000  0.255000 1.315000 0.425000 ;
+      RECT 0.175000  0.425000 0.435000 1.040000 ;
+      RECT 0.175000  1.920000 0.505000 3.245000 ;
+      RECT 1.055000  2.630000 1.385000 3.245000 ;
+      RECT 1.105000  0.425000 1.315000 1.085000 ;
+      RECT 1.105000  1.085000 3.245000 1.255000 ;
+      RECT 1.485000  0.285000 1.815000 0.745000 ;
+      RECT 1.485000  0.745000 2.815000 0.915000 ;
+      RECT 1.955000  2.660000 2.285000 3.245000 ;
+      RECT 1.985000  0.085000 2.315000 0.575000 ;
+      RECT 2.485000  0.285000 2.815000 0.745000 ;
+      RECT 2.915000  1.815000 3.175000 3.245000 ;
+      RECT 2.985000  0.305000 3.245000 1.085000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nand3_2
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef
index e55c482..857799b 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_4.magic.lef
@@ -89,23 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 3.675000  0.085000 3.945000 0.575000 ;
-        RECT 4.475000  0.085000 4.805000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -114,46 +97,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.145000 1.920000 0.475000 3.245000 ;
-        RECT 1.005000 2.270000 1.335000 3.245000 ;
-        RECT 1.865000 2.115000 2.195000 3.245000 ;
-        RECT 2.725000 2.630000 3.055000 3.245000 ;
-        RECT 3.585000 2.630000 3.915000 3.245000 ;
-        RECT 4.475000 2.630000 4.805000 3.245000 ;
-        RECT 5.335000 2.290000 5.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 ;
-        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.125000 0.255000 2.105000 0.425000 ;
-      RECT 0.125000 0.425000 0.425000 1.145000 ;
-      RECT 0.985000 0.425000 1.315000 0.885000 ;
-      RECT 1.880000 0.425000 2.105000 1.085000 ;
-      RECT 1.880000 1.085000 5.665000 1.255000 ;
-      RECT 2.275000 0.255000 3.505000 0.425000 ;
-      RECT 2.275000 0.425000 2.605000 0.915000 ;
-      RECT 2.775000 0.645000 3.005000 1.085000 ;
-      RECT 3.175000 0.425000 3.505000 0.745000 ;
-      RECT 3.175000 0.745000 5.235000 0.915000 ;
-      RECT 4.065000 0.700000 4.355000 0.745000 ;
-      RECT 4.930000 0.700000 5.235000 0.745000 ;
-      RECT 5.405000 0.265000 5.665000 1.085000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.125000  0.255000 2.105000 0.425000 ;
+      RECT 0.125000  0.425000 0.425000 1.145000 ;
+      RECT 0.145000  1.920000 0.475000 3.245000 ;
+      RECT 0.985000  0.425000 1.315000 0.885000 ;
+      RECT 1.005000  2.270000 1.335000 3.245000 ;
+      RECT 1.865000  2.115000 2.195000 3.245000 ;
+      RECT 1.880000  0.425000 2.105000 1.085000 ;
+      RECT 1.880000  1.085000 5.665000 1.255000 ;
+      RECT 2.275000  0.255000 3.505000 0.425000 ;
+      RECT 2.275000  0.425000 2.605000 0.915000 ;
+      RECT 2.725000  2.630000 3.055000 3.245000 ;
+      RECT 2.775000  0.645000 3.005000 1.085000 ;
+      RECT 3.175000  0.425000 3.505000 0.745000 ;
+      RECT 3.175000  0.745000 5.235000 0.915000 ;
+      RECT 3.585000  2.630000 3.915000 3.245000 ;
+      RECT 3.675000  0.085000 3.945000 0.575000 ;
+      RECT 4.065000  0.700000 4.355000 0.745000 ;
+      RECT 4.475000  0.085000 4.805000 0.575000 ;
+      RECT 4.475000  2.630000 4.805000 3.245000 ;
+      RECT 4.930000  0.700000 5.235000 0.745000 ;
+      RECT 5.335000  2.290000 5.665000 3.245000 ;
+      RECT 5.405000  0.265000 5.665000 1.085000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand3_4
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_lp.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_lp.magic.lef
index 5f3105c..7d3226f 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_lp.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_lp.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 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 ;
       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.175000 2.025000 0.425000 3.245000 ;
-        RECT 1.280000 2.055000 1.610000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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.175000  2.025000 0.425000 3.245000 ;
+      RECT 0.320000  0.085000 0.650000 0.675000 ;
+      RECT 1.280000  2.055000 1.610000 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_lp__nand3_lp
diff --git a/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef b/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef
index 4a2b741..66f1484 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_m.magic.lef
@@ -74,14 +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 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -90,17 +82,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.180000 2.300000 0.390000 3.245000 ;
-        RECT 1.040000 2.300000 1.250000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 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.130000  0.085000 0.460000 0.485000 ;
+      RECT 0.180000  2.300000 0.390000 3.245000 ;
+      RECT 1.040000  2.300000 1.250000 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_lp__nand3_m
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef
index 34d5ade..33085ef 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.magic.lef
@@ -74,16 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.820000  0.085000 1.190000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -92,27 +82,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.880000 1.920000 1.180000 3.245000 ;
-        RECT 1.805000 2.260000 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.155000 0.765000 0.650000 1.085000 ;
-      RECT 0.155000 1.085000 2.375000 1.255000 ;
-      RECT 0.155000 1.255000 0.325000 1.920000 ;
-      RECT 0.155000 1.920000 0.710000 2.210000 ;
-      RECT 2.125000 1.255000 2.375000 1.515000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.155000  0.765000 0.650000 1.085000 ;
+      RECT 0.155000  1.085000 2.375000 1.255000 ;
+      RECT 0.155000  1.255000 0.325000 1.920000 ;
+      RECT 0.155000  1.920000 0.710000 2.210000 ;
+      RECT 0.820000  0.085000 1.190000 0.915000 ;
+      RECT 0.880000  1.920000 1.180000 3.245000 ;
+      RECT 1.805000  2.260000 2.135000 3.245000 ;
+      RECT 2.125000  1.255000 2.375000 1.515000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__nand3b_1
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.magic.lef
index f76501e..844cbda 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_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.775000  0.085000 1.105000 0.835000 ;
-        RECT 3.665000  0.085000 3.995000 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 ;
       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.735000 1.920000 1.020000 3.245000 ;
-        RECT 1.735000 2.755000 2.065000 3.245000 ;
-        RECT 2.745000 2.755000 3.065000 3.245000 ;
-        RECT 3.735000 2.755000 3.995000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.090000 0.825000 0.565000 1.005000 ;
-      RECT 0.090000 1.005000 2.060000 1.175000 ;
-      RECT 0.090000 1.175000 0.260000 1.920000 ;
-      RECT 0.090000 1.920000 0.565000 2.200000 ;
-      RECT 1.275000 0.255000 3.495000 0.425000 ;
-      RECT 1.275000 0.425000 1.535000 0.835000 ;
-      RECT 1.705000 0.595000 3.095000 0.765000 ;
-      RECT 1.705000 0.765000 2.035000 0.835000 ;
-      RECT 1.890000 1.175000 2.060000 1.345000 ;
-      RECT 1.890000 1.345000 2.350000 1.565000 ;
-      RECT 2.765000 0.765000 3.095000 0.835000 ;
-      RECT 3.265000 0.425000 3.495000 0.835000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.090000  0.825000 0.565000 1.005000 ;
+      RECT 0.090000  1.005000 2.060000 1.175000 ;
+      RECT 0.090000  1.175000 0.260000 1.920000 ;
+      RECT 0.090000  1.920000 0.565000 2.200000 ;
+      RECT 0.735000  1.920000 1.020000 3.245000 ;
+      RECT 0.775000  0.085000 1.105000 0.835000 ;
+      RECT 1.275000  0.255000 3.495000 0.425000 ;
+      RECT 1.275000  0.425000 1.535000 0.835000 ;
+      RECT 1.705000  0.595000 3.095000 0.765000 ;
+      RECT 1.705000  0.765000 2.035000 0.835000 ;
+      RECT 1.735000  2.755000 2.065000 3.245000 ;
+      RECT 1.890000  1.175000 2.060000 1.345000 ;
+      RECT 1.890000  1.345000 2.350000 1.565000 ;
+      RECT 2.745000  2.755000 3.065000 3.245000 ;
+      RECT 2.765000  0.765000 3.095000 0.835000 ;
+      RECT 3.265000  0.425000 3.495000 0.835000 ;
+      RECT 3.665000  0.085000 3.995000 0.835000 ;
+      RECT 3.735000  2.755000 3.995000 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_lp__nand3b_2
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef
index 220167c..33305f2 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.magic.lef
@@ -84,28 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.700000 ;
-        RECT 5.045000  0.085000 5.375000 0.885000 ;
-        RECT 5.905000  0.085000 6.235000 0.895000 ;
-        RECT 6.800000  0.085000 7.095000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -114,56 +92,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.910000 1.885000 1.185000 3.245000 ;
-        RECT 1.765000 2.115000 2.095000 3.245000 ;
-        RECT 2.625000 2.660000 2.955000 3.245000 ;
-        RECT 3.550000 2.270000 3.880000 3.245000 ;
-        RECT 4.535000 2.270000 4.865000 3.245000 ;
-        RECT 5.500000 2.270000 5.830000 3.245000 ;
-        RECT 6.360000 1.930000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.360000 0.395000 0.870000 ;
-      RECT 0.135000 0.870000 1.320000 1.040000 ;
-      RECT 0.135000 1.040000 0.405000 1.920000 ;
-      RECT 0.135000 1.920000 0.740000 3.075000 ;
-      RECT 0.975000 1.040000 1.320000 1.315000 ;
-      RECT 0.975000 1.315000 2.750000 1.520000 ;
-      RECT 1.085000 0.255000 4.855000 0.425000 ;
-      RECT 1.085000 0.425000 1.345000 0.700000 ;
-      RECT 1.945000 0.425000 2.275000 0.805000 ;
-      RECT 2.805000 0.425000 4.855000 0.445000 ;
-      RECT 2.805000 0.445000 3.135000 0.805000 ;
-      RECT 3.305000 0.615000 3.495000 0.955000 ;
-      RECT 3.305000 0.955000 4.355000 1.065000 ;
-      RECT 3.330000 1.065000 6.630000 1.085000 ;
-      RECT 3.375000 1.085000 6.630000 1.235000 ;
-      RECT 3.665000 0.445000 3.995000 0.785000 ;
-      RECT 4.165000 0.615000 4.355000 0.955000 ;
-      RECT 4.525000 0.445000 4.855000 0.895000 ;
-      RECT 5.545000 0.255000 5.735000 1.065000 ;
-      RECT 6.405000 0.255000 6.630000 1.065000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.135000  0.360000 0.395000 0.870000 ;
+      RECT 0.135000  0.870000 1.320000 1.040000 ;
+      RECT 0.135000  1.040000 0.405000 1.920000 ;
+      RECT 0.135000  1.920000 0.740000 3.075000 ;
+      RECT 0.565000  0.085000 0.895000 0.700000 ;
+      RECT 0.910000  1.885000 1.185000 3.245000 ;
+      RECT 0.975000  1.040000 1.320000 1.315000 ;
+      RECT 0.975000  1.315000 2.750000 1.520000 ;
+      RECT 1.085000  0.255000 4.855000 0.425000 ;
+      RECT 1.085000  0.425000 1.345000 0.700000 ;
+      RECT 1.765000  2.115000 2.095000 3.245000 ;
+      RECT 1.945000  0.425000 2.275000 0.805000 ;
+      RECT 2.625000  2.660000 2.955000 3.245000 ;
+      RECT 2.805000  0.425000 4.855000 0.445000 ;
+      RECT 2.805000  0.445000 3.135000 0.805000 ;
+      RECT 3.305000  0.615000 3.495000 0.955000 ;
+      RECT 3.305000  0.955000 4.355000 1.065000 ;
+      RECT 3.330000  1.065000 6.630000 1.085000 ;
+      RECT 3.375000  1.085000 6.630000 1.235000 ;
+      RECT 3.550000  2.270000 3.880000 3.245000 ;
+      RECT 3.665000  0.445000 3.995000 0.785000 ;
+      RECT 4.165000  0.615000 4.355000 0.955000 ;
+      RECT 4.525000  0.445000 4.855000 0.895000 ;
+      RECT 4.535000  2.270000 4.865000 3.245000 ;
+      RECT 5.045000  0.085000 5.375000 0.885000 ;
+      RECT 5.500000  2.270000 5.830000 3.245000 ;
+      RECT 5.545000  0.255000 5.735000 1.065000 ;
+      RECT 5.905000  0.085000 6.235000 0.895000 ;
+      RECT 6.360000  1.930000 6.690000 3.245000 ;
+      RECT 6.405000  0.255000 6.630000 1.065000 ;
+      RECT 6.800000  0.085000 7.095000 1.095000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand3b_4
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef
index 828a6b4..f739c73 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.magic.lef
@@ -75,16 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.535000  0.085000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -93,27 +83,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.725000 2.450000 1.055000 3.245000 ;
-        RECT 1.785000 2.060000 2.115000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.450000 1.200000 2.765000 1.370000 ;
-      RECT 0.450000 1.370000 0.780000 1.905000 ;
-      RECT 2.355000 2.060000 2.765000 3.065000 ;
-      RECT 2.435000 0.850000 2.765000 1.200000 ;
-      RECT 2.595000 1.370000 2.765000 2.060000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.450000  1.200000 2.765000 1.370000 ;
+      RECT 0.450000  1.370000 0.780000 1.905000 ;
+      RECT 0.725000  2.450000 1.055000 3.245000 ;
+      RECT 1.535000  0.085000 1.865000 1.020000 ;
+      RECT 1.785000  2.060000 2.115000 3.245000 ;
+      RECT 2.355000  2.060000 2.765000 3.065000 ;
+      RECT 2.435000  0.850000 2.765000 1.200000 ;
+      RECT 2.595000  1.370000 2.765000 2.060000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__nand3b_lp
diff --git a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef
index 6623979..30de22c 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.magic.lef
@@ -74,15 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.655000  0.085000 0.825000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -91,29 +82,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.765000 2.065000 0.935000 2.375000 ;
-        RECT 0.765000 2.375000 1.795000 2.545000 ;
-        RECT 0.870000 2.545000 1.040000 3.245000 ;
-        RECT 1.625000 2.065000 1.795000 2.375000 ;
-        RECT 1.625000 2.545000 1.795000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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.405000 0.475000 0.615000 ;
-      RECT 0.110000 0.615000 0.280000 2.125000 ;
-      RECT 0.110000 2.125000 0.585000 2.335000 ;
-      RECT 0.255000 2.335000 0.585000 2.715000 ;
-      RECT 0.255000 2.715000 0.700000 3.045000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.110000  0.405000 0.475000 0.615000 ;
+      RECT 0.110000  0.615000 0.280000 2.125000 ;
+      RECT 0.110000  2.125000 0.585000 2.335000 ;
+      RECT 0.255000  2.335000 0.585000 2.715000 ;
+      RECT 0.255000  2.715000 0.700000 3.045000 ;
+      RECT 0.655000  0.085000 0.825000 0.545000 ;
+      RECT 0.765000  2.065000 0.935000 2.375000 ;
+      RECT 0.765000  2.375000 1.795000 2.545000 ;
+      RECT 0.870000  2.545000 1.040000 3.245000 ;
+      RECT 1.625000  2.065000 1.795000 2.375000 ;
+      RECT 1.625000  2.545000 1.795000 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_lp__nand3b_m
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef
index 7f3b3ac..368ab5c 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_0.magic.lef
@@ -83,16 +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.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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -101,20 +91,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.480000 2.290000 0.775000 3.245000 ;
-        RECT 1.375000 2.300000 1.635000 3.245000 ;
-        RECT 2.235000 2.300000 2.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 ;
       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.340000  0.085000 0.670000 0.610000 ;
+      RECT 0.480000  2.290000 0.775000 3.245000 ;
+      RECT 1.375000  2.300000 1.635000 3.245000 ;
+      RECT 2.235000  2.300000 2.530000 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_lp__nand4_0
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef
index 760c4e6..b45b3ee 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_1.magic.lef
@@ -83,16 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.270000  0.085000 0.480000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,20 +91,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.245000 2.105000 0.455000 3.245000 ;
-        RECT 1.130000 2.445000 1.340000 3.245000 ;
-        RECT 2.425000 2.105000 2.635000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.245000  2.105000 0.455000 3.245000 ;
+      RECT 0.270000  0.085000 0.480000 0.885000 ;
+      RECT 1.130000  2.445000 1.340000 3.245000 ;
+      RECT 2.425000  2.105000 2.635000 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_lp__nand4_1
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef
index a89da6e..c7a374a 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_2.magic.lef
@@ -91,20 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.735000  0.085000 1.065000 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
@@ -113,40 +99,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.135000 1.815000 0.455000 2.295000 ;
-        RECT 0.135000 2.295000 0.805000 3.245000 ;
-        RECT 1.335000 2.095000 1.665000 3.245000 ;
-        RECT 2.240000 2.260000 2.570000 3.245000 ;
-        RECT 3.260000 2.260000 3.590000 3.245000 ;
-        RECT 4.245000 1.920000 4.575000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.305000 0.255000 0.565000 0.985000 ;
-      RECT 0.305000 0.985000 1.415000 1.155000 ;
-      RECT 1.235000 0.255000 2.385000 0.545000 ;
-      RECT 1.235000 0.545000 1.415000 0.985000 ;
-      RECT 1.625000 0.715000 3.355000 0.905000 ;
-      RECT 1.625000 0.905000 1.955000 0.995000 ;
-      RECT 2.595000 0.255000 4.645000 0.425000 ;
-      RECT 2.595000 0.425000 3.715000 0.545000 ;
-      RECT 3.525000 0.545000 3.715000 0.905000 ;
-      RECT 4.385000 0.425000 4.645000 1.195000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.135000  1.815000 0.455000 2.295000 ;
+      RECT 0.135000  2.295000 0.805000 3.245000 ;
+      RECT 0.305000  0.255000 0.565000 0.985000 ;
+      RECT 0.305000  0.985000 1.415000 1.155000 ;
+      RECT 0.735000  0.085000 1.065000 0.805000 ;
+      RECT 1.235000  0.255000 2.385000 0.545000 ;
+      RECT 1.235000  0.545000 1.415000 0.985000 ;
+      RECT 1.335000  2.095000 1.665000 3.245000 ;
+      RECT 1.625000  0.715000 3.355000 0.905000 ;
+      RECT 1.625000  0.905000 1.955000 0.995000 ;
+      RECT 2.240000  2.260000 2.570000 3.245000 ;
+      RECT 2.595000  0.255000 4.645000 0.425000 ;
+      RECT 2.595000  0.425000 3.715000 0.545000 ;
+      RECT 3.260000  2.260000 3.590000 3.245000 ;
+      RECT 3.525000  0.545000 3.715000 0.905000 ;
+      RECT 4.245000  1.920000 4.575000 3.245000 ;
+      RECT 4.385000  0.425000 4.645000 1.195000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand4_2
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef
index 21ba044..1d9cc47 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_4.magic.lef
@@ -93,28 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.915000 ;
-        RECT 1.385000  0.085000 1.715000 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
@@ -123,57 +101,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.145000 1.920000 0.440000 3.245000 ;
-        RECT 1.005000 2.290000 1.335000 3.245000 ;
-        RECT 1.945000 2.260000 2.275000 3.245000 ;
-        RECT 2.885000 2.260000 3.215000 3.245000 ;
-        RECT 3.745000 2.260000 4.075000 3.245000 ;
-        RECT 4.605000 2.260000 4.935000 3.245000 ;
-        RECT 5.465000 2.260000 6.245000 3.245000 ;
-        RECT 6.775000 2.260000 7.105000 3.245000 ;
-        RECT 7.635000 1.920000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.305000 0.355000 1.085000 ;
-      RECT 0.155000 1.085000 2.075000 1.255000 ;
-      RECT 1.025000 0.305000 1.215000 1.085000 ;
-      RECT 1.885000 0.265000 3.945000 0.435000 ;
-      RECT 1.885000 0.435000 2.075000 1.085000 ;
-      RECT 2.245000 0.605000 2.575000 1.035000 ;
-      RECT 2.245000 1.035000 3.435000 1.205000 ;
-      RECT 2.745000 0.435000 2.935000 0.865000 ;
-      RECT 3.105000 0.605000 3.435000 0.745000 ;
-      RECT 3.105000 0.745000 5.815000 0.915000 ;
-      RECT 3.105000 0.915000 3.435000 1.035000 ;
-      RECT 3.615000 0.435000 3.945000 0.565000 ;
-      RECT 4.195000 0.275000 7.965000 0.445000 ;
-      RECT 4.195000 0.445000 6.175000 0.575000 ;
-      RECT 5.985000 0.575000 6.175000 0.915000 ;
-      RECT 6.845000 0.445000 7.035000 0.915000 ;
-      RECT 7.705000 0.445000 7.965000 1.195000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.145000  1.920000 0.440000 3.245000 ;
+      RECT 0.155000  0.305000 0.355000 1.085000 ;
+      RECT 0.155000  1.085000 2.075000 1.255000 ;
+      RECT 0.525000  0.085000 0.855000 0.915000 ;
+      RECT 1.005000  2.290000 1.335000 3.245000 ;
+      RECT 1.025000  0.305000 1.215000 1.085000 ;
+      RECT 1.385000  0.085000 1.715000 0.915000 ;
+      RECT 1.885000  0.265000 3.945000 0.435000 ;
+      RECT 1.885000  0.435000 2.075000 1.085000 ;
+      RECT 1.945000  2.260000 2.275000 3.245000 ;
+      RECT 2.245000  0.605000 2.575000 1.035000 ;
+      RECT 2.245000  1.035000 3.435000 1.205000 ;
+      RECT 2.745000  0.435000 2.935000 0.865000 ;
+      RECT 2.885000  2.260000 3.215000 3.245000 ;
+      RECT 3.105000  0.605000 3.435000 0.745000 ;
+      RECT 3.105000  0.745000 5.815000 0.915000 ;
+      RECT 3.105000  0.915000 3.435000 1.035000 ;
+      RECT 3.615000  0.435000 3.945000 0.565000 ;
+      RECT 3.745000  2.260000 4.075000 3.245000 ;
+      RECT 4.195000  0.275000 7.965000 0.445000 ;
+      RECT 4.195000  0.445000 6.175000 0.575000 ;
+      RECT 4.605000  2.260000 4.935000 3.245000 ;
+      RECT 5.465000  2.260000 6.245000 3.245000 ;
+      RECT 5.985000  0.575000 6.175000 0.915000 ;
+      RECT 6.775000  2.260000 7.105000 3.245000 ;
+      RECT 6.845000  0.445000 7.035000 0.915000 ;
+      RECT 7.635000  1.920000 7.965000 3.245000 ;
+      RECT 7.705000  0.445000 7.965000 1.195000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand4_4
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef
index 070dafe..422d2d3 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_lp.magic.lef
@@ -83,16 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.205000  0.085000 0.535000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,20 +91,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.135000 2.025000 0.465000 3.245000 ;
-        RECT 1.195000 2.025000 1.525000 3.245000 ;
-        RECT 2.330000 2.025000 2.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 ;
       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.135000  2.025000 0.465000 3.245000 ;
+      RECT 0.205000  0.085000 0.535000 0.645000 ;
+      RECT 1.195000  2.025000 1.525000 3.245000 ;
+      RECT 2.330000  2.025000 2.660000 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_lp__nand4_lp
diff --git a/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef b/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef
index 9689609..0939d3b 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_m.magic.lef
@@ -83,16 +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.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,20 +91,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.540000 2.300000 0.750000 3.245000 ;
-        RECT 1.400000 2.300000 1.610000 3.245000 ;
-        RECT 2.425000 2.300000 2.635000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.340000  0.085000 0.670000 0.485000 ;
+      RECT 0.540000  2.300000 0.750000 3.245000 ;
+      RECT 1.400000  2.300000 1.610000 3.245000 ;
+      RECT 2.425000  2.300000 2.635000 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_lp__nand4_m
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef
index ff56e59..06dfedc 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.magic.lef
@@ -83,17 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.795000  0.085000 1.125000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,29 +91,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.745000 2.035000 1.160000 3.245000 ;
-        RECT 1.785000 2.375000 2.115000 3.245000 ;
-        RECT 2.725000 2.375000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.685000 0.625000 1.015000 ;
-      RECT 0.085000 1.015000 0.350000 1.695000 ;
-      RECT 0.085000 1.695000 2.850000 1.865000 ;
-      RECT 0.085000 1.865000 0.575000 2.200000 ;
-      RECT 2.600000 1.345000 2.850000 1.695000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.085000  0.685000 0.625000 1.015000 ;
+      RECT 0.085000  1.015000 0.350000 1.695000 ;
+      RECT 0.085000  1.695000 2.850000 1.865000 ;
+      RECT 0.085000  1.865000 0.575000 2.200000 ;
+      RECT 0.745000  2.035000 1.160000 3.245000 ;
+      RECT 0.795000  0.085000 1.125000 1.015000 ;
+      RECT 1.785000  2.375000 2.115000 3.245000 ;
+      RECT 2.600000  1.345000 2.850000 1.695000 ;
+      RECT 2.725000  2.375000 3.055000 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_lp__nand4b_1
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef
index 2f71d6f..a0b3417 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.magic.lef
@@ -87,23 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.525000 ;
-        RECT 4.825000  0.085000 5.155000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -112,49 +95,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.955000 1.815000 1.335000 3.245000 ;
-        RECT 1.940000 2.260000 2.270000 3.245000 ;
-        RECT 2.845000 2.290000 3.855000 3.245000 ;
-        RECT 4.385000 2.260000 4.715000 3.245000 ;
-        RECT 5.245000 1.920000 5.575000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.155000 0.300000 0.345000 0.695000 ;
-      RECT 0.155000 0.695000 0.785000 0.865000 ;
-      RECT 0.420000 1.895000 0.785000 2.225000 ;
-      RECT 0.605000 0.865000 0.785000 1.415000 ;
-      RECT 0.605000 1.415000 1.755000 1.645000 ;
-      RECT 0.605000 1.645000 0.785000 1.895000 ;
-      RECT 1.045000 0.255000 2.305000 0.425000 ;
-      RECT 1.045000 0.425000 1.305000 1.185000 ;
-      RECT 1.975000 0.425000 2.305000 0.725000 ;
-      RECT 1.975000 0.725000 3.235000 0.905000 ;
-      RECT 2.475000 0.255000 4.285000 0.425000 ;
-      RECT 2.475000 0.425000 2.805000 0.555000 ;
-      RECT 2.975000 0.645000 3.235000 0.725000 ;
-      RECT 3.445000 0.595000 3.775000 1.085000 ;
-      RECT 3.445000 1.085000 5.605000 1.255000 ;
-      RECT 3.955000 0.425000 4.285000 0.915000 ;
-      RECT 4.455000 0.325000 4.655000 1.085000 ;
-      RECT 5.325000 0.325000 5.605000 1.085000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.155000  0.300000 0.345000 0.695000 ;
+      RECT 0.155000  0.695000 0.785000 0.865000 ;
+      RECT 0.420000  1.895000 0.785000 2.225000 ;
+      RECT 0.525000  0.085000 0.855000 0.525000 ;
+      RECT 0.605000  0.865000 0.785000 1.415000 ;
+      RECT 0.605000  1.415000 1.755000 1.645000 ;
+      RECT 0.605000  1.645000 0.785000 1.895000 ;
+      RECT 0.955000  1.815000 1.335000 3.245000 ;
+      RECT 1.045000  0.255000 2.305000 0.425000 ;
+      RECT 1.045000  0.425000 1.305000 1.185000 ;
+      RECT 1.940000  2.260000 2.270000 3.245000 ;
+      RECT 1.975000  0.425000 2.305000 0.725000 ;
+      RECT 1.975000  0.725000 3.235000 0.905000 ;
+      RECT 2.475000  0.255000 4.285000 0.425000 ;
+      RECT 2.475000  0.425000 2.805000 0.555000 ;
+      RECT 2.845000  2.290000 3.855000 3.245000 ;
+      RECT 2.975000  0.645000 3.235000 0.725000 ;
+      RECT 3.445000  0.595000 3.775000 1.085000 ;
+      RECT 3.445000  1.085000 5.605000 1.255000 ;
+      RECT 3.955000  0.425000 4.285000 0.915000 ;
+      RECT 4.385000  2.260000 4.715000 3.245000 ;
+      RECT 4.455000  0.325000 4.655000 1.085000 ;
+      RECT 4.825000  0.085000 5.155000 0.915000 ;
+      RECT 5.245000  1.920000 5.575000 3.245000 ;
+      RECT 5.325000  0.325000 5.605000 1.085000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand4b_2
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef
index 9131c99..b8b3bf6 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.magic.lef
@@ -101,31 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.855000 ;
-        RECT 7.335000  0.085000 7.665000 0.905000 ;
-        RECT 8.195000  0.085000 8.525000 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 ;
-        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
@@ -134,65 +109,87 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.945000 1.815000 1.175000 3.245000 ;
-        RECT 1.785000 2.125000 2.115000 3.245000 ;
-        RECT 2.685000 2.115000 3.015000 3.245000 ;
-        RECT 3.565000 2.290000 3.895000 3.245000 ;
-        RECT 4.425000 2.290000 5.095000 3.245000 ;
-        RECT 5.625000 2.290000 5.955000 3.245000 ;
-        RECT 6.595000 2.105000 7.185000 3.245000 ;
-        RECT 7.715000 2.270000 8.045000 3.245000 ;
-        RECT 8.575000 1.920000 8.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.345000 1.025000 ;
-      RECT 0.095000 1.025000 0.855000 1.195000 ;
-      RECT 0.445000 1.930000 0.775000 3.075000 ;
-      RECT 0.605000 1.195000 0.855000 1.425000 ;
-      RECT 0.605000 1.425000 2.800000 1.595000 ;
-      RECT 0.605000 1.595000 0.775000 1.930000 ;
-      RECT 1.045000 0.255000 4.895000 0.425000 ;
-      RECT 1.045000 0.425000 1.340000 1.115000 ;
-      RECT 1.905000 0.425000 2.235000 0.905000 ;
-      RECT 2.765000 0.425000 4.895000 0.515000 ;
-      RECT 2.765000 0.515000 3.095000 0.905000 ;
-      RECT 3.275000 0.685000 4.465000 0.725000 ;
-      RECT 3.275000 0.725000 5.795000 0.905000 ;
-      RECT 5.105000 0.255000 7.165000 0.435000 ;
-      RECT 5.105000 0.435000 6.295000 0.555000 ;
-      RECT 5.530000 0.905000 5.795000 1.075000 ;
-      RECT 5.530000 1.075000 6.805000 1.255000 ;
-      RECT 5.965000 0.555000 6.295000 0.905000 ;
-      RECT 6.475000 0.605000 6.805000 1.075000 ;
-      RECT 6.975000 0.435000 7.165000 1.075000 ;
-      RECT 6.975000 1.075000 8.955000 1.245000 ;
-      RECT 7.835000 0.305000 8.025000 1.075000 ;
-      RECT 8.695000 0.305000 8.955000 1.075000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  0.255000 0.345000 1.025000 ;
+      RECT 0.095000  1.025000 0.855000 1.195000 ;
+      RECT 0.445000  1.930000 0.775000 3.075000 ;
+      RECT 0.525000  0.085000 0.855000 0.855000 ;
+      RECT 0.605000  1.195000 0.855000 1.425000 ;
+      RECT 0.605000  1.425000 2.800000 1.595000 ;
+      RECT 0.605000  1.595000 0.775000 1.930000 ;
+      RECT 0.945000  1.815000 1.175000 3.245000 ;
+      RECT 1.045000  0.255000 4.895000 0.425000 ;
+      RECT 1.045000  0.425000 1.340000 1.115000 ;
+      RECT 1.785000  2.125000 2.115000 3.245000 ;
+      RECT 1.905000  0.425000 2.235000 0.905000 ;
+      RECT 2.685000  2.115000 3.015000 3.245000 ;
+      RECT 2.765000  0.425000 4.895000 0.515000 ;
+      RECT 2.765000  0.515000 3.095000 0.905000 ;
+      RECT 3.275000  0.685000 4.465000 0.725000 ;
+      RECT 3.275000  0.725000 5.795000 0.905000 ;
+      RECT 3.565000  2.290000 3.895000 3.245000 ;
+      RECT 4.425000  2.290000 5.095000 3.245000 ;
+      RECT 5.105000  0.255000 7.165000 0.435000 ;
+      RECT 5.105000  0.435000 6.295000 0.555000 ;
+      RECT 5.530000  0.905000 5.795000 1.075000 ;
+      RECT 5.530000  1.075000 6.805000 1.255000 ;
+      RECT 5.625000  2.290000 5.955000 3.245000 ;
+      RECT 5.965000  0.555000 6.295000 0.905000 ;
+      RECT 6.475000  0.605000 6.805000 1.075000 ;
+      RECT 6.595000  2.105000 7.185000 3.245000 ;
+      RECT 6.975000  0.435000 7.165000 1.075000 ;
+      RECT 6.975000  1.075000 8.955000 1.245000 ;
+      RECT 7.335000  0.085000 7.665000 0.905000 ;
+      RECT 7.715000  2.270000 8.045000 3.245000 ;
+      RECT 7.835000  0.305000 8.025000 1.075000 ;
+      RECT 8.195000  0.085000 8.525000 0.895000 ;
+      RECT 8.575000  1.920000 8.905000 3.245000 ;
+      RECT 8.695000  0.305000 8.955000 1.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand4b_4
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef
index 5f9f14c..cd87a86 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.magic.lef
@@ -86,17 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.010000  0.085000 2.340000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -105,29 +94,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.130000 2.310000 0.460000 3.245000 ;
-        RECT 1.190000 2.375000 1.520000 3.245000 ;
-        RECT 2.250000 2.025000 2.580000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.535000 0.825000 3.255000 0.995000 ;
-      RECT 0.535000 0.995000 0.865000 1.155000 ;
-      RECT 2.800000 2.025000 3.255000 3.065000 ;
-      RECT 2.880000 0.265000 3.210000 0.825000 ;
-      RECT 3.085000 0.995000 3.255000 2.025000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.130000  2.310000 0.460000 3.245000 ;
+      RECT 0.535000  0.825000 3.255000 0.995000 ;
+      RECT 0.535000  0.995000 0.865000 1.155000 ;
+      RECT 1.190000  2.375000 1.520000 3.245000 ;
+      RECT 2.010000  0.085000 2.340000 0.645000 ;
+      RECT 2.250000  2.025000 2.580000 3.245000 ;
+      RECT 2.800000  2.025000 3.255000 3.065000 ;
+      RECT 2.880000  0.265000 3.210000 0.825000 ;
+      RECT 3.085000  0.995000 3.255000 2.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nand4b_lp
diff --git a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef
index 22d3184..cf04785 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.magic.lef
@@ -83,17 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.675000  0.085000 0.845000 0.570000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,27 +91,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.985000 2.070000 1.155000 3.245000 ;
-        RECT 1.845000 2.070000 2.015000 3.245000 ;
-        RECT 2.705000 2.070000 2.895000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.165000 0.430000 0.495000 0.640000 ;
-      RECT 0.165000 0.640000 0.385000 2.720000 ;
-      RECT 0.165000 2.720000 0.805000 3.050000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.165000  0.430000 0.495000 0.640000 ;
+      RECT 0.165000  0.640000 0.385000 2.720000 ;
+      RECT 0.165000  2.720000 0.805000 3.050000 ;
+      RECT 0.675000  0.085000 0.845000 0.570000 ;
+      RECT 0.985000  2.070000 1.155000 3.245000 ;
+      RECT 1.845000  2.070000 2.015000 3.245000 ;
+      RECT 2.705000  2.070000 2.895000 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_lp__nand4b_m
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef
index 36fe5c9..ed2d271 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.magic.lef
@@ -83,20 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.015000  0.085000 1.345000 0.650000 ;
-        RECT 3.420000  0.085000 3.695000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,34 +91,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.975000 1.920000 1.345000 3.245000 ;
-        RECT 1.950000 2.030000 2.280000 3.245000 ;
-        RECT 2.990000 1.900000 3.475000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.820000 2.480000 1.030000 ;
-      RECT 0.205000 1.030000 0.465000 2.210000 ;
-      RECT 2.220000 1.030000 2.480000 1.520000 ;
-      RECT 2.990000 1.345000 3.250000 1.560000 ;
-      RECT 2.990000 1.560000 4.210000 1.730000 ;
-      RECT 3.645000 1.730000 3.915000 2.215000 ;
-      RECT 3.865000 0.305000 4.210000 0.635000 ;
-      RECT 4.030000 0.635000 4.210000 1.560000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.205000  0.820000 2.480000 1.030000 ;
+      RECT 0.205000  1.030000 0.465000 2.210000 ;
+      RECT 0.975000  1.920000 1.345000 3.245000 ;
+      RECT 1.015000  0.085000 1.345000 0.650000 ;
+      RECT 1.950000  2.030000 2.280000 3.245000 ;
+      RECT 2.220000  1.030000 2.480000 1.520000 ;
+      RECT 2.990000  1.345000 3.250000 1.560000 ;
+      RECT 2.990000  1.560000 4.210000 1.730000 ;
+      RECT 2.990000  1.900000 3.475000 3.245000 ;
+      RECT 3.420000  0.085000 3.695000 0.635000 ;
+      RECT 3.645000  1.730000 3.915000 2.215000 ;
+      RECT 3.865000  0.305000 4.210000 0.635000 ;
+      RECT 4.030000  0.635000 4.210000 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 ;
   END
 END sky130_fd_sc_lp__nand4bb_1
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef
index bd63e2a..6ce5fc3 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.magic.lef
@@ -89,24 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.660000  0.085000 0.990000 0.555000 ;
-        RECT 5.355000  0.085000 5.685000 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 ;
-        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
@@ -115,54 +97,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.560000 1.965000 0.795000 3.245000 ;
-        RECT 1.825000 2.685000 2.155000 3.245000 ;
-        RECT 2.685000 2.105000 3.015000 3.245000 ;
-        RECT 3.545000 2.090000 3.875000 3.245000 ;
-        RECT 4.405000 1.945000 4.735000 3.245000 ;
-        RECT 5.645000 1.920000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.275000 0.490000 0.605000 ;
-      RECT 0.085000 0.605000 0.295000 1.625000 ;
-      RECT 0.085000 1.625000 1.135000 1.795000 ;
-      RECT 0.085000 1.795000 0.390000 2.240000 ;
-      RECT 0.965000 1.795000 1.135000 2.345000 ;
-      RECT 0.965000 2.345000 2.155000 2.515000 ;
-      RECT 1.160000 0.275000 1.645000 0.605000 ;
-      RECT 1.305000 1.845000 1.815000 2.175000 ;
-      RECT 1.475000 0.605000 1.645000 1.325000 ;
-      RECT 1.475000 1.325000 1.815000 1.845000 ;
-      RECT 1.815000 0.255000 3.875000 0.425000 ;
-      RECT 1.815000 0.425000 2.015000 1.095000 ;
-      RECT 1.985000 1.375000 3.250000 1.570000 ;
-      RECT 1.985000 1.570000 2.155000 2.345000 ;
-      RECT 2.605000 0.425000 3.875000 0.465000 ;
-      RECT 2.605000 0.465000 2.935000 0.825000 ;
-      RECT 3.115000 0.635000 4.825000 0.865000 ;
-      RECT 4.065000 0.255000 5.185000 0.465000 ;
-      RECT 4.995000 0.465000 5.185000 1.065000 ;
-      RECT 4.995000 1.065000 6.115000 1.235000 ;
-      RECT 5.855000 0.255000 6.115000 1.065000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.085000  0.275000 0.490000 0.605000 ;
+      RECT 0.085000  0.605000 0.295000 1.625000 ;
+      RECT 0.085000  1.625000 1.135000 1.795000 ;
+      RECT 0.085000  1.795000 0.390000 2.240000 ;
+      RECT 0.560000  1.965000 0.795000 3.245000 ;
+      RECT 0.660000  0.085000 0.990000 0.555000 ;
+      RECT 0.965000  1.795000 1.135000 2.345000 ;
+      RECT 0.965000  2.345000 2.155000 2.515000 ;
+      RECT 1.160000  0.275000 1.645000 0.605000 ;
+      RECT 1.305000  1.845000 1.815000 2.175000 ;
+      RECT 1.475000  0.605000 1.645000 1.325000 ;
+      RECT 1.475000  1.325000 1.815000 1.845000 ;
+      RECT 1.815000  0.255000 3.875000 0.425000 ;
+      RECT 1.815000  0.425000 2.015000 1.095000 ;
+      RECT 1.825000  2.685000 2.155000 3.245000 ;
+      RECT 1.985000  1.375000 3.250000 1.570000 ;
+      RECT 1.985000  1.570000 2.155000 2.345000 ;
+      RECT 2.605000  0.425000 3.875000 0.465000 ;
+      RECT 2.605000  0.465000 2.935000 0.825000 ;
+      RECT 2.685000  2.105000 3.015000 3.245000 ;
+      RECT 3.115000  0.635000 4.825000 0.865000 ;
+      RECT 3.545000  2.090000 3.875000 3.245000 ;
+      RECT 4.065000  0.255000 5.185000 0.465000 ;
+      RECT 4.405000  1.945000 4.735000 3.245000 ;
+      RECT 4.995000  0.465000 5.185000 1.065000 ;
+      RECT 4.995000  1.065000 6.115000 1.235000 ;
+      RECT 5.355000  0.085000 5.685000 0.895000 ;
+      RECT 5.645000  1.920000 5.975000 3.245000 ;
+      RECT 5.855000  0.255000 6.115000 1.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand4bb_2
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef
index 27b69e9..25dd1d5 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.magic.lef
@@ -92,33 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.630000  0.085000  0.960000 1.040000 ;
-        RECT 8.365000  0.085000  8.695000 0.690000 ;
-        RECT 9.225000  0.085000  9.555000 0.690000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -127,76 +100,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.630000 2.680000  0.960000 3.245000 ;
-        RECT 1.845000 2.680000  2.175000 3.245000 ;
-        RECT 2.705000 2.115000  3.035000 3.245000 ;
-        RECT 3.595000 2.115000  3.825000 3.245000 ;
-        RECT 4.425000 2.290000  4.755000 3.245000 ;
-        RECT 5.285000 2.330000  6.475000 3.245000 ;
-        RECT 6.255000 2.125000  6.475000 2.330000 ;
-        RECT 7.045000 2.115000  7.375000 3.245000 ;
-        RECT 7.905000 2.115000  8.235000 3.245000 ;
-        RECT 8.765000 2.115000  9.095000 3.245000 ;
-        RECT 9.655000 1.815000  9.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 ;
-        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.325000 0.460000 1.040000 ;
-      RECT 0.085000 1.040000 0.275000 1.930000 ;
-      RECT 0.085000 1.930000 0.450000 2.340000 ;
-      RECT 0.085000 2.340000 2.020000 2.510000 ;
-      RECT 0.085000 2.510000 0.450000 2.940000 ;
-      RECT 1.060000 1.920000 1.680000 2.170000 ;
-      RECT 1.130000 0.325000 1.330000 0.615000 ;
-      RECT 1.130000 0.615000 4.040000 0.785000 ;
-      RECT 1.130000 0.785000 1.330000 1.040000 ;
-      RECT 1.500000 0.785000 1.680000 1.920000 ;
-      RECT 1.600000 0.255000 5.760000 0.425000 ;
-      RECT 1.600000 0.425000 4.945000 0.445000 ;
-      RECT 1.850000 1.385000 3.340000 1.605000 ;
-      RECT 1.850000 1.605000 2.020000 2.340000 ;
-      RECT 3.870000 0.785000 4.040000 1.415000 ;
-      RECT 3.870000 1.415000 5.900000 1.605000 ;
-      RECT 4.245000 0.885000 4.445000 1.055000 ;
-      RECT 4.245000 1.055000 6.100000 1.245000 ;
-      RECT 4.615000 0.445000 4.945000 0.885000 ;
-      RECT 5.115000 0.860000 5.305000 0.960000 ;
-      RECT 5.115000 0.960000 6.100000 1.055000 ;
-      RECT 5.475000 0.425000 5.760000 0.790000 ;
-      RECT 5.930000 0.310000 7.775000 0.520000 ;
-      RECT 5.930000 0.520000 6.100000 0.960000 ;
-      RECT 6.280000 0.700000 7.345000 0.860000 ;
-      RECT 6.280000 0.860000 9.925000 1.030000 ;
-      RECT 7.515000 0.520000 7.775000 0.690000 ;
-      RECT 7.995000 0.255000 8.195000 0.860000 ;
-      RECT 8.865000 0.255000 9.045000 0.860000 ;
-      RECT 9.725000 0.255000 9.925000 0.860000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.085000  0.325000  0.460000 1.040000 ;
+      RECT 0.085000  1.040000  0.275000 1.930000 ;
+      RECT 0.085000  1.930000  0.450000 2.340000 ;
+      RECT 0.085000  2.340000  2.020000 2.510000 ;
+      RECT 0.085000  2.510000  0.450000 2.940000 ;
+      RECT 0.630000  0.085000  0.960000 1.040000 ;
+      RECT 0.630000  2.680000  0.960000 3.245000 ;
+      RECT 1.060000  1.920000  1.680000 2.170000 ;
+      RECT 1.130000  0.325000  1.330000 0.615000 ;
+      RECT 1.130000  0.615000  4.040000 0.785000 ;
+      RECT 1.130000  0.785000  1.330000 1.040000 ;
+      RECT 1.500000  0.785000  1.680000 1.920000 ;
+      RECT 1.600000  0.255000  5.760000 0.425000 ;
+      RECT 1.600000  0.425000  4.945000 0.445000 ;
+      RECT 1.845000  2.680000  2.175000 3.245000 ;
+      RECT 1.850000  1.385000  3.340000 1.605000 ;
+      RECT 1.850000  1.605000  2.020000 2.340000 ;
+      RECT 2.705000  2.115000  3.035000 3.245000 ;
+      RECT 3.595000  2.115000  3.825000 3.245000 ;
+      RECT 3.870000  0.785000  4.040000 1.415000 ;
+      RECT 3.870000  1.415000  5.900000 1.605000 ;
+      RECT 4.245000  0.885000  4.445000 1.055000 ;
+      RECT 4.245000  1.055000  6.100000 1.245000 ;
+      RECT 4.425000  2.290000  4.755000 3.245000 ;
+      RECT 4.615000  0.445000  4.945000 0.885000 ;
+      RECT 5.115000  0.860000  5.305000 0.960000 ;
+      RECT 5.115000  0.960000  6.100000 1.055000 ;
+      RECT 5.285000  2.330000  6.475000 3.245000 ;
+      RECT 5.475000  0.425000  5.760000 0.790000 ;
+      RECT 5.930000  0.310000  7.775000 0.520000 ;
+      RECT 5.930000  0.520000  6.100000 0.960000 ;
+      RECT 6.255000  2.125000  6.475000 2.330000 ;
+      RECT 6.280000  0.700000  7.345000 0.860000 ;
+      RECT 6.280000  0.860000  9.925000 1.030000 ;
+      RECT 7.045000  2.115000  7.375000 3.245000 ;
+      RECT 7.515000  0.520000  7.775000 0.690000 ;
+      RECT 7.905000  2.115000  8.235000 3.245000 ;
+      RECT 7.995000  0.255000  8.195000 0.860000 ;
+      RECT 8.365000  0.085000  8.695000 0.690000 ;
+      RECT 8.765000  2.115000  9.095000 3.245000 ;
+      RECT 8.865000  0.255000  9.045000 0.860000 ;
+      RECT 9.225000  0.085000  9.555000 0.690000 ;
+      RECT 9.655000  1.815000  9.955000 3.245000 ;
+      RECT 9.725000  0.255000  9.925000 0.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 ;
+      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_lp__nand4bb_4
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef
index bb334ad..7c32138 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.magic.lef
@@ -86,20 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.675000 ;
-        RECT 3.035000  0.085000 3.365000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -108,37 +94,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.825000 2.075000 1.155000 3.245000 ;
-        RECT 1.885000 2.700000 2.215000 3.245000 ;
-        RECT 3.255000 2.330000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.265000 0.445000 0.675000 ;
-      RECT 0.115000 0.675000 0.285000 1.725000 ;
-      RECT 0.115000 1.725000 1.420000 1.895000 ;
-      RECT 0.115000 1.895000 0.625000 3.065000 ;
-      RECT 1.090000 1.225000 1.420000 1.725000 ;
-      RECT 1.950000 1.090000 2.280000 1.265000 ;
-      RECT 1.950000 1.265000 4.205000 1.435000 ;
-      RECT 1.950000 1.435000 2.280000 1.760000 ;
-      RECT 3.825000 1.435000 4.205000 3.065000 ;
-      RECT 3.875000 0.295000 4.205000 0.585000 ;
-      RECT 4.035000 0.585000 4.205000 1.265000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  0.265000 0.445000 0.675000 ;
+      RECT 0.115000  0.675000 0.285000 1.725000 ;
+      RECT 0.115000  1.725000 1.420000 1.895000 ;
+      RECT 0.115000  1.895000 0.625000 3.065000 ;
+      RECT 0.825000  2.075000 1.155000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.675000 ;
+      RECT 1.090000  1.225000 1.420000 1.725000 ;
+      RECT 1.885000  2.700000 2.215000 3.245000 ;
+      RECT 1.950000  1.090000 2.280000 1.265000 ;
+      RECT 1.950000  1.265000 4.205000 1.435000 ;
+      RECT 1.950000  1.435000 2.280000 1.760000 ;
+      RECT 3.035000  0.085000 3.365000 0.585000 ;
+      RECT 3.255000  2.330000 3.585000 3.245000 ;
+      RECT 3.825000  1.435000 4.205000 3.065000 ;
+      RECT 3.875000  0.295000 4.205000 0.585000 ;
+      RECT 4.035000  0.585000 4.205000 1.265000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nand4bb_lp
diff --git a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef
index fcc7399..dab94cb 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.magic.lef
@@ -85,19 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.605000  0.085000 0.935000 1.005000 ;
-        RECT 2.975000  0.085000 3.305000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,35 +93,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.745000 2.165000 0.955000 2.395000 ;
-        RECT 0.745000 2.395000 1.100000 2.605000 ;
-        RECT 0.910000 2.605000 1.100000 3.245000 ;
-        RECT 1.720000 2.165000 1.890000 3.245000 ;
-        RECT 2.540000 2.225000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.820000 0.425000 1.030000 ;
-      RECT 0.095000 1.030000 0.265000 2.185000 ;
-      RECT 0.095000 2.185000 0.550000 2.395000 ;
-      RECT 0.220000 2.395000 0.550000 2.775000 ;
-      RECT 0.220000 2.775000 0.740000 3.075000 ;
-      RECT 2.540000 1.560000 3.675000 1.890000 ;
-      RECT 3.205000 1.890000 3.535000 2.305000 ;
-      RECT 3.485000 0.325000 3.675000 1.560000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.820000 0.425000 1.030000 ;
+      RECT 0.095000  1.030000 0.265000 2.185000 ;
+      RECT 0.095000  2.185000 0.550000 2.395000 ;
+      RECT 0.220000  2.395000 0.550000 2.775000 ;
+      RECT 0.220000  2.775000 0.740000 3.075000 ;
+      RECT 0.605000  0.085000 0.935000 1.005000 ;
+      RECT 0.745000  2.165000 0.955000 2.395000 ;
+      RECT 0.745000  2.395000 1.100000 2.605000 ;
+      RECT 0.910000  2.605000 1.100000 3.245000 ;
+      RECT 1.720000  2.165000 1.890000 3.245000 ;
+      RECT 2.540000  1.560000 3.675000 1.890000 ;
+      RECT 2.540000  2.225000 2.870000 3.245000 ;
+      RECT 2.975000  0.085000 3.305000 0.485000 ;
+      RECT 3.205000  1.890000 3.535000 2.305000 ;
+      RECT 3.485000  0.325000 3.675000 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 ;
   END
 END sky130_fd_sc_lp__nand4bb_m
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef
index d1eee89..40dcd2b 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_0.magic.lef
@@ -62,14 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.145000  0.085000 0.455000 0.670000 ;
-        RECT 1.055000  0.085000 1.335000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -78,15 +70,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.145000 2.395000 0.455000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 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.145000  0.085000 0.455000 0.670000 ;
+      RECT 0.145000  2.395000 0.455000 3.245000 ;
+      RECT 1.055000  0.085000 1.335000 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  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_lp__nor2_0
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef
index d7ab1c3..1a42ce8 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_1.magic.lef
@@ -62,14 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 1.040000 ;
-        RECT 0.985000  0.085000 1.315000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.440000 0.245000 ;
     END
@@ -78,15 +70,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.125000 1.920000 0.455000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 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.125000  0.085000 0.455000 1.040000 ;
+      RECT 0.125000  1.920000 0.455000 3.245000 ;
+      RECT 0.985000  0.085000 1.315000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__nor2_1
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef
index 3e92272..d735e8f 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_2.magic.lef
@@ -67,17 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.100000  0.085000 0.430000 1.040000 ;
-        RECT 0.960000  0.085000 1.290000 0.905000 ;
-        RECT 1.935000  0.085000 2.185000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -86,25 +75,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.530000 2.260000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 1.920000 1.210000 2.090000 ;
-      RECT 0.100000 2.090000 0.360000 3.075000 ;
-      RECT 1.030000 2.090000 1.210000 2.905000 ;
-      RECT 1.030000 2.905000 2.295000 3.075000 ;
-      RECT 2.045000 1.820000 2.295000 2.905000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.100000  0.085000 0.430000 1.040000 ;
+      RECT 0.100000  1.920000 1.210000 2.090000 ;
+      RECT 0.100000  2.090000 0.360000 3.075000 ;
+      RECT 0.530000  2.260000 0.860000 3.245000 ;
+      RECT 0.960000  0.085000 1.290000 0.905000 ;
+      RECT 1.030000  2.090000 1.210000 2.905000 ;
+      RECT 1.030000  2.905000 2.295000 3.075000 ;
+      RECT 1.935000  0.085000 2.185000 0.905000 ;
+      RECT 2.045000  1.820000 2.295000 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 ;
   END
 END sky130_fd_sc_lp__nor2_2
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef
index d6ccc8e..2558000 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_4.magic.lef
@@ -73,23 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.325000  0.085000 0.655000 1.040000 ;
-        RECT 1.185000  0.085000 1.515000 0.700000 ;
-        RECT 2.080000  0.085000 2.340000 1.155000 ;
-        RECT 2.905000  0.085000 3.235000 0.915000 ;
-        RECT 3.795000  0.085000 4.095000 1.140000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,32 +81,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.755000 2.095000 1.085000 3.245000 ;
-        RECT 1.615000 2.095000 1.945000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.325000 1.730000 2.335000 1.925000 ;
-      RECT 0.325000 1.925000 0.585000 3.075000 ;
-      RECT 1.255000 1.925000 1.445000 3.075000 ;
-      RECT 2.115000 1.925000 2.335000 2.905000 ;
-      RECT 2.115000 2.905000 4.095000 3.075000 ;
-      RECT 2.950000 2.290000 3.205000 2.905000 ;
-      RECT 3.805000 1.930000 4.095000 2.905000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.325000  0.085000 0.655000 1.040000 ;
+      RECT 0.325000  1.730000 2.335000 1.925000 ;
+      RECT 0.325000  1.925000 0.585000 3.075000 ;
+      RECT 0.755000  2.095000 1.085000 3.245000 ;
+      RECT 1.185000  0.085000 1.515000 0.700000 ;
+      RECT 1.255000  1.925000 1.445000 3.075000 ;
+      RECT 1.615000  2.095000 1.945000 3.245000 ;
+      RECT 2.080000  0.085000 2.340000 1.155000 ;
+      RECT 2.115000  1.925000 2.335000 2.905000 ;
+      RECT 2.115000  2.905000 4.095000 3.075000 ;
+      RECT 2.905000  0.085000 3.235000 0.915000 ;
+      RECT 2.950000  2.290000 3.205000 2.905000 ;
+      RECT 3.795000  0.085000 4.095000 1.140000 ;
+      RECT 3.805000  1.930000 4.095000 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_lp__nor2_4
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef
index f190c7b..21a780d 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_8.magic.lef
@@ -81,34 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.185000  0.085000 0.510000 1.185000 ;
-        RECT 1.055000  0.085000 1.385000 0.905000 ;
-        RECT 1.915000  0.085000 2.245000 0.905000 ;
-        RECT 2.775000  0.085000 3.105000 1.040000 ;
-        RECT 3.635000  0.085000 3.965000 1.040000 ;
-        RECT 4.495000  0.085000 4.825000 1.190000 ;
-        RECT 5.355000  0.085000 5.685000 0.915000 ;
-        RECT 6.215000  0.085000 6.545000 0.915000 ;
-        RECT 7.075000  0.085000 7.405000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -117,48 +89,73 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.625000 2.280000 0.955000 3.245000 ;
-        RECT 1.485000 2.280000 1.815000 3.245000 ;
-        RECT 2.345000 2.280000 2.675000 3.245000 ;
-        RECT 3.205000 2.095000 3.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 ;
-        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.185000 1.940000 3.035000 2.110000 ;
-      RECT 0.185000 2.110000 0.455000 3.075000 ;
-      RECT 1.125000 2.110000 1.315000 3.075000 ;
-      RECT 1.985000 2.110000 2.175000 3.075000 ;
-      RECT 2.830000 1.700000 3.895000 1.925000 ;
-      RECT 2.830000 1.925000 3.035000 1.940000 ;
-      RECT 2.845000 2.110000 3.035000 3.075000 ;
-      RECT 3.705000 1.925000 3.895000 2.905000 ;
-      RECT 3.705000 2.905000 7.405000 3.075000 ;
-      RECT 4.565000 2.260000 4.755000 2.905000 ;
-      RECT 5.425000 2.260000 5.615000 2.895000 ;
-      RECT 5.425000 2.895000 7.405000 2.905000 ;
-      RECT 6.285000 2.260000 6.475000 2.895000 ;
-      RECT 7.145000 2.260000 7.405000 2.895000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.185000  0.085000 0.510000 1.185000 ;
+      RECT 0.185000  1.940000 3.035000 2.110000 ;
+      RECT 0.185000  2.110000 0.455000 3.075000 ;
+      RECT 0.625000  2.280000 0.955000 3.245000 ;
+      RECT 1.055000  0.085000 1.385000 0.905000 ;
+      RECT 1.125000  2.110000 1.315000 3.075000 ;
+      RECT 1.485000  2.280000 1.815000 3.245000 ;
+      RECT 1.915000  0.085000 2.245000 0.905000 ;
+      RECT 1.985000  2.110000 2.175000 3.075000 ;
+      RECT 2.345000  2.280000 2.675000 3.245000 ;
+      RECT 2.775000  0.085000 3.105000 1.040000 ;
+      RECT 2.830000  1.700000 3.895000 1.925000 ;
+      RECT 2.830000  1.925000 3.035000 1.940000 ;
+      RECT 2.845000  2.110000 3.035000 3.075000 ;
+      RECT 3.205000  2.095000 3.535000 3.245000 ;
+      RECT 3.635000  0.085000 3.965000 1.040000 ;
+      RECT 3.705000  1.925000 3.895000 2.905000 ;
+      RECT 3.705000  2.905000 7.405000 3.075000 ;
+      RECT 4.495000  0.085000 4.825000 1.190000 ;
+      RECT 4.565000  2.260000 4.755000 2.905000 ;
+      RECT 5.355000  0.085000 5.685000 0.915000 ;
+      RECT 5.425000  2.260000 5.615000 2.895000 ;
+      RECT 5.425000  2.895000 7.405000 2.905000 ;
+      RECT 6.215000  0.085000 6.545000 0.915000 ;
+      RECT 6.285000  2.260000 6.475000 2.895000 ;
+      RECT 7.075000  0.085000 7.405000 0.915000 ;
+      RECT 7.145000  2.260000 7.405000 2.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor2_8
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
index 9469448..c046ce8 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.magic.lef
@@ -57,7 +57,7 @@
         RECT 1.015000 0.440000 1.345000 2.890000 ;
     END
   END Y
-  PIN VNB
+  PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
@@ -71,6 +71,12 @@
         RECT 1.115000 -0.085000 1.285000 0.085000 ;
         RECT 1.595000 -0.085000 1.765000 0.085000 ;
         RECT 2.075000 -0.085000 2.245000 0.085000 ;
+    END
+  END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
         RECT 0.000000  0.245000 0.500000 0.500000 ;
@@ -80,6 +86,15 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
+      LAYER met1 ;
+        RECT 0.000000 2.800000 0.500000 3.085000 ;
+        RECT 0.000000 3.085000 2.400000 3.575000 ;
+    END
+  END VPB
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
       LAYER li1 ;
         RECT 0.000000 3.245000 2.400000 3.415000 ;
         RECT 0.195000 2.430000 0.525000 3.245000 ;
@@ -89,9 +104,6 @@
         RECT 1.115000 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 2.800000 0.500000 3.085000 ;
-        RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
-  END VPB
+  END VPWR
 END sky130_fd_sc_lp__nor2_lp
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef
index 6811a3d..25a0a51 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.magic.lef
@@ -61,16 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.195000  0.085000 0.525000 1.000000 ;
-        RECT 1.835000  0.085000 2.165000 1.000000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -79,17 +69,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.115000 1.980000 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 ;
-        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  1.980000 0.445000 3.245000 ;
+      RECT 0.195000  0.085000 0.525000 1.000000 ;
+      RECT 1.835000  0.085000 2.165000 1.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 ;
+  END
 END sky130_fd_sc_lp__nor2_lp2
diff --git a/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef b/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef
index 71fef0c..1d0ae4c 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_m.magic.lef
@@ -63,14 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.440000 0.085000 ;
-        RECT 0.205000  0.085000 0.415000 0.660000 ;
-        RECT 1.065000  0.085000 1.275000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -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,15 +71,23 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.440000 3.415000 ;
-        RECT 0.205000 2.405000 0.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 ;
       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.205000  0.085000 0.415000 0.660000 ;
+      RECT 0.205000  2.405000 0.415000 3.245000 ;
+      RECT 1.065000  0.085000 1.275000 0.660000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  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_lp__nor2_m
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.magic.lef
index 506609e..ce25001 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__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.795000  0.085000 1.220000 0.915000 ;
-        RECT 1.820000  0.085000 2.150000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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 0.960000 2.310000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.355000 0.285000 0.625000 1.085000 ;
-      RECT 0.355000 1.085000 1.885000 1.255000 ;
-      RECT 0.420000 1.920000 1.755000 2.140000 ;
-      RECT 1.585000 1.255000 1.885000 1.515000 ;
-      RECT 1.585000 1.515000 1.755000 1.920000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.355000  0.285000 0.625000 1.085000 ;
+      RECT 0.355000  1.085000 1.885000 1.255000 ;
+      RECT 0.420000  1.920000 1.755000 2.140000 ;
+      RECT 0.795000  0.085000 1.220000 0.915000 ;
+      RECT 0.960000  2.310000 1.290000 3.245000 ;
+      RECT 1.585000  1.255000 1.885000 1.515000 ;
+      RECT 1.585000  1.515000 1.755000 1.920000 ;
+      RECT 1.820000  0.085000 2.150000 0.575000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__nor2b_1
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef
index 1743552..b966d8b 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.magic.lef
@@ -68,20 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.620000  0.085000 1.265000 0.885000 ;
-        RECT 0.620000  0.885000 0.895000 1.015000 ;
-        RECT 1.865000  0.085000 2.195000 0.565000 ;
-        RECT 2.725000  0.085000 3.055000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -90,30 +76,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.865000 2.025000 1.250000 3.245000 ;
-        RECT 2.680000 2.365000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.160000 0.700000 0.430000 1.685000 ;
-      RECT 0.160000 1.685000 2.275000 1.855000 ;
-      RECT 0.160000 1.855000 0.695000 2.210000 ;
-      RECT 1.420000 2.025000 1.650000 2.895000 ;
-      RECT 1.420000 2.895000 2.510000 3.075000 ;
-      RECT 1.945000 1.415000 2.275000 1.685000 ;
-      RECT 2.320000 2.365000 2.510000 2.895000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.160000  0.700000 0.430000 1.685000 ;
+      RECT 0.160000  1.685000 2.275000 1.855000 ;
+      RECT 0.160000  1.855000 0.695000 2.210000 ;
+      RECT 0.620000  0.085000 1.265000 0.885000 ;
+      RECT 0.620000  0.885000 0.895000 1.015000 ;
+      RECT 0.865000  2.025000 1.250000 3.245000 ;
+      RECT 1.420000  2.025000 1.650000 2.895000 ;
+      RECT 1.420000  2.895000 2.510000 3.075000 ;
+      RECT 1.865000  0.085000 2.195000 0.565000 ;
+      RECT 1.945000  1.415000 2.275000 1.685000 ;
+      RECT 2.320000  2.365000 2.510000 2.895000 ;
+      RECT 2.680000  2.365000 3.010000 3.245000 ;
+      RECT 2.725000  0.085000 3.055000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nor2b_2
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef
index 2afe8ce..11f5419 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.magic.lef
@@ -74,24 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.690000  0.085000 1.020000 0.835000 ;
-        RECT 1.700000  0.085000 1.890000 0.575000 ;
-        RECT 2.560000  0.085000 2.750000 0.575000 ;
-        RECT 3.420000  0.085000 3.680000 0.575000 ;
-        RECT 4.210000  0.085000 4.540000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -100,41 +82,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.750000 2.270000 1.080000 2.425000 ;
-        RECT 0.750000 2.425000 2.820000 2.655000 ;
-        RECT 0.750000 2.655000 1.030000 3.245000 ;
-        RECT 4.210000 2.375000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.260000 0.255000 0.520000 1.005000 ;
-      RECT 0.260000 1.005000 0.785000 1.085000 ;
-      RECT 0.260000 1.085000 3.635000 1.175000 ;
-      RECT 0.260000 1.930000 0.785000 2.100000 ;
-      RECT 0.260000 2.100000 0.530000 3.075000 ;
-      RECT 0.615000 1.175000 3.635000 1.255000 ;
-      RECT 0.615000 1.255000 0.785000 1.930000 ;
-      RECT 1.200000 2.825000 3.190000 2.885000 ;
-      RECT 1.200000 2.885000 4.040000 3.065000 ;
-      RECT 1.565000 1.255000 1.895000 1.515000 ;
-      RECT 2.990000 2.375000 3.190000 2.825000 ;
-      RECT 3.375000 1.255000 3.635000 1.515000 ;
-      RECT 3.840000 2.375000 4.040000 2.885000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.260000  0.255000 0.520000 1.005000 ;
+      RECT 0.260000  1.005000 0.785000 1.085000 ;
+      RECT 0.260000  1.085000 3.635000 1.175000 ;
+      RECT 0.260000  1.930000 0.785000 2.100000 ;
+      RECT 0.260000  2.100000 0.530000 3.075000 ;
+      RECT 0.615000  1.175000 3.635000 1.255000 ;
+      RECT 0.615000  1.255000 0.785000 1.930000 ;
+      RECT 0.690000  0.085000 1.020000 0.835000 ;
+      RECT 0.750000  2.270000 1.080000 2.425000 ;
+      RECT 0.750000  2.425000 2.820000 2.655000 ;
+      RECT 0.750000  2.655000 1.030000 3.245000 ;
+      RECT 1.200000  2.825000 3.190000 2.885000 ;
+      RECT 1.200000  2.885000 4.040000 3.065000 ;
+      RECT 1.565000  1.255000 1.895000 1.515000 ;
+      RECT 1.700000  0.085000 1.890000 0.575000 ;
+      RECT 2.560000  0.085000 2.750000 0.575000 ;
+      RECT 2.990000  2.375000 3.190000 2.825000 ;
+      RECT 3.375000  1.255000 3.635000 1.515000 ;
+      RECT 3.420000  0.085000 3.680000 0.575000 ;
+      RECT 3.840000  2.375000 4.040000 2.885000 ;
+      RECT 4.210000  0.085000 4.540000 0.835000 ;
+      RECT 4.210000  2.375000 4.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 ;
   END
 END sky130_fd_sc_lp__nor2b_4
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef
index 9c1e92c..f0aeee9 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.magic.lef
@@ -63,18 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.520000  0.085000 0.850000 0.725000 ;
-        RECT 2.100000  0.085000 2.430000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,28 +71,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.720000 2.020000 1.050000 3.245000 ;
-        RECT 2.360000 2.025000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.975000 0.825000 3.225000 0.995000 ;
-      RECT 1.975000 0.995000 2.305000 1.840000 ;
-      RECT 2.890000 0.265000 3.225000 0.825000 ;
-      RECT 2.890000 2.025000 3.225000 3.065000 ;
-      RECT 3.055000 0.995000 3.225000 2.025000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.520000  0.085000 0.850000 0.725000 ;
+      RECT 0.720000  2.020000 1.050000 3.245000 ;
+      RECT 1.975000  0.825000 3.225000 0.995000 ;
+      RECT 1.975000  0.995000 2.305000 1.840000 ;
+      RECT 2.100000  0.085000 2.430000 0.645000 ;
+      RECT 2.360000  2.025000 2.690000 3.245000 ;
+      RECT 2.890000  0.265000 3.225000 0.825000 ;
+      RECT 2.890000  2.025000 3.225000 3.065000 ;
+      RECT 3.055000  0.995000 3.225000 2.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nor2b_lp
diff --git a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef
index 004d043..1363514 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.magic.lef
@@ -64,16 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.985000  0.085000 1.155000 0.660000 ;
-        RECT 1.865000  0.085000 2.055000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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 +72,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.090000 2.650000 1.420000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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.460000 0.445000 2.300000 ;
-      RECT 0.255000 2.300000 1.875000 2.470000 ;
-      RECT 0.580000 2.470000 0.910000 2.710000 ;
-      RECT 1.705000 1.290000 1.875000 2.300000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.255000  0.460000 0.445000 2.300000 ;
+      RECT 0.255000  2.300000 1.875000 2.470000 ;
+      RECT 0.580000  2.470000 0.910000 2.710000 ;
+      RECT 0.985000  0.085000 1.155000 0.660000 ;
+      RECT 1.090000  2.650000 1.420000 3.245000 ;
+      RECT 1.705000  1.290000 1.875000 2.300000 ;
+      RECT 1.865000  0.085000 2.055000 0.660000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__nor2b_m
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef
index 10f6d77..6a6dba0 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_0.magic.lef
@@ -76,15 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.120000  0.085000 0.450000 0.670000 ;
-        RECT 0.980000  0.085000 1.310000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 1.920000 0.245000 ;
     END
@@ -93,16 +84,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.160000 2.405000 0.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 ;
       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.120000  0.085000 0.450000 0.670000 ;
+      RECT 0.160000  2.405000 0.465000 3.245000 ;
+      RECT 0.980000  0.085000 1.310000 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  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__nor3_0
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef
index 8eb8263..6832951 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_1.magic.lef
@@ -76,15 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 1.040000 ;
-        RECT 0.975000  0.085000 1.305000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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,16 +84,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.095000 1.920000 0.425000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 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  0.085000 0.425000 1.040000 ;
+      RECT 0.095000  1.920000 0.425000 3.245000 ;
+      RECT 0.975000  0.085000 1.305000 0.700000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__nor3_1
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef
index e49851c..50deac0 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_2.magic.lef
@@ -78,21 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.465000  0.085000 0.795000 1.015000 ;
-        RECT 1.345000  0.085000 1.675000 0.670000 ;
-        RECT 2.255000  0.085000 2.585000 0.670000 ;
-        RECT 3.150000  0.085000 3.445000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -101,34 +86,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.580000 2.025000 0.820000 2.815000 ;
-        RECT 0.580000 2.815000 1.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 ;
-        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.140000 1.685000 1.160000 1.855000 ;
-      RECT 0.140000 1.855000 0.410000 3.075000 ;
-      RECT 0.990000 1.855000 1.160000 2.465000 ;
-      RECT 0.990000 2.465000 2.845000 2.645000 ;
-      RECT 1.415000 2.645000 1.605000 3.075000 ;
-      RECT 1.775000 2.815000 3.315000 3.075000 ;
-      RECT 2.675000 1.955000 3.745000 2.125000 ;
-      RECT 2.675000 2.125000 2.845000 2.465000 ;
-      RECT 3.015000 2.295000 3.315000 2.815000 ;
-      RECT 3.485000 2.125000 3.745000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.140000  1.685000 1.160000 1.855000 ;
+      RECT 0.140000  1.855000 0.410000 3.075000 ;
+      RECT 0.465000  0.085000 0.795000 1.015000 ;
+      RECT 0.580000  2.025000 0.820000 2.815000 ;
+      RECT 0.580000  2.815000 1.245000 3.245000 ;
+      RECT 0.990000  1.855000 1.160000 2.465000 ;
+      RECT 0.990000  2.465000 2.845000 2.645000 ;
+      RECT 1.345000  0.085000 1.675000 0.670000 ;
+      RECT 1.415000  2.645000 1.605000 3.075000 ;
+      RECT 1.775000  2.815000 3.315000 3.075000 ;
+      RECT 2.255000  0.085000 2.585000 0.670000 ;
+      RECT 2.675000  1.955000 3.745000 2.125000 ;
+      RECT 2.675000  2.125000 2.845000 2.465000 ;
+      RECT 3.015000  2.295000 3.315000 2.815000 ;
+      RECT 3.150000  0.085000 3.445000 1.095000 ;
+      RECT 3.485000  2.125000 3.745000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor3_2
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef
index d8a50c1..420d268 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_4.magic.lef
@@ -86,28 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.105000  0.085000 0.405000 1.040000 ;
-        RECT 0.965000  0.085000 1.295000 0.700000 ;
-        RECT 1.825000  0.085000 2.155000 0.700000 ;
-        RECT 2.715000  0.085000 2.945000 0.555000 ;
-        RECT 3.615000  0.085000 3.805000 0.555000 ;
-        RECT 4.475000  0.085000 4.665000 0.555000 ;
-        RECT 5.335000  0.085000 5.595000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -116,38 +94,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.535000 2.105000 0.865000 3.245000 ;
-        RECT 1.395000 2.105000 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 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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 1.705000 3.015000 1.875000 ;
-      RECT 0.105000 1.875000 0.365000 3.075000 ;
-      RECT 1.035000 1.875000 1.225000 3.075000 ;
-      RECT 1.895000 1.875000 2.085000 3.075000 ;
-      RECT 2.255000 2.055000 2.585000 2.675000 ;
-      RECT 2.255000 2.675000 5.105000 3.075000 ;
-      RECT 2.755000 1.875000 3.015000 2.325000 ;
-      RECT 2.755000 2.325000 5.615000 2.495000 ;
-      RECT 5.285000 2.155000 5.615000 2.325000 ;
-      RECT 5.285000 2.495000 5.615000 3.075000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.105000  0.085000 0.405000 1.040000 ;
+      RECT 0.105000  1.705000 3.015000 1.875000 ;
+      RECT 0.105000  1.875000 0.365000 3.075000 ;
+      RECT 0.535000  2.105000 0.865000 3.245000 ;
+      RECT 0.965000  0.085000 1.295000 0.700000 ;
+      RECT 1.035000  1.875000 1.225000 3.075000 ;
+      RECT 1.395000  2.105000 1.725000 3.245000 ;
+      RECT 1.825000  0.085000 2.155000 0.700000 ;
+      RECT 1.895000  1.875000 2.085000 3.075000 ;
+      RECT 2.255000  2.055000 2.585000 2.675000 ;
+      RECT 2.255000  2.675000 5.105000 3.075000 ;
+      RECT 2.715000  0.085000 2.945000 0.555000 ;
+      RECT 2.755000  1.875000 3.015000 2.325000 ;
+      RECT 2.755000  2.325000 5.615000 2.495000 ;
+      RECT 3.615000  0.085000 3.805000 0.555000 ;
+      RECT 4.475000  0.085000 4.665000 0.555000 ;
+      RECT 5.285000  2.155000 5.615000 2.325000 ;
+      RECT 5.285000  2.495000 5.615000 3.075000 ;
+      RECT 5.335000  0.085000 5.595000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor3_4
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef
index f46d9b1..2ccdce8 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_lp.magic.lef
@@ -77,18 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.200000  0.085000 1.530000 0.645000 ;
-        RECT 2.780000  0.085000 3.110000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,19 +85,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 2.520000 2.025000 2.850000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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 1.200000  0.085000 1.530000 0.645000 ;
+      RECT 2.520000  2.025000 2.850000 3.245000 ;
+      RECT 2.780000  0.085000 3.110000 0.725000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nor3_lp
diff --git a/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef b/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef
index 2d11903..cbef8e6 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_m.magic.lef
@@ -74,15 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.180000  0.085000 0.390000 0.635000 ;
-        RECT 1.040000  0.085000 1.250000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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,16 +82,25 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.185000 2.405000 0.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 ;
       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.180000  0.085000 0.390000 0.635000 ;
+      RECT 0.185000  2.405000 0.395000 3.245000 ;
+      RECT 1.040000  0.085000 1.250000 0.635000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__nor3_m
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef
index ebac05e..b5abe18 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.magic.lef
@@ -75,17 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.800000  0.085000 1.250000 1.010000 ;
-        RECT 1.815000  0.085000 2.145000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -94,26 +83,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.920000 2.310000 1.250000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.085000 0.700000 0.630000 1.030000 ;
-      RECT 0.085000 1.030000 0.305000 1.930000 ;
-      RECT 0.085000 1.930000 2.175000 2.140000 ;
-      RECT 2.005000 1.340000 2.385000 1.670000 ;
-      RECT 2.005000 1.670000 2.175000 1.930000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.085000  0.700000 0.630000 1.030000 ;
+      RECT 0.085000  1.030000 0.305000 1.930000 ;
+      RECT 0.085000  1.930000 2.175000 2.140000 ;
+      RECT 0.800000  0.085000 1.250000 1.010000 ;
+      RECT 0.920000  2.310000 1.250000 3.245000 ;
+      RECT 1.815000  0.085000 2.145000 0.830000 ;
+      RECT 2.005000  1.340000 2.385000 1.670000 ;
+      RECT 2.005000  1.670000 2.175000 1.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 ;
   END
 END sky130_fd_sc_lp__nor3b_1
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef
index de5dbcf..16d7850 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.magic.lef
@@ -77,23 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.525000  0.085000 1.425000 0.940000 ;
-        RECT 2.120000  0.085000 2.450000 0.815000 ;
-        RECT 3.020000  0.085000 3.350000 0.825000 ;
-        RECT 3.920000  0.085000 4.210000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -102,42 +85,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.525000 2.640000 0.855000 3.245000 ;
-        RECT 3.510000 2.260000 3.840000 3.245000 ;
-        RECT 4.370000 1.920000 4.700000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 0.700000 0.355000 1.110000 ;
-      RECT 0.095000 1.110000 0.925000 1.185000 ;
-      RECT 0.095000 1.185000 1.425000 1.280000 ;
-      RECT 0.095000 2.300000 0.925000 2.470000 ;
-      RECT 0.095000 2.470000 0.355000 2.915000 ;
-      RECT 0.755000 1.280000 1.425000 1.515000 ;
-      RECT 0.755000 1.515000 0.925000 2.300000 ;
-      RECT 1.095000 1.805000 1.305000 2.905000 ;
-      RECT 1.095000 2.905000 3.095000 3.075000 ;
-      RECT 1.975000 1.805000 2.165000 2.905000 ;
-      RECT 2.335000 1.845000 2.665000 1.920000 ;
-      RECT 2.335000 1.920000 4.190000 2.090000 ;
-      RECT 2.335000 2.090000 2.665000 2.735000 ;
-      RECT 2.835000 2.260000 3.095000 2.905000 ;
-      RECT 4.010000 2.090000 4.190000 3.075000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.095000  0.700000 0.355000 1.110000 ;
+      RECT 0.095000  1.110000 0.925000 1.185000 ;
+      RECT 0.095000  1.185000 1.425000 1.280000 ;
+      RECT 0.095000  2.300000 0.925000 2.470000 ;
+      RECT 0.095000  2.470000 0.355000 2.915000 ;
+      RECT 0.525000  0.085000 1.425000 0.940000 ;
+      RECT 0.525000  2.640000 0.855000 3.245000 ;
+      RECT 0.755000  1.280000 1.425000 1.515000 ;
+      RECT 0.755000  1.515000 0.925000 2.300000 ;
+      RECT 1.095000  1.805000 1.305000 2.905000 ;
+      RECT 1.095000  2.905000 3.095000 3.075000 ;
+      RECT 1.975000  1.805000 2.165000 2.905000 ;
+      RECT 2.120000  0.085000 2.450000 0.815000 ;
+      RECT 2.335000  1.845000 2.665000 1.920000 ;
+      RECT 2.335000  1.920000 4.190000 2.090000 ;
+      RECT 2.335000  2.090000 2.665000 2.735000 ;
+      RECT 2.835000  2.260000 3.095000 2.905000 ;
+      RECT 3.020000  0.085000 3.350000 0.825000 ;
+      RECT 3.510000  2.260000 3.840000 3.245000 ;
+      RECT 3.920000  0.085000 4.210000 1.095000 ;
+      RECT 4.010000  2.090000 4.190000 3.075000 ;
+      RECT 4.370000  1.920000 4.700000 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_lp__nor3b_2
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef
index 75def39..dd3c477 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.magic.lef
@@ -87,30 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.805000  0.085000 1.135000 1.015000 ;
-        RECT 1.740000  0.085000 2.070000 0.675000 ;
-        RECT 2.640000  0.085000 2.970000 0.815000 ;
-        RECT 3.500000  0.085000 3.830000 0.815000 ;
-        RECT 4.425000  0.085000 4.755000 0.700000 ;
-        RECT 5.350000  0.085000 5.680000 0.700000 ;
-        RECT 6.210000  0.085000 6.540000 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,51 +95,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.600000 2.105000 0.930000 3.245000 ;
-        RECT 1.460000 2.395000 1.790000 3.245000 ;
-        RECT 2.320000 2.665000 2.650000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.255000 0.580000 1.015000 ;
-      RECT 0.095000 1.015000 0.275000 1.705000 ;
-      RECT 0.095000 1.705000 3.065000 1.875000 ;
-      RECT 0.095000 1.875000 0.420000 3.075000 ;
-      RECT 1.100000 2.045000 2.220000 2.225000 ;
-      RECT 1.100000 2.225000 1.290000 3.065000 ;
-      RECT 1.960000 2.225000 2.220000 2.325000 ;
-      RECT 1.960000 2.325000 5.320000 2.495000 ;
-      RECT 1.960000 2.495000 2.150000 3.065000 ;
-      RECT 2.895000 1.325000 4.585000 1.505000 ;
-      RECT 2.895000 1.505000 3.065000 1.705000 ;
-      RECT 2.900000 2.665000 4.030000 2.875000 ;
-      RECT 2.900000 2.875000 5.680000 2.885000 ;
-      RECT 2.900000 2.885000 6.610000 3.075000 ;
-      RECT 4.990000 2.025000 6.180000 2.205000 ;
-      RECT 4.990000 2.205000 5.320000 2.325000 ;
-      RECT 4.990000 2.495000 5.320000 2.705000 ;
-      RECT 5.490000 2.375000 5.680000 2.875000 ;
-      RECT 5.850000 2.205000 6.180000 2.705000 ;
-      RECT 6.350000 2.025000 6.610000 2.885000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.095000  0.255000 0.580000 1.015000 ;
+      RECT 0.095000  1.015000 0.275000 1.705000 ;
+      RECT 0.095000  1.705000 3.065000 1.875000 ;
+      RECT 0.095000  1.875000 0.420000 3.075000 ;
+      RECT 0.600000  2.105000 0.930000 3.245000 ;
+      RECT 0.805000  0.085000 1.135000 1.015000 ;
+      RECT 1.100000  2.045000 2.220000 2.225000 ;
+      RECT 1.100000  2.225000 1.290000 3.065000 ;
+      RECT 1.460000  2.395000 1.790000 3.245000 ;
+      RECT 1.740000  0.085000 2.070000 0.675000 ;
+      RECT 1.960000  2.225000 2.220000 2.325000 ;
+      RECT 1.960000  2.325000 5.320000 2.495000 ;
+      RECT 1.960000  2.495000 2.150000 3.065000 ;
+      RECT 2.320000  2.665000 2.650000 3.245000 ;
+      RECT 2.640000  0.085000 2.970000 0.815000 ;
+      RECT 2.895000  1.325000 4.585000 1.505000 ;
+      RECT 2.895000  1.505000 3.065000 1.705000 ;
+      RECT 2.900000  2.665000 4.030000 2.875000 ;
+      RECT 2.900000  2.875000 5.680000 2.885000 ;
+      RECT 2.900000  2.885000 6.610000 3.075000 ;
+      RECT 3.500000  0.085000 3.830000 0.815000 ;
+      RECT 4.425000  0.085000 4.755000 0.700000 ;
+      RECT 4.990000  2.025000 6.180000 2.205000 ;
+      RECT 4.990000  2.205000 5.320000 2.325000 ;
+      RECT 4.990000  2.495000 5.320000 2.705000 ;
+      RECT 5.350000  0.085000 5.680000 0.700000 ;
+      RECT 5.490000  2.375000 5.680000 2.875000 ;
+      RECT 5.850000  2.205000 6.180000 2.705000 ;
+      RECT 6.210000  0.085000 6.540000 0.815000 ;
+      RECT 6.350000  2.025000 6.610000 2.885000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor3b_4
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef
index 51ff719..4d9ebb6 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.magic.lef
@@ -75,19 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.015000  0.085000 1.345000 0.645000 ;
-        RECT 2.595000  0.085000 2.925000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,29 +83,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.385000 2.025000 0.715000 3.245000 ;
-        RECT 2.855000 2.025000 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 ;
-        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 2.325000 0.825000 3.715000 0.995000 ;
-      RECT 2.325000 0.995000 2.655000 1.495000 ;
-      RECT 3.385000 0.265000 3.715000 0.825000 ;
-      RECT 3.385000 2.025000 3.715000 3.065000 ;
-      RECT 3.545000 0.995000 3.715000 2.025000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.385000  2.025000 0.715000 3.245000 ;
+      RECT 1.015000  0.085000 1.345000 0.645000 ;
+      RECT 2.325000  0.825000 3.715000 0.995000 ;
+      RECT 2.325000  0.995000 2.655000 1.495000 ;
+      RECT 2.595000  0.085000 2.925000 0.645000 ;
+      RECT 2.855000  2.025000 3.185000 3.245000 ;
+      RECT 3.385000  0.265000 3.715000 0.825000 ;
+      RECT 3.385000  2.025000 3.715000 3.065000 ;
+      RECT 3.545000  0.995000 3.715000 2.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor3b_lp
diff --git a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef
index 74fbce1..6d0e8b6 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.magic.lef
@@ -74,16 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.745000  0.085000 0.935000 0.595000 ;
-        RECT 1.625000  0.085000 1.835000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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,27 +82,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.595000 2.395000 0.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 2.055000 1.825000 2.225000 ;
-      RECT 0.110000 2.225000 0.425000 2.505000 ;
-      RECT 0.255000 0.330000 0.525000 0.820000 ;
-      RECT 0.255000 0.820000 0.775000 0.990000 ;
-      RECT 0.605000 0.990000 0.775000 2.055000 ;
-      RECT 1.655000 2.225000 1.825000 2.780000 ;
-      RECT 1.655000 2.780000 1.990000 3.075000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.110000  2.055000 1.825000 2.225000 ;
+      RECT 0.110000  2.225000 0.425000 2.505000 ;
+      RECT 0.255000  0.330000 0.525000 0.820000 ;
+      RECT 0.255000  0.820000 0.775000 0.990000 ;
+      RECT 0.595000  2.395000 0.925000 3.245000 ;
+      RECT 0.605000  0.990000 0.775000 2.055000 ;
+      RECT 0.745000  0.085000 0.935000 0.595000 ;
+      RECT 1.625000  0.085000 1.835000 0.575000 ;
+      RECT 1.655000  2.225000 1.825000 2.780000 ;
+      RECT 1.655000  2.780000 1.990000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__nor3b_m
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef
index cc1d91a..98c7948 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_0.magic.lef
@@ -85,18 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.195000  0.085000 0.525000 0.670000 ;
-        RECT 1.050000  0.085000 1.725000 0.670000 ;
-        RECT 2.255000  0.085000 2.585000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -105,18 +93,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.415000 2.405000 0.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 ;
       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.195000  0.085000 0.525000 0.670000 ;
+      RECT 0.415000  2.405000 0.745000 3.245000 ;
+      RECT 1.050000  0.085000 1.725000 0.670000 ;
+      RECT 2.255000  0.085000 2.585000 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 ;
+  END
 END sky130_fd_sc_lp__nor4_0
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef
index c341485..d344792 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_1.magic.lef
@@ -86,18 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 1.095000 ;
-        RECT 1.065000  0.085000 1.395000 0.895000 ;
-        RECT 2.035000  0.085000 2.365000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -106,18 +94,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.095000 1.920000 0.425000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.095000  0.085000 0.425000 1.095000 ;
+      RECT 0.095000  1.920000 0.425000 3.245000 ;
+      RECT 1.065000  0.085000 1.395000 0.895000 ;
+      RECT 2.035000  0.085000 2.365000 0.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__nor4_1
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef
index 1d68377..0be88c2 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_2.magic.lef
@@ -96,24 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.330000  0.085000 0.625000 1.095000 ;
-        RECT 1.190000  0.085000 1.520000 0.700000 ;
-        RECT 2.150000  0.085000 2.480000 0.915000 ;
-        RECT 3.100000  0.085000 3.430000 0.675000 ;
-        RECT 3.960000  0.085000 4.290000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -122,36 +104,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 1.190000 2.635000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.330000 1.955000 2.240000 2.035000 ;
-      RECT 0.330000 2.035000 2.530000 2.125000 ;
-      RECT 0.330000 2.125000 0.625000 3.075000 ;
-      RECT 0.795000 2.295000 1.915000 2.465000 ;
-      RECT 0.795000 2.465000 1.020000 3.075000 ;
-      RECT 1.690000 2.465000 1.915000 3.075000 ;
-      RECT 2.085000 2.125000 2.530000 2.905000 ;
-      RECT 2.085000 2.905000 4.360000 3.075000 ;
-      RECT 2.740000 2.035000 3.000000 2.505000 ;
-      RECT 2.740000 2.505000 3.930000 2.735000 ;
-      RECT 4.100000 2.375000 4.360000 2.905000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.330000  0.085000 0.625000 1.095000 ;
+      RECT 0.330000  1.955000 2.240000 2.035000 ;
+      RECT 0.330000  2.035000 2.530000 2.125000 ;
+      RECT 0.330000  2.125000 0.625000 3.075000 ;
+      RECT 0.795000  2.295000 1.915000 2.465000 ;
+      RECT 0.795000  2.465000 1.020000 3.075000 ;
+      RECT 1.190000  0.085000 1.520000 0.700000 ;
+      RECT 1.190000  2.635000 1.520000 3.245000 ;
+      RECT 1.690000  2.465000 1.915000 3.075000 ;
+      RECT 2.085000  2.125000 2.530000 2.905000 ;
+      RECT 2.085000  2.905000 4.360000 3.075000 ;
+      RECT 2.150000  0.085000 2.480000 0.915000 ;
+      RECT 2.740000  2.035000 3.000000 2.505000 ;
+      RECT 2.740000  2.505000 3.930000 2.735000 ;
+      RECT 3.100000  0.085000 3.430000 0.675000 ;
+      RECT 3.960000  0.085000 4.290000 0.835000 ;
+      RECT 4.100000  2.375000 4.360000 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_lp__nor4_2
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef
index 71dc47f..3aaa154 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_4.magic.lef
@@ -95,35 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.390000  0.085000 0.695000 1.095000 ;
-        RECT 1.250000  0.085000 1.580000 0.835000 ;
-        RECT 2.110000  0.085000 2.885000 0.700000 ;
-        RECT 3.420000  0.085000 3.750000 0.700000 ;
-        RECT 4.280000  0.085000 4.610000 0.700000 ;
-        RECT 5.140000  0.085000 5.470000 0.700000 ;
-        RECT 6.000000  0.085000 6.330000 0.700000 ;
-        RECT 6.860000  0.085000 7.190000 0.700000 ;
-        RECT 7.720000  0.085000 8.050000 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
@@ -132,51 +103,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.750000 2.260000 1.080000 3.245000 ;
-        RECT 1.610000 2.260000 1.940000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.320000 1.920000 2.345000 2.090000 ;
-      RECT 0.320000 2.090000 0.580000 3.065000 ;
-      RECT 1.250000 2.090000 1.440000 3.065000 ;
-      RECT 2.110000 2.090000 2.345000 2.895000 ;
-      RECT 2.110000 2.895000 4.090000 3.065000 ;
-      RECT 2.515000 1.705000 5.820000 1.875000 ;
-      RECT 2.515000 1.875000 2.730000 2.725000 ;
-      RECT 2.900000 2.055000 3.230000 2.895000 ;
-      RECT 3.400000 1.875000 3.615000 2.725000 ;
-      RECT 3.785000 2.055000 4.090000 2.895000 ;
-      RECT 4.280000 2.055000 4.610000 2.905000 ;
-      RECT 4.280000 2.905000 8.050000 3.075000 ;
-      RECT 4.780000 1.875000 4.970000 2.735000 ;
-      RECT 5.140000 2.055000 5.470000 2.905000 ;
-      RECT 5.640000 1.875000 5.820000 2.735000 ;
-      RECT 6.000000 2.055000 6.330000 2.905000 ;
-      RECT 6.860000 2.055000 7.190000 2.905000 ;
-      RECT 7.720000 2.055000 8.050000 2.905000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.320000  1.920000 2.345000 2.090000 ;
+      RECT 0.320000  2.090000 0.580000 3.065000 ;
+      RECT 0.390000  0.085000 0.695000 1.095000 ;
+      RECT 0.750000  2.260000 1.080000 3.245000 ;
+      RECT 1.250000  0.085000 1.580000 0.835000 ;
+      RECT 1.250000  2.090000 1.440000 3.065000 ;
+      RECT 1.610000  2.260000 1.940000 3.245000 ;
+      RECT 2.110000  0.085000 2.885000 0.700000 ;
+      RECT 2.110000  2.090000 2.345000 2.895000 ;
+      RECT 2.110000  2.895000 4.090000 3.065000 ;
+      RECT 2.515000  1.705000 5.820000 1.875000 ;
+      RECT 2.515000  1.875000 2.730000 2.725000 ;
+      RECT 2.900000  2.055000 3.230000 2.895000 ;
+      RECT 3.400000  1.875000 3.615000 2.725000 ;
+      RECT 3.420000  0.085000 3.750000 0.700000 ;
+      RECT 3.785000  2.055000 4.090000 2.895000 ;
+      RECT 4.280000  0.085000 4.610000 0.700000 ;
+      RECT 4.280000  2.055000 4.610000 2.905000 ;
+      RECT 4.280000  2.905000 8.050000 3.075000 ;
+      RECT 4.780000  1.875000 4.970000 2.735000 ;
+      RECT 5.140000  0.085000 5.470000 0.700000 ;
+      RECT 5.140000  2.055000 5.470000 2.905000 ;
+      RECT 5.640000  1.875000 5.820000 2.735000 ;
+      RECT 6.000000  0.085000 6.330000 0.700000 ;
+      RECT 6.000000  2.055000 6.330000 2.905000 ;
+      RECT 6.860000  0.085000 7.190000 0.700000 ;
+      RECT 6.860000  2.055000 7.190000 2.905000 ;
+      RECT 7.720000  0.085000 8.050000 0.835000 ;
+      RECT 7.720000  2.055000 8.050000 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_lp__nor4_4
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef
index 3bb9cd4..fc7bb80 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_lp.magic.lef
@@ -83,20 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.235000  0.085000 0.565000 0.725000 ;
-        RECT 1.815000  0.085000 2.145000 0.595000 ;
-        RECT 3.395000  0.085000 3.725000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,31 +91,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 3.315000 2.025000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 2.025000 0.445000 2.145000 ;
-      RECT 0.115000 2.145000 2.065000 2.315000 ;
-      RECT 0.115000 2.315000 0.445000 3.065000 ;
-      RECT 0.645000 2.495000 0.975000 2.895000 ;
-      RECT 0.645000 2.895000 2.625000 3.065000 ;
-      RECT 1.735000 1.635000 2.065000 2.145000 ;
-      RECT 1.735000 2.315000 2.065000 2.675000 ;
-      RECT 2.295000 2.025000 2.625000 2.895000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  2.025000 0.445000 2.145000 ;
+      RECT 0.115000  2.145000 2.065000 2.315000 ;
+      RECT 0.115000  2.315000 0.445000 3.065000 ;
+      RECT 0.235000  0.085000 0.565000 0.725000 ;
+      RECT 0.645000  2.495000 0.975000 2.895000 ;
+      RECT 0.645000  2.895000 2.625000 3.065000 ;
+      RECT 1.735000  1.635000 2.065000 2.145000 ;
+      RECT 1.735000  2.315000 2.065000 2.675000 ;
+      RECT 1.815000  0.085000 2.145000 0.595000 ;
+      RECT 2.295000  2.025000 2.625000 2.895000 ;
+      RECT 3.315000  2.025000 3.645000 3.245000 ;
+      RECT 3.395000  0.085000 3.725000 0.725000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4_lp
diff --git a/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef b/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef
index e0c8420..dfa43f6 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_m.magic.lef
@@ -84,18 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.245000  0.085000 0.455000 0.660000 ;
-        RECT 1.115000  0.085000 1.445000 0.600000 ;
-        RECT 2.255000  0.085000 2.465000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,18 +92,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.475000 2.405000 0.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 ;
       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.245000  0.085000 0.455000 0.660000 ;
+      RECT 0.475000  2.405000 0.685000 3.245000 ;
+      RECT 1.115000  0.085000 1.445000 0.600000 ;
+      RECT 2.255000  0.085000 2.465000 0.660000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__nor4_m
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef
index b9e01a1..4307166 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.magic.lef
@@ -84,19 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.790000  0.085000 1.240000 0.915000 ;
-        RECT 1.855000  0.085000 2.185000 0.825000 ;
-        RECT 2.770000  0.085000 3.100000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -105,29 +92,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.900000 2.310000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.360000 0.700000 0.620000 1.085000 ;
-      RECT 0.360000 1.085000 0.935000 1.255000 ;
-      RECT 0.360000 1.930000 0.935000 1.970000 ;
-      RECT 0.360000 1.970000 2.695000 2.140000 ;
-      RECT 0.765000 1.255000 0.935000 1.930000 ;
-      RECT 2.525000 1.345000 2.895000 1.675000 ;
-      RECT 2.525000 1.675000 2.695000 1.970000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.360000  0.700000 0.620000 1.085000 ;
+      RECT 0.360000  1.085000 0.935000 1.255000 ;
+      RECT 0.360000  1.930000 0.935000 1.970000 ;
+      RECT 0.360000  1.970000 2.695000 2.140000 ;
+      RECT 0.765000  1.255000 0.935000 1.930000 ;
+      RECT 0.790000  0.085000 1.240000 0.915000 ;
+      RECT 0.900000  2.310000 1.230000 3.245000 ;
+      RECT 1.855000  0.085000 2.185000 0.825000 ;
+      RECT 2.525000  1.345000 2.895000 1.675000 ;
+      RECT 2.525000  1.675000 2.695000 1.970000 ;
+      RECT 2.770000  0.085000 3.100000 0.815000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nor4b_1
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef
index b07e995..5173782 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.magic.lef
@@ -93,25 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.865000  0.085000 1.365000 0.915000 ;
-        RECT 1.965000  0.085000 2.295000 0.575000 ;
-        RECT 2.985000  0.085000 3.315000 0.575000 ;
-        RECT 3.995000  0.085000 4.325000 0.700000 ;
-        RECT 4.855000  0.085000 5.185000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -120,44 +101,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.525000 2.720000 0.855000 3.245000 ;
-        RECT 3.995000 2.455000 5.195000 2.665000 ;
-        RECT 4.935000 2.665000 5.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 ;
-        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 1.695000 1.415000 1.865000 ;
-      RECT 0.095000 1.865000 0.355000 3.050000 ;
-      RECT 0.150000 0.795000 0.695000 1.005000 ;
-      RECT 0.525000 1.005000 0.695000 1.695000 ;
-      RECT 1.105000 2.035000 1.415000 2.315000 ;
-      RECT 1.105000 2.315000 3.235000 2.485000 ;
-      RECT 1.105000 2.485000 1.410000 3.075000 ;
-      RECT 1.245000 1.425000 2.320000 1.635000 ;
-      RECT 1.245000 1.635000 1.415000 1.695000 ;
-      RECT 1.580000 2.655000 2.735000 3.010000 ;
-      RECT 2.905000 2.145000 5.185000 2.285000 ;
-      RECT 2.905000 2.285000 3.815000 2.315000 ;
-      RECT 2.905000 2.485000 3.235000 3.075000 ;
-      RECT 3.440000 2.485000 3.770000 2.835000 ;
-      RECT 3.440000 2.835000 4.755000 3.075000 ;
-      RECT 3.645000 2.005000 5.185000 2.145000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.095000  1.695000 1.415000 1.865000 ;
+      RECT 0.095000  1.865000 0.355000 3.050000 ;
+      RECT 0.150000  0.795000 0.695000 1.005000 ;
+      RECT 0.525000  1.005000 0.695000 1.695000 ;
+      RECT 0.525000  2.720000 0.855000 3.245000 ;
+      RECT 0.865000  0.085000 1.365000 0.915000 ;
+      RECT 1.105000  2.035000 1.415000 2.315000 ;
+      RECT 1.105000  2.315000 3.235000 2.485000 ;
+      RECT 1.105000  2.485000 1.410000 3.075000 ;
+      RECT 1.245000  1.425000 2.320000 1.635000 ;
+      RECT 1.245000  1.635000 1.415000 1.695000 ;
+      RECT 1.580000  2.655000 2.735000 3.010000 ;
+      RECT 1.965000  0.085000 2.295000 0.575000 ;
+      RECT 2.905000  2.145000 5.185000 2.285000 ;
+      RECT 2.905000  2.285000 3.815000 2.315000 ;
+      RECT 2.905000  2.485000 3.235000 3.075000 ;
+      RECT 2.985000  0.085000 3.315000 0.575000 ;
+      RECT 3.440000  2.485000 3.770000 2.835000 ;
+      RECT 3.440000  2.835000 4.755000 3.075000 ;
+      RECT 3.645000  2.005000 5.185000 2.145000 ;
+      RECT 3.995000  0.085000 4.325000 0.700000 ;
+      RECT 3.995000  2.455000 5.195000 2.665000 ;
+      RECT 4.855000  0.085000 5.185000 1.015000 ;
+      RECT 4.935000  2.665000 5.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 ;
+      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_lp__nor4b_2
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef
index cf97e07..04325a4 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.magic.lef
@@ -98,37 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.535000  0.085000 0.865000 0.815000 ;
-        RECT 1.465000  0.085000 1.795000 0.795000 ;
-        RECT 2.355000  0.085000 3.035000 0.785000 ;
-        RECT 3.565000  0.085000 3.895000 0.670000 ;
-        RECT 4.425000  0.085000 5.255000 0.670000 ;
-        RECT 5.785000  0.085000 6.115000 0.835000 ;
-        RECT 6.645000  0.085000 6.975000 0.835000 ;
-        RECT 7.545000  0.085000 7.875000 0.700000 ;
-        RECT 8.405000  0.085000 8.735000 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
@@ -137,61 +106,89 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.525000 2.270000 0.855000 3.245000 ;
-        RECT 7.155000 2.105000 7.485000 3.245000 ;
-        RECT 8.015000 2.105000 8.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 ;
-        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.930000 0.925000 2.100000 ;
-      RECT 0.095000 2.100000 0.355000 3.075000 ;
-      RECT 0.105000 0.255000 0.365000 0.985000 ;
-      RECT 0.105000 0.985000 0.925000 1.155000 ;
-      RECT 0.720000 1.155000 0.925000 1.315000 ;
-      RECT 0.720000 1.315000 2.800000 1.485000 ;
-      RECT 0.720000 1.485000 0.925000 1.930000 ;
-      RECT 1.095000 1.815000 1.305000 2.905000 ;
-      RECT 1.095000 2.905000 4.815000 3.075000 ;
-      RECT 1.975000 2.005000 2.165000 2.905000 ;
-      RECT 2.835000 2.005000 3.025000 2.905000 ;
-      RECT 3.195000 2.005000 6.625000 2.185000 ;
-      RECT 3.195000 2.185000 3.525000 2.735000 ;
-      RECT 3.695000 2.355000 3.895000 2.905000 ;
-      RECT 4.115000 2.185000 4.315000 2.735000 ;
-      RECT 4.485000 2.355000 4.815000 2.905000 ;
-      RECT 5.005000 2.355000 5.335000 2.905000 ;
-      RECT 5.005000 2.905000 6.985000 3.075000 ;
-      RECT 5.505000 2.185000 5.730000 2.735000 ;
-      RECT 5.900000 2.355000 6.125000 2.905000 ;
-      RECT 6.295000 2.185000 6.625000 2.735000 ;
-      RECT 6.795000 1.695000 8.775000 1.925000 ;
-      RECT 6.795000 1.925000 6.985000 2.905000 ;
-      RECT 7.655000 1.925000 7.845000 3.075000 ;
-      RECT 8.515000 1.925000 8.775000 3.075000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  1.930000 0.925000 2.100000 ;
+      RECT 0.095000  2.100000 0.355000 3.075000 ;
+      RECT 0.105000  0.255000 0.365000 0.985000 ;
+      RECT 0.105000  0.985000 0.925000 1.155000 ;
+      RECT 0.525000  2.270000 0.855000 3.245000 ;
+      RECT 0.535000  0.085000 0.865000 0.815000 ;
+      RECT 0.720000  1.155000 0.925000 1.315000 ;
+      RECT 0.720000  1.315000 2.800000 1.485000 ;
+      RECT 0.720000  1.485000 0.925000 1.930000 ;
+      RECT 1.095000  1.815000 1.305000 2.905000 ;
+      RECT 1.095000  2.905000 4.815000 3.075000 ;
+      RECT 1.465000  0.085000 1.795000 0.795000 ;
+      RECT 1.975000  2.005000 2.165000 2.905000 ;
+      RECT 2.355000  0.085000 3.035000 0.785000 ;
+      RECT 2.835000  2.005000 3.025000 2.905000 ;
+      RECT 3.195000  2.005000 6.625000 2.185000 ;
+      RECT 3.195000  2.185000 3.525000 2.735000 ;
+      RECT 3.565000  0.085000 3.895000 0.670000 ;
+      RECT 3.695000  2.355000 3.895000 2.905000 ;
+      RECT 4.115000  2.185000 4.315000 2.735000 ;
+      RECT 4.425000  0.085000 5.255000 0.670000 ;
+      RECT 4.485000  2.355000 4.815000 2.905000 ;
+      RECT 5.005000  2.355000 5.335000 2.905000 ;
+      RECT 5.005000  2.905000 6.985000 3.075000 ;
+      RECT 5.505000  2.185000 5.730000 2.735000 ;
+      RECT 5.785000  0.085000 6.115000 0.835000 ;
+      RECT 5.900000  2.355000 6.125000 2.905000 ;
+      RECT 6.295000  2.185000 6.625000 2.735000 ;
+      RECT 6.645000  0.085000 6.975000 0.835000 ;
+      RECT 6.795000  1.695000 8.775000 1.925000 ;
+      RECT 6.795000  1.925000 6.985000 2.905000 ;
+      RECT 7.155000  2.105000 7.485000 3.245000 ;
+      RECT 7.545000  0.085000 7.875000 0.700000 ;
+      RECT 7.655000  1.925000 7.845000 3.075000 ;
+      RECT 8.015000  2.105000 8.345000 3.245000 ;
+      RECT 8.405000  0.085000 8.735000 1.040000 ;
+      RECT 8.515000  1.925000 8.775000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4b_4
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef
index 25b5908..cd59059 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.magic.lef
@@ -84,22 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 1.055000  0.085000 1.385000 0.645000 ;
-        RECT 2.665000  0.085000 2.995000 0.685000 ;
-        RECT 4.330000  0.085000 4.660000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,31 +92,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.665000 2.025000 0.995000 3.245000 ;
-        RECT 4.210000 2.025000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.265000 0.595000 0.825000 ;
-      RECT 0.135000 0.825000 1.385000 0.995000 ;
-      RECT 0.135000 0.995000 0.305000 2.025000 ;
-      RECT 0.135000 2.025000 0.465000 3.065000 ;
-      RECT 1.055000 0.995000 1.385000 1.845000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.135000  0.265000 0.595000 0.825000 ;
+      RECT 0.135000  0.825000 1.385000 0.995000 ;
+      RECT 0.135000  0.995000 0.305000 2.025000 ;
+      RECT 0.135000  2.025000 0.465000 3.065000 ;
+      RECT 0.665000  2.025000 0.995000 3.245000 ;
+      RECT 1.055000  0.085000 1.385000 0.645000 ;
+      RECT 1.055000  0.995000 1.385000 1.845000 ;
+      RECT 2.665000  0.085000 2.995000 0.685000 ;
+      RECT 4.210000  2.025000 4.540000 3.245000 ;
+      RECT 4.330000  0.085000 4.660000 0.725000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4b_lp
diff --git a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef
index 6fad7f6..6015a68 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.magic.lef
@@ -84,19 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.985000  0.085000 1.175000 0.650000 ;
-        RECT 1.865000  0.085000 2.075000 0.650000 ;
-        RECT 2.725000  0.085000 3.055000 0.590000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -105,27 +92,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.015000 2.650000 1.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.185000 0.450000 0.395000 2.300000 ;
-      RECT 0.185000 2.300000 2.920000 2.320000 ;
-      RECT 0.185000 2.320000 2.730000 2.470000 ;
-      RECT 0.625000 2.470000 0.835000 2.790000 ;
-      RECT 2.560000 1.650000 2.920000 2.300000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.185000  0.450000 0.395000 2.300000 ;
+      RECT 0.185000  2.300000 2.920000 2.320000 ;
+      RECT 0.185000  2.320000 2.730000 2.470000 ;
+      RECT 0.625000  2.470000 0.835000 2.790000 ;
+      RECT 0.985000  0.085000 1.175000 0.650000 ;
+      RECT 1.015000  2.650000 1.345000 3.245000 ;
+      RECT 1.865000  0.085000 2.075000 0.650000 ;
+      RECT 2.560000  1.650000 2.920000 2.300000 ;
+      RECT 2.725000  0.085000 3.055000 0.590000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__nor4b_m
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef
index 1c6f922..784c6f1 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.magic.lef
@@ -84,21 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.160000  0.085000 1.540000 0.895000 ;
-        RECT 2.115000  0.085000 2.385000 0.915000 ;
-        RECT 3.080000  0.085000 3.750000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -107,36 +92,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.525000 2.630000 0.855000 3.245000 ;
-        RECT 3.080000 2.315000 3.410000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 2.290000 1.030000 2.460000 ;
-      RECT 0.095000 2.460000 0.355000 2.920000 ;
-      RECT 0.430000 0.705000 0.990000 1.035000 ;
-      RECT 0.820000 1.035000 0.990000 1.185000 ;
-      RECT 0.820000 1.185000 1.355000 1.515000 ;
-      RECT 0.820000 1.515000 1.030000 2.290000 ;
-      RECT 1.875000 1.425000 2.205000 1.930000 ;
-      RECT 1.875000 1.930000 3.950000 2.145000 ;
-      RECT 3.385000 1.085000 4.160000 1.255000 ;
-      RECT 3.385000 1.255000 3.555000 1.930000 ;
-      RECT 3.920000 0.695000 4.160000 1.085000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  2.290000 1.030000 2.460000 ;
+      RECT 0.095000  2.460000 0.355000 2.920000 ;
+      RECT 0.430000  0.705000 0.990000 1.035000 ;
+      RECT 0.525000  2.630000 0.855000 3.245000 ;
+      RECT 0.820000  1.035000 0.990000 1.185000 ;
+      RECT 0.820000  1.185000 1.355000 1.515000 ;
+      RECT 0.820000  1.515000 1.030000 2.290000 ;
+      RECT 1.160000  0.085000 1.540000 0.895000 ;
+      RECT 1.875000  1.425000 2.205000 1.930000 ;
+      RECT 1.875000  1.930000 3.950000 2.145000 ;
+      RECT 2.115000  0.085000 2.385000 0.915000 ;
+      RECT 3.080000  0.085000 3.750000 0.915000 ;
+      RECT 3.080000  2.315000 3.410000 3.245000 ;
+      RECT 3.385000  1.085000 4.160000 1.255000 ;
+      RECT 3.385000  1.255000 3.555000 1.930000 ;
+      RECT 3.920000  0.695000 4.160000 1.085000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4bb_1
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef
index 378c7d7..ed82c35 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.magic.lef
@@ -90,29 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.615000  0.085000 0.955000 1.070000 ;
-        RECT 2.275000  0.085000 2.605000 0.490000 ;
-        RECT 3.135000  0.085000 3.465000 0.825000 ;
-        RECT 3.995000  0.085000 4.805000 0.670000 ;
-        RECT 5.335000  0.085000 5.665000 0.885000 ;
-        RECT 6.195000  0.085000 6.525000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -121,54 +98,74 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.635000 2.670000 1.305000 3.245000 ;
-        RECT 5.845000 2.025000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.185000 0.865000 0.435000 1.240000 ;
-      RECT 0.185000 1.240000 1.295000 1.410000 ;
-      RECT 0.185000 1.410000 0.435000 2.605000 ;
-      RECT 0.185000 2.605000 0.465000 2.935000 ;
-      RECT 1.125000 0.660000 2.555000 0.830000 ;
-      RECT 1.125000 0.830000 1.295000 1.240000 ;
-      RECT 1.475000 1.000000 2.205000 1.260000 ;
-      RECT 1.475000 2.670000 1.975000 3.000000 ;
-      RECT 1.805000 1.260000 2.205000 1.600000 ;
-      RECT 1.805000 1.600000 1.975000 2.670000 ;
-      RECT 2.275000 1.755000 2.535000 2.905000 ;
-      RECT 2.275000 2.905000 3.415000 3.075000 ;
-      RECT 2.385000 0.830000 2.555000 1.335000 ;
-      RECT 2.385000 1.335000 3.825000 1.505000 ;
-      RECT 3.205000 2.015000 4.365000 2.185000 ;
-      RECT 3.205000 2.185000 3.415000 2.905000 ;
-      RECT 3.585000 2.355000 3.915000 2.905000 ;
-      RECT 3.585000 2.905000 5.315000 3.075000 ;
-      RECT 4.085000 2.185000 4.365000 2.735000 ;
-      RECT 4.555000 1.685000 6.605000 1.855000 ;
-      RECT 4.555000 1.855000 4.815000 2.735000 ;
-      RECT 4.985000 2.025000 5.315000 2.905000 ;
-      RECT 5.485000 1.855000 5.675000 3.075000 ;
-      RECT 6.345000 1.855000 6.605000 3.075000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.185000  0.865000 0.435000 1.240000 ;
+      RECT 0.185000  1.240000 1.295000 1.410000 ;
+      RECT 0.185000  1.410000 0.435000 2.605000 ;
+      RECT 0.185000  2.605000 0.465000 2.935000 ;
+      RECT 0.615000  0.085000 0.955000 1.070000 ;
+      RECT 0.635000  2.670000 1.305000 3.245000 ;
+      RECT 1.125000  0.660000 2.555000 0.830000 ;
+      RECT 1.125000  0.830000 1.295000 1.240000 ;
+      RECT 1.475000  1.000000 2.205000 1.260000 ;
+      RECT 1.475000  2.670000 1.975000 3.000000 ;
+      RECT 1.805000  1.260000 2.205000 1.600000 ;
+      RECT 1.805000  1.600000 1.975000 2.670000 ;
+      RECT 2.275000  0.085000 2.605000 0.490000 ;
+      RECT 2.275000  1.755000 2.535000 2.905000 ;
+      RECT 2.275000  2.905000 3.415000 3.075000 ;
+      RECT 2.385000  0.830000 2.555000 1.335000 ;
+      RECT 2.385000  1.335000 3.825000 1.505000 ;
+      RECT 3.135000  0.085000 3.465000 0.825000 ;
+      RECT 3.205000  2.015000 4.365000 2.185000 ;
+      RECT 3.205000  2.185000 3.415000 2.905000 ;
+      RECT 3.585000  2.355000 3.915000 2.905000 ;
+      RECT 3.585000  2.905000 5.315000 3.075000 ;
+      RECT 3.995000  0.085000 4.805000 0.670000 ;
+      RECT 4.085000  2.185000 4.365000 2.735000 ;
+      RECT 4.555000  1.685000 6.605000 1.855000 ;
+      RECT 4.555000  1.855000 4.815000 2.735000 ;
+      RECT 4.985000  2.025000 5.315000 2.905000 ;
+      RECT 5.335000  0.085000 5.665000 0.885000 ;
+      RECT 5.485000  1.855000 5.675000 3.075000 ;
+      RECT 5.845000  2.025000 6.175000 3.245000 ;
+      RECT 6.195000  0.085000 6.525000 1.015000 ;
+      RECT 6.345000  1.855000 6.605000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4bb_2
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef
index 8c518fa..44a02bf 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.magic.lef
@@ -98,39 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 0.855000 ;
-        RECT 1.525000  0.085000 1.855000 0.815000 ;
-        RECT 2.535000  0.085000 2.865000 0.485000 ;
-        RECT 3.555000  0.085000 3.885000 0.485000 ;
-        RECT 4.415000  0.085000 4.745000 0.825000 ;
-        RECT 5.275000  0.085000 5.990000 0.815000 ;
-        RECT 6.520000  0.085000 6.850000 0.835000 ;
-        RECT 7.380000  0.085000 7.710000 0.835000 ;
-        RECT 8.240000  0.085000 8.570000 0.835000 ;
-        RECT 9.135000  0.085000 9.430000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -139,75 +106,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.575000 2.650000 0.905000 3.245000 ;
-        RECT 7.810000 2.270000 8.140000 3.245000 ;
-        RECT 8.670000 2.270000 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 ;
-        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.145000 0.255000 0.395000 1.025000 ;
-      RECT 0.145000 1.025000 0.825000 1.195000 ;
-      RECT 0.145000 1.930000 0.825000 2.310000 ;
-      RECT 0.145000 2.310000 2.025000 2.480000 ;
-      RECT 0.145000 2.480000 0.405000 3.075000 ;
-      RECT 0.645000 1.195000 0.825000 1.930000 ;
-      RECT 1.005000 1.930000 1.635000 2.140000 ;
-      RECT 1.075000 0.255000 1.335000 0.995000 ;
-      RECT 1.075000 0.995000 3.890000 1.165000 ;
-      RECT 1.075000 1.165000 1.635000 1.175000 ;
-      RECT 1.455000 1.175000 1.635000 1.930000 ;
-      RECT 1.695000 2.650000 2.025000 2.905000 ;
-      RECT 1.695000 2.905000 3.675000 3.075000 ;
-      RECT 1.820000 1.335000 3.510000 1.515000 ;
-      RECT 1.820000 1.515000 2.025000 2.310000 ;
-      RECT 2.555000 2.025000 2.885000 2.905000 ;
-      RECT 3.455000 2.035000 5.465000 2.205000 ;
-      RECT 3.455000 2.205000 3.675000 2.905000 ;
-      RECT 3.720000 1.165000 3.890000 1.335000 ;
-      RECT 3.720000 1.335000 5.070000 1.515000 ;
-      RECT 3.845000 2.375000 4.175000 2.905000 ;
-      RECT 3.845000 2.905000 7.275000 3.075000 ;
-      RECT 4.345000 2.205000 4.535000 2.735000 ;
-      RECT 4.705000 2.375000 5.035000 2.885000 ;
-      RECT 4.705000 2.885000 7.275000 2.905000 ;
-      RECT 5.205000 2.205000 5.465000 2.715000 ;
-      RECT 5.655000 2.035000 6.775000 2.205000 ;
-      RECT 5.655000 2.205000 5.915000 2.715000 ;
-      RECT 6.085000 2.375000 6.415000 2.885000 ;
-      RECT 6.515000 1.705000 7.625000 1.875000 ;
-      RECT 6.515000 1.875000 6.775000 2.035000 ;
-      RECT 6.585000 2.205000 6.775000 2.715000 ;
-      RECT 6.945000 2.055000 7.275000 2.885000 ;
-      RECT 7.445000 1.875000 7.625000 1.930000 ;
-      RECT 7.445000 1.930000 9.430000 2.100000 ;
-      RECT 7.445000 2.100000 7.640000 3.075000 ;
-      RECT 8.310000 2.100000 8.500000 3.075000 ;
-      RECT 9.170000 2.100000 9.430000 3.075000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.145000  0.255000 0.395000 1.025000 ;
+      RECT 0.145000  1.025000 0.825000 1.195000 ;
+      RECT 0.145000  1.930000 0.825000 2.310000 ;
+      RECT 0.145000  2.310000 2.025000 2.480000 ;
+      RECT 0.145000  2.480000 0.405000 3.075000 ;
+      RECT 0.575000  0.085000 0.905000 0.855000 ;
+      RECT 0.575000  2.650000 0.905000 3.245000 ;
+      RECT 0.645000  1.195000 0.825000 1.930000 ;
+      RECT 1.005000  1.930000 1.635000 2.140000 ;
+      RECT 1.075000  0.255000 1.335000 0.995000 ;
+      RECT 1.075000  0.995000 3.890000 1.165000 ;
+      RECT 1.075000  1.165000 1.635000 1.175000 ;
+      RECT 1.455000  1.175000 1.635000 1.930000 ;
+      RECT 1.525000  0.085000 1.855000 0.815000 ;
+      RECT 1.695000  2.650000 2.025000 2.905000 ;
+      RECT 1.695000  2.905000 3.675000 3.075000 ;
+      RECT 1.820000  1.335000 3.510000 1.515000 ;
+      RECT 1.820000  1.515000 2.025000 2.310000 ;
+      RECT 2.535000  0.085000 2.865000 0.485000 ;
+      RECT 2.555000  2.025000 2.885000 2.905000 ;
+      RECT 3.455000  2.035000 5.465000 2.205000 ;
+      RECT 3.455000  2.205000 3.675000 2.905000 ;
+      RECT 3.555000  0.085000 3.885000 0.485000 ;
+      RECT 3.720000  1.165000 3.890000 1.335000 ;
+      RECT 3.720000  1.335000 5.070000 1.515000 ;
+      RECT 3.845000  2.375000 4.175000 2.905000 ;
+      RECT 3.845000  2.905000 7.275000 3.075000 ;
+      RECT 4.345000  2.205000 4.535000 2.735000 ;
+      RECT 4.415000  0.085000 4.745000 0.825000 ;
+      RECT 4.705000  2.375000 5.035000 2.885000 ;
+      RECT 4.705000  2.885000 7.275000 2.905000 ;
+      RECT 5.205000  2.205000 5.465000 2.715000 ;
+      RECT 5.275000  0.085000 5.990000 0.815000 ;
+      RECT 5.655000  2.035000 6.775000 2.205000 ;
+      RECT 5.655000  2.205000 5.915000 2.715000 ;
+      RECT 6.085000  2.375000 6.415000 2.885000 ;
+      RECT 6.515000  1.705000 7.625000 1.875000 ;
+      RECT 6.515000  1.875000 6.775000 2.035000 ;
+      RECT 6.520000  0.085000 6.850000 0.835000 ;
+      RECT 6.585000  2.205000 6.775000 2.715000 ;
+      RECT 6.945000  2.055000 7.275000 2.885000 ;
+      RECT 7.380000  0.085000 7.710000 0.835000 ;
+      RECT 7.445000  1.875000 7.625000 1.930000 ;
+      RECT 7.445000  1.930000 9.430000 2.100000 ;
+      RECT 7.445000  2.100000 7.640000 3.075000 ;
+      RECT 7.810000  2.270000 8.140000 3.245000 ;
+      RECT 8.240000  0.085000 8.570000 0.835000 ;
+      RECT 8.310000  2.100000 8.500000 3.075000 ;
+      RECT 8.670000  2.270000 9.000000 3.245000 ;
+      RECT 9.135000  0.085000 9.430000 1.095000 ;
+      RECT 9.170000  2.100000 9.430000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4bb_4
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef
index 71f9539..59aa121 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.magic.lef
@@ -84,24 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 1.055000  0.085000 1.385000 0.645000 ;
-        RECT 2.635000  0.085000 2.965000 0.635000 ;
-        RECT 4.305000  0.085000 4.635000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -110,47 +92,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.645000 2.025000 0.975000 3.245000 ;
-        RECT 4.405000 2.025000 4.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 ;
-        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.265000 0.595000 0.825000 ;
-      RECT 0.115000 0.825000 1.385000 0.995000 ;
-      RECT 0.115000 0.995000 0.285000 2.025000 ;
-      RECT 0.115000 2.025000 0.365000 3.065000 ;
-      RECT 1.055000 0.995000 1.385000 1.790000 ;
-      RECT 1.205000 2.025000 1.535000 2.185000 ;
-      RECT 1.205000 2.185000 3.155000 2.355000 ;
-      RECT 1.205000 2.355000 1.535000 3.065000 ;
-      RECT 1.735000 2.535000 2.065000 2.895000 ;
-      RECT 1.735000 2.895000 3.715000 3.065000 ;
-      RECT 2.520000 1.165000 2.975000 1.495000 ;
-      RECT 2.805000 1.495000 2.975000 1.675000 ;
-      RECT 2.805000 1.675000 5.595000 1.845000 ;
-      RECT 2.825000 2.025000 3.155000 2.185000 ;
-      RECT 2.825000 2.355000 3.155000 2.715000 ;
-      RECT 3.385000 2.025000 3.715000 2.895000 ;
-      RECT 4.975000 1.845000 5.595000 3.065000 ;
-      RECT 5.265000 0.265000 5.595000 0.645000 ;
-      RECT 5.425000 0.645000 5.595000 1.675000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.115000  0.265000 0.595000 0.825000 ;
+      RECT 0.115000  0.825000 1.385000 0.995000 ;
+      RECT 0.115000  0.995000 0.285000 2.025000 ;
+      RECT 0.115000  2.025000 0.365000 3.065000 ;
+      RECT 0.645000  2.025000 0.975000 3.245000 ;
+      RECT 1.055000  0.085000 1.385000 0.645000 ;
+      RECT 1.055000  0.995000 1.385000 1.790000 ;
+      RECT 1.205000  2.025000 1.535000 2.185000 ;
+      RECT 1.205000  2.185000 3.155000 2.355000 ;
+      RECT 1.205000  2.355000 1.535000 3.065000 ;
+      RECT 1.735000  2.535000 2.065000 2.895000 ;
+      RECT 1.735000  2.895000 3.715000 3.065000 ;
+      RECT 2.520000  1.165000 2.975000 1.495000 ;
+      RECT 2.635000  0.085000 2.965000 0.635000 ;
+      RECT 2.805000  1.495000 2.975000 1.675000 ;
+      RECT 2.805000  1.675000 5.595000 1.845000 ;
+      RECT 2.825000  2.025000 3.155000 2.185000 ;
+      RECT 2.825000  2.355000 3.155000 2.715000 ;
+      RECT 3.385000  2.025000 3.715000 2.895000 ;
+      RECT 4.305000  0.085000 4.635000 0.645000 ;
+      RECT 4.405000  2.025000 4.735000 3.245000 ;
+      RECT 4.975000  1.845000 5.595000 3.065000 ;
+      RECT 5.265000  0.265000 5.595000 0.645000 ;
+      RECT 5.425000  0.645000 5.595000 1.675000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4bb_lp
diff --git a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef
index 4737020..219f6eb 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.magic.lef
@@ -85,20 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.725000  0.085000 0.935000 0.935000 ;
-        RECT 1.660000  0.085000 1.830000 0.935000 ;
-        RECT 2.905000  0.085000 3.075000 0.935000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -107,33 +93,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.525000 2.705000 0.855000 3.245000 ;
-        RECT 2.665000 2.115000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 2.355000 0.820000 2.525000 ;
-      RECT 0.155000 2.525000 0.345000 2.845000 ;
-      RECT 0.215000 0.795000 0.545000 1.155000 ;
-      RECT 0.215000 1.155000 1.130000 1.325000 ;
-      RECT 0.650000 1.325000 1.130000 1.825000 ;
-      RECT 0.650000 1.825000 0.820000 2.355000 ;
-      RECT 3.035000 2.855000 3.640000 3.025000 ;
-      RECT 3.255000 0.765000 3.640000 0.975000 ;
-      RECT 3.450000 0.975000 3.640000 2.855000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.155000  2.355000 0.820000 2.525000 ;
+      RECT 0.155000  2.525000 0.345000 2.845000 ;
+      RECT 0.215000  0.795000 0.545000 1.155000 ;
+      RECT 0.215000  1.155000 1.130000 1.325000 ;
+      RECT 0.525000  2.705000 0.855000 3.245000 ;
+      RECT 0.650000  1.325000 1.130000 1.825000 ;
+      RECT 0.650000  1.825000 0.820000 2.355000 ;
+      RECT 0.725000  0.085000 0.935000 0.935000 ;
+      RECT 1.660000  0.085000 1.830000 0.935000 ;
+      RECT 2.665000  2.115000 2.855000 3.245000 ;
+      RECT 2.905000  0.085000 3.075000 0.935000 ;
+      RECT 3.035000  2.855000 3.640000 3.025000 ;
+      RECT 3.255000  0.765000 3.640000 0.975000 ;
+      RECT 3.450000  0.975000 3.640000 2.855000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__nor4bb_m
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef
index 265244e..d6c3c2a 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.magic.lef
@@ -89,19 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.570000 ;
-        RECT 2.735000  0.085000 3.065000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -110,34 +97,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.840000 2.385000 1.135000 3.245000 ;
-        RECT 1.740000 2.385000 2.340000 3.245000 ;
-        RECT 3.260000 2.385000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 0.740000 1.375000 0.910000 ;
-      RECT 0.525000 0.910000 0.795000 2.035000 ;
-      RECT 0.525000 2.035000 2.800000 2.215000 ;
-      RECT 1.120000 0.280000 1.375000 0.740000 ;
-      RECT 1.305000 2.215000 1.570000 3.075000 ;
-      RECT 2.270000 0.280000 2.565000 0.695000 ;
-      RECT 2.270000 0.695000 3.530000 0.865000 ;
-      RECT 2.510000 2.215000 2.800000 3.075000 ;
-      RECT 3.250000 0.280000 3.530000 0.695000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.525000  0.085000 0.855000 0.570000 ;
+      RECT 0.525000  0.740000 1.375000 0.910000 ;
+      RECT 0.525000  0.910000 0.795000 2.035000 ;
+      RECT 0.525000  2.035000 2.800000 2.215000 ;
+      RECT 0.840000  2.385000 1.135000 3.245000 ;
+      RECT 1.120000  0.280000 1.375000 0.740000 ;
+      RECT 1.305000  2.215000 1.570000 3.075000 ;
+      RECT 1.740000  2.385000 2.340000 3.245000 ;
+      RECT 2.270000  0.280000 2.565000 0.695000 ;
+      RECT 2.270000  0.695000 3.530000 0.865000 ;
+      RECT 2.510000  2.215000 2.800000 3.075000 ;
+      RECT 2.735000  0.085000 3.065000 0.525000 ;
+      RECT 3.250000  0.280000 3.530000 0.695000 ;
+      RECT 3.260000  2.385000 3.590000 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_lp__o2111a_0
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef
index 902b954..6b63a3b 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.magic.lef
@@ -88,21 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.535000  0.085000 0.855000 0.905000 ;
-        RECT 0.535000  0.905000 0.805000 1.015000 ;
-        RECT 3.330000  0.085000 3.660000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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 +96,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.535000 1.815000 0.805000 2.270000 ;
-        RECT 0.535000 2.270000 1.490000 3.245000 ;
-        RECT 2.020000 2.270000 2.760000 3.245000 ;
-        RECT 3.730000 1.930000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 1.185000 1.560000 1.245000 ;
-      RECT 0.535000 1.245000 1.145000 1.515000 ;
-      RECT 0.975000 1.075000 1.560000 1.185000 ;
-      RECT 0.975000 1.515000 1.145000 1.930000 ;
-      RECT 0.975000 1.930000 3.260000 2.100000 ;
-      RECT 1.230000 0.255000 1.560000 1.075000 ;
-      RECT 1.660000 2.100000 1.850000 3.075000 ;
-      RECT 2.560000 0.255000 3.160000 0.995000 ;
-      RECT 2.560000 0.995000 4.090000 1.165000 ;
-      RECT 2.930000 2.100000 3.260000 3.075000 ;
-      RECT 3.830000 0.255000 4.090000 0.995000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.535000  0.085000 0.855000 0.905000 ;
+      RECT 0.535000  0.905000 0.805000 1.015000 ;
+      RECT 0.535000  1.185000 1.560000 1.245000 ;
+      RECT 0.535000  1.245000 1.145000 1.515000 ;
+      RECT 0.535000  1.815000 0.805000 2.270000 ;
+      RECT 0.535000  2.270000 1.490000 3.245000 ;
+      RECT 0.975000  1.075000 1.560000 1.185000 ;
+      RECT 0.975000  1.515000 1.145000 1.930000 ;
+      RECT 0.975000  1.930000 3.260000 2.100000 ;
+      RECT 1.230000  0.255000 1.560000 1.075000 ;
+      RECT 1.660000  2.100000 1.850000 3.075000 ;
+      RECT 2.020000  2.270000 2.760000 3.245000 ;
+      RECT 2.560000  0.255000 3.160000 0.995000 ;
+      RECT 2.560000  0.995000 4.090000 1.165000 ;
+      RECT 2.930000  2.100000 3.260000 3.075000 ;
+      RECT 3.330000  0.085000 3.660000 0.825000 ;
+      RECT 3.730000  1.930000 4.090000 3.245000 ;
+      RECT 3.830000  0.255000 4.090000 0.995000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2111a_1
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef
index 9b8780c..d4ade88 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.magic.lef
@@ -91,21 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.095000  0.085000 0.390000 1.095000 ;
-        RECT 0.975000  0.085000 1.285000 0.885000 ;
-        RECT 3.385000  0.085000 3.715000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -114,39 +99,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.095000 1.820000 0.390000 3.245000 ;
-        RECT 0.975000 2.295000 1.735000 3.245000 ;
-        RECT 2.325000 2.295000 2.655000 3.245000 ;
-        RECT 3.885000 1.920000 4.215000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.975000 1.055000 1.805000 1.155000 ;
-      RECT 0.975000 1.155000 1.575000 1.225000 ;
-      RECT 0.975000 1.225000 1.305000 1.515000 ;
-      RECT 1.045000 1.515000 1.305000 1.955000 ;
-      RECT 1.045000 1.955000 3.195000 2.125000 ;
-      RECT 1.430000 1.020000 1.805000 1.055000 ;
-      RECT 1.455000 0.255000 1.805000 1.020000 ;
-      RECT 1.905000 2.125000 2.155000 3.075000 ;
-      RECT 2.865000 0.255000 3.195000 1.035000 ;
-      RECT 2.865000 1.035000 4.215000 1.205000 ;
-      RECT 2.865000 2.125000 3.195000 3.075000 ;
-      RECT 3.885000 0.255000 4.215000 1.035000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.085000 0.390000 1.095000 ;
+      RECT 0.095000  1.820000 0.390000 3.245000 ;
+      RECT 0.975000  0.085000 1.285000 0.885000 ;
+      RECT 0.975000  1.055000 1.805000 1.155000 ;
+      RECT 0.975000  1.155000 1.575000 1.225000 ;
+      RECT 0.975000  1.225000 1.305000 1.515000 ;
+      RECT 0.975000  2.295000 1.735000 3.245000 ;
+      RECT 1.045000  1.515000 1.305000 1.955000 ;
+      RECT 1.045000  1.955000 3.195000 2.125000 ;
+      RECT 1.430000  1.020000 1.805000 1.055000 ;
+      RECT 1.455000  0.255000 1.805000 1.020000 ;
+      RECT 1.905000  2.125000 2.155000 3.075000 ;
+      RECT 2.325000  2.295000 2.655000 3.245000 ;
+      RECT 2.865000  0.255000 3.195000 1.035000 ;
+      RECT 2.865000  1.035000 4.215000 1.205000 ;
+      RECT 2.865000  2.125000 3.195000 3.075000 ;
+      RECT 3.385000  0.085000 3.715000 0.865000 ;
+      RECT 3.885000  0.255000 4.215000 1.035000 ;
+      RECT 3.885000  1.920000 4.215000 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_lp__o2111a_2
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef
index 1294201..8f236fb 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.magic.lef
@@ -101,30 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 3.690000  0.085000 3.935000 0.545000 ;
-        RECT 4.500000  0.085000 4.830000 0.565000 ;
-        RECT 5.430000  0.085000 5.695000 0.930000 ;
-        RECT 6.260000  0.085000 6.590000 0.895000 ;
-        RECT 7.120000  0.085000 7.450000 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 ;
-        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
@@ -133,71 +109,92 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.550000 2.155000 0.880000 3.245000 ;
-        RECT 1.445000 2.630000 1.775000 3.245000 ;
-        RECT 2.350000 2.640000 2.680000 3.245000 ;
-        RECT 4.110000 2.620000 4.440000 3.245000 ;
-        RECT 5.515000 2.105000 5.845000 3.245000 ;
-        RECT 6.375000 2.095000 6.705000 3.245000 ;
-        RECT 7.235000 2.095000 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.120000 1.815000 1.250000 1.985000 ;
-      RECT 0.120000 1.985000 0.380000 3.075000 ;
-      RECT 0.130000 0.255000 1.250000 0.425000 ;
-      RECT 0.130000 0.425000 0.390000 1.040000 ;
-      RECT 0.560000 0.595000 0.890000 1.815000 ;
-      RECT 1.050000 1.985000 1.250000 2.290000 ;
-      RECT 1.050000 2.290000 3.545000 2.460000 ;
-      RECT 1.050000 2.460000 1.275000 3.075000 ;
-      RECT 1.060000 0.425000 1.250000 1.085000 ;
-      RECT 1.060000 1.085000 3.180000 1.255000 ;
-      RECT 1.420000 0.285000 1.750000 0.725000 ;
-      RECT 1.420000 0.725000 2.680000 0.915000 ;
-      RECT 1.920000 0.255000 3.520000 0.425000 ;
-      RECT 1.920000 0.425000 2.250000 0.555000 ;
-      RECT 1.945000 2.460000 3.545000 2.470000 ;
-      RECT 1.945000 2.470000 2.180000 3.075000 ;
-      RECT 2.375000 0.680000 2.680000 0.725000 ;
-      RECT 2.850000 0.595000 3.180000 1.085000 ;
-      RECT 2.850000 2.470000 3.545000 3.075000 ;
-      RECT 2.905000 1.930000 5.300000 2.100000 ;
-      RECT 2.905000 2.100000 3.545000 2.290000 ;
-      RECT 3.350000 0.425000 3.520000 0.725000 ;
-      RECT 3.350000 0.725000 4.330000 0.735000 ;
-      RECT 3.350000 0.735000 5.260000 0.905000 ;
-      RECT 3.715000 2.280000 4.840000 2.450000 ;
-      RECT 3.715000 2.450000 3.940000 3.075000 ;
-      RECT 4.105000 0.255000 4.330000 0.725000 ;
-      RECT 4.610000 2.450000 4.840000 3.075000 ;
-      RECT 4.970000 1.755000 5.845000 1.925000 ;
-      RECT 4.970000 1.925000 5.300000 1.930000 ;
-      RECT 5.000000 0.255000 5.260000 0.735000 ;
-      RECT 5.010000 2.100000 5.300000 3.075000 ;
-      RECT 5.675000 1.405000 7.055000 1.585000 ;
-      RECT 5.675000 1.585000 5.845000 1.755000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.120000  1.815000 1.250000 1.985000 ;
+      RECT 0.120000  1.985000 0.380000 3.075000 ;
+      RECT 0.130000  0.255000 1.250000 0.425000 ;
+      RECT 0.130000  0.425000 0.390000 1.040000 ;
+      RECT 0.550000  2.155000 0.880000 3.245000 ;
+      RECT 0.560000  0.595000 0.890000 1.815000 ;
+      RECT 1.050000  1.985000 1.250000 2.290000 ;
+      RECT 1.050000  2.290000 3.545000 2.460000 ;
+      RECT 1.050000  2.460000 1.275000 3.075000 ;
+      RECT 1.060000  0.425000 1.250000 1.085000 ;
+      RECT 1.060000  1.085000 3.180000 1.255000 ;
+      RECT 1.420000  0.285000 1.750000 0.725000 ;
+      RECT 1.420000  0.725000 2.680000 0.915000 ;
+      RECT 1.445000  2.630000 1.775000 3.245000 ;
+      RECT 1.920000  0.255000 3.520000 0.425000 ;
+      RECT 1.920000  0.425000 2.250000 0.555000 ;
+      RECT 1.945000  2.460000 3.545000 2.470000 ;
+      RECT 1.945000  2.470000 2.180000 3.075000 ;
+      RECT 2.350000  2.640000 2.680000 3.245000 ;
+      RECT 2.375000  0.680000 2.680000 0.725000 ;
+      RECT 2.850000  0.595000 3.180000 1.085000 ;
+      RECT 2.850000  2.470000 3.545000 3.075000 ;
+      RECT 2.905000  1.930000 5.300000 2.100000 ;
+      RECT 2.905000  2.100000 3.545000 2.290000 ;
+      RECT 3.350000  0.425000 3.520000 0.725000 ;
+      RECT 3.350000  0.725000 4.330000 0.735000 ;
+      RECT 3.350000  0.735000 5.260000 0.905000 ;
+      RECT 3.690000  0.085000 3.935000 0.545000 ;
+      RECT 3.715000  2.280000 4.840000 2.450000 ;
+      RECT 3.715000  2.450000 3.940000 3.075000 ;
+      RECT 4.105000  0.255000 4.330000 0.725000 ;
+      RECT 4.110000  2.620000 4.440000 3.245000 ;
+      RECT 4.500000  0.085000 4.830000 0.565000 ;
+      RECT 4.610000  2.450000 4.840000 3.075000 ;
+      RECT 4.970000  1.755000 5.845000 1.925000 ;
+      RECT 4.970000  1.925000 5.300000 1.930000 ;
+      RECT 5.000000  0.255000 5.260000 0.735000 ;
+      RECT 5.010000  2.100000 5.300000 3.075000 ;
+      RECT 5.430000  0.085000 5.695000 0.930000 ;
+      RECT 5.515000  2.105000 5.845000 3.245000 ;
+      RECT 5.675000  1.405000 7.055000 1.585000 ;
+      RECT 5.675000  1.585000 5.845000 1.755000 ;
+      RECT 6.260000  0.085000 6.590000 0.895000 ;
+      RECT 6.375000  2.095000 6.705000 3.245000 ;
+      RECT 7.120000  0.085000 7.450000 0.895000 ;
+      RECT 7.235000  2.095000 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_lp__o2111a_4
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef
index c30e4ce..7803059 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.555000  0.085000 0.885000 0.695000 ;
-        RECT 3.085000  0.085000 3.415000 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 ;
       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.115000 2.075000 0.445000 3.245000 ;
-        RECT 1.705000 2.680000 2.035000 3.245000 ;
-        RECT 3.105000 2.075000 3.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 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.125000 0.265000 0.375000 0.875000 ;
-      RECT 0.125000 0.875000 1.315000 1.045000 ;
-      RECT 1.065000 0.265000 1.315000 0.875000 ;
-      RECT 1.175000 2.075000 1.505000 2.330000 ;
-      RECT 1.175000 2.330000 2.905000 2.500000 ;
-      RECT 1.175000 2.500000 1.505000 3.065000 ;
-      RECT 2.175000 0.315000 2.715000 0.585000 ;
-      RECT 2.175000 0.585000 2.345000 1.265000 ;
-      RECT 2.175000 1.265000 2.745000 1.435000 ;
-      RECT 2.575000 1.435000 2.745000 1.715000 ;
-      RECT 2.575000 1.715000 3.745000 1.885000 ;
-      RECT 2.575000 1.885000 2.905000 2.330000 ;
-      RECT 2.575000 2.500000 2.905000 3.065000 ;
-      RECT 3.415000 1.215000 3.745000 1.715000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.115000  2.075000 0.445000 3.245000 ;
+      RECT 0.125000  0.265000 0.375000 0.875000 ;
+      RECT 0.125000  0.875000 1.315000 1.045000 ;
+      RECT 0.555000  0.085000 0.885000 0.695000 ;
+      RECT 1.065000  0.265000 1.315000 0.875000 ;
+      RECT 1.175000  2.075000 1.505000 2.330000 ;
+      RECT 1.175000  2.330000 2.905000 2.500000 ;
+      RECT 1.175000  2.500000 1.505000 3.065000 ;
+      RECT 1.705000  2.680000 2.035000 3.245000 ;
+      RECT 2.175000  0.315000 2.715000 0.585000 ;
+      RECT 2.175000  0.585000 2.345000 1.265000 ;
+      RECT 2.175000  1.265000 2.745000 1.435000 ;
+      RECT 2.575000  1.435000 2.745000 1.715000 ;
+      RECT 2.575000  1.715000 3.745000 1.885000 ;
+      RECT 2.575000  1.885000 2.905000 2.330000 ;
+      RECT 2.575000  2.500000 2.905000 3.065000 ;
+      RECT 3.085000  0.085000 3.415000 0.585000 ;
+      RECT 3.105000  2.075000 3.435000 3.245000 ;
+      RECT 3.415000  1.215000 3.745000 1.715000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2111a_lp
diff --git a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef
index 59b76f1..746daad 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.magic.lef
@@ -89,19 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.585000  0.085000 0.795000 0.545000 ;
-        RECT 2.925000  0.085000 3.135000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -110,34 +97,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.850000 2.785000 1.060000 3.245000 ;
-        RECT 1.690000 2.845000 2.020000 3.245000 ;
-        RECT 3.155000 2.845000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.725000 1.320000 0.895000 ;
-      RECT 0.545000 0.895000 0.715000 2.435000 ;
-      RECT 0.545000 2.435000 2.635000 2.605000 ;
-      RECT 1.110000 0.345000 1.320000 0.725000 ;
-      RECT 1.300000 2.605000 1.510000 2.985000 ;
-      RECT 2.425000 2.605000 2.635000 2.985000 ;
-      RECT 2.515000 0.345000 2.705000 0.725000 ;
-      RECT 2.515000 0.725000 3.565000 0.895000 ;
-      RECT 3.355000 0.345000 3.565000 0.725000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.545000  0.725000 1.320000 0.895000 ;
+      RECT 0.545000  0.895000 0.715000 2.435000 ;
+      RECT 0.545000  2.435000 2.635000 2.605000 ;
+      RECT 0.585000  0.085000 0.795000 0.545000 ;
+      RECT 0.850000  2.785000 1.060000 3.245000 ;
+      RECT 1.110000  0.345000 1.320000 0.725000 ;
+      RECT 1.300000  2.605000 1.510000 2.985000 ;
+      RECT 1.690000  2.845000 2.020000 3.245000 ;
+      RECT 2.425000  2.605000 2.635000 2.985000 ;
+      RECT 2.515000  0.345000 2.705000 0.725000 ;
+      RECT 2.515000  0.725000 3.565000 0.895000 ;
+      RECT 2.925000  0.085000 3.135000 0.545000 ;
+      RECT 3.155000  2.845000 3.485000 3.245000 ;
+      RECT 3.355000  0.345000 3.565000 0.725000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2111a_m
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef
index 896f491..0f960eb 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.magic.lef
@@ -93,17 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.470000  0.085000 2.740000 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 ;
       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 0.125000 2.305000 0.405000 3.245000 ;
-        RECT 1.055000 2.305000 1.925000 3.245000 ;
-        RECT 2.935000 2.315000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.650000 0.280000 2.300000 0.595000 ;
-      RECT 2.035000 0.595000 2.300000 0.780000 ;
-      RECT 2.035000 0.780000 3.200000 0.950000 ;
-      RECT 2.910000 0.280000 3.200000 0.780000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  2.305000 0.405000 3.245000 ;
+      RECT 1.055000  2.305000 1.925000 3.245000 ;
+      RECT 1.650000  0.280000 2.300000 0.595000 ;
+      RECT 2.035000  0.595000 2.300000 0.780000 ;
+      RECT 2.035000  0.780000 3.200000 0.950000 ;
+      RECT 2.470000  0.085000 2.740000 0.610000 ;
+      RECT 2.910000  0.280000 3.200000 0.780000 ;
+      RECT 2.935000  2.315000 3.275000 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_lp__o2111ai_0
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef
index 3f2685f..c3fe03c 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.magic.lef
@@ -94,17 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.400000  0.085000 2.730000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -113,27 +102,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.430000 2.095000 0.780000 3.245000 ;
-        RECT 1.480000 2.270000 1.810000 3.245000 ;
-        RECT 2.900000 1.925000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.840000 0.255000 2.170000 1.005000 ;
-      RECT 1.840000 1.005000 3.230000 1.175000 ;
-      RECT 2.900000 0.255000 3.230000 1.005000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.430000  2.095000 0.780000 3.245000 ;
+      RECT 1.480000  2.270000 1.810000 3.245000 ;
+      RECT 1.840000  0.255000 2.170000 1.005000 ;
+      RECT 1.840000  1.005000 3.230000 1.175000 ;
+      RECT 2.400000  0.085000 2.730000 0.805000 ;
+      RECT 2.900000  0.255000 3.230000 1.005000 ;
+      RECT 2.900000  1.925000 3.230000 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_lp__o2111ai_1
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef
index a942053..91f2ffc 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.magic.lef
@@ -97,23 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 3.860000  0.085000 4.190000 0.675000 ;
-        RECT 4.720000  0.085000 5.050000 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 ;
-        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,50 +105,64 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.175000 1.925000 0.425000 3.245000 ;
-        RECT 1.035000 2.095000 1.365000 3.245000 ;
-        RECT 1.895000 2.095000 2.225000 3.245000 ;
-        RECT 2.755000 2.025000 3.085000 3.245000 ;
-        RECT 4.720000 1.945000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 1.335000 0.425000 ;
-      RECT 0.175000 0.425000 0.435000 1.040000 ;
-      RECT 1.115000 0.425000 1.335000 0.870000 ;
-      RECT 1.115000 0.870000 2.275000 1.040000 ;
-      RECT 1.505000 0.255000 3.330000 0.425000 ;
-      RECT 1.505000 0.425000 1.775000 0.700000 ;
-      RECT 1.945000 0.595000 2.275000 0.870000 ;
-      RECT 1.945000 1.040000 2.275000 1.205000 ;
-      RECT 2.570000 0.775000 3.690000 0.845000 ;
-      RECT 2.570000 0.845000 5.480000 1.015000 ;
-      RECT 3.000000 0.425000 3.330000 0.605000 ;
-      RECT 3.430000 2.025000 3.690000 2.905000 ;
-      RECT 3.430000 2.905000 4.550000 3.075000 ;
-      RECT 3.500000 0.255000 3.690000 0.775000 ;
-      RECT 4.360000 0.255000 4.550000 0.845000 ;
-      RECT 4.360000 1.605000 5.480000 1.775000 ;
-      RECT 4.360000 1.775000 4.550000 2.905000 ;
-      RECT 5.220000 0.255000 5.480000 0.845000 ;
-      RECT 5.220000 1.775000 5.480000 3.075000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.175000  0.255000 1.335000 0.425000 ;
+      RECT 0.175000  0.425000 0.435000 1.040000 ;
+      RECT 0.175000  1.925000 0.425000 3.245000 ;
+      RECT 1.035000  2.095000 1.365000 3.245000 ;
+      RECT 1.115000  0.425000 1.335000 0.870000 ;
+      RECT 1.115000  0.870000 2.275000 1.040000 ;
+      RECT 1.505000  0.255000 3.330000 0.425000 ;
+      RECT 1.505000  0.425000 1.775000 0.700000 ;
+      RECT 1.895000  2.095000 2.225000 3.245000 ;
+      RECT 1.945000  0.595000 2.275000 0.870000 ;
+      RECT 1.945000  1.040000 2.275000 1.205000 ;
+      RECT 2.570000  0.775000 3.690000 0.845000 ;
+      RECT 2.570000  0.845000 5.480000 1.015000 ;
+      RECT 2.755000  2.025000 3.085000 3.245000 ;
+      RECT 3.000000  0.425000 3.330000 0.605000 ;
+      RECT 3.430000  2.025000 3.690000 2.905000 ;
+      RECT 3.430000  2.905000 4.550000 3.075000 ;
+      RECT 3.500000  0.255000 3.690000 0.775000 ;
+      RECT 3.860000  0.085000 4.190000 0.675000 ;
+      RECT 4.360000  0.255000 4.550000 0.845000 ;
+      RECT 4.360000  1.605000 5.480000 1.775000 ;
+      RECT 4.360000  1.775000 4.550000 2.905000 ;
+      RECT 4.720000  0.085000 5.050000 0.675000 ;
+      RECT 4.720000  1.945000 5.050000 3.245000 ;
+      RECT 5.220000  0.255000 5.480000 0.845000 ;
+      RECT 5.220000  1.775000 5.480000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2111ai_2
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef
index 16e021d..7dad50c 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.magic.lef
@@ -108,34 +108,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 6.205000  0.085000  6.535000 0.845000 ;
-        RECT 7.065000  0.085000  7.395000 0.695000 ;
-        RECT 8.285000  0.085000  8.615000 0.835000 ;
-        RECT 9.145000  0.085000  9.475000 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 ;
-        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
@@ -144,75 +116,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.525000 2.015000  0.855000 3.245000 ;
-        RECT 1.385000 2.015000  1.715000 3.245000 ;
-        RECT 2.245000 2.015000  2.575000 3.245000 ;
-        RECT 3.105000 2.015000  3.435000 3.245000 ;
-        RECT 4.300000 2.270000  4.635000 3.245000 ;
-        RECT 5.165000 2.270000  5.495000 3.245000 ;
-        RECT 7.835000 2.665000  8.165000 3.245000 ;
-        RECT 8.695000 2.270000  9.025000 3.245000 ;
-        RECT 9.555000 1.930000  9.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 2.075000 0.530000 ;
-      RECT 0.095000 0.530000 0.425000 0.815000 ;
-      RECT 1.855000 0.530000 2.075000 0.985000 ;
-      RECT 1.855000 0.985000 2.945000 1.155000 ;
-      RECT 2.245000 0.255000 5.675000 0.425000 ;
-      RECT 2.245000 0.425000 4.815000 0.485000 ;
-      RECT 2.245000 0.485000 2.575000 0.815000 ;
-      RECT 2.745000 0.655000 3.805000 0.985000 ;
-      RECT 4.055000 0.655000 4.315000 1.015000 ;
-      RECT 4.055000 1.015000 9.905000 1.035000 ;
-      RECT 4.055000 1.035000 6.965000 1.185000 ;
-      RECT 4.485000 0.485000 4.815000 0.845000 ;
-      RECT 4.985000 0.595000 5.175000 1.015000 ;
-      RECT 5.345000 0.425000 5.675000 0.845000 ;
-      RECT 5.845000 0.255000 6.035000 1.015000 ;
-      RECT 6.025000 2.270000 6.355000 2.895000 ;
-      RECT 6.025000 2.895000 7.215000 3.075000 ;
-      RECT 6.705000 0.255000 6.895000 0.865000 ;
-      RECT 6.705000 0.865000 8.115000 1.005000 ;
-      RECT 6.705000 1.005000 9.905000 1.015000 ;
-      RECT 6.885000 2.045000 7.145000 2.325000 ;
-      RECT 6.885000 2.325000 8.525000 2.495000 ;
-      RECT 6.885000 2.495000 7.215000 2.895000 ;
-      RECT 7.565000 0.255000 8.115000 0.865000 ;
-      RECT 7.835000 1.035000 9.905000 1.175000 ;
-      RECT 8.265000 1.930000 9.385000 2.100000 ;
-      RECT 8.265000 2.100000 8.525000 2.325000 ;
-      RECT 8.335000 2.495000 8.525000 3.075000 ;
-      RECT 8.785000 0.255000 8.975000 1.005000 ;
-      RECT 9.195000 2.100000 9.385000 3.075000 ;
-      RECT 9.645000 0.255000 9.905000 1.005000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.095000  0.255000  2.075000 0.530000 ;
+      RECT 0.095000  0.530000  0.425000 0.815000 ;
+      RECT 0.525000  2.015000  0.855000 3.245000 ;
+      RECT 1.385000  2.015000  1.715000 3.245000 ;
+      RECT 1.855000  0.530000  2.075000 0.985000 ;
+      RECT 1.855000  0.985000  2.945000 1.155000 ;
+      RECT 2.245000  0.255000  5.675000 0.425000 ;
+      RECT 2.245000  0.425000  4.815000 0.485000 ;
+      RECT 2.245000  0.485000  2.575000 0.815000 ;
+      RECT 2.245000  2.015000  2.575000 3.245000 ;
+      RECT 2.745000  0.655000  3.805000 0.985000 ;
+      RECT 3.105000  2.015000  3.435000 3.245000 ;
+      RECT 4.055000  0.655000  4.315000 1.015000 ;
+      RECT 4.055000  1.015000  9.905000 1.035000 ;
+      RECT 4.055000  1.035000  6.965000 1.185000 ;
+      RECT 4.300000  2.270000  4.635000 3.245000 ;
+      RECT 4.485000  0.485000  4.815000 0.845000 ;
+      RECT 4.985000  0.595000  5.175000 1.015000 ;
+      RECT 5.165000  2.270000  5.495000 3.245000 ;
+      RECT 5.345000  0.425000  5.675000 0.845000 ;
+      RECT 5.845000  0.255000  6.035000 1.015000 ;
+      RECT 6.025000  2.270000  6.355000 2.895000 ;
+      RECT 6.025000  2.895000  7.215000 3.075000 ;
+      RECT 6.205000  0.085000  6.535000 0.845000 ;
+      RECT 6.705000  0.255000  6.895000 0.865000 ;
+      RECT 6.705000  0.865000  8.115000 1.005000 ;
+      RECT 6.705000  1.005000  9.905000 1.015000 ;
+      RECT 6.885000  2.045000  7.145000 2.325000 ;
+      RECT 6.885000  2.325000  8.525000 2.495000 ;
+      RECT 6.885000  2.495000  7.215000 2.895000 ;
+      RECT 7.065000  0.085000  7.395000 0.695000 ;
+      RECT 7.565000  0.255000  8.115000 0.865000 ;
+      RECT 7.835000  1.035000  9.905000 1.175000 ;
+      RECT 7.835000  2.665000  8.165000 3.245000 ;
+      RECT 8.265000  1.930000  9.385000 2.100000 ;
+      RECT 8.265000  2.100000  8.525000 2.325000 ;
+      RECT 8.285000  0.085000  8.615000 0.835000 ;
+      RECT 8.335000  2.495000  8.525000 3.075000 ;
+      RECT 8.695000  2.270000  9.025000 3.245000 ;
+      RECT 8.785000  0.255000  8.975000 1.005000 ;
+      RECT 9.145000  0.085000  9.475000 0.835000 ;
+      RECT 9.195000  2.100000  9.385000 3.075000 ;
+      RECT 9.555000  1.930000  9.885000 3.245000 ;
+      RECT 9.645000  0.255000  9.905000 1.005000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2111ai_4
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef
index 686439d..6a9a8d4 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.magic.lef
@@ -94,17 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.310000  0.085000 2.640000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,27 +102,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.250000 2.115000 0.580000 3.245000 ;
-        RECT 1.310000 2.325000 1.640000 3.245000 ;
-        RECT 2.890000 2.025000 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.800000 0.265000 2.130000 0.775000 ;
-      RECT 1.800000 0.775000 3.150000 0.945000 ;
-      RECT 2.820000 0.265000 3.150000 0.775000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.250000  2.115000 0.580000 3.245000 ;
+      RECT 1.310000  2.325000 1.640000 3.245000 ;
+      RECT 1.800000  0.265000 2.130000 0.775000 ;
+      RECT 1.800000  0.775000 3.150000 0.945000 ;
+      RECT 2.310000  0.085000 2.640000 0.595000 ;
+      RECT 2.820000  0.265000 3.150000 0.775000 ;
+      RECT 2.890000  2.025000 3.220000 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_lp__o2111ai_lp
diff --git a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef
index f4f0e00..6ffc292 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.magic.lef
@@ -93,17 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.250000  0.085000 2.460000 0.560000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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 +101,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.265000 2.785000 0.455000 3.245000 ;
-        RECT 1.390000 2.805000 1.600000 3.245000 ;
-        RECT 2.550000 2.845000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.820000 0.360000 2.030000 0.740000 ;
-      RECT 1.820000 0.740000 2.890000 0.910000 ;
-      RECT 2.680000 0.360000 2.890000 0.740000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.265000  2.785000 0.455000 3.245000 ;
+      RECT 1.390000  2.805000 1.600000 3.245000 ;
+      RECT 1.820000  0.360000 2.030000 0.740000 ;
+      RECT 1.820000  0.740000 2.890000 0.910000 ;
+      RECT 2.250000  0.085000 2.460000 0.560000 ;
+      RECT 2.550000  2.845000 2.880000 3.245000 ;
+      RECT 2.680000  0.360000 2.890000 0.740000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o2111ai_m
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef
index ed47fd3..c85d5c9 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_0.magic.lef
@@ -80,18 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.545000  0.085000 0.875000 0.615000 ;
-        RECT 1.745000  0.085000 2.005000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -100,34 +88,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.245000 2.405000 1.575000 3.245000 ;
-        RECT 2.505000 2.405000 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 ;
-        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.545000 1.935000 1.790000 2.050000 ;
-      RECT 0.545000 2.050000 3.265000 2.235000 ;
-      RECT 1.255000 0.280000 1.575000 0.780000 ;
-      RECT 1.255000 0.780000 2.405000 0.950000 ;
-      RECT 2.065000 2.235000 2.335000 3.075000 ;
-      RECT 2.175000 0.280000 2.405000 0.780000 ;
-      RECT 2.575000 0.280000 3.265000 0.605000 ;
-      RECT 2.575000 0.605000 2.745000 1.190000 ;
-      RECT 2.575000 1.190000 3.265000 1.360000 ;
-      RECT 2.935000 1.360000 3.265000 2.050000 ;
-      RECT 2.935000 2.235000 3.265000 3.075000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.545000  0.085000 0.875000 0.615000 ;
+      RECT 0.545000  1.935000 1.790000 2.050000 ;
+      RECT 0.545000  2.050000 3.265000 2.235000 ;
+      RECT 1.245000  2.405000 1.575000 3.245000 ;
+      RECT 1.255000  0.280000 1.575000 0.780000 ;
+      RECT 1.255000  0.780000 2.405000 0.950000 ;
+      RECT 1.745000  0.085000 2.005000 0.610000 ;
+      RECT 2.065000  2.235000 2.335000 3.075000 ;
+      RECT 2.175000  0.280000 2.405000 0.780000 ;
+      RECT 2.505000  2.405000 2.765000 3.245000 ;
+      RECT 2.575000  0.280000 3.265000 0.605000 ;
+      RECT 2.575000  0.605000 2.745000 1.190000 ;
+      RECT 2.575000  1.190000 3.265000 1.360000 ;
+      RECT 2.935000  1.360000 3.265000 2.050000 ;
+      RECT 2.935000  2.235000 3.265000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o211a_0
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef
index be90f60..0b7ec70 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_1.magic.lef
@@ -81,19 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 1.015000 ;
-        RECT 1.815000  0.085000 2.145000 0.515000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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 +89,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.030000 2.260000 1.700000 3.245000 ;
-        RECT 2.750000 2.260000 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.500000 1.185000 3.570000 1.195000 ;
-      RECT 0.500000 1.195000 1.325000 1.515000 ;
-      RECT 1.085000 1.025000 3.570000 1.185000 ;
-      RECT 1.085000 1.515000 1.325000 1.920000 ;
-      RECT 1.085000 1.920000 3.570000 2.090000 ;
-      RECT 1.290000 0.255000 1.620000 0.685000 ;
-      RECT 1.290000 0.685000 2.725000 0.855000 ;
-      RECT 2.215000 2.090000 2.545000 3.075000 ;
-      RECT 2.395000 0.255000 2.725000 0.685000 ;
-      RECT 3.240000 0.255000 3.570000 1.025000 ;
-      RECT 3.250000 2.090000 3.570000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.500000  1.185000 3.570000 1.195000 ;
+      RECT 0.500000  1.195000 1.325000 1.515000 ;
+      RECT 0.585000  0.085000 0.915000 1.015000 ;
+      RECT 1.030000  2.260000 1.700000 3.245000 ;
+      RECT 1.085000  1.025000 3.570000 1.185000 ;
+      RECT 1.085000  1.515000 1.325000 1.920000 ;
+      RECT 1.085000  1.920000 3.570000 2.090000 ;
+      RECT 1.290000  0.255000 1.620000 0.685000 ;
+      RECT 1.290000  0.685000 2.725000 0.855000 ;
+      RECT 1.815000  0.085000 2.145000 0.515000 ;
+      RECT 2.215000  2.090000 2.545000 3.075000 ;
+      RECT 2.395000  0.255000 2.725000 0.685000 ;
+      RECT 2.750000  2.260000 3.080000 3.245000 ;
+      RECT 3.240000  0.255000 3.570000 1.025000 ;
+      RECT 3.250000  2.090000 3.570000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o211a_1
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef
index 3f0797d..8e0a9d1 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_2.magic.lef
@@ -85,21 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.405000  0.085000 1.735000 0.700000 ;
-        RECT 2.335000  0.085000 2.565000 1.040000 ;
-        RECT 3.235000  0.085000 3.620000 0.785000 ;
-        RECT 3.370000  0.785000 3.620000 1.055000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -108,39 +93,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.715000 2.085000 1.045000 3.245000 ;
-        RECT 2.195000 2.630000 2.865000 3.245000 ;
-        RECT 3.395000 2.290000 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.095000 0.255000 0.425000 0.860000 ;
-      RECT 0.095000 0.860000 0.705000 1.040000 ;
-      RECT 0.265000 1.745000 1.425000 1.915000 ;
-      RECT 0.265000 1.915000 0.545000 3.075000 ;
-      RECT 0.525000 1.040000 0.705000 1.640000 ;
-      RECT 0.525000 1.640000 1.425000 1.745000 ;
-      RECT 0.885000 0.270000 1.215000 0.870000 ;
-      RECT 0.885000 0.870000 2.165000 1.040000 ;
-      RECT 1.215000 1.915000 1.425000 2.290000 ;
-      RECT 1.215000 2.290000 2.660000 2.460000 ;
-      RECT 1.215000 2.460000 1.615000 3.075000 ;
-      RECT 1.905000 0.270000 2.165000 0.870000 ;
-      RECT 2.490000 1.295000 2.860000 1.625000 ;
-      RECT 2.490000 1.625000 2.660000 2.290000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.255000 0.425000 0.860000 ;
+      RECT 0.095000  0.860000 0.705000 1.040000 ;
+      RECT 0.265000  1.745000 1.425000 1.915000 ;
+      RECT 0.265000  1.915000 0.545000 3.075000 ;
+      RECT 0.525000  1.040000 0.705000 1.640000 ;
+      RECT 0.525000  1.640000 1.425000 1.745000 ;
+      RECT 0.715000  2.085000 1.045000 3.245000 ;
+      RECT 0.885000  0.270000 1.215000 0.870000 ;
+      RECT 0.885000  0.870000 2.165000 1.040000 ;
+      RECT 1.215000  1.915000 1.425000 2.290000 ;
+      RECT 1.215000  2.290000 2.660000 2.460000 ;
+      RECT 1.215000  2.460000 1.615000 3.075000 ;
+      RECT 1.405000  0.085000 1.735000 0.700000 ;
+      RECT 1.905000  0.270000 2.165000 0.870000 ;
+      RECT 2.195000  2.630000 2.865000 3.245000 ;
+      RECT 2.335000  0.085000 2.565000 1.040000 ;
+      RECT 2.490000  1.295000 2.860000 1.625000 ;
+      RECT 2.490000  1.625000 2.660000 2.290000 ;
+      RECT 3.235000  0.085000 3.620000 0.785000 ;
+      RECT 3.370000  0.785000 3.620000 1.055000 ;
+      RECT 3.395000  2.290000 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_lp__o211a_2
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_4.magic.lef
index 51939f2..63b8a51 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_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.095000  0.085000 0.425000 0.875000 ;
-        RECT 0.955000  0.085000 1.285000 0.875000 ;
-        RECT 1.850000  0.085000 2.085000 0.940000 ;
-        RECT 4.835000  0.085000 5.165000 0.575000 ;
-        RECT 5.835000  0.085000 6.025000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,56 +98,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.485000 2.095000 0.815000 3.245000 ;
-        RECT 1.345000 2.095000 1.675000 3.245000 ;
-        RECT 2.205000 2.610000 2.535000 3.245000 ;
-        RECT 3.465000 2.610000 3.795000 3.245000 ;
-        RECT 4.470000 2.610000 4.735000 3.245000 ;
-        RECT 6.195000 1.930000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.540000 1.385000 2.375000 1.585000 ;
-      RECT 2.205000 1.065000 3.700000 1.235000 ;
-      RECT 2.205000 1.235000 2.375000 1.385000 ;
-      RECT 2.205000 1.585000 2.375000 2.270000 ;
-      RECT 2.205000 2.270000 5.665000 2.440000 ;
-      RECT 2.335000 0.255000 2.665000 0.635000 ;
-      RECT 2.335000 0.635000 4.665000 0.745000 ;
-      RECT 2.335000 0.745000 6.525000 0.805000 ;
-      RECT 2.335000 0.805000 2.665000 0.895000 ;
-      RECT 2.705000 2.440000 3.295000 3.075000 ;
-      RECT 2.845000 0.255000 4.225000 0.465000 ;
-      RECT 3.370000 0.975000 3.700000 1.065000 ;
-      RECT 3.965000 2.440000 4.300000 3.075000 ;
-      RECT 4.365000 0.805000 6.525000 0.915000 ;
-      RECT 4.365000 0.915000 4.660000 1.025000 ;
-      RECT 4.395000 0.255000 4.665000 0.635000 ;
-      RECT 4.905000 2.780000 6.025000 3.075000 ;
-      RECT 5.335000 0.255000 5.665000 0.745000 ;
-      RECT 5.335000 1.930000 5.665000 2.270000 ;
-      RECT 5.335000 2.440000 5.665000 2.610000 ;
-      RECT 5.835000 1.930000 6.025000 2.780000 ;
-      RECT 6.195000 0.255000 6.525000 0.745000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.875000 ;
+      RECT 0.485000  2.095000 0.815000 3.245000 ;
+      RECT 0.540000  1.385000 2.375000 1.585000 ;
+      RECT 0.955000  0.085000 1.285000 0.875000 ;
+      RECT 1.345000  2.095000 1.675000 3.245000 ;
+      RECT 1.850000  0.085000 2.085000 0.940000 ;
+      RECT 2.205000  1.065000 3.700000 1.235000 ;
+      RECT 2.205000  1.235000 2.375000 1.385000 ;
+      RECT 2.205000  1.585000 2.375000 2.270000 ;
+      RECT 2.205000  2.270000 5.665000 2.440000 ;
+      RECT 2.205000  2.610000 2.535000 3.245000 ;
+      RECT 2.335000  0.255000 2.665000 0.635000 ;
+      RECT 2.335000  0.635000 4.665000 0.745000 ;
+      RECT 2.335000  0.745000 6.525000 0.805000 ;
+      RECT 2.335000  0.805000 2.665000 0.895000 ;
+      RECT 2.705000  2.440000 3.295000 3.075000 ;
+      RECT 2.845000  0.255000 4.225000 0.465000 ;
+      RECT 3.370000  0.975000 3.700000 1.065000 ;
+      RECT 3.465000  2.610000 3.795000 3.245000 ;
+      RECT 3.965000  2.440000 4.300000 3.075000 ;
+      RECT 4.365000  0.805000 6.525000 0.915000 ;
+      RECT 4.365000  0.915000 4.660000 1.025000 ;
+      RECT 4.395000  0.255000 4.665000 0.635000 ;
+      RECT 4.470000  2.610000 4.735000 3.245000 ;
+      RECT 4.835000  0.085000 5.165000 0.575000 ;
+      RECT 4.905000  2.780000 6.025000 3.075000 ;
+      RECT 5.335000  0.255000 5.665000 0.745000 ;
+      RECT 5.335000  1.930000 5.665000 2.270000 ;
+      RECT 5.335000  2.440000 5.665000 2.610000 ;
+      RECT 5.835000  0.085000 6.025000 0.575000 ;
+      RECT 5.835000  1.930000 6.025000 2.780000 ;
+      RECT 6.195000  0.255000 6.525000 0.745000 ;
+      RECT 6.195000  1.930000 6.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 ;
   END
 END sky130_fd_sc_lp__o211a_4
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef
index 68fac69..c61946a 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_lp.magic.lef
@@ -80,19 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.625000  0.085000 0.955000 0.930000 ;
-        RECT 2.575000  0.085000 2.905000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -101,37 +88,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.115000 2.310000 0.445000 3.245000 ;
-        RECT 1.665000 2.660000 1.995000 3.245000 ;
-        RECT 2.865000 2.025000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.850000 0.365000 1.100000 ;
-      RECT 0.115000 1.100000 1.465000 1.160000 ;
-      RECT 0.115000 1.160000 1.410000 1.270000 ;
-      RECT 1.135000 0.700000 1.465000 1.100000 ;
-      RECT 1.135000 2.310000 2.635000 2.480000 ;
-      RECT 1.135000 2.480000 1.465000 3.065000 ;
-      RECT 1.955000 0.700000 2.285000 0.795000 ;
-      RECT 1.955000 0.795000 3.210000 1.125000 ;
-      RECT 1.955000 1.125000 2.345000 1.160000 ;
-      RECT 2.175000 1.160000 2.345000 2.075000 ;
-      RECT 2.175000 2.075000 2.635000 2.310000 ;
-      RECT 2.175000 2.480000 2.635000 3.065000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.850000 0.365000 1.100000 ;
+      RECT 0.115000  1.100000 1.465000 1.160000 ;
+      RECT 0.115000  1.160000 1.410000 1.270000 ;
+      RECT 0.115000  2.310000 0.445000 3.245000 ;
+      RECT 0.625000  0.085000 0.955000 0.930000 ;
+      RECT 1.135000  0.700000 1.465000 1.100000 ;
+      RECT 1.135000  2.310000 2.635000 2.480000 ;
+      RECT 1.135000  2.480000 1.465000 3.065000 ;
+      RECT 1.665000  2.660000 1.995000 3.245000 ;
+      RECT 1.955000  0.700000 2.285000 0.795000 ;
+      RECT 1.955000  0.795000 3.210000 1.125000 ;
+      RECT 1.955000  1.125000 2.345000 1.160000 ;
+      RECT 2.175000  1.160000 2.345000 2.075000 ;
+      RECT 2.175000  2.075000 2.635000 2.310000 ;
+      RECT 2.175000  2.480000 2.635000 3.065000 ;
+      RECT 2.575000  0.085000 2.905000 0.615000 ;
+      RECT 2.865000  2.025000 3.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 ;
   END
 END sky130_fd_sc_lp__o211a_lp
diff --git a/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef b/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef
index cec2e57..d6f5894 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_m.magic.lef
@@ -80,18 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.605000  0.085000 0.795000 0.740000 ;
-        RECT 1.475000  0.085000 1.805000 0.455000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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.945000 2.025000 1.275000 3.245000 ;
-        RECT 2.420000 2.045000 2.750000 2.255000 ;
-        RECT 2.580000 2.255000 2.750000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.625000 1.025000 0.795000 1.675000 ;
-      RECT 0.625000 1.675000 2.625000 1.695000 ;
-      RECT 0.625000 1.695000 3.120000 1.845000 ;
-      RECT 1.105000 0.355000 1.295000 0.635000 ;
-      RECT 1.105000 0.635000 2.255000 0.805000 ;
-      RECT 1.895000 1.845000 3.120000 1.865000 ;
-      RECT 1.895000 1.865000 2.105000 2.165000 ;
-      RECT 2.045000 0.355000 2.255000 0.635000 ;
-      RECT 2.455000 0.330000 3.045000 0.660000 ;
-      RECT 2.455000 0.660000 2.625000 1.675000 ;
-      RECT 2.930000 1.865000 3.120000 2.165000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.605000  0.085000 0.795000 0.740000 ;
+      RECT 0.625000  1.025000 0.795000 1.675000 ;
+      RECT 0.625000  1.675000 2.625000 1.695000 ;
+      RECT 0.625000  1.695000 3.120000 1.845000 ;
+      RECT 0.945000  2.025000 1.275000 3.245000 ;
+      RECT 1.105000  0.355000 1.295000 0.635000 ;
+      RECT 1.105000  0.635000 2.255000 0.805000 ;
+      RECT 1.475000  0.085000 1.805000 0.455000 ;
+      RECT 1.895000  1.845000 3.120000 1.865000 ;
+      RECT 1.895000  1.865000 2.105000 2.165000 ;
+      RECT 2.045000  0.355000 2.255000 0.635000 ;
+      RECT 2.420000  2.045000 2.750000 2.255000 ;
+      RECT 2.455000  0.330000 3.045000 0.660000 ;
+      RECT 2.455000  0.660000 2.625000 1.675000 ;
+      RECT 2.580000  2.255000 2.750000 3.245000 ;
+      RECT 2.930000  1.865000 3.120000 2.165000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o211a_m
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef
index eeb224d..4d445e3 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.magic.lef
@@ -83,16 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.570000  0.085000 1.240000 0.570000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,25 +91,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.200000 2.305000 0.530000 3.245000 ;
-        RECT 1.460000 2.305000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.140000 0.280000 0.400000 0.740000 ;
-      RECT 0.140000 0.740000 1.670000 0.910000 ;
-      RECT 1.410000 0.280000 1.670000 0.740000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.140000  0.280000 0.400000 0.740000 ;
+      RECT 0.140000  0.740000 1.670000 0.910000 ;
+      RECT 0.200000  2.305000 0.530000 3.245000 ;
+      RECT 0.570000  0.085000 1.240000 0.570000 ;
+      RECT 1.410000  0.280000 1.670000 0.740000 ;
+      RECT 1.460000  2.305000 2.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 ;
   END
 END sky130_fd_sc_lp__o211ai_0
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef
index 21a278e..692a15e 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.magic.lef
@@ -85,16 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.595000  0.085000 0.925000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -103,25 +93,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.095000 1.920000 0.425000 3.245000 ;
-        RECT 1.480000 2.290000 1.810000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.255000 0.425000 0.845000 ;
-      RECT 0.095000 0.845000 1.400000 1.015000 ;
-      RECT 1.125000 0.255000 1.400000 0.845000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.255000 0.425000 0.845000 ;
+      RECT 0.095000  0.845000 1.400000 1.015000 ;
+      RECT 0.095000  1.920000 0.425000 3.245000 ;
+      RECT 0.595000  0.085000 0.925000 0.675000 ;
+      RECT 1.125000  0.255000 1.400000 0.845000 ;
+      RECT 1.480000  2.290000 1.810000 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_lp__o211ai_1
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef
index b942713..f3dded3 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.magic.lef
@@ -87,22 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 2.395000  0.085000 2.725000 0.645000 ;
-        RECT 3.255000  0.085000 3.585000 0.910000 ;
-        RECT 4.115000  0.085000 4.445000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -111,42 +95,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.115000 1.920000 0.445000 3.245000 ;
-        RECT 0.975000 2.100000 1.305000 3.245000 ;
-        RECT 1.835000 2.100000 2.165000 3.245000 ;
-        RECT 3.685000 2.100000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 2.165000 0.425000 ;
-      RECT 0.095000 0.425000 0.375000 1.040000 ;
-      RECT 1.045000 0.425000 2.165000 0.645000 ;
-      RECT 1.045000 0.645000 1.235000 1.040000 ;
-      RECT 1.405000 0.815000 3.085000 1.025000 ;
-      RECT 2.395000 2.100000 2.655000 2.905000 ;
-      RECT 2.395000 2.905000 3.515000 3.075000 ;
-      RECT 2.895000 0.255000 3.085000 0.815000 ;
-      RECT 2.905000 1.025000 3.085000 1.080000 ;
-      RECT 2.905000 1.080000 3.945000 1.250000 ;
-      RECT 3.325000 1.760000 4.445000 1.930000 ;
-      RECT 3.325000 1.930000 3.515000 2.905000 ;
-      RECT 3.755000 0.255000 3.945000 1.080000 ;
-      RECT 4.185000 1.930000 4.445000 3.075000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.095000  0.255000 2.165000 0.425000 ;
+      RECT 0.095000  0.425000 0.375000 1.040000 ;
+      RECT 0.115000  1.920000 0.445000 3.245000 ;
+      RECT 0.975000  2.100000 1.305000 3.245000 ;
+      RECT 1.045000  0.425000 2.165000 0.645000 ;
+      RECT 1.045000  0.645000 1.235000 1.040000 ;
+      RECT 1.405000  0.815000 3.085000 1.025000 ;
+      RECT 1.835000  2.100000 2.165000 3.245000 ;
+      RECT 2.395000  0.085000 2.725000 0.645000 ;
+      RECT 2.395000  2.100000 2.655000 2.905000 ;
+      RECT 2.395000  2.905000 3.515000 3.075000 ;
+      RECT 2.895000  0.255000 3.085000 0.815000 ;
+      RECT 2.905000  1.025000 3.085000 1.080000 ;
+      RECT 2.905000  1.080000 3.945000 1.250000 ;
+      RECT 3.255000  0.085000 3.585000 0.910000 ;
+      RECT 3.325000  1.760000 4.445000 1.930000 ;
+      RECT 3.325000  1.930000 3.515000 2.905000 ;
+      RECT 3.685000  2.100000 4.015000 3.245000 ;
+      RECT 3.755000  0.255000 3.945000 1.080000 ;
+      RECT 4.115000  0.085000 4.445000 1.040000 ;
+      RECT 4.185000  1.930000 4.445000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o211ai_2
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef
index b692096..65217d4 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.magic.lef
@@ -97,30 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.675000  0.085000 1.005000 0.825000 ;
-        RECT 1.535000  0.085000 1.865000 0.805000 ;
-        RECT 2.395000  0.085000 2.725000 0.825000 ;
-        RECT 3.255000  0.085000 3.585000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,56 +105,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.245000 1.815000 0.535000 3.245000 ;
-        RECT 1.105000 2.690000 1.435000 3.245000 ;
-        RECT 3.705000 2.680000 4.035000 3.245000 ;
-        RECT 4.585000 2.610000 4.915000 3.245000 ;
-        RECT 5.480000 2.610000 5.730000 3.245000 ;
-        RECT 6.305000 2.675000 6.975000 3.245000 ;
-        RECT 7.505000 2.675000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.305000 0.255000 0.505000 0.995000 ;
-      RECT 0.305000 0.995000 4.915000 1.175000 ;
-      RECT 0.705000 1.815000 0.925000 2.290000 ;
-      RECT 0.705000 2.290000 1.805000 2.520000 ;
-      RECT 0.705000 2.520000 0.925000 3.075000 ;
-      RECT 1.175000 0.255000 1.365000 0.995000 ;
-      RECT 1.605000 2.520000 1.805000 2.810000 ;
-      RECT 1.605000 2.810000 3.525000 3.075000 ;
-      RECT 2.035000 0.255000 2.225000 0.995000 ;
-      RECT 2.895000 0.255000 3.085000 0.995000 ;
-      RECT 3.315000 2.680000 3.525000 2.810000 ;
-      RECT 3.755000 0.255000 3.985000 0.995000 ;
-      RECT 4.155000 0.265000 7.535000 0.455000 ;
-      RECT 4.155000 0.455000 4.485000 0.825000 ;
-      RECT 4.655000 0.625000 8.045000 0.795000 ;
-      RECT 4.655000 0.795000 4.915000 0.995000 ;
-      RECT 7.715000 0.365000 8.045000 0.625000 ;
-      RECT 7.715000 0.795000 8.045000 0.905000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.245000  1.815000 0.535000 3.245000 ;
+      RECT 0.305000  0.255000 0.505000 0.995000 ;
+      RECT 0.305000  0.995000 4.915000 1.175000 ;
+      RECT 0.675000  0.085000 1.005000 0.825000 ;
+      RECT 0.705000  1.815000 0.925000 2.290000 ;
+      RECT 0.705000  2.290000 1.805000 2.520000 ;
+      RECT 0.705000  2.520000 0.925000 3.075000 ;
+      RECT 1.105000  2.690000 1.435000 3.245000 ;
+      RECT 1.175000  0.255000 1.365000 0.995000 ;
+      RECT 1.535000  0.085000 1.865000 0.805000 ;
+      RECT 1.605000  2.520000 1.805000 2.810000 ;
+      RECT 1.605000  2.810000 3.525000 3.075000 ;
+      RECT 2.035000  0.255000 2.225000 0.995000 ;
+      RECT 2.395000  0.085000 2.725000 0.825000 ;
+      RECT 2.895000  0.255000 3.085000 0.995000 ;
+      RECT 3.255000  0.085000 3.585000 0.825000 ;
+      RECT 3.315000  2.680000 3.525000 2.810000 ;
+      RECT 3.705000  2.680000 4.035000 3.245000 ;
+      RECT 3.755000  0.255000 3.985000 0.995000 ;
+      RECT 4.155000  0.265000 7.535000 0.455000 ;
+      RECT 4.155000  0.455000 4.485000 0.825000 ;
+      RECT 4.585000  2.610000 4.915000 3.245000 ;
+      RECT 4.655000  0.625000 8.045000 0.795000 ;
+      RECT 4.655000  0.795000 4.915000 0.995000 ;
+      RECT 5.480000  2.610000 5.730000 3.245000 ;
+      RECT 6.305000  2.675000 6.975000 3.245000 ;
+      RECT 7.505000  2.675000 7.835000 3.245000 ;
+      RECT 7.715000  0.365000 8.045000 0.625000 ;
+      RECT 7.715000  0.795000 8.045000 0.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_lp__o211ai_4
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef
index c506070..a756d39 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.magic.lef
@@ -83,16 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.680000  0.085000 1.010000 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
@@ -101,25 +91,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.130000 2.025000 0.460000 3.245000 ;
-        RECT 1.720000 2.370000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.265000 0.500000 0.820000 ;
-      RECT 0.170000 0.820000 1.520000 0.990000 ;
-      RECT 1.190000 0.265000 1.520000 0.820000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.130000  2.025000 0.460000 3.245000 ;
+      RECT 0.170000  0.265000 0.500000 0.820000 ;
+      RECT 0.170000  0.820000 1.520000 0.990000 ;
+      RECT 0.680000  0.085000 1.010000 0.640000 ;
+      RECT 1.190000  0.265000 1.520000 0.820000 ;
+      RECT 1.720000  2.370000 2.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 ;
   END
 END sky130_fd_sc_lp__o211ai_lp
diff --git a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef
index d8bb137..d6649af 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.magic.lef
@@ -86,15 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.555000  0.085000 0.885000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -103,24 +94,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.285000 2.845000 0.615000 3.245000 ;
-        RECT 1.525000 2.845000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.165000 0.345000 0.375000 0.665000 ;
-      RECT 0.165000 0.665000 1.275000 0.835000 ;
-      RECT 1.065000 0.345000 1.275000 0.665000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.165000  0.345000 0.375000 0.665000 ;
+      RECT 0.165000  0.665000 1.275000 0.835000 ;
+      RECT 0.285000  2.845000 0.615000 3.245000 ;
+      RECT 0.555000  0.085000 0.885000 0.485000 ;
+      RECT 1.065000  0.345000 1.275000 0.665000 ;
+      RECT 1.525000  2.845000 1.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 ;
   END
 END sky130_fd_sc_lp__o211ai_m
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef
index 3293c5c..08e57c8 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_0.magic.lef
@@ -72,17 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.570000  0.085000 0.855000 0.605000 ;
-        RECT 1.935000  0.085000 2.205000 0.665000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,30 +80,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.735000 2.395000 1.005000 3.245000 ;
-        RECT 2.020000 2.395000 2.350000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.505000 0.775000 1.345000 0.955000 ;
-      RECT 0.505000 0.955000 0.755000 2.045000 ;
-      RECT 0.505000 2.045000 1.425000 2.215000 ;
-      RECT 1.105000 0.335000 1.345000 0.775000 ;
-      RECT 1.175000 2.215000 1.425000 3.075000 ;
-      RECT 1.515000 0.335000 1.765000 0.835000 ;
-      RECT 1.515000 0.835000 2.665000 1.005000 ;
-      RECT 2.375000 0.335000 2.665000 0.835000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.505000  0.775000 1.345000 0.955000 ;
+      RECT 0.505000  0.955000 0.755000 2.045000 ;
+      RECT 0.505000  2.045000 1.425000 2.215000 ;
+      RECT 0.570000  0.085000 0.855000 0.605000 ;
+      RECT 0.735000  2.395000 1.005000 3.245000 ;
+      RECT 1.105000  0.335000 1.345000 0.775000 ;
+      RECT 1.175000  2.215000 1.425000 3.075000 ;
+      RECT 1.515000  0.335000 1.765000 0.835000 ;
+      RECT 1.515000  0.835000 2.665000 1.005000 ;
+      RECT 1.935000  0.085000 2.205000 0.665000 ;
+      RECT 2.020000  2.395000 2.350000 3.245000 ;
+      RECT 2.375000  0.335000 2.665000 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 ;
   END
 END sky130_fd_sc_lp__o21a_0
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_1.magic.lef
index 7f532dc..1ac8c4b 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__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.525000  0.085000 0.855000 0.915000 ;
-        RECT 1.955000  0.085000 2.285000 0.855000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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.715000 2.270000 1.435000 3.245000 ;
-        RECT 2.435000 1.930000 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.525000 1.085000 1.345000 1.255000 ;
-      RECT 0.525000 1.255000 0.905000 1.515000 ;
-      RECT 0.735000 1.515000 0.905000 1.930000 ;
-      RECT 0.735000 1.930000 1.935000 2.100000 ;
-      RECT 1.045000 0.255000 1.345000 1.085000 ;
-      RECT 1.515000 0.255000 1.785000 1.025000 ;
-      RECT 1.515000 1.025000 2.765000 1.195000 ;
-      RECT 1.605000 2.100000 1.935000 3.075000 ;
-      RECT 2.455000 0.255000 2.765000 1.025000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.525000  0.085000 0.855000 0.915000 ;
+      RECT 0.525000  1.085000 1.345000 1.255000 ;
+      RECT 0.525000  1.255000 0.905000 1.515000 ;
+      RECT 0.715000  2.270000 1.435000 3.245000 ;
+      RECT 0.735000  1.515000 0.905000 1.930000 ;
+      RECT 0.735000  1.930000 1.935000 2.100000 ;
+      RECT 1.045000  0.255000 1.345000 1.085000 ;
+      RECT 1.515000  0.255000 1.785000 1.025000 ;
+      RECT 1.515000  1.025000 2.765000 1.195000 ;
+      RECT 1.605000  2.100000 1.935000 3.075000 ;
+      RECT 1.955000  0.085000 2.285000 0.855000 ;
+      RECT 2.435000  1.930000 2.765000 3.245000 ;
+      RECT 2.455000  0.255000 2.765000 1.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__o21a_1
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef
index 4233be7..4037a50 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_2.magic.lef
@@ -70,19 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.125000  0.085000 0.395000 1.095000 ;
-        RECT 0.985000  0.085000 1.315000 0.905000 ;
-        RECT 2.385000  0.085000 2.715000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -91,33 +78,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.125000 1.815000 0.395000 3.245000 ;
-        RECT 0.985000 2.260000 1.835000 3.245000 ;
-        RECT 2.835000 1.920000 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.985000 1.075000 1.800000 1.245000 ;
-      RECT 0.985000 1.245000 1.315000 1.520000 ;
-      RECT 1.145000 1.520000 1.315000 1.920000 ;
-      RECT 1.145000 1.920000 2.265000 2.090000 ;
-      RECT 1.505000 0.255000 1.800000 1.075000 ;
-      RECT 1.970000 0.255000 2.215000 1.035000 ;
-      RECT 1.970000 1.035000 3.165000 1.205000 ;
-      RECT 2.005000 2.090000 2.265000 3.075000 ;
-      RECT 2.885000 0.255000 3.165000 1.035000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  0.085000 0.395000 1.095000 ;
+      RECT 0.125000  1.815000 0.395000 3.245000 ;
+      RECT 0.985000  0.085000 1.315000 0.905000 ;
+      RECT 0.985000  1.075000 1.800000 1.245000 ;
+      RECT 0.985000  1.245000 1.315000 1.520000 ;
+      RECT 0.985000  2.260000 1.835000 3.245000 ;
+      RECT 1.145000  1.520000 1.315000 1.920000 ;
+      RECT 1.145000  1.920000 2.265000 2.090000 ;
+      RECT 1.505000  0.255000 1.800000 1.075000 ;
+      RECT 1.970000  0.255000 2.215000 1.035000 ;
+      RECT 1.970000  1.035000 3.165000 1.205000 ;
+      RECT 2.005000  2.090000 2.265000 3.075000 ;
+      RECT 2.385000  0.085000 2.715000 0.865000 ;
+      RECT 2.835000  1.920000 3.165000 3.245000 ;
+      RECT 2.885000  0.255000 3.165000 1.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o21a_2
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_4.magic.lef
index 91044bd..fc506a2 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_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.145000  0.085000 0.475000 0.885000 ;
-        RECT 1.005000  0.085000 1.335000 0.885000 ;
-        RECT 1.865000  0.085000 2.195000 0.905000 ;
-        RECT 3.925000  0.085000 4.265000 0.565000 ;
-        RECT 4.795000  0.085000 5.125000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 5.760000 0.245000 ;
     END
@@ -108,50 +88,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.465000 2.095000 0.795000 3.245000 ;
-        RECT 1.325000 2.095000 1.655000 3.245000 ;
-        RECT 2.185000 2.270000 2.515000 3.245000 ;
-        RECT 3.045000 2.805000 3.815000 3.245000 ;
-        RECT 3.245000 1.925000 3.575000 2.805000 ;
-        RECT 5.295000 1.815000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.520000 1.395000 2.345000 1.585000 ;
-      RECT 2.175000 1.075000 4.265000 1.245000 ;
-      RECT 2.175000 1.245000 2.345000 1.395000 ;
-      RECT 2.175000 1.585000 2.345000 1.930000 ;
-      RECT 2.175000 1.930000 2.875000 2.100000 ;
-      RECT 2.415000 0.255000 3.755000 0.425000 ;
-      RECT 2.415000 0.425000 2.745000 0.895000 ;
-      RECT 2.685000 2.100000 2.875000 3.075000 ;
-      RECT 2.915000 0.595000 3.245000 1.075000 ;
-      RECT 3.425000 0.425000 3.755000 0.735000 ;
-      RECT 3.425000 0.735000 4.625000 0.905000 ;
-      RECT 3.995000 2.670000 5.065000 3.000000 ;
-      RECT 4.085000 1.245000 4.265000 1.930000 ;
-      RECT 4.085000 1.930000 4.695000 2.140000 ;
-      RECT 4.435000 0.305000 4.625000 0.735000 ;
-      RECT 4.435000 0.905000 4.625000 1.085000 ;
-      RECT 4.435000 1.085000 5.555000 1.255000 ;
-      RECT 5.295000 0.305000 5.555000 1.085000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.145000  0.085000 0.475000 0.885000 ;
+      RECT 0.465000  2.095000 0.795000 3.245000 ;
+      RECT 0.520000  1.395000 2.345000 1.585000 ;
+      RECT 1.005000  0.085000 1.335000 0.885000 ;
+      RECT 1.325000  2.095000 1.655000 3.245000 ;
+      RECT 1.865000  0.085000 2.195000 0.905000 ;
+      RECT 2.175000  1.075000 4.265000 1.245000 ;
+      RECT 2.175000  1.245000 2.345000 1.395000 ;
+      RECT 2.175000  1.585000 2.345000 1.930000 ;
+      RECT 2.175000  1.930000 2.875000 2.100000 ;
+      RECT 2.185000  2.270000 2.515000 3.245000 ;
+      RECT 2.415000  0.255000 3.755000 0.425000 ;
+      RECT 2.415000  0.425000 2.745000 0.895000 ;
+      RECT 2.685000  2.100000 2.875000 3.075000 ;
+      RECT 2.915000  0.595000 3.245000 1.075000 ;
+      RECT 3.045000  2.805000 3.815000 3.245000 ;
+      RECT 3.245000  1.925000 3.575000 2.805000 ;
+      RECT 3.425000  0.425000 3.755000 0.735000 ;
+      RECT 3.425000  0.735000 4.625000 0.905000 ;
+      RECT 3.925000  0.085000 4.265000 0.565000 ;
+      RECT 3.995000  2.670000 5.065000 3.000000 ;
+      RECT 4.085000  1.245000 4.265000 1.930000 ;
+      RECT 4.085000  1.930000 4.695000 2.140000 ;
+      RECT 4.435000  0.305000 4.625000 0.735000 ;
+      RECT 4.435000  0.905000 4.625000 1.085000 ;
+      RECT 4.435000  1.085000 5.555000 1.255000 ;
+      RECT 4.795000  0.085000 5.125000 0.915000 ;
+      RECT 5.295000  0.305000 5.555000 1.085000 ;
+      RECT 5.295000  1.815000 5.555000 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_lp__o21a_4
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef
index a0e58b0..4c4c394 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_lp.magic.lef
@@ -72,18 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.625000  0.085000 0.875000 0.645000 ;
-        RECT 2.125000  0.085000 2.455000 0.645000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -92,32 +80,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.175000 2.025000 0.505000 3.245000 ;
-        RECT 2.025000 2.035000 2.355000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.265000 0.445000 0.825000 ;
-      RECT 0.115000 0.825000 1.385000 0.995000 ;
-      RECT 1.055000 0.265000 1.385000 0.825000 ;
-      RECT 1.495000 1.685000 2.175000 1.855000 ;
-      RECT 1.495000 1.855000 1.825000 3.065000 ;
-      RECT 1.565000 0.265000 1.895000 0.825000 ;
-      RECT 1.565000 0.825000 2.685000 0.995000 ;
-      RECT 2.005000 0.995000 2.175000 1.685000 ;
-      RECT 2.355000 0.995000 2.685000 1.495000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.265000 0.445000 0.825000 ;
+      RECT 0.115000  0.825000 1.385000 0.995000 ;
+      RECT 0.175000  2.025000 0.505000 3.245000 ;
+      RECT 0.625000  0.085000 0.875000 0.645000 ;
+      RECT 1.055000  0.265000 1.385000 0.825000 ;
+      RECT 1.495000  1.685000 2.175000 1.855000 ;
+      RECT 1.495000  1.855000 1.825000 3.065000 ;
+      RECT 1.565000  0.265000 1.895000 0.825000 ;
+      RECT 1.565000  0.825000 2.685000 0.995000 ;
+      RECT 2.005000  0.995000 2.175000 1.685000 ;
+      RECT 2.025000  2.035000 2.355000 3.245000 ;
+      RECT 2.125000  0.085000 2.455000 0.645000 ;
+      RECT 2.355000  0.995000 2.685000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o21a_lp
diff --git a/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef b/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef
index 447be60..66ce96d 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_m.magic.lef
@@ -72,17 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.585000  0.085000 0.795000 0.555000 ;
-        RECT 1.965000  0.085000 2.175000 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
@@ -91,31 +80,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.895000 2.785000 1.065000 3.245000 ;
-        RECT 2.035000 2.845000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 0.775000 1.315000 0.945000 ;
-      RECT 0.505000 0.945000 0.675000 2.300000 ;
-      RECT 0.505000 2.300000 1.415000 2.470000 ;
-      RECT 1.105000 0.480000 1.315000 0.775000 ;
-      RECT 1.245000 2.470000 1.415000 2.715000 ;
-      RECT 1.245000 2.715000 1.575000 2.925000 ;
-      RECT 1.535000 0.480000 1.745000 0.860000 ;
-      RECT 1.535000 0.860000 2.605000 1.030000 ;
-      RECT 2.395000 0.480000 2.605000 0.860000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.505000  0.775000 1.315000 0.945000 ;
+      RECT 0.505000  0.945000 0.675000 2.300000 ;
+      RECT 0.505000  2.300000 1.415000 2.470000 ;
+      RECT 0.585000  0.085000 0.795000 0.555000 ;
+      RECT 0.895000  2.785000 1.065000 3.245000 ;
+      RECT 1.105000  0.480000 1.315000 0.775000 ;
+      RECT 1.245000  2.470000 1.415000 2.715000 ;
+      RECT 1.245000  2.715000 1.575000 2.925000 ;
+      RECT 1.535000  0.480000 1.745000 0.860000 ;
+      RECT 1.535000  0.860000 2.605000 1.030000 ;
+      RECT 1.965000  0.085000 2.175000 0.680000 ;
+      RECT 2.035000  2.845000 2.365000 3.245000 ;
+      RECT 2.395000  0.480000 2.605000 0.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 ;
   END
 END sky130_fd_sc_lp__o21a_m
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef
index e99dd3d..f638389 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.magic.lef
@@ -74,14 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.585000  0.085000 0.915000 0.505000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -90,23 +82,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.195000 2.395000 0.525000 3.245000 ;
-        RECT 1.505000 2.395000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.280000 0.415000 0.675000 ;
-      RECT 0.155000 0.675000 1.320000 0.845000 ;
-      RECT 1.085000 0.280000 1.320000 0.675000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.155000  0.280000 0.415000 0.675000 ;
+      RECT 0.155000  0.675000 1.320000 0.845000 ;
+      RECT 0.195000  2.395000 0.525000 3.245000 ;
+      RECT 0.585000  0.085000 0.915000 0.505000 ;
+      RECT 1.085000  0.280000 1.320000 0.675000 ;
+      RECT 1.505000  2.395000 1.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 ;
   END
 END sky130_fd_sc_lp__o21ai_0
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef
index 82dc7be..ffdd03b 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.magic.lef
@@ -73,14 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -89,24 +81,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.105000 1.920000 0.435000 3.245000 ;
-        RECT 1.530000 1.920000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.265000 0.375000 0.635000 ;
-      RECT 0.105000 0.635000 1.395000 0.805000 ;
-      RECT 0.105000 0.805000 1.020000 1.040000 ;
-      RECT 1.065000 0.255000 1.395000 0.635000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.105000  0.265000 0.375000 0.635000 ;
+      RECT 0.105000  0.635000 1.395000 0.805000 ;
+      RECT 0.105000  0.805000 1.020000 1.040000 ;
+      RECT 0.105000  1.920000 0.435000 3.245000 ;
+      RECT 0.565000  0.085000 0.895000 0.465000 ;
+      RECT 1.065000  0.255000 1.395000 0.635000 ;
+      RECT 1.530000  1.920000 1.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 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  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_lp__o21ai_1
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.magic.lef
index e065544..5461d7a 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__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.540000  0.085000 0.870000 0.675000 ;
-        RECT 1.535000  0.085000 1.865000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,35 +85,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.110000 2.035000 0.440000 3.245000 ;
-        RECT 2.000000 2.375000 2.330000 3.245000 ;
-        RECT 2.905000 1.920000 3.215000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.255000 0.370000 0.845000 ;
-      RECT 0.110000 0.845000 1.365000 1.005000 ;
-      RECT 0.110000 1.005000 2.355000 1.015000 ;
-      RECT 0.610000 2.035000 0.830000 2.905000 ;
-      RECT 0.610000 2.905000 1.805000 3.075000 ;
-      RECT 1.040000 0.255000 1.365000 0.845000 ;
-      RECT 1.195000 1.015000 2.355000 1.175000 ;
-      RECT 1.475000 2.375000 1.805000 2.905000 ;
-      RECT 2.035000 0.255000 3.215000 0.425000 ;
-      RECT 2.035000 0.425000 2.355000 1.005000 ;
-      RECT 2.905000 0.425000 3.215000 1.040000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.110000  0.255000 0.370000 0.845000 ;
+      RECT 0.110000  0.845000 1.365000 1.005000 ;
+      RECT 0.110000  1.005000 2.355000 1.015000 ;
+      RECT 0.110000  2.035000 0.440000 3.245000 ;
+      RECT 0.540000  0.085000 0.870000 0.675000 ;
+      RECT 0.610000  2.035000 0.830000 2.905000 ;
+      RECT 0.610000  2.905000 1.805000 3.075000 ;
+      RECT 1.040000  0.255000 1.365000 0.845000 ;
+      RECT 1.195000  1.015000 2.355000 1.175000 ;
+      RECT 1.475000  2.375000 1.805000 2.905000 ;
+      RECT 1.535000  0.085000 1.865000 0.825000 ;
+      RECT 2.000000  2.375000 2.330000 3.245000 ;
+      RECT 2.035000  0.255000 3.215000 0.425000 ;
+      RECT 2.035000  0.425000 2.355000 1.005000 ;
+      RECT 2.905000  0.425000 3.215000 1.040000 ;
+      RECT 2.905000  1.920000 3.215000 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_lp__o21ai_2
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef
index dfabc16..8488fe6 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.magic.lef
@@ -82,25 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.550000  0.085000 0.880000 0.700000 ;
-        RECT 1.410000  0.085000 1.740000 0.565000 ;
-        RECT 2.270000  0.085000 2.600000 0.565000 ;
-        RECT 3.130000  0.085000 3.460000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -109,46 +90,62 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.120000 1.815000 0.405000 3.245000 ;
-        RECT 0.980000 2.095000 1.310000 3.245000 ;
-        RECT 3.580000 2.270000 3.910000 3.245000 ;
-        RECT 4.460000 2.095000 4.790000 3.245000 ;
-        RECT 5.320000 2.105000 5.650000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.120000 0.255000 0.380000 0.870000 ;
-      RECT 0.120000 0.870000 3.930000 0.905000 ;
-      RECT 0.120000 0.905000 1.250000 1.040000 ;
-      RECT 0.575000 1.755000 1.670000 1.925000 ;
-      RECT 0.575000 1.925000 0.810000 3.075000 ;
-      RECT 1.050000 0.255000 1.240000 0.735000 ;
-      RECT 1.050000 0.735000 3.930000 0.870000 ;
-      RECT 1.480000 1.925000 1.670000 2.905000 ;
-      RECT 1.480000 2.905000 3.410000 3.075000 ;
-      RECT 1.910000 0.255000 2.100000 0.735000 ;
-      RECT 2.340000 2.270000 2.530000 2.905000 ;
-      RECT 2.770000 0.255000 2.960000 0.735000 ;
-      RECT 3.200000 2.270000 3.410000 2.905000 ;
-      RECT 3.630000 0.255000 5.650000 0.530000 ;
-      RECT 3.630000 0.530000 3.930000 0.735000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.120000  0.255000 0.380000 0.870000 ;
+      RECT 0.120000  0.870000 3.930000 0.905000 ;
+      RECT 0.120000  0.905000 1.250000 1.040000 ;
+      RECT 0.120000  1.815000 0.405000 3.245000 ;
+      RECT 0.550000  0.085000 0.880000 0.700000 ;
+      RECT 0.575000  1.755000 1.670000 1.925000 ;
+      RECT 0.575000  1.925000 0.810000 3.075000 ;
+      RECT 0.980000  2.095000 1.310000 3.245000 ;
+      RECT 1.050000  0.255000 1.240000 0.735000 ;
+      RECT 1.050000  0.735000 3.930000 0.870000 ;
+      RECT 1.410000  0.085000 1.740000 0.565000 ;
+      RECT 1.480000  1.925000 1.670000 2.905000 ;
+      RECT 1.480000  2.905000 3.410000 3.075000 ;
+      RECT 1.910000  0.255000 2.100000 0.735000 ;
+      RECT 2.270000  0.085000 2.600000 0.565000 ;
+      RECT 2.340000  2.270000 2.530000 2.905000 ;
+      RECT 2.770000  0.255000 2.960000 0.735000 ;
+      RECT 3.130000  0.085000 3.460000 0.565000 ;
+      RECT 3.200000  2.270000 3.410000 2.905000 ;
+      RECT 3.580000  2.270000 3.910000 3.245000 ;
+      RECT 3.630000  0.255000 5.650000 0.530000 ;
+      RECT 3.630000  0.530000 3.930000 0.735000 ;
+      RECT 4.460000  2.095000 4.790000 3.245000 ;
+      RECT 5.320000  2.105000 5.650000 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_lp__o21ai_4
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef
index 0dc0482..377eae6 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.magic.lef
@@ -75,15 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.810000  0.085000 1.140000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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,24 +83,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.220000 2.025000 0.550000 3.245000 ;
-        RECT 1.810000 2.325000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.300000 0.265000 0.630000 0.775000 ;
-      RECT 0.300000 0.775000 1.650000 0.945000 ;
-      RECT 1.320000 0.265000 1.650000 0.775000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.220000  2.025000 0.550000 3.245000 ;
+      RECT 0.300000  0.265000 0.630000 0.775000 ;
+      RECT 0.300000  0.775000 1.650000 0.945000 ;
+      RECT 0.810000  0.085000 1.140000 0.595000 ;
+      RECT 1.320000  0.265000 1.650000 0.775000 ;
+      RECT 1.810000  2.325000 2.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 ;
   END
 END sky130_fd_sc_lp__o21ai_lp
diff --git a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef
index 01b511c..979d6bc 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.magic.lef
@@ -73,14 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.505000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -89,23 +81,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 0.095000 2.340000 0.425000 3.245000 ;
-        RECT 1.485000 2.280000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 1.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.365000 0.345000 0.685000 ;
-      RECT 0.155000 0.685000 1.225000 0.855000 ;
-      RECT 1.035000 0.365000 1.225000 0.685000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.095000  2.340000 0.425000 3.245000 ;
+      RECT 0.155000  0.365000 0.345000 0.685000 ;
+      RECT 0.155000  0.685000 1.225000 0.855000 ;
+      RECT 0.525000  0.085000 0.855000 0.505000 ;
+      RECT 1.035000  0.365000 1.225000 0.685000 ;
+      RECT 1.485000  2.280000 1.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 ;
   END
 END sky130_fd_sc_lp__o21ai_m
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef
index b78a765..fc5abcc 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.635000  0.085000 1.305000 0.595000 ;
-        RECT 2.935000  0.085000 3.200000 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 ;
       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.525000 1.965000 0.805000 3.245000 ;
-        RECT 1.880000 2.805000 2.210000 3.245000 ;
-        RECT 3.150000 2.415000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 1.125000 0.755000 1.625000 ;
-      RECT 0.505000 1.625000 1.145000 1.795000 ;
-      RECT 0.975000 1.795000 1.145000 2.465000 ;
-      RECT 0.975000 2.465000 2.660000 2.635000 ;
-      RECT 1.315000 1.965000 1.750000 2.295000 ;
-      RECT 1.475000 0.280000 1.735000 0.865000 ;
-      RECT 1.475000 0.865000 1.930000 1.535000 ;
-      RECT 1.475000 1.535000 1.750000 1.965000 ;
-      RECT 2.100000 0.280000 2.335000 2.395000 ;
-      RECT 2.100000 2.395000 2.660000 2.465000 ;
-      RECT 2.380000 2.635000 2.660000 3.075000 ;
-      RECT 2.505000 0.280000 2.765000 0.780000 ;
-      RECT 2.505000 0.780000 3.660000 0.960000 ;
-      RECT 3.370000 0.280000 3.660000 0.780000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.505000  1.125000 0.755000 1.625000 ;
+      RECT 0.505000  1.625000 1.145000 1.795000 ;
+      RECT 0.525000  1.965000 0.805000 3.245000 ;
+      RECT 0.635000  0.085000 1.305000 0.595000 ;
+      RECT 0.975000  1.795000 1.145000 2.465000 ;
+      RECT 0.975000  2.465000 2.660000 2.635000 ;
+      RECT 1.315000  1.965000 1.750000 2.295000 ;
+      RECT 1.475000  0.280000 1.735000 0.865000 ;
+      RECT 1.475000  0.865000 1.930000 1.535000 ;
+      RECT 1.475000  1.535000 1.750000 1.965000 ;
+      RECT 1.880000  2.805000 2.210000 3.245000 ;
+      RECT 2.100000  0.280000 2.335000 2.395000 ;
+      RECT 2.100000  2.395000 2.660000 2.465000 ;
+      RECT 2.380000  2.635000 2.660000 3.075000 ;
+      RECT 2.505000  0.280000 2.765000 0.780000 ;
+      RECT 2.505000  0.780000 3.660000 0.960000 ;
+      RECT 2.935000  0.085000 3.200000 0.610000 ;
+      RECT 3.150000  2.415000 3.480000 3.245000 ;
+      RECT 3.370000  0.280000 3.660000 0.780000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o21ba_0
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.magic.lef
index 218a000..b299445 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_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.555000  0.085000 0.915000 0.700000 ;
-        RECT 2.905000  0.085000 3.235000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,39 +79,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.745000 1.925000 1.255000 3.245000 ;
-        RECT 2.015000 2.270000 2.345000 3.245000 ;
-        RECT 3.405000 1.920000 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.565000 1.220000 0.935000 1.550000 ;
-      RECT 0.765000 0.870000 1.305000 1.040000 ;
-      RECT 0.765000 1.040000 0.935000 1.220000 ;
-      RECT 1.135000 0.255000 2.310000 0.425000 ;
-      RECT 1.135000 0.425000 1.305000 0.870000 ;
-      RECT 1.425000 1.925000 1.755000 2.210000 ;
-      RECT 1.475000 0.860000 1.905000 1.550000 ;
-      RECT 1.475000 1.550000 1.755000 1.925000 ;
-      RECT 2.075000 0.425000 2.310000 1.925000 ;
-      RECT 2.075000 1.925000 2.795000 2.100000 ;
-      RECT 2.480000 0.255000 2.715000 1.035000 ;
-      RECT 2.480000 1.035000 3.735000 1.205000 ;
-      RECT 2.525000 2.100000 2.795000 3.075000 ;
-      RECT 3.405000 0.255000 3.735000 1.035000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.555000  0.085000 0.915000 0.700000 ;
+      RECT 0.565000  1.220000 0.935000 1.550000 ;
+      RECT 0.745000  1.925000 1.255000 3.245000 ;
+      RECT 0.765000  0.870000 1.305000 1.040000 ;
+      RECT 0.765000  1.040000 0.935000 1.220000 ;
+      RECT 1.135000  0.255000 2.310000 0.425000 ;
+      RECT 1.135000  0.425000 1.305000 0.870000 ;
+      RECT 1.425000  1.925000 1.755000 2.210000 ;
+      RECT 1.475000  0.860000 1.905000 1.550000 ;
+      RECT 1.475000  1.550000 1.755000 1.925000 ;
+      RECT 2.015000  2.270000 2.345000 3.245000 ;
+      RECT 2.075000  0.425000 2.310000 1.925000 ;
+      RECT 2.075000  1.925000 2.795000 2.100000 ;
+      RECT 2.480000  0.255000 2.715000 1.035000 ;
+      RECT 2.480000  1.035000 3.735000 1.205000 ;
+      RECT 2.525000  2.100000 2.795000 3.075000 ;
+      RECT 2.905000  0.085000 3.235000 0.865000 ;
+      RECT 3.405000  0.255000 3.735000 1.035000 ;
+      RECT 3.405000  1.920000 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_lp__o21ba_1
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef
index 1107873..e88a46f 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.magic.lef
@@ -71,20 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.530000  0.085000 0.895000 1.040000 ;
-        RECT 1.485000  0.085000 1.815000 0.835000 ;
-        RECT 2.935000  0.085000 3.265000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,40 +79,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.910000 2.630000 1.240000 3.245000 ;
-        RECT 1.840000 2.630000 2.170000 3.245000 ;
-        RECT 3.385000 1.920000 3.700000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.700000 0.360000 1.030000 ;
-      RECT 0.085000 1.030000 0.270000 1.920000 ;
-      RECT 0.085000 1.920000 0.595000 2.290000 ;
-      RECT 0.085000 2.290000 2.235000 2.460000 ;
-      RECT 1.485000 1.005000 2.615000 1.175000 ;
-      RECT 1.485000 1.175000 1.795000 1.515000 ;
-      RECT 2.005000 0.255000 2.265000 1.005000 ;
-      RECT 2.005000 1.345000 2.265000 1.675000 ;
-      RECT 2.005000 1.675000 2.235000 2.290000 ;
-      RECT 2.405000 1.855000 2.615000 3.075000 ;
-      RECT 2.435000 0.255000 2.765000 0.655000 ;
-      RECT 2.435000 0.655000 3.705000 0.835000 ;
-      RECT 2.435000 1.175000 2.615000 1.855000 ;
-      RECT 3.375000 0.835000 3.705000 1.040000 ;
-      RECT 3.435000 0.255000 3.705000 0.655000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.085000  0.700000 0.360000 1.030000 ;
+      RECT 0.085000  1.030000 0.270000 1.920000 ;
+      RECT 0.085000  1.920000 0.595000 2.290000 ;
+      RECT 0.085000  2.290000 2.235000 2.460000 ;
+      RECT 0.530000  0.085000 0.895000 1.040000 ;
+      RECT 0.910000  2.630000 1.240000 3.245000 ;
+      RECT 1.485000  0.085000 1.815000 0.835000 ;
+      RECT 1.485000  1.005000 2.615000 1.175000 ;
+      RECT 1.485000  1.175000 1.795000 1.515000 ;
+      RECT 1.840000  2.630000 2.170000 3.245000 ;
+      RECT 2.005000  0.255000 2.265000 1.005000 ;
+      RECT 2.005000  1.345000 2.265000 1.675000 ;
+      RECT 2.005000  1.675000 2.235000 2.290000 ;
+      RECT 2.405000  1.855000 2.615000 3.075000 ;
+      RECT 2.435000  0.255000 2.765000 0.655000 ;
+      RECT 2.435000  0.655000 3.705000 0.835000 ;
+      RECT 2.435000  1.175000 2.615000 1.855000 ;
+      RECT 2.935000  0.085000 3.265000 0.485000 ;
+      RECT 3.375000  0.835000 3.705000 1.040000 ;
+      RECT 3.385000  1.920000 3.700000 3.245000 ;
+      RECT 3.435000  0.255000 3.705000 0.655000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o21ba_2
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef
index e6eeaaa..f0c14d2 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.magic.lef
@@ -79,27 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.595000  0.085000 0.865000 1.030000 ;
-        RECT 1.455000  0.085000 1.785000 0.905000 ;
-        RECT 2.315000  0.085000 2.645000 0.905000 ;
-        RECT 4.355000  0.085000 4.695000 0.555000 ;
-        RECT 5.225000  0.085000 5.555000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,58 +87,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.635000 2.780000 0.965000 3.245000 ;
-        RECT 1.495000 2.780000 1.825000 3.245000 ;
-        RECT 2.360000 2.780000 3.035000 3.245000 ;
-        RECT 2.765000 2.115000 3.035000 2.780000 ;
-        RECT 3.595000 1.815000 3.905000 2.785000 ;
-        RECT 3.595000 2.785000 4.265000 3.245000 ;
-        RECT 5.775000 1.815000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 1.030000 ;
-      RECT 0.085000 1.030000 0.260000 1.920000 ;
-      RECT 0.085000 1.920000 0.455000 2.430000 ;
-      RECT 0.085000 2.430000 2.595000 2.610000 ;
-      RECT 0.085000 2.610000 0.465000 3.075000 ;
-      RECT 1.375000 1.415000 2.485000 1.605000 ;
-      RECT 2.315000 1.075000 4.695000 1.245000 ;
-      RECT 2.315000 1.245000 2.485000 1.415000 ;
-      RECT 2.425000 1.775000 3.010000 1.945000 ;
-      RECT 2.425000 1.945000 2.595000 2.430000 ;
-      RECT 2.680000 1.415000 3.010000 1.775000 ;
-      RECT 2.835000 0.265000 4.185000 0.435000 ;
-      RECT 2.835000 0.435000 3.175000 0.905000 ;
-      RECT 3.205000 1.245000 3.425000 3.075000 ;
-      RECT 3.345000 0.605000 3.675000 1.075000 ;
-      RECT 3.855000 0.435000 4.185000 0.725000 ;
-      RECT 3.855000 0.725000 5.055000 0.895000 ;
-      RECT 4.435000 2.670000 5.495000 3.000000 ;
-      RECT 4.525000 1.245000 4.695000 1.930000 ;
-      RECT 4.525000 1.930000 5.125000 2.140000 ;
-      RECT 4.865000 0.295000 5.055000 0.725000 ;
-      RECT 4.865000 0.895000 5.055000 1.075000 ;
-      RECT 4.865000 1.075000 6.005000 1.245000 ;
-      RECT 5.735000 0.305000 6.005000 1.075000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.085000  0.255000 0.425000 1.030000 ;
+      RECT 0.085000  1.030000 0.260000 1.920000 ;
+      RECT 0.085000  1.920000 0.455000 2.430000 ;
+      RECT 0.085000  2.430000 2.595000 2.610000 ;
+      RECT 0.085000  2.610000 0.465000 3.075000 ;
+      RECT 0.595000  0.085000 0.865000 1.030000 ;
+      RECT 0.635000  2.780000 0.965000 3.245000 ;
+      RECT 1.375000  1.415000 2.485000 1.605000 ;
+      RECT 1.455000  0.085000 1.785000 0.905000 ;
+      RECT 1.495000  2.780000 1.825000 3.245000 ;
+      RECT 2.315000  0.085000 2.645000 0.905000 ;
+      RECT 2.315000  1.075000 4.695000 1.245000 ;
+      RECT 2.315000  1.245000 2.485000 1.415000 ;
+      RECT 2.360000  2.780000 3.035000 3.245000 ;
+      RECT 2.425000  1.775000 3.010000 1.945000 ;
+      RECT 2.425000  1.945000 2.595000 2.430000 ;
+      RECT 2.680000  1.415000 3.010000 1.775000 ;
+      RECT 2.765000  2.115000 3.035000 2.780000 ;
+      RECT 2.835000  0.265000 4.185000 0.435000 ;
+      RECT 2.835000  0.435000 3.175000 0.905000 ;
+      RECT 3.205000  1.245000 3.425000 3.075000 ;
+      RECT 3.345000  0.605000 3.675000 1.075000 ;
+      RECT 3.595000  1.815000 3.905000 2.785000 ;
+      RECT 3.595000  2.785000 4.265000 3.245000 ;
+      RECT 3.855000  0.435000 4.185000 0.725000 ;
+      RECT 3.855000  0.725000 5.055000 0.895000 ;
+      RECT 4.355000  0.085000 4.695000 0.555000 ;
+      RECT 4.435000  2.670000 5.495000 3.000000 ;
+      RECT 4.525000  1.245000 4.695000 1.930000 ;
+      RECT 4.525000  1.930000 5.125000 2.140000 ;
+      RECT 4.865000  0.295000 5.055000 0.725000 ;
+      RECT 4.865000  0.895000 5.055000 1.075000 ;
+      RECT 4.865000  1.075000 6.005000 1.245000 ;
+      RECT 5.225000  0.085000 5.555000 0.905000 ;
+      RECT 5.735000  0.305000 6.005000 1.075000 ;
+      RECT 5.775000  1.815000 6.025000 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_lp__o21ba_4
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef
index ee99cb0..29f39bf 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.magic.lef
@@ -72,20 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.660000  0.085000 0.990000 0.585000 ;
-        RECT 3.085000  0.085000 3.415000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -94,40 +80,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.220000 1.965000 0.550000 3.245000 ;
-        RECT 1.890000 2.785000 2.220000 3.245000 ;
-        RECT 3.345000 2.785000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 0.265000 0.480000 0.765000 ;
-      RECT 0.150000 0.765000 1.500000 0.935000 ;
-      RECT 1.170000 0.265000 1.500000 0.765000 ;
-      RECT 1.280000 1.965000 1.850000 2.435000 ;
-      RECT 1.280000 2.435000 3.585000 2.605000 ;
-      RECT 1.280000 2.605000 1.680000 2.965000 ;
-      RECT 1.680000 0.265000 2.040000 0.715000 ;
-      RECT 1.680000 0.715000 1.850000 1.965000 ;
-      RECT 2.030000 0.905000 2.625000 1.575000 ;
-      RECT 2.295000 0.355000 2.625000 0.905000 ;
-      RECT 2.455000 1.575000 2.625000 1.925000 ;
-      RECT 2.455000 1.925000 2.830000 2.255000 ;
-      RECT 3.415000 0.995000 3.745000 1.665000 ;
-      RECT 3.415000 1.665000 3.585000 2.435000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.150000  0.265000 0.480000 0.765000 ;
+      RECT 0.150000  0.765000 1.500000 0.935000 ;
+      RECT 0.220000  1.965000 0.550000 3.245000 ;
+      RECT 0.660000  0.085000 0.990000 0.585000 ;
+      RECT 1.170000  0.265000 1.500000 0.765000 ;
+      RECT 1.280000  1.965000 1.850000 2.435000 ;
+      RECT 1.280000  2.435000 3.585000 2.605000 ;
+      RECT 1.280000  2.605000 1.680000 2.965000 ;
+      RECT 1.680000  0.265000 2.040000 0.715000 ;
+      RECT 1.680000  0.715000 1.850000 1.965000 ;
+      RECT 1.890000  2.785000 2.220000 3.245000 ;
+      RECT 2.030000  0.905000 2.625000 1.575000 ;
+      RECT 2.295000  0.355000 2.625000 0.905000 ;
+      RECT 2.455000  1.575000 2.625000 1.925000 ;
+      RECT 2.455000  1.925000 2.830000 2.255000 ;
+      RECT 3.085000  0.085000 3.415000 0.815000 ;
+      RECT 3.345000  2.785000 3.675000 3.245000 ;
+      RECT 3.415000  0.995000 3.745000 1.665000 ;
+      RECT 3.415000  1.665000 3.585000 2.435000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o21ba_lp
diff --git a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef
index 7d940e9..8fe8ada 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.magic.lef
@@ -72,21 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.090000  0.085000 0.260000 0.635000 ;
-        RECT 0.090000  0.635000 1.020000 0.805000 ;
-        RECT 0.810000  0.805000 1.020000 1.125000 ;
-        RECT 2.965000  0.085000 3.175000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,38 +80,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.885000 2.105000 1.095000 3.245000 ;
-        RECT 1.835000 2.785000 2.025000 3.245000 ;
-        RECT 2.995000 2.845000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.440000 0.285000 2.375000 0.455000 ;
-      RECT 1.255000 0.645000 1.645000 1.195000 ;
-      RECT 1.335000 1.930000 1.645000 2.940000 ;
-      RECT 1.475000 1.195000 1.645000 1.275000 ;
-      RECT 1.475000 1.275000 2.025000 1.445000 ;
-      RECT 1.475000 1.445000 1.645000 1.930000 ;
-      RECT 1.855000 0.775000 2.025000 1.275000 ;
-      RECT 2.045000 0.455000 2.375000 0.495000 ;
-      RECT 2.205000 0.495000 2.375000 2.715000 ;
-      RECT 2.205000 2.715000 2.535000 2.925000 ;
-      RECT 2.555000 0.355000 2.745000 0.735000 ;
-      RECT 2.555000 0.735000 3.605000 0.905000 ;
-      RECT 3.395000 0.355000 3.605000 0.735000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.090000  0.085000 0.260000 0.635000 ;
+      RECT 0.090000  0.635000 1.020000 0.805000 ;
+      RECT 0.440000  0.285000 2.375000 0.455000 ;
+      RECT 0.810000  0.805000 1.020000 1.125000 ;
+      RECT 0.885000  2.105000 1.095000 3.245000 ;
+      RECT 1.255000  0.645000 1.645000 1.195000 ;
+      RECT 1.335000  1.930000 1.645000 2.940000 ;
+      RECT 1.475000  1.195000 1.645000 1.275000 ;
+      RECT 1.475000  1.275000 2.025000 1.445000 ;
+      RECT 1.475000  1.445000 1.645000 1.930000 ;
+      RECT 1.835000  2.785000 2.025000 3.245000 ;
+      RECT 1.855000  0.775000 2.025000 1.275000 ;
+      RECT 2.045000  0.455000 2.375000 0.495000 ;
+      RECT 2.205000  0.495000 2.375000 2.715000 ;
+      RECT 2.205000  2.715000 2.535000 2.925000 ;
+      RECT 2.555000  0.355000 2.745000 0.735000 ;
+      RECT 2.555000  0.735000 3.605000 0.905000 ;
+      RECT 2.965000  0.085000 3.175000 0.555000 ;
+      RECT 2.995000  2.845000 3.325000 3.245000 ;
+      RECT 3.395000  0.355000 3.605000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o21ba_m
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef
index 4eb5ddf..2c0c2fc 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.magic.lef
@@ -73,17 +73,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.525000 ;
-        RECT 2.040000  0.085000 2.305000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -92,29 +81,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.095000 2.345000 1.440000 3.245000 ;
-        RECT 2.455000 2.345000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.300000 0.415000 0.695000 ;
-      RECT 0.155000 0.695000 0.925000 0.865000 ;
-      RECT 0.615000 2.410000 0.925000 2.740000 ;
-      RECT 0.675000 0.865000 0.925000 2.410000 ;
-      RECT 1.635000 0.280000 1.870000 0.780000 ;
-      RECT 1.635000 0.780000 2.765000 0.950000 ;
-      RECT 2.475000 0.280000 2.765000 0.780000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.155000  0.300000 0.415000 0.695000 ;
+      RECT 0.155000  0.695000 0.925000 0.865000 ;
+      RECT 0.585000  0.085000 0.915000 0.525000 ;
+      RECT 0.615000  2.410000 0.925000 2.740000 ;
+      RECT 0.675000  0.865000 0.925000 2.410000 ;
+      RECT 1.095000  2.345000 1.440000 3.245000 ;
+      RECT 1.635000  0.280000 1.870000 0.780000 ;
+      RECT 1.635000  0.780000 2.765000 0.950000 ;
+      RECT 2.040000  0.085000 2.305000 0.610000 ;
+      RECT 2.455000  2.345000 2.725000 3.245000 ;
+      RECT 2.475000  0.280000 2.765000 0.780000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__o21bai_0
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef
index 9c9cb3c..88e6602 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.magic.lef
@@ -73,17 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.675000 ;
-        RECT 1.980000  0.085000 2.310000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,31 +81,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.070000 2.270000 1.425000 3.245000 ;
-        RECT 2.455000 1.920000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.385000 0.355000 0.845000 ;
-      RECT 0.095000 0.845000 0.910000 1.015000 ;
-      RECT 0.570000 2.060000 0.900000 2.390000 ;
-      RECT 0.685000 1.015000 0.910000 1.185000 ;
-      RECT 0.685000 1.185000 1.070000 1.515000 ;
-      RECT 0.685000 1.515000 0.900000 2.060000 ;
-      RECT 1.580000 0.255000 1.810000 1.035000 ;
-      RECT 1.580000 1.035000 2.785000 1.205000 ;
-      RECT 2.480000 0.255000 2.785000 1.035000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.385000 0.355000 0.845000 ;
+      RECT 0.095000  0.845000 0.910000 1.015000 ;
+      RECT 0.525000  0.085000 0.855000 0.675000 ;
+      RECT 0.570000  2.060000 0.900000 2.390000 ;
+      RECT 0.685000  1.015000 0.910000 1.185000 ;
+      RECT 0.685000  1.185000 1.070000 1.515000 ;
+      RECT 0.685000  1.515000 0.900000 2.060000 ;
+      RECT 1.070000  2.270000 1.425000 3.245000 ;
+      RECT 1.580000  0.255000 1.810000 1.035000 ;
+      RECT 1.580000  1.035000 2.785000 1.205000 ;
+      RECT 1.980000  0.085000 2.310000 0.865000 ;
+      RECT 2.455000  1.920000 2.785000 3.245000 ;
+      RECT 2.480000  0.255000 2.785000 1.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__o21bai_1
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.magic.lef
index c64abee..19bc5b2 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__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.095000  0.085000 0.425000 0.670000 ;
-        RECT 2.435000  0.085000 2.765000 0.915000 ;
-        RECT 3.355000  0.085000 3.685000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -100,38 +85,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.965000 1.815000 1.425000 3.245000 ;
-        RECT 1.995000 2.790000 2.325000 3.245000 ;
-        RECT 3.865000 1.815000 4.115000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.460000 1.755000 0.795000 2.210000 ;
-      RECT 0.595000 0.355000 0.855000 1.355000 ;
-      RECT 0.595000 1.355000 1.455000 1.605000 ;
-      RECT 0.595000 1.605000 0.795000 1.755000 ;
-      RECT 1.125000 0.255000 2.265000 0.425000 ;
-      RECT 1.125000 0.425000 1.375000 1.185000 ;
-      RECT 2.065000 0.425000 2.265000 1.085000 ;
-      RECT 2.065000 1.085000 4.135000 1.255000 ;
-      RECT 2.495000 2.800000 3.685000 3.075000 ;
-      RECT 2.935000 0.305000 3.185000 1.085000 ;
-      RECT 3.355000 2.290000 3.685000 2.800000 ;
-      RECT 3.855000 0.305000 4.135000 1.085000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.670000 ;
+      RECT 0.460000  1.755000 0.795000 2.210000 ;
+      RECT 0.595000  0.355000 0.855000 1.355000 ;
+      RECT 0.595000  1.355000 1.455000 1.605000 ;
+      RECT 0.595000  1.605000 0.795000 1.755000 ;
+      RECT 0.965000  1.815000 1.425000 3.245000 ;
+      RECT 1.125000  0.255000 2.265000 0.425000 ;
+      RECT 1.125000  0.425000 1.375000 1.185000 ;
+      RECT 1.995000  2.790000 2.325000 3.245000 ;
+      RECT 2.065000  0.425000 2.265000 1.085000 ;
+      RECT 2.065000  1.085000 4.135000 1.255000 ;
+      RECT 2.435000  0.085000 2.765000 0.915000 ;
+      RECT 2.495000  2.800000 3.685000 3.075000 ;
+      RECT 2.935000  0.305000 3.185000 1.085000 ;
+      RECT 3.355000  0.085000 3.685000 0.915000 ;
+      RECT 3.355000  2.290000 3.685000 2.800000 ;
+      RECT 3.855000  0.305000 4.135000 1.085000 ;
+      RECT 3.865000  1.815000 4.115000 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_lp__o21bai_2
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef
index 6b23a37..a9eb0ef 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.magic.lef
@@ -80,28 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.905000 ;
-        RECT 3.255000  0.085000 3.585000 0.885000 ;
-        RECT 4.115000  0.085000 4.445000 0.885000 ;
-        RECT 4.975000  0.085000 5.305000 0.845000 ;
-        RECT 5.835000  0.085000 6.165000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -110,59 +88,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.615000 2.270000 1.340000 3.245000 ;
-        RECT 1.100000 1.825000 1.340000 2.270000 ;
-        RECT 1.910000 2.105000 2.240000 3.245000 ;
-        RECT 2.770000 2.700000 3.070000 3.245000 ;
-        RECT 5.390000 2.630000 5.720000 3.245000 ;
-        RECT 6.250000 1.930000 6.580000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.255000 0.355000 1.075000 ;
-      RECT 0.095000 1.075000 0.930000 1.245000 ;
-      RECT 0.150000 1.930000 0.930000 2.100000 ;
-      RECT 0.150000 2.100000 0.445000 3.075000 ;
-      RECT 0.760000 1.245000 0.930000 1.325000 ;
-      RECT 0.760000 1.325000 1.380000 1.355000 ;
-      RECT 0.760000 1.355000 2.165000 1.585000 ;
-      RECT 0.760000 1.585000 1.340000 1.655000 ;
-      RECT 0.760000 1.655000 0.930000 1.930000 ;
-      RECT 1.050000 0.255000 3.085000 0.595000 ;
-      RECT 1.050000 0.595000 1.380000 0.945000 ;
-      RECT 2.895000 0.595000 3.085000 1.055000 ;
-      RECT 2.895000 1.055000 6.595000 1.205000 ;
-      RECT 2.895000 1.205000 4.795000 1.225000 ;
-      RECT 3.240000 2.790000 5.220000 3.075000 ;
-      RECT 3.755000 0.255000 3.945000 1.055000 ;
-      RECT 4.615000 0.255000 4.805000 1.015000 ;
-      RECT 4.615000 1.015000 5.665000 1.035000 ;
-      RECT 4.615000 1.035000 6.595000 1.055000 ;
-      RECT 4.960000 2.270000 6.080000 2.460000 ;
-      RECT 4.960000 2.460000 5.220000 2.790000 ;
-      RECT 5.475000 0.255000 5.665000 1.015000 ;
-      RECT 5.880000 1.930000 6.080000 2.270000 ;
-      RECT 5.890000 2.460000 6.080000 3.075000 ;
-      RECT 6.335000 0.255000 6.595000 1.035000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.095000  0.255000 0.355000 1.075000 ;
+      RECT 0.095000  1.075000 0.930000 1.245000 ;
+      RECT 0.150000  1.930000 0.930000 2.100000 ;
+      RECT 0.150000  2.100000 0.445000 3.075000 ;
+      RECT 0.525000  0.085000 0.855000 0.905000 ;
+      RECT 0.615000  2.270000 1.340000 3.245000 ;
+      RECT 0.760000  1.245000 0.930000 1.325000 ;
+      RECT 0.760000  1.325000 1.380000 1.355000 ;
+      RECT 0.760000  1.355000 2.165000 1.585000 ;
+      RECT 0.760000  1.585000 1.340000 1.655000 ;
+      RECT 0.760000  1.655000 0.930000 1.930000 ;
+      RECT 1.050000  0.255000 3.085000 0.595000 ;
+      RECT 1.050000  0.595000 1.380000 0.945000 ;
+      RECT 1.100000  1.825000 1.340000 2.270000 ;
+      RECT 1.910000  2.105000 2.240000 3.245000 ;
+      RECT 2.770000  2.700000 3.070000 3.245000 ;
+      RECT 2.895000  0.595000 3.085000 1.055000 ;
+      RECT 2.895000  1.055000 6.595000 1.205000 ;
+      RECT 2.895000  1.205000 4.795000 1.225000 ;
+      RECT 3.240000  2.790000 5.220000 3.075000 ;
+      RECT 3.255000  0.085000 3.585000 0.885000 ;
+      RECT 3.755000  0.255000 3.945000 1.055000 ;
+      RECT 4.115000  0.085000 4.445000 0.885000 ;
+      RECT 4.615000  0.255000 4.805000 1.015000 ;
+      RECT 4.615000  1.015000 5.665000 1.035000 ;
+      RECT 4.615000  1.035000 6.595000 1.055000 ;
+      RECT 4.960000  2.270000 6.080000 2.460000 ;
+      RECT 4.960000  2.460000 5.220000 2.790000 ;
+      RECT 4.975000  0.085000 5.305000 0.845000 ;
+      RECT 5.390000  2.630000 5.720000 3.245000 ;
+      RECT 5.475000  0.255000 5.665000 1.015000 ;
+      RECT 5.835000  0.085000 6.165000 0.865000 ;
+      RECT 5.880000  1.930000 6.080000 2.270000 ;
+      RECT 5.890000  2.460000 6.080000 3.075000 ;
+      RECT 6.250000  1.930000 6.580000 3.245000 ;
+      RECT 6.335000  0.255000 6.595000 1.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o21bai_4
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef
index 083e548..6ea71aa 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.magic.lef
@@ -73,18 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.635000  0.085000 0.965000 0.760000 ;
-        RECT 2.125000  0.085000 2.455000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -93,30 +81,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.145000 2.310000 0.475000 3.245000 ;
-        RECT 1.665000 2.660000 1.995000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.120000 0.605000 0.450000 0.930000 ;
-      RECT 0.120000 0.930000 1.465000 1.100000 ;
-      RECT 1.135000 0.605000 1.465000 0.930000 ;
-      RECT 2.455000 1.330000 3.245000 1.660000 ;
-      RECT 2.455000 1.660000 2.785000 3.020000 ;
-      RECT 2.915000 0.295000 3.245000 0.610000 ;
-      RECT 3.075000 0.610000 3.245000 1.330000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.120000  0.605000 0.450000 0.930000 ;
+      RECT 0.120000  0.930000 1.465000 1.100000 ;
+      RECT 0.145000  2.310000 0.475000 3.245000 ;
+      RECT 0.635000  0.085000 0.965000 0.760000 ;
+      RECT 1.135000  0.605000 1.465000 0.930000 ;
+      RECT 1.665000  2.660000 1.995000 3.245000 ;
+      RECT 2.125000  0.085000 2.455000 0.610000 ;
+      RECT 2.455000  1.330000 3.245000 1.660000 ;
+      RECT 2.455000  1.660000 2.785000 3.020000 ;
+      RECT 2.915000  0.295000 3.245000 0.610000 ;
+      RECT 3.075000  0.610000 3.245000 1.330000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o21bai_lp
diff --git a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef
index b8135ec..ce9e01e 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.magic.lef
@@ -74,17 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.610000  0.085000 0.820000 0.620000 ;
-        RECT 2.065000  0.085000 2.275000 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,30 +82,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.660000 2.845000 0.990000 3.245000 ;
-        RECT 1.970000 2.805000 2.180000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.150000 0.330000 0.390000 0.660000 ;
-      RECT 0.150000 0.660000 0.320000 1.750000 ;
-      RECT 0.150000 1.750000 1.065000 1.920000 ;
-      RECT 0.150000 1.920000 0.480000 2.925000 ;
-      RECT 0.895000 1.920000 1.065000 2.420000 ;
-      RECT 1.635000 0.520000 1.845000 0.860000 ;
-      RECT 1.635000 0.860000 2.705000 1.030000 ;
-      RECT 2.495000 0.500000 2.705000 0.860000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.150000  0.330000 0.390000 0.660000 ;
+      RECT 0.150000  0.660000 0.320000 1.750000 ;
+      RECT 0.150000  1.750000 1.065000 1.920000 ;
+      RECT 0.150000  1.920000 0.480000 2.925000 ;
+      RECT 0.610000  0.085000 0.820000 0.620000 ;
+      RECT 0.660000  2.845000 0.990000 3.245000 ;
+      RECT 0.895000  1.920000 1.065000 2.420000 ;
+      RECT 1.635000  0.520000 1.845000 0.860000 ;
+      RECT 1.635000  0.860000 2.705000 1.030000 ;
+      RECT 1.970000  2.805000 2.180000 3.245000 ;
+      RECT 2.065000  0.085000 2.275000 0.680000 ;
+      RECT 2.495000  0.500000 2.705000 0.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 ;
   END
 END sky130_fd_sc_lp__o21bai_m
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef
index 6043173..71746a1 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_0.magic.lef
@@ -89,19 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 2.030000  0.085000 2.280000 0.595000 ;
-        RECT 2.935000  0.085000 3.265000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -110,37 +97,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.550000 2.725000 1.220000 3.245000 ;
-        RECT 2.580000 2.725000 3.250000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.575000 0.480000 0.905000 ;
-      RECT 0.115000 0.905000 0.295000 2.385000 ;
-      RECT 0.115000 2.385000 3.265000 2.555000 ;
-      RECT 0.115000 2.555000 0.380000 3.075000 ;
-      RECT 0.650000 0.255000 1.740000 0.440000 ;
-      RECT 0.650000 0.440000 0.870000 0.905000 ;
-      RECT 1.040000 0.610000 1.370000 1.195000 ;
-      RECT 1.040000 1.195000 2.620000 1.365000 ;
-      RECT 1.540000 0.440000 1.740000 0.905000 ;
-      RECT 1.735000 2.555000 2.065000 3.075000 ;
-      RECT 2.450000 0.280000 2.765000 0.610000 ;
-      RECT 2.450000 0.610000 2.620000 1.195000 ;
-      RECT 2.935000 1.930000 3.265000 2.385000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.575000 0.480000 0.905000 ;
+      RECT 0.115000  0.905000 0.295000 2.385000 ;
+      RECT 0.115000  2.385000 3.265000 2.555000 ;
+      RECT 0.115000  2.555000 0.380000 3.075000 ;
+      RECT 0.550000  2.725000 1.220000 3.245000 ;
+      RECT 0.650000  0.255000 1.740000 0.440000 ;
+      RECT 0.650000  0.440000 0.870000 0.905000 ;
+      RECT 1.040000  0.610000 1.370000 1.195000 ;
+      RECT 1.040000  1.195000 2.620000 1.365000 ;
+      RECT 1.540000  0.440000 1.740000 0.905000 ;
+      RECT 1.735000  2.555000 2.065000 3.075000 ;
+      RECT 2.030000  0.085000 2.280000 0.595000 ;
+      RECT 2.450000  0.280000 2.765000 0.610000 ;
+      RECT 2.450000  0.610000 2.620000 1.195000 ;
+      RECT 2.580000  2.725000 3.250000 3.245000 ;
+      RECT 2.935000  0.085000 3.265000 0.610000 ;
+      RECT 2.935000  1.930000 3.265000 2.385000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o221a_0
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef
index 236d692..c1dff31 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_1.magic.lef
@@ -93,20 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 2.290000  0.085000 2.620000 0.675000 ;
-        RECT 3.150000  0.085000 3.480000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,41 +101,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.925000 2.270000 1.255000 3.245000 ;
-        RECT 3.140000 2.035000 3.470000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.495000 0.255000 0.730000 1.005000 ;
-      RECT 0.495000 1.005000 0.935000 1.175000 ;
-      RECT 0.495000 1.930000 2.630000 2.100000 ;
-      RECT 0.495000 2.100000 0.755000 3.075000 ;
-      RECT 0.765000 1.175000 0.935000 1.930000 ;
-      RECT 0.900000 0.255000 2.100000 0.425000 ;
-      RECT 0.900000 0.425000 1.230000 0.835000 ;
-      RECT 1.400000 0.595000 1.600000 0.845000 ;
-      RECT 1.400000 0.845000 2.980000 1.015000 ;
-      RECT 1.770000 0.425000 2.100000 0.675000 ;
-      RECT 1.800000 1.695000 3.565000 1.865000 ;
-      RECT 1.800000 1.865000 2.630000 1.930000 ;
-      RECT 1.800000 2.100000 2.630000 3.075000 ;
-      RECT 2.790000 0.255000 2.980000 0.845000 ;
-      RECT 3.395000 1.185000 3.755000 1.515000 ;
-      RECT 3.395000 1.515000 3.565000 1.695000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.495000  0.255000 0.730000 1.005000 ;
+      RECT 0.495000  1.005000 0.935000 1.175000 ;
+      RECT 0.495000  1.930000 2.630000 2.100000 ;
+      RECT 0.495000  2.100000 0.755000 3.075000 ;
+      RECT 0.765000  1.175000 0.935000 1.930000 ;
+      RECT 0.900000  0.255000 2.100000 0.425000 ;
+      RECT 0.900000  0.425000 1.230000 0.835000 ;
+      RECT 0.925000  2.270000 1.255000 3.245000 ;
+      RECT 1.400000  0.595000 1.600000 0.845000 ;
+      RECT 1.400000  0.845000 2.980000 1.015000 ;
+      RECT 1.770000  0.425000 2.100000 0.675000 ;
+      RECT 1.800000  1.695000 3.565000 1.865000 ;
+      RECT 1.800000  1.865000 2.630000 1.930000 ;
+      RECT 1.800000  2.100000 2.630000 3.075000 ;
+      RECT 2.290000  0.085000 2.620000 0.675000 ;
+      RECT 2.790000  0.255000 2.980000 0.845000 ;
+      RECT 3.140000  2.035000 3.470000 3.245000 ;
+      RECT 3.150000  0.085000 3.480000 1.015000 ;
+      RECT 3.395000  1.185000 3.755000 1.515000 ;
+      RECT 3.395000  1.515000 3.565000 1.695000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o221a_1
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef
index 925ca58..d19f432 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_2.magic.lef
@@ -92,21 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 2.030000  0.085000 2.360000 0.825000 ;
-        RECT 3.010000  0.085000 3.255000 1.095000 ;
-        RECT 3.855000  0.085000 4.155000 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 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -115,40 +100,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.665000 2.270000 0.995000 3.245000 ;
-        RECT 2.640000 2.270000 3.310000 3.245000 ;
-        RECT 3.840000 2.165000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.140000 0.315000 0.400000 0.860000 ;
-      RECT 0.140000 0.860000 0.715000 1.030000 ;
-      RECT 0.180000 1.930000 3.295000 2.100000 ;
-      RECT 0.180000 2.100000 0.495000 3.075000 ;
-      RECT 0.545000 1.030000 0.715000 1.930000 ;
-      RECT 0.570000 0.255000 1.840000 0.425000 ;
-      RECT 0.570000 0.425000 0.900000 0.690000 ;
-      RECT 1.070000 0.595000 1.400000 0.995000 ;
-      RECT 1.070000 0.995000 2.840000 1.165000 ;
-      RECT 1.510000 2.100000 2.195000 3.075000 ;
-      RECT 1.570000 0.425000 1.840000 0.825000 ;
-      RECT 2.530000 0.255000 2.840000 0.995000 ;
-      RECT 3.125000 1.405000 3.600000 1.645000 ;
-      RECT 3.125000 1.645000 3.295000 1.930000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.140000  0.315000 0.400000 0.860000 ;
+      RECT 0.140000  0.860000 0.715000 1.030000 ;
+      RECT 0.180000  1.930000 3.295000 2.100000 ;
+      RECT 0.180000  2.100000 0.495000 3.075000 ;
+      RECT 0.545000  1.030000 0.715000 1.930000 ;
+      RECT 0.570000  0.255000 1.840000 0.425000 ;
+      RECT 0.570000  0.425000 0.900000 0.690000 ;
+      RECT 0.665000  2.270000 0.995000 3.245000 ;
+      RECT 1.070000  0.595000 1.400000 0.995000 ;
+      RECT 1.070000  0.995000 2.840000 1.165000 ;
+      RECT 1.510000  2.100000 2.195000 3.075000 ;
+      RECT 1.570000  0.425000 1.840000 0.825000 ;
+      RECT 2.030000  0.085000 2.360000 0.825000 ;
+      RECT 2.530000  0.255000 2.840000 0.995000 ;
+      RECT 2.640000  2.270000 3.310000 3.245000 ;
+      RECT 3.010000  0.085000 3.255000 1.095000 ;
+      RECT 3.125000  1.405000 3.600000 1.645000 ;
+      RECT 3.125000  1.645000 3.295000 1.930000 ;
+      RECT 3.840000  2.165000 4.170000 3.245000 ;
+      RECT 3.855000  0.085000 4.155000 0.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o221a_2
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef
index ba0cd6e..4b178c5 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_4.magic.lef
@@ -100,29 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 3.245000  0.085000 3.575000 0.540000 ;
-        RECT 4.105000  0.085000 4.435000 0.540000 ;
-        RECT 5.035000  0.085000 5.295000 0.905000 ;
-        RECT 5.865000  0.085000 6.195000 0.865000 ;
-        RECT 6.725000  0.085000 7.055000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -131,57 +108,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 0.105000 1.955000 0.435000 3.245000 ;
-        RECT 0.985000 2.270000 1.315000 3.245000 ;
-        RECT 2.725000 2.270000 3.505000 3.245000 ;
-        RECT 4.970000 2.270000 5.300000 3.245000 ;
-        RECT 5.900000 2.105000 6.230000 3.245000 ;
-        RECT 6.760000 2.105000 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.105000 0.255000 3.055000 0.425000 ;
-      RECT 0.105000 0.425000 0.365000 1.040000 ;
-      RECT 0.535000 0.595000 0.865000 1.145000 ;
-      RECT 0.605000 1.145000 0.865000 1.930000 ;
-      RECT 0.605000 1.930000 5.370000 2.100000 ;
-      RECT 0.605000 2.100000 0.815000 3.075000 ;
-      RECT 1.035000 0.425000 3.055000 0.540000 ;
-      RECT 1.035000 0.540000 1.265000 0.975000 ;
-      RECT 1.435000 0.710000 2.645000 0.725000 ;
-      RECT 1.435000 0.725000 4.865000 0.905000 ;
-      RECT 1.485000 2.270000 1.695000 2.905000 ;
-      RECT 1.485000 2.905000 2.555000 3.075000 ;
-      RECT 1.865000 2.100000 2.195000 2.735000 ;
-      RECT 2.365000 2.270000 2.555000 2.905000 ;
-      RECT 2.725000 0.540000 3.055000 0.555000 ;
-      RECT 3.135000 0.710000 4.865000 0.725000 ;
-      RECT 3.675000 2.270000 3.865000 2.905000 ;
-      RECT 3.675000 2.905000 4.795000 3.075000 ;
-      RECT 4.035000 2.100000 4.365000 2.735000 ;
-      RECT 4.535000 2.280000 4.795000 2.905000 ;
-      RECT 5.200000 1.385000 6.695000 1.585000 ;
-      RECT 5.200000 1.585000 5.370000 1.930000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.105000  0.255000 3.055000 0.425000 ;
+      RECT 0.105000  0.425000 0.365000 1.040000 ;
+      RECT 0.105000  1.955000 0.435000 3.245000 ;
+      RECT 0.535000  0.595000 0.865000 1.145000 ;
+      RECT 0.605000  1.145000 0.865000 1.930000 ;
+      RECT 0.605000  1.930000 5.370000 2.100000 ;
+      RECT 0.605000  2.100000 0.815000 3.075000 ;
+      RECT 0.985000  2.270000 1.315000 3.245000 ;
+      RECT 1.035000  0.425000 3.055000 0.540000 ;
+      RECT 1.035000  0.540000 1.265000 0.975000 ;
+      RECT 1.435000  0.710000 2.645000 0.725000 ;
+      RECT 1.435000  0.725000 4.865000 0.905000 ;
+      RECT 1.485000  2.270000 1.695000 2.905000 ;
+      RECT 1.485000  2.905000 2.555000 3.075000 ;
+      RECT 1.865000  2.100000 2.195000 2.735000 ;
+      RECT 2.365000  2.270000 2.555000 2.905000 ;
+      RECT 2.725000  0.540000 3.055000 0.555000 ;
+      RECT 2.725000  2.270000 3.505000 3.245000 ;
+      RECT 3.135000  0.710000 4.865000 0.725000 ;
+      RECT 3.245000  0.085000 3.575000 0.540000 ;
+      RECT 3.675000  2.270000 3.865000 2.905000 ;
+      RECT 3.675000  2.905000 4.795000 3.075000 ;
+      RECT 4.035000  2.100000 4.365000 2.735000 ;
+      RECT 4.105000  0.085000 4.435000 0.540000 ;
+      RECT 4.535000  2.280000 4.795000 2.905000 ;
+      RECT 4.970000  2.270000 5.300000 3.245000 ;
+      RECT 5.035000  0.085000 5.295000 0.905000 ;
+      RECT 5.200000  1.385000 6.695000 1.585000 ;
+      RECT 5.200000  1.585000 5.370000 1.930000 ;
+      RECT 5.865000  0.085000 6.195000 0.865000 ;
+      RECT 5.900000  2.105000 6.230000 3.245000 ;
+      RECT 6.725000  0.085000 7.055000 0.875000 ;
+      RECT 6.760000  2.105000 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  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o221a_4
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef
index b6cb5db..74cf367 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_lp.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.905000  0.085000 1.155000 0.675000 ;
-        RECT 1.845000  0.085000 2.175000 0.365000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,38 +98,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.690000 2.320000 1.020000 3.245000 ;
-        RECT 2.875000 2.320000 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 ;
-        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.450000 1.225000 0.840000 1.895000 ;
-      RECT 0.670000 1.895000 0.840000 1.970000 ;
-      RECT 0.670000 1.970000 4.235000 2.140000 ;
-      RECT 1.335000 0.265000 1.665000 0.545000 ;
-      RECT 1.335000 0.545000 3.265000 0.715000 ;
-      RECT 1.815000 2.140000 2.145000 3.065000 ;
-      RECT 2.425000 0.895000 2.755000 0.990000 ;
-      RECT 2.425000 0.990000 3.695000 1.160000 ;
-      RECT 2.935000 0.715000 3.265000 0.820000 ;
-      RECT 3.405000 2.140000 4.235000 3.065000 ;
-      RECT 3.445000 0.685000 3.695000 0.990000 ;
-      RECT 3.865000 0.685000 4.235000 1.015000 ;
-      RECT 4.065000 1.015000 4.235000 1.970000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.450000  1.225000 0.840000 1.895000 ;
+      RECT 0.670000  1.895000 0.840000 1.970000 ;
+      RECT 0.670000  1.970000 4.235000 2.140000 ;
+      RECT 0.690000  2.320000 1.020000 3.245000 ;
+      RECT 0.905000  0.085000 1.155000 0.675000 ;
+      RECT 1.335000  0.265000 1.665000 0.545000 ;
+      RECT 1.335000  0.545000 3.265000 0.715000 ;
+      RECT 1.815000  2.140000 2.145000 3.065000 ;
+      RECT 1.845000  0.085000 2.175000 0.365000 ;
+      RECT 2.425000  0.895000 2.755000 0.990000 ;
+      RECT 2.425000  0.990000 3.695000 1.160000 ;
+      RECT 2.875000  2.320000 3.205000 3.245000 ;
+      RECT 2.935000  0.715000 3.265000 0.820000 ;
+      RECT 3.405000  2.140000 4.235000 3.065000 ;
+      RECT 3.445000  0.685000 3.695000 0.990000 ;
+      RECT 3.865000  0.685000 4.235000 1.015000 ;
+      RECT 4.065000  1.015000 4.235000 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 ;
+      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_lp__o221a_lp
diff --git a/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef b/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef
index 5080450..943cfb2 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_m.magic.lef
@@ -90,18 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.625000  0.085000 1.955000 0.485000 ;
-        RECT 2.565000  0.085000 2.775000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,36 +98,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.650000 2.845000 0.980000 3.245000 ;
-        RECT 2.540000 2.785000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.140000 1.005000 0.365000 2.495000 ;
-      RECT 0.140000 2.495000 1.415000 2.665000 ;
-      RECT 0.140000 2.665000 0.470000 2.925000 ;
-      RECT 0.585000 1.005000 0.795000 1.325000 ;
-      RECT 0.585000 1.325000 1.845000 1.495000 ;
-      RECT 1.050000 0.665000 2.345000 0.835000 ;
-      RECT 1.050000 0.835000 1.380000 1.145000 ;
-      RECT 1.245000 2.665000 1.415000 2.695000 ;
-      RECT 1.245000 2.695000 2.360000 3.025000 ;
-      RECT 1.635000 1.035000 1.845000 1.325000 ;
-      RECT 2.135000 0.345000 2.345000 0.665000 ;
-      RECT 2.190000 1.970000 2.910000 2.300000 ;
-      RECT 2.190000 2.300000 2.360000 2.695000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.140000  1.005000 0.365000 2.495000 ;
+      RECT 0.140000  2.495000 1.415000 2.665000 ;
+      RECT 0.140000  2.665000 0.470000 2.925000 ;
+      RECT 0.585000  1.005000 0.795000 1.325000 ;
+      RECT 0.585000  1.325000 1.845000 1.495000 ;
+      RECT 0.650000  2.845000 0.980000 3.245000 ;
+      RECT 1.050000  0.665000 2.345000 0.835000 ;
+      RECT 1.050000  0.835000 1.380000 1.145000 ;
+      RECT 1.245000  2.665000 1.415000 2.695000 ;
+      RECT 1.245000  2.695000 2.360000 3.025000 ;
+      RECT 1.625000  0.085000 1.955000 0.485000 ;
+      RECT 1.635000  1.035000 1.845000 1.325000 ;
+      RECT 2.135000  0.345000 2.345000 0.665000 ;
+      RECT 2.190000  1.970000 2.910000 2.300000 ;
+      RECT 2.190000  2.300000 2.360000 2.695000 ;
+      RECT 2.540000  2.785000 2.730000 3.245000 ;
+      RECT 2.565000  0.085000 2.775000 0.545000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o221a_m
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef
index 019274e..5b3f12f 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.magic.lef
@@ -95,17 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.465000  0.085000 2.135000 0.360000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -114,32 +103,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.615000 2.660000 0.945000 3.245000 ;
-        RECT 2.365000 2.330000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.280000 0.835000 0.615000 ;
-      RECT 0.545000 0.615000 0.715000 0.870000 ;
-      RECT 0.545000 0.870000 1.635000 0.875000 ;
-      RECT 0.545000 0.875000 3.075000 1.040000 ;
-      RECT 1.005000 0.280000 1.285000 0.530000 ;
-      RECT 1.005000 0.530000 2.600000 0.700000 ;
-      RECT 1.465000 1.040000 3.075000 1.045000 ;
-      RECT 2.315000 0.280000 2.600000 0.530000 ;
-      RECT 2.770000 0.280000 3.075000 0.875000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.545000  0.280000 0.835000 0.615000 ;
+      RECT 0.545000  0.615000 0.715000 0.870000 ;
+      RECT 0.545000  0.870000 1.635000 0.875000 ;
+      RECT 0.545000  0.875000 3.075000 1.040000 ;
+      RECT 0.615000  2.660000 0.945000 3.245000 ;
+      RECT 1.005000  0.280000 1.285000 0.530000 ;
+      RECT 1.005000  0.530000 2.600000 0.700000 ;
+      RECT 1.465000  0.085000 2.135000 0.360000 ;
+      RECT 1.465000  1.040000 3.075000 1.045000 ;
+      RECT 2.315000  0.280000 2.600000 0.530000 ;
+      RECT 2.365000  2.330000 2.695000 3.245000 ;
+      RECT 2.770000  0.280000 3.075000 0.875000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o221ai_0
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef
index 8a3e3b7..2e7c3f1 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.magic.lef
@@ -95,17 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 2.495000  0.085000 2.825000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -114,31 +103,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.725000 2.290000 1.395000 3.245000 ;
-        RECT 2.935000 1.920000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.255000 1.880000 0.425000 ;
-      RECT 0.545000 0.425000 0.875000 0.835000 ;
-      RECT 1.065000 0.595000 1.380000 0.995000 ;
-      RECT 1.065000 0.995000 2.325000 1.005000 ;
-      RECT 1.065000 1.005000 3.265000 1.175000 ;
-      RECT 1.550000 0.425000 1.880000 0.815000 ;
-      RECT 2.050000 0.255000 2.325000 0.995000 ;
-      RECT 2.995000 0.255000 3.265000 1.005000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.545000  0.255000 1.880000 0.425000 ;
+      RECT 0.545000  0.425000 0.875000 0.835000 ;
+      RECT 0.725000  2.290000 1.395000 3.245000 ;
+      RECT 1.065000  0.595000 1.380000 0.995000 ;
+      RECT 1.065000  0.995000 2.325000 1.005000 ;
+      RECT 1.065000  1.005000 3.265000 1.175000 ;
+      RECT 1.550000  0.425000 1.880000 0.815000 ;
+      RECT 2.050000  0.255000 2.325000 0.995000 ;
+      RECT 2.495000  0.085000 2.825000 0.835000 ;
+      RECT 2.935000  1.920000 3.265000 3.245000 ;
+      RECT 2.995000  0.255000 3.265000 1.005000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o221ai_1
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef
index 3e8567b..2d5de53 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.magic.lef
@@ -99,23 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 3.895000  0.085000 4.225000 0.700000 ;
-        RECT 4.795000  0.085000 5.125000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -124,52 +107,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.105000 1.920000 0.365000 3.245000 ;
-        RECT 0.965000 2.385000 1.815000 3.245000 ;
-        RECT 3.395000 2.385000 3.725000 3.245000 ;
-        RECT 5.315000 2.045000 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.105000 0.255000 1.235000 0.425000 ;
-      RECT 0.105000 0.425000 0.365000 1.040000 ;
-      RECT 1.045000 0.425000 1.235000 1.085000 ;
-      RECT 1.045000 1.085000 2.315000 1.255000 ;
-      RECT 1.485000 0.255000 3.715000 0.425000 ;
-      RECT 1.485000 0.425000 1.815000 0.915000 ;
-      RECT 1.985000 0.595000 2.315000 0.870000 ;
-      RECT 1.985000 0.870000 3.345000 1.040000 ;
-      RECT 1.985000 1.040000 2.315000 1.085000 ;
-      RECT 1.985000 2.385000 2.245000 2.905000 ;
-      RECT 1.985000 2.905000 3.175000 3.075000 ;
-      RECT 2.485000 0.425000 2.695000 0.700000 ;
-      RECT 2.865000 0.595000 3.345000 0.870000 ;
-      RECT 2.915000 2.385000 3.175000 2.905000 ;
-      RECT 3.005000 1.040000 3.345000 1.145000 ;
-      RECT 3.515000 0.425000 3.715000 0.870000 ;
-      RECT 3.515000 0.870000 5.575000 1.040000 ;
-      RECT 4.025000 2.385000 4.285000 2.895000 ;
-      RECT 4.025000 2.895000 5.145000 3.075000 ;
-      RECT 4.395000 0.305000 4.625000 0.870000 ;
-      RECT 4.955000 2.045000 5.145000 2.895000 ;
-      RECT 5.295000 0.305000 5.575000 0.870000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.105000  0.255000 1.235000 0.425000 ;
+      RECT 0.105000  0.425000 0.365000 1.040000 ;
+      RECT 0.105000  1.920000 0.365000 3.245000 ;
+      RECT 0.965000  2.385000 1.815000 3.245000 ;
+      RECT 1.045000  0.425000 1.235000 1.085000 ;
+      RECT 1.045000  1.085000 2.315000 1.255000 ;
+      RECT 1.485000  0.255000 3.715000 0.425000 ;
+      RECT 1.485000  0.425000 1.815000 0.915000 ;
+      RECT 1.985000  0.595000 2.315000 0.870000 ;
+      RECT 1.985000  0.870000 3.345000 1.040000 ;
+      RECT 1.985000  1.040000 2.315000 1.085000 ;
+      RECT 1.985000  2.385000 2.245000 2.905000 ;
+      RECT 1.985000  2.905000 3.175000 3.075000 ;
+      RECT 2.485000  0.425000 2.695000 0.700000 ;
+      RECT 2.865000  0.595000 3.345000 0.870000 ;
+      RECT 2.915000  2.385000 3.175000 2.905000 ;
+      RECT 3.005000  1.040000 3.345000 1.145000 ;
+      RECT 3.395000  2.385000 3.725000 3.245000 ;
+      RECT 3.515000  0.425000 3.715000 0.870000 ;
+      RECT 3.515000  0.870000 5.575000 1.040000 ;
+      RECT 3.895000  0.085000 4.225000 0.700000 ;
+      RECT 4.025000  2.385000 4.285000 2.895000 ;
+      RECT 4.025000  2.895000 5.145000 3.075000 ;
+      RECT 4.395000  0.305000 4.625000 0.870000 ;
+      RECT 4.795000  0.085000 5.125000 0.700000 ;
+      RECT 4.955000  2.045000 5.145000 2.895000 ;
+      RECT 5.295000  0.305000 5.575000 0.870000 ;
+      RECT 5.315000  2.045000 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_lp__o221ai_2
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef
index eee26c4..108e2aa 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.magic.lef
@@ -108,34 +108,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 6.560000  0.085000  6.890000 0.565000 ;
-        RECT 7.420000  0.085000  7.750000 0.565000 ;
-        RECT 8.280000  0.085000  8.610000 0.565000 ;
-        RECT 9.140000  0.085000  9.470000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -144,78 +116,103 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.785000 1.920000  1.115000 3.245000 ;
-        RECT 1.645000 2.260000  1.975000 3.245000 ;
-        RECT 2.505000 2.295000  2.835000 3.245000 ;
-        RECT 3.365000 2.635000  3.695000 3.245000 ;
-        RECT 6.050000 2.305000  6.380000 3.245000 ;
-        RECT 8.745000 2.030000  9.075000 3.245000 ;
-        RECT 9.640000 1.815000  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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 10.080000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.255000 2.315000 0.425000 ;
-      RECT 0.105000 0.425000 0.365000 1.185000 ;
-      RECT 1.035000 0.425000 1.365000 0.895000 ;
-      RECT 2.035000 0.425000 2.315000 0.655000 ;
-      RECT 2.035000 0.655000 3.195000 0.915000 ;
-      RECT 2.505000 0.255000 6.390000 0.445000 ;
-      RECT 2.505000 0.445000 3.695000 0.485000 ;
-      RECT 2.810000 0.915000 3.195000 1.005000 ;
-      RECT 2.810000 1.005000 5.845000 1.025000 ;
-      RECT 2.810000 1.025000 4.045000 1.230000 ;
-      RECT 3.005000 2.295000 4.055000 2.465000 ;
-      RECT 3.005000 2.465000 3.195000 3.075000 ;
-      RECT 3.365000 0.485000 3.695000 0.835000 ;
-      RECT 3.865000 0.615000 4.115000 0.775000 ;
-      RECT 3.865000 0.775000 5.845000 1.005000 ;
-      RECT 3.865000 2.465000 4.055000 2.905000 ;
-      RECT 3.865000 2.905000 5.845000 3.075000 ;
-      RECT 4.285000 0.445000 5.355000 0.605000 ;
-      RECT 4.725000 2.315000 4.915000 2.905000 ;
-      RECT 5.515000 0.665000 5.845000 0.775000 ;
-      RECT 5.585000 2.305000 5.845000 2.905000 ;
-      RECT 6.060000 0.445000 6.390000 0.735000 ;
-      RECT 6.060000 0.735000 8.970000 0.870000 ;
-      RECT 6.060000 0.870000 9.900000 0.905000 ;
-      RECT 6.060000 0.905000 6.290000 0.945000 ;
-      RECT 6.560000 2.305000 6.820000 2.905000 ;
-      RECT 6.560000 2.905000 8.575000 3.075000 ;
-      RECT 7.060000 0.255000 7.250000 0.735000 ;
-      RECT 7.490000 2.290000 7.680000 2.905000 ;
-      RECT 7.920000 0.255000 8.110000 0.735000 ;
-      RECT 8.385000 1.690000 9.470000 1.860000 ;
-      RECT 8.385000 1.860000 8.575000 2.905000 ;
-      RECT 8.760000 0.905000 9.900000 1.040000 ;
-      RECT 8.780000 0.255000 8.970000 0.735000 ;
-      RECT 9.245000 1.860000 9.470000 3.075000 ;
-      RECT 9.640000 0.255000 9.900000 0.870000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.105000  0.255000  2.315000 0.425000 ;
+      RECT 0.105000  0.425000  0.365000 1.185000 ;
+      RECT 0.785000  1.920000  1.115000 3.245000 ;
+      RECT 1.035000  0.425000  1.365000 0.895000 ;
+      RECT 1.645000  2.260000  1.975000 3.245000 ;
+      RECT 2.035000  0.425000  2.315000 0.655000 ;
+      RECT 2.035000  0.655000  3.195000 0.915000 ;
+      RECT 2.505000  0.255000  6.390000 0.445000 ;
+      RECT 2.505000  0.445000  3.695000 0.485000 ;
+      RECT 2.505000  2.295000  2.835000 3.245000 ;
+      RECT 2.810000  0.915000  3.195000 1.005000 ;
+      RECT 2.810000  1.005000  5.845000 1.025000 ;
+      RECT 2.810000  1.025000  4.045000 1.230000 ;
+      RECT 3.005000  2.295000  4.055000 2.465000 ;
+      RECT 3.005000  2.465000  3.195000 3.075000 ;
+      RECT 3.365000  0.485000  3.695000 0.835000 ;
+      RECT 3.365000  2.635000  3.695000 3.245000 ;
+      RECT 3.865000  0.615000  4.115000 0.775000 ;
+      RECT 3.865000  0.775000  5.845000 1.005000 ;
+      RECT 3.865000  2.465000  4.055000 2.905000 ;
+      RECT 3.865000  2.905000  5.845000 3.075000 ;
+      RECT 4.285000  0.445000  5.355000 0.605000 ;
+      RECT 4.725000  2.315000  4.915000 2.905000 ;
+      RECT 5.515000  0.665000  5.845000 0.775000 ;
+      RECT 5.585000  2.305000  5.845000 2.905000 ;
+      RECT 6.050000  2.305000  6.380000 3.245000 ;
+      RECT 6.060000  0.445000  6.390000 0.735000 ;
+      RECT 6.060000  0.735000  8.970000 0.870000 ;
+      RECT 6.060000  0.870000  9.900000 0.905000 ;
+      RECT 6.060000  0.905000  6.290000 0.945000 ;
+      RECT 6.560000  0.085000  6.890000 0.565000 ;
+      RECT 6.560000  2.305000  6.820000 2.905000 ;
+      RECT 6.560000  2.905000  8.575000 3.075000 ;
+      RECT 7.060000  0.255000  7.250000 0.735000 ;
+      RECT 7.420000  0.085000  7.750000 0.565000 ;
+      RECT 7.490000  2.290000  7.680000 2.905000 ;
+      RECT 7.920000  0.255000  8.110000 0.735000 ;
+      RECT 8.280000  0.085000  8.610000 0.565000 ;
+      RECT 8.385000  1.690000  9.470000 1.860000 ;
+      RECT 8.385000  1.860000  8.575000 2.905000 ;
+      RECT 8.745000  2.030000  9.075000 3.245000 ;
+      RECT 8.760000  0.905000  9.900000 1.040000 ;
+      RECT 8.780000  0.255000  8.970000 0.735000 ;
+      RECT 9.140000  0.085000  9.470000 0.700000 ;
+      RECT 9.245000  1.860000  9.470000 3.075000 ;
+      RECT 9.640000  0.255000  9.900000 0.870000 ;
+      RECT 9.640000  1.815000  9.935000 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_lp__o221ai_4
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef
index 753ac82..581f490 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.magic.lef
@@ -95,19 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 2.075000  0.085000 2.405000 0.505000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,35 +103,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.075000 2.815000 1.405000 3.245000 ;
-        RECT 3.260000 2.465000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.055000 0.265000 1.385000 0.895000 ;
-      RECT 1.055000 0.895000 1.225000 2.115000 ;
-      RECT 1.055000 2.115000 4.185000 2.285000 ;
-      RECT 1.565000 0.265000 1.895000 0.685000 ;
-      RECT 1.565000 0.685000 3.530000 0.715000 ;
-      RECT 1.565000 0.715000 2.755000 0.855000 ;
-      RECT 2.585000 0.545000 3.530000 0.685000 ;
-      RECT 3.200000 0.265000 3.530000 0.545000 ;
-      RECT 3.710000 0.265000 4.185000 0.715000 ;
-      RECT 4.015000 0.715000 4.185000 2.115000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 1.055000  0.265000 1.385000 0.895000 ;
+      RECT 1.055000  0.895000 1.225000 2.115000 ;
+      RECT 1.055000  2.115000 4.185000 2.285000 ;
+      RECT 1.075000  2.815000 1.405000 3.245000 ;
+      RECT 1.565000  0.265000 1.895000 0.685000 ;
+      RECT 1.565000  0.685000 3.530000 0.715000 ;
+      RECT 1.565000  0.715000 2.755000 0.855000 ;
+      RECT 2.075000  0.085000 2.405000 0.505000 ;
+      RECT 2.585000  0.545000 3.530000 0.685000 ;
+      RECT 3.200000  0.265000 3.530000 0.545000 ;
+      RECT 3.260000  2.465000 3.590000 3.245000 ;
+      RECT 3.710000  0.265000 4.185000 0.715000 ;
+      RECT 4.015000  0.715000 4.185000 2.115000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o221ai_lp
diff --git a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef
index e2fa4c6..4f6f097 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.magic.lef
@@ -92,17 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.610000  0.085000 1.940000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,37 +100,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.710000 2.650000 1.040000 3.245000 ;
-        RECT 2.540000 2.485000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.860000 0.985000 1.030000 ;
-      RECT 0.545000 1.030000 0.715000 1.585000 ;
-      RECT 0.545000 1.585000 1.185000 1.685000 ;
-      RECT 0.545000 1.685000 3.255000 1.705000 ;
-      RECT 0.545000 1.705000 2.145000 1.755000 ;
-      RECT 0.775000 0.345000 0.985000 0.860000 ;
-      RECT 1.015000 1.755000 2.145000 1.855000 ;
-      RECT 1.220000 0.345000 1.430000 0.645000 ;
-      RECT 1.220000 0.645000 2.430000 0.660000 ;
-      RECT 1.220000 0.660000 2.375000 0.815000 ;
-      RECT 1.975000 1.535000 3.255000 1.685000 ;
-      RECT 2.205000 0.330000 2.430000 0.645000 ;
-      RECT 2.650000 0.330000 3.255000 0.660000 ;
-      RECT 3.085000 0.660000 3.255000 1.535000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.545000  0.860000 0.985000 1.030000 ;
+      RECT 0.545000  1.030000 0.715000 1.585000 ;
+      RECT 0.545000  1.585000 1.185000 1.685000 ;
+      RECT 0.545000  1.685000 3.255000 1.705000 ;
+      RECT 0.545000  1.705000 2.145000 1.755000 ;
+      RECT 0.710000  2.650000 1.040000 3.245000 ;
+      RECT 0.775000  0.345000 0.985000 0.860000 ;
+      RECT 1.015000  1.755000 2.145000 1.855000 ;
+      RECT 1.220000  0.345000 1.430000 0.645000 ;
+      RECT 1.220000  0.645000 2.430000 0.660000 ;
+      RECT 1.220000  0.660000 2.375000 0.815000 ;
+      RECT 1.610000  0.085000 1.940000 0.465000 ;
+      RECT 1.975000  1.535000 3.255000 1.685000 ;
+      RECT 2.205000  0.330000 2.430000 0.645000 ;
+      RECT 2.540000  2.485000 2.870000 3.245000 ;
+      RECT 2.650000  0.330000 3.255000 0.660000 ;
+      RECT 3.085000  0.660000 3.255000 1.535000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o221ai_m
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef
index 28e2f44..2d90356 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_0.magic.lef
@@ -88,20 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.645000  0.085000 0.825000 0.670000 ;
-        RECT 0.645000  0.670000 0.945000 1.000000 ;
-        RECT 2.875000  0.085000 3.205000 0.865000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -110,37 +96,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.595000 2.775000 1.735000 3.245000 ;
-        RECT 3.185000 2.775000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.495000 1.565000 0.665000 2.065000 ;
-      RECT 0.495000 2.065000 0.765000 2.235000 ;
-      RECT 0.595000 2.235000 0.765000 2.435000 ;
-      RECT 0.595000 2.435000 3.745000 2.605000 ;
-      RECT 1.465000 0.615000 1.685000 1.000000 ;
-      RECT 1.495000 0.445000 2.695000 0.615000 ;
-      RECT 1.855000 0.785000 2.185000 1.035000 ;
-      RECT 1.855000 1.035000 3.075000 1.205000 ;
-      RECT 2.225000 2.605000 2.555000 3.075000 ;
-      RECT 2.365000 0.615000 2.695000 0.865000 ;
-      RECT 2.905000 1.205000 3.075000 1.585000 ;
-      RECT 2.905000 1.585000 3.745000 1.755000 ;
-      RECT 3.540000 1.755000 3.745000 2.435000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.495000  1.565000 0.665000 2.065000 ;
+      RECT 0.495000  2.065000 0.765000 2.235000 ;
+      RECT 0.595000  2.235000 0.765000 2.435000 ;
+      RECT 0.595000  2.435000 3.745000 2.605000 ;
+      RECT 0.595000  2.775000 1.735000 3.245000 ;
+      RECT 0.645000  0.085000 0.825000 0.670000 ;
+      RECT 0.645000  0.670000 0.945000 1.000000 ;
+      RECT 1.465000  0.615000 1.685000 1.000000 ;
+      RECT 1.495000  0.445000 2.695000 0.615000 ;
+      RECT 1.855000  0.785000 2.185000 1.035000 ;
+      RECT 1.855000  1.035000 3.075000 1.205000 ;
+      RECT 2.225000  2.605000 2.555000 3.075000 ;
+      RECT 2.365000  0.615000 2.695000 0.865000 ;
+      RECT 2.875000  0.085000 3.205000 0.865000 ;
+      RECT 2.905000  1.205000 3.075000 1.585000 ;
+      RECT 2.905000  1.585000 3.745000 1.755000 ;
+      RECT 3.185000  2.775000 3.515000 3.245000 ;
+      RECT 3.540000  1.755000 3.745000 2.435000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o22a_0
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_1.magic.lef
index 502deae..87d20f1 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__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.585000  0.085000 0.795000 0.885000 ;
-        RECT 2.700000  0.085000 3.030000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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 +90,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.100000 2.445000 1.310000 3.245000 ;
-        RECT 3.385000 2.105000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.550000 1.075000 2.005000 1.245000 ;
-      RECT 0.550000 1.245000 0.880000 1.435000 ;
-      RECT 1.060000 1.245000 1.230000 1.930000 ;
-      RECT 1.060000 1.930000 2.375000 2.100000 ;
-      RECT 1.285000 0.345000 2.435000 0.515000 ;
-      RECT 1.285000 0.515000 1.615000 0.895000 ;
-      RECT 1.795000 0.765000 2.005000 1.075000 ;
-      RECT 2.165000 2.100000 2.375000 2.940000 ;
-      RECT 2.225000 0.515000 2.435000 1.005000 ;
-      RECT 2.225000 1.005000 3.540000 1.175000 ;
-      RECT 3.330000 0.425000 3.540000 1.005000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.550000  1.075000 2.005000 1.245000 ;
+      RECT 0.550000  1.245000 0.880000 1.435000 ;
+      RECT 0.585000  0.085000 0.795000 0.885000 ;
+      RECT 1.060000  1.245000 1.230000 1.930000 ;
+      RECT 1.060000  1.930000 2.375000 2.100000 ;
+      RECT 1.100000  2.445000 1.310000 3.245000 ;
+      RECT 1.285000  0.345000 2.435000 0.515000 ;
+      RECT 1.285000  0.515000 1.615000 0.895000 ;
+      RECT 1.795000  0.765000 2.005000 1.075000 ;
+      RECT 2.165000  2.100000 2.375000 2.940000 ;
+      RECT 2.225000  0.515000 2.435000 1.005000 ;
+      RECT 2.225000  1.005000 3.540000 1.175000 ;
+      RECT 2.700000  0.085000 3.030000 0.825000 ;
+      RECT 3.330000  0.425000 3.540000 1.005000 ;
+      RECT 3.385000  2.105000 3.595000 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_lp__o22a_1
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_2.magic.lef
index 54d860e..e8ce922 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_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.095000  0.085000 0.365000 1.105000 ;
-        RECT 0.955000  0.085000 1.285000 0.905000 ;
-        RECT 2.875000  0.085000 3.205000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.200000 1.995000 0.450000 3.245000 ;
-        RECT 1.060000 2.270000 1.805000 3.245000 ;
-        RECT 3.375000 1.920000 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 1.050000 1.075000 2.205000 1.245000 ;
-      RECT 1.050000 1.245000 1.310000 1.930000 ;
-      RECT 1.050000 1.930000 2.590000 2.100000 ;
-      RECT 1.475000 0.255000 2.705000 0.425000 ;
-      RECT 1.475000 0.425000 1.805000 0.895000 ;
-      RECT 1.975000 0.595000 2.205000 1.075000 ;
-      RECT 2.245000 2.100000 2.590000 3.075000 ;
-      RECT 2.375000 0.425000 2.705000 0.995000 ;
-      RECT 2.375000 0.995000 3.690000 1.165000 ;
-      RECT 3.375000 0.255000 3.690000 0.995000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.085000 0.365000 1.105000 ;
+      RECT 0.200000  1.995000 0.450000 3.245000 ;
+      RECT 0.955000  0.085000 1.285000 0.905000 ;
+      RECT 1.050000  1.075000 2.205000 1.245000 ;
+      RECT 1.050000  1.245000 1.310000 1.930000 ;
+      RECT 1.050000  1.930000 2.590000 2.100000 ;
+      RECT 1.060000  2.270000 1.805000 3.245000 ;
+      RECT 1.475000  0.255000 2.705000 0.425000 ;
+      RECT 1.475000  0.425000 1.805000 0.895000 ;
+      RECT 1.975000  0.595000 2.205000 1.075000 ;
+      RECT 2.245000  2.100000 2.590000 3.075000 ;
+      RECT 2.375000  0.425000 2.705000 0.995000 ;
+      RECT 2.375000  0.995000 3.690000 1.165000 ;
+      RECT 2.875000  0.085000 3.205000 0.825000 ;
+      RECT 3.375000  0.255000 3.690000 0.995000 ;
+      RECT 3.375000  1.920000 3.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 ;
   END
 END sky130_fd_sc_lp__o22a_2
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef
index b71be09..a81e791 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_4.magic.lef
@@ -91,28 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 0.885000 ;
-        RECT 0.985000  0.085000 1.315000 0.885000 ;
-        RECT 1.885000  0.085000 2.125000 1.105000 ;
-        RECT 4.845000  0.085000 5.175000 0.565000 ;
-        RECT 5.745000  0.085000 6.075000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -121,53 +99,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.790000 2.095000 1.120000 3.245000 ;
-        RECT 1.650000 2.105000 1.980000 3.245000 ;
-        RECT 2.545000 2.270000 2.875000 3.245000 ;
-        RECT 4.380000 2.270000 4.710000 3.245000 ;
-        RECT 6.175000 1.940000 6.505000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.775000 1.405000 2.680000 1.575000 ;
-      RECT 2.295000 0.255000 4.205000 0.515000 ;
-      RECT 2.295000 0.515000 2.465000 1.405000 ;
-      RECT 2.510000 1.575000 2.680000 1.930000 ;
-      RECT 2.510000 1.930000 5.645000 2.100000 ;
-      RECT 2.635000 0.685000 4.675000 0.735000 ;
-      RECT 2.635000 0.735000 6.505000 0.905000 ;
-      RECT 2.635000 0.905000 2.865000 1.015000 ;
-      RECT 3.045000 2.270000 3.275000 2.905000 ;
-      RECT 3.045000 2.905000 4.205000 3.075000 ;
-      RECT 3.445000 2.100000 3.775000 2.735000 ;
-      RECT 3.945000 2.270000 4.205000 2.905000 ;
-      RECT 4.385000 0.255000 4.675000 0.685000 ;
-      RECT 4.885000 2.270000 5.145000 2.905000 ;
-      RECT 4.885000 2.905000 6.005000 3.075000 ;
-      RECT 5.315000 2.100000 5.645000 2.735000 ;
-      RECT 5.345000 0.255000 5.575000 0.735000 ;
-      RECT 5.815000 1.940000 6.005000 2.905000 ;
-      RECT 6.225000 0.905000 6.505000 1.015000 ;
-      RECT 6.245000 0.255000 6.505000 0.735000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.125000  0.085000 0.455000 0.885000 ;
+      RECT 0.775000  1.405000 2.680000 1.575000 ;
+      RECT 0.790000  2.095000 1.120000 3.245000 ;
+      RECT 0.985000  0.085000 1.315000 0.885000 ;
+      RECT 1.650000  2.105000 1.980000 3.245000 ;
+      RECT 1.885000  0.085000 2.125000 1.105000 ;
+      RECT 2.295000  0.255000 4.205000 0.515000 ;
+      RECT 2.295000  0.515000 2.465000 1.405000 ;
+      RECT 2.510000  1.575000 2.680000 1.930000 ;
+      RECT 2.510000  1.930000 5.645000 2.100000 ;
+      RECT 2.545000  2.270000 2.875000 3.245000 ;
+      RECT 2.635000  0.685000 4.675000 0.735000 ;
+      RECT 2.635000  0.735000 6.505000 0.905000 ;
+      RECT 2.635000  0.905000 2.865000 1.015000 ;
+      RECT 3.045000  2.270000 3.275000 2.905000 ;
+      RECT 3.045000  2.905000 4.205000 3.075000 ;
+      RECT 3.445000  2.100000 3.775000 2.735000 ;
+      RECT 3.945000  2.270000 4.205000 2.905000 ;
+      RECT 4.380000  2.270000 4.710000 3.245000 ;
+      RECT 4.385000  0.255000 4.675000 0.685000 ;
+      RECT 4.845000  0.085000 5.175000 0.565000 ;
+      RECT 4.885000  2.270000 5.145000 2.905000 ;
+      RECT 4.885000  2.905000 6.005000 3.075000 ;
+      RECT 5.315000  2.100000 5.645000 2.735000 ;
+      RECT 5.345000  0.255000 5.575000 0.735000 ;
+      RECT 5.745000  0.085000 6.075000 0.565000 ;
+      RECT 5.815000  1.940000 6.005000 2.905000 ;
+      RECT 6.175000  1.940000 6.505000 3.245000 ;
+      RECT 6.225000  0.905000 6.505000 1.015000 ;
+      RECT 6.245000  0.255000 6.505000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o22a_4
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef
index 1c03a13..87a02ed 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_lp.magic.lef
@@ -81,19 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 1.075000 ;
-        RECT 2.605000  0.085000 2.935000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,36 +89,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.115000 2.310000 0.445000 3.245000 ;
-        RECT 2.220000 2.310000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.130000 0.850000 0.405000 1.245000 ;
-      RECT 0.130000 1.245000 1.505000 1.415000 ;
-      RECT 1.095000 0.850000 2.445000 1.020000 ;
-      RECT 1.095000 1.020000 1.505000 1.245000 ;
-      RECT 1.135000 2.310000 1.855000 2.480000 ;
-      RECT 1.135000 2.480000 1.465000 3.065000 ;
-      RECT 1.685000 1.200000 1.935000 1.960000 ;
-      RECT 1.685000 1.960000 3.105000 2.130000 ;
-      RECT 1.685000 2.130000 1.855000 2.310000 ;
-      RECT 2.115000 1.020000 2.445000 1.270000 ;
-      RECT 2.935000 0.855000 3.265000 1.525000 ;
-      RECT 2.935000 1.525000 3.105000 1.960000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  2.310000 0.445000 3.245000 ;
+      RECT 0.130000  0.850000 0.405000 1.245000 ;
+      RECT 0.130000  1.245000 1.505000 1.415000 ;
+      RECT 0.575000  0.085000 0.905000 1.075000 ;
+      RECT 1.095000  0.850000 2.445000 1.020000 ;
+      RECT 1.095000  1.020000 1.505000 1.245000 ;
+      RECT 1.135000  2.310000 1.855000 2.480000 ;
+      RECT 1.135000  2.480000 1.465000 3.065000 ;
+      RECT 1.685000  1.200000 1.935000 1.960000 ;
+      RECT 1.685000  1.960000 3.105000 2.130000 ;
+      RECT 1.685000  2.130000 1.855000 2.310000 ;
+      RECT 2.115000  1.020000 2.445000 1.270000 ;
+      RECT 2.220000  2.310000 2.550000 3.245000 ;
+      RECT 2.605000  0.085000 2.935000 0.615000 ;
+      RECT 2.935000  0.855000 3.265000 1.525000 ;
+      RECT 2.935000  1.525000 3.105000 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 ;
   END
 END sky130_fd_sc_lp__o22a_lp
diff --git a/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef b/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef
index 26901df..b498f04 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_m.magic.lef
@@ -83,18 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.650000  0.085000 0.980000 0.635000 ;
-        RECT 2.690000  0.085000 3.020000 0.655000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -103,31 +91,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.565000 2.885000 0.895000 3.245000 ;
-        RECT 2.930000 2.845000 3.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 ;
-        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.545000 0.815000 2.000000 0.985000 ;
-      RECT 0.545000 0.985000 0.715000 2.535000 ;
-      RECT 0.545000 2.535000 2.300000 2.705000 ;
-      RECT 1.160000 0.265000 2.510000 0.435000 ;
-      RECT 1.160000 0.435000 1.490000 0.635000 ;
-      RECT 1.670000 0.615000 2.000000 0.815000 ;
-      RECT 2.090000 2.705000 2.300000 2.985000 ;
-      RECT 2.180000 0.435000 2.510000 0.655000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.545000  0.815000 2.000000 0.985000 ;
+      RECT 0.545000  0.985000 0.715000 2.535000 ;
+      RECT 0.545000  2.535000 2.300000 2.705000 ;
+      RECT 0.565000  2.885000 0.895000 3.245000 ;
+      RECT 0.650000  0.085000 0.980000 0.635000 ;
+      RECT 1.160000  0.265000 2.510000 0.435000 ;
+      RECT 1.160000  0.435000 1.490000 0.635000 ;
+      RECT 1.670000  0.615000 2.000000 0.815000 ;
+      RECT 2.090000  2.705000 2.300000 2.985000 ;
+      RECT 2.180000  0.435000 2.510000 0.655000 ;
+      RECT 2.690000  0.085000 3.020000 0.655000 ;
+      RECT 2.930000  2.845000 3.260000 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_lp__o22a_m
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef
index e26197a..3dad2f2 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.magic.lef
@@ -83,15 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 1.525000  0.085000 1.855000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -100,27 +91,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.125000 2.395000 0.385000 2.660000 ;
-        RECT 0.125000 2.660000 0.590000 3.245000 ;
-        RECT 1.935000 2.395000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.255000 1.355000 0.425000 ;
-      RECT 0.115000 0.425000 0.445000 0.670000 ;
-      RECT 1.135000 0.425000 1.355000 0.870000 ;
-      RECT 1.135000 0.870000 2.305000 1.040000 ;
-      RECT 2.025000 0.470000 2.305000 0.870000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.115000  0.255000 1.355000 0.425000 ;
+      RECT 0.115000  0.425000 0.445000 0.670000 ;
+      RECT 0.125000  2.395000 0.385000 2.660000 ;
+      RECT 0.125000  2.660000 0.590000 3.245000 ;
+      RECT 1.135000  0.425000 1.355000 0.870000 ;
+      RECT 1.135000  0.870000 2.305000 1.040000 ;
+      RECT 1.525000  0.085000 1.855000 0.700000 ;
+      RECT 1.935000  2.395000 2.230000 3.245000 ;
+      RECT 2.025000  0.470000 2.305000 0.870000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__o22ai_0
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.magic.lef
index c1edcc3..6931299 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__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.450000  0.085000 2.120000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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.095000 1.920000 0.355000 3.245000 ;
-        RECT 2.040000 1.920000 2.370000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.255000 1.280000 0.425000 ;
-      RECT 0.095000 0.425000 0.355000 1.040000 ;
-      RECT 1.025000 0.425000 1.280000 0.870000 ;
-      RECT 1.025000 0.870000 2.550000 1.040000 ;
-      RECT 2.290000 0.325000 2.550000 0.870000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.255000 1.280000 0.425000 ;
+      RECT 0.095000  0.425000 0.355000 1.040000 ;
+      RECT 0.095000  1.920000 0.355000 3.245000 ;
+      RECT 1.025000  0.425000 1.280000 0.870000 ;
+      RECT 1.025000  0.870000 2.550000 1.040000 ;
+      RECT 1.450000  0.085000 2.120000 0.700000 ;
+      RECT 2.040000  1.920000 2.370000 3.245000 ;
+      RECT 2.290000  0.325000 2.550000 0.870000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__o22ai_1
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef
index 0b80185..f2529c4 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.magic.lef
@@ -86,21 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 2.775000  0.085000 3.105000 0.700000 ;
-        RECT 3.635000  0.085000 3.965000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,43 +94,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.605000 2.115000 0.935000 3.245000 ;
-        RECT 3.705000 2.035000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 2.605000 0.425000 ;
-      RECT 0.175000 0.425000 0.435000 1.040000 ;
-      RECT 0.175000 1.775000 1.295000 1.945000 ;
-      RECT 0.175000 1.945000 0.435000 3.075000 ;
-      RECT 1.105000 0.425000 2.605000 0.650000 ;
-      RECT 1.105000 1.945000 1.295000 2.905000 ;
-      RECT 1.105000 2.905000 2.225000 3.075000 ;
-      RECT 1.965000 2.035000 2.225000 2.905000 ;
-      RECT 2.415000 2.035000 2.675000 2.905000 ;
-      RECT 2.415000 2.905000 3.535000 3.075000 ;
-      RECT 2.425000 0.650000 2.605000 0.870000 ;
-      RECT 2.425000 0.870000 4.395000 1.040000 ;
-      RECT 3.285000 0.315000 3.465000 0.870000 ;
-      RECT 3.345000 1.695000 4.465000 1.865000 ;
-      RECT 3.345000 1.865000 3.535000 2.905000 ;
-      RECT 4.135000 0.315000 4.395000 0.870000 ;
-      RECT 4.205000 1.865000 4.465000 3.075000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.175000  0.255000 2.605000 0.425000 ;
+      RECT 0.175000  0.425000 0.435000 1.040000 ;
+      RECT 0.175000  1.775000 1.295000 1.945000 ;
+      RECT 0.175000  1.945000 0.435000 3.075000 ;
+      RECT 0.605000  2.115000 0.935000 3.245000 ;
+      RECT 1.105000  0.425000 2.605000 0.650000 ;
+      RECT 1.105000  1.945000 1.295000 2.905000 ;
+      RECT 1.105000  2.905000 2.225000 3.075000 ;
+      RECT 1.965000  2.035000 2.225000 2.905000 ;
+      RECT 2.415000  2.035000 2.675000 2.905000 ;
+      RECT 2.415000  2.905000 3.535000 3.075000 ;
+      RECT 2.425000  0.650000 2.605000 0.870000 ;
+      RECT 2.425000  0.870000 4.395000 1.040000 ;
+      RECT 2.775000  0.085000 3.105000 0.700000 ;
+      RECT 3.285000  0.315000 3.465000 0.870000 ;
+      RECT 3.345000  1.695000 4.465000 1.865000 ;
+      RECT 3.345000  1.865000 3.535000 2.905000 ;
+      RECT 3.635000  0.085000 3.965000 0.700000 ;
+      RECT 3.705000  2.035000 4.035000 3.245000 ;
+      RECT 4.135000  0.315000 4.395000 0.870000 ;
+      RECT 4.205000  1.865000 4.465000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o22ai_2
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef
index 0f2dd3d..e0de6fc 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.magic.lef
@@ -100,29 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.555000  0.085000 0.885000 0.825000 ;
-        RECT 1.415000  0.085000 1.745000 0.825000 ;
-        RECT 2.275000  0.085000 2.605000 0.825000 ;
-        RECT 3.135000  0.085000 3.465000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -131,53 +108,73 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.140000 1.815000 0.430000 3.245000 ;
-        RECT 1.000000 2.630000 1.330000 3.245000 ;
-        RECT 3.650000 2.640000 3.960000 3.245000 ;
-        RECT 4.510000 2.395000 4.840000 3.245000 ;
-        RECT 7.090000 2.105000 7.420000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.125000 0.255000 0.385000 1.005000 ;
-      RECT 0.125000 1.005000 3.815000 1.175000 ;
-      RECT 0.600000 1.815000 0.855000 2.290000 ;
-      RECT 0.600000 2.290000 1.700000 2.460000 ;
-      RECT 0.600000 2.460000 0.830000 3.075000 ;
-      RECT 1.055000 0.255000 1.245000 1.005000 ;
-      RECT 1.500000 2.460000 1.700000 2.790000 ;
-      RECT 1.500000 2.790000 3.480000 3.075000 ;
-      RECT 1.915000 0.255000 2.105000 1.005000 ;
-      RECT 2.775000 0.255000 2.965000 1.005000 ;
-      RECT 3.635000 0.255000 7.390000 0.475000 ;
-      RECT 3.635000 0.475000 3.815000 1.005000 ;
-      RECT 4.130000 2.045000 5.200000 2.225000 ;
-      RECT 4.130000 2.225000 4.340000 3.075000 ;
-      RECT 5.010000 2.225000 5.200000 2.905000 ;
-      RECT 5.010000 2.905000 6.920000 3.075000 ;
-      RECT 5.870000 2.270000 6.060000 2.905000 ;
-      RECT 6.730000 2.045000 6.920000 2.905000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.125000  0.255000 0.385000 1.005000 ;
+      RECT 0.125000  1.005000 3.815000 1.175000 ;
+      RECT 0.140000  1.815000 0.430000 3.245000 ;
+      RECT 0.555000  0.085000 0.885000 0.825000 ;
+      RECT 0.600000  1.815000 0.855000 2.290000 ;
+      RECT 0.600000  2.290000 1.700000 2.460000 ;
+      RECT 0.600000  2.460000 0.830000 3.075000 ;
+      RECT 1.000000  2.630000 1.330000 3.245000 ;
+      RECT 1.055000  0.255000 1.245000 1.005000 ;
+      RECT 1.415000  0.085000 1.745000 0.825000 ;
+      RECT 1.500000  2.460000 1.700000 2.790000 ;
+      RECT 1.500000  2.790000 3.480000 3.075000 ;
+      RECT 1.915000  0.255000 2.105000 1.005000 ;
+      RECT 2.275000  0.085000 2.605000 0.825000 ;
+      RECT 2.775000  0.255000 2.965000 1.005000 ;
+      RECT 3.135000  0.085000 3.465000 0.825000 ;
+      RECT 3.635000  0.255000 7.390000 0.475000 ;
+      RECT 3.635000  0.475000 3.815000 1.005000 ;
+      RECT 3.650000  2.640000 3.960000 3.245000 ;
+      RECT 4.130000  2.045000 5.200000 2.225000 ;
+      RECT 4.130000  2.225000 4.340000 3.075000 ;
+      RECT 4.510000  2.395000 4.840000 3.245000 ;
+      RECT 5.010000  2.225000 5.200000 2.905000 ;
+      RECT 5.010000  2.905000 6.920000 3.075000 ;
+      RECT 5.870000  2.270000 6.060000 2.905000 ;
+      RECT 6.730000  2.045000 6.920000 2.905000 ;
+      RECT 7.090000  2.105000 7.420000 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_lp__o22ai_4
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef
index 77711bb..57c1e06 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.magic.lef
@@ -84,17 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.945000  0.085000 2.275000 0.855000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -103,30 +92,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.290000 2.310000 0.620000 3.245000 ;
-        RECT 2.740000 2.235000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.330000 0.265000 1.765000 0.435000 ;
-      RECT 0.330000 0.435000 0.660000 0.920000 ;
-      RECT 1.350000 0.435000 1.765000 0.945000 ;
-      RECT 1.595000 0.945000 1.765000 1.885000 ;
-      RECT 1.595000 1.885000 3.195000 2.055000 ;
-      RECT 2.640000 0.485000 3.195000 0.855000 ;
-      RECT 3.025000 0.855000 3.195000 1.885000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.290000  2.310000 0.620000 3.245000 ;
+      RECT 0.330000  0.265000 1.765000 0.435000 ;
+      RECT 0.330000  0.435000 0.660000 0.920000 ;
+      RECT 1.350000  0.435000 1.765000 0.945000 ;
+      RECT 1.595000  0.945000 1.765000 1.885000 ;
+      RECT 1.595000  1.885000 3.195000 2.055000 ;
+      RECT 1.945000  0.085000 2.275000 0.855000 ;
+      RECT 2.640000  0.485000 3.195000 0.855000 ;
+      RECT 2.740000  2.235000 3.070000 3.245000 ;
+      RECT 3.025000  0.855000 3.195000 1.885000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o22ai_lp
diff --git a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef
index 55a2e36..fc321ca 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.magic.lef
@@ -84,16 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.855000  0.085000 2.185000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,27 +92,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.535000 2.845000 0.865000 3.245000 ;
-        RECT 2.115000 2.845000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.385000 0.270000 1.675000 0.440000 ;
-      RECT 0.385000 0.440000 0.715000 0.660000 ;
-      RECT 1.465000 0.440000 1.675000 0.840000 ;
-      RECT 1.465000 0.840000 2.555000 1.010000 ;
-      RECT 2.365000 0.520000 2.555000 0.840000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.385000  0.270000 1.675000 0.440000 ;
+      RECT 0.385000  0.440000 0.715000 0.660000 ;
+      RECT 0.535000  2.845000 0.865000 3.245000 ;
+      RECT 1.465000  0.440000 1.675000 0.840000 ;
+      RECT 1.465000  0.840000 2.555000 1.010000 ;
+      RECT 1.855000  0.085000 2.185000 0.660000 ;
+      RECT 2.115000  2.845000 2.445000 3.245000 ;
+      RECT 2.365000  0.520000 2.555000 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_lp__o22ai_m
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef
index 1d9dd76..f6f74e0 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.magic.lef
@@ -83,19 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.675000  0.085000 0.935000 0.690000 ;
-        RECT 3.000000  0.085000 3.260000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -104,44 +91,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.525000 2.640000 0.835000 3.245000 ;
-        RECT 2.145000 2.515000 2.405000 3.245000 ;
-        RECT 3.325000 2.460000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.495000 0.880000 0.715000 1.550000 ;
-      RECT 0.545000 1.550000 0.715000 2.300000 ;
-      RECT 0.545000 2.300000 1.175000 2.470000 ;
-      RECT 1.005000 2.470000 1.175000 2.905000 ;
-      RECT 1.005000 2.905000 1.975000 3.075000 ;
-      RECT 1.345000 2.405000 1.635000 2.735000 ;
-      RECT 1.465000 1.745000 2.035000 1.915000 ;
-      RECT 1.465000 1.915000 1.635000 2.405000 ;
-      RECT 1.520000 0.395000 1.960000 0.725000 ;
-      RECT 1.790000 0.725000 1.960000 1.585000 ;
-      RECT 1.790000 1.585000 2.035000 1.745000 ;
-      RECT 1.805000 2.175000 2.865000 2.345000 ;
-      RECT 1.805000 2.345000 1.975000 2.905000 ;
-      RECT 2.130000 0.280000 2.375000 0.675000 ;
-      RECT 2.205000 0.675000 2.375000 2.175000 ;
-      RECT 2.545000 0.280000 2.830000 0.780000 ;
-      RECT 2.545000 0.780000 3.725000 0.950000 ;
-      RECT 2.575000 2.345000 2.865000 2.790000 ;
-      RECT 3.430000 0.280000 3.725000 0.780000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.495000  0.880000 0.715000 1.550000 ;
+      RECT 0.525000  2.640000 0.835000 3.245000 ;
+      RECT 0.545000  1.550000 0.715000 2.300000 ;
+      RECT 0.545000  2.300000 1.175000 2.470000 ;
+      RECT 0.675000  0.085000 0.935000 0.690000 ;
+      RECT 1.005000  2.470000 1.175000 2.905000 ;
+      RECT 1.005000  2.905000 1.975000 3.075000 ;
+      RECT 1.345000  2.405000 1.635000 2.735000 ;
+      RECT 1.465000  1.745000 2.035000 1.915000 ;
+      RECT 1.465000  1.915000 1.635000 2.405000 ;
+      RECT 1.520000  0.395000 1.960000 0.725000 ;
+      RECT 1.790000  0.725000 1.960000 1.585000 ;
+      RECT 1.790000  1.585000 2.035000 1.745000 ;
+      RECT 1.805000  2.175000 2.865000 2.345000 ;
+      RECT 1.805000  2.345000 1.975000 2.905000 ;
+      RECT 2.130000  0.280000 2.375000 0.675000 ;
+      RECT 2.145000  2.515000 2.405000 3.245000 ;
+      RECT 2.205000  0.675000 2.375000 2.175000 ;
+      RECT 2.545000  0.280000 2.830000 0.780000 ;
+      RECT 2.545000  0.780000 3.725000 0.950000 ;
+      RECT 2.575000  2.345000 2.865000 2.790000 ;
+      RECT 3.000000  0.085000 3.260000 0.610000 ;
+      RECT 3.325000  2.460000 3.655000 3.245000 ;
+      RECT 3.430000  0.280000 3.725000 0.780000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2bb2a_0
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef
index 27167a3..dd42cc1 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.magic.lef
@@ -79,19 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.525000  0.085000 0.875000 0.690000 ;
-        RECT 2.935000  0.085000 3.265000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -100,44 +87,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.525000 1.815000 0.855000 2.505000 ;
-        RECT 0.525000 2.505000 1.265000 3.245000 ;
-        RECT 1.970000 2.650000 2.300000 3.245000 ;
-        RECT 3.325000 2.510000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 0.860000 1.320000 1.030000 ;
-      RECT 0.525000 1.030000 0.865000 1.515000 ;
-      RECT 1.045000 0.280000 2.370000 0.530000 ;
-      RECT 1.045000 0.530000 1.320000 0.860000 ;
-      RECT 1.435000 2.350000 2.500000 2.480000 ;
-      RECT 1.435000 2.480000 1.675000 2.835000 ;
-      RECT 1.485000 2.310000 2.500000 2.350000 ;
-      RECT 1.550000 0.700000 1.880000 1.405000 ;
-      RECT 1.550000 1.405000 2.500000 1.575000 ;
-      RECT 2.075000 0.530000 2.370000 0.620000 ;
-      RECT 2.175000 0.620000 2.370000 1.055000 ;
-      RECT 2.175000 1.055000 2.840000 1.225000 ;
-      RECT 2.240000 1.575000 2.500000 2.310000 ;
-      RECT 2.505000 2.650000 2.840000 2.920000 ;
-      RECT 2.540000 0.280000 2.765000 0.715000 ;
-      RECT 2.540000 0.715000 3.695000 0.885000 ;
-      RECT 2.670000 1.225000 2.840000 2.650000 ;
-      RECT 3.435000 0.280000 3.695000 0.715000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.525000  0.085000 0.875000 0.690000 ;
+      RECT 0.525000  0.860000 1.320000 1.030000 ;
+      RECT 0.525000  1.030000 0.865000 1.515000 ;
+      RECT 0.525000  1.815000 0.855000 2.505000 ;
+      RECT 0.525000  2.505000 1.265000 3.245000 ;
+      RECT 1.045000  0.280000 2.370000 0.530000 ;
+      RECT 1.045000  0.530000 1.320000 0.860000 ;
+      RECT 1.435000  2.350000 2.500000 2.480000 ;
+      RECT 1.435000  2.480000 1.675000 2.835000 ;
+      RECT 1.485000  2.310000 2.500000 2.350000 ;
+      RECT 1.550000  0.700000 1.880000 1.405000 ;
+      RECT 1.550000  1.405000 2.500000 1.575000 ;
+      RECT 1.970000  2.650000 2.300000 3.245000 ;
+      RECT 2.075000  0.530000 2.370000 0.620000 ;
+      RECT 2.175000  0.620000 2.370000 1.055000 ;
+      RECT 2.175000  1.055000 2.840000 1.225000 ;
+      RECT 2.240000  1.575000 2.500000 2.310000 ;
+      RECT 2.505000  2.650000 2.840000 2.920000 ;
+      RECT 2.540000  0.280000 2.765000 0.715000 ;
+      RECT 2.540000  0.715000 3.695000 0.885000 ;
+      RECT 2.670000  1.225000 2.840000 2.650000 ;
+      RECT 2.935000  0.085000 3.265000 0.545000 ;
+      RECT 3.325000  2.510000 3.655000 3.245000 ;
+      RECT 3.435000  0.280000 3.695000 0.715000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2bb2a_1
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef
index 02b6a52..a127425 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.magic.lef
@@ -79,22 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.745000  0.085000 1.075000 0.485000 ;
-        RECT 3.405000  0.085000 3.745000 1.015000 ;
-        RECT 4.355000  0.085000 4.605000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -103,45 +87,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.295000 1.835000 0.625000 3.245000 ;
-        RECT 1.825000 2.095000 2.155000 3.245000 ;
-        RECT 3.375000 2.025000 3.745000 3.245000 ;
-        RECT 4.355000 1.815000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.295000 0.280000 0.575000 0.655000 ;
-      RECT 0.295000 0.655000 1.490000 0.825000 ;
-      RECT 1.140000 1.835000 2.495000 1.925000 ;
-      RECT 1.140000 1.925000 1.655000 2.515000 ;
-      RECT 1.245000 0.280000 1.490000 0.655000 ;
-      RECT 1.465000 0.995000 1.895000 1.165000 ;
-      RECT 1.465000 1.165000 1.645000 1.755000 ;
-      RECT 1.465000 1.755000 2.495000 1.835000 ;
-      RECT 1.660000 0.280000 1.895000 0.995000 ;
-      RECT 1.815000 1.335000 2.855000 1.585000 ;
-      RECT 2.325000 1.925000 2.495000 2.665000 ;
-      RECT 2.325000 2.665000 3.205000 2.835000 ;
-      RECT 2.470000 0.280000 2.855000 1.335000 ;
-      RECT 2.665000 1.585000 2.855000 2.485000 ;
-      RECT 3.035000 1.685000 3.745000 1.855000 ;
-      RECT 3.035000 1.855000 3.205000 2.665000 ;
-      RECT 3.495000 1.185000 3.745000 1.685000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.295000  0.280000 0.575000 0.655000 ;
+      RECT 0.295000  0.655000 1.490000 0.825000 ;
+      RECT 0.295000  1.835000 0.625000 3.245000 ;
+      RECT 0.745000  0.085000 1.075000 0.485000 ;
+      RECT 1.140000  1.835000 2.495000 1.925000 ;
+      RECT 1.140000  1.925000 1.655000 2.515000 ;
+      RECT 1.245000  0.280000 1.490000 0.655000 ;
+      RECT 1.465000  0.995000 1.895000 1.165000 ;
+      RECT 1.465000  1.165000 1.645000 1.755000 ;
+      RECT 1.465000  1.755000 2.495000 1.835000 ;
+      RECT 1.660000  0.280000 1.895000 0.995000 ;
+      RECT 1.815000  1.335000 2.855000 1.585000 ;
+      RECT 1.825000  2.095000 2.155000 3.245000 ;
+      RECT 2.325000  1.925000 2.495000 2.665000 ;
+      RECT 2.325000  2.665000 3.205000 2.835000 ;
+      RECT 2.470000  0.280000 2.855000 1.335000 ;
+      RECT 2.665000  1.585000 2.855000 2.485000 ;
+      RECT 3.035000  1.685000 3.745000 1.855000 ;
+      RECT 3.035000  1.855000 3.205000 2.665000 ;
+      RECT 3.375000  2.025000 3.745000 3.245000 ;
+      RECT 3.405000  0.085000 3.745000 1.015000 ;
+      RECT 3.495000  1.185000 3.745000 1.685000 ;
+      RECT 4.355000  0.085000 4.605000 1.095000 ;
+      RECT 4.355000  1.815000 4.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 ;
   END
 END sky130_fd_sc_lp__o2bb2a_2
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef
index f4ecd7a..0484d9b 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.magic.lef
@@ -91,31 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.635000  0.085000 0.965000 0.895000 ;
-        RECT 1.495000  0.085000 1.825000 0.485000 ;
-        RECT 3.385000  0.085000 3.645000 0.555000 ;
-        RECT 5.175000  0.085000 5.705000 0.915000 ;
-        RECT 6.305000  0.085000 6.635000 0.875000 ;
-        RECT 7.165000  0.085000 7.495000 0.875000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -124,65 +99,87 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.205000 1.815000 0.455000 3.245000 ;
-        RECT 1.935000 2.670000 2.420000 3.245000 ;
-        RECT 2.195000 1.795000 2.420000 2.670000 ;
-        RECT 3.030000 2.780000 3.700000 3.245000 ;
-        RECT 4.230000 2.780000 4.560000 3.245000 ;
-        RECT 5.105000 2.780000 5.435000 3.245000 ;
-        RECT 6.040000 2.095000 6.370000 3.245000 ;
-        RECT 6.900000 2.095000 7.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 ;
-        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.205000 0.255000 0.465000 1.065000 ;
-      RECT 0.205000 1.065000 1.315000 1.235000 ;
-      RECT 0.625000 2.670000 1.765000 3.000000 ;
-      RECT 0.985000 1.930000 1.665000 2.140000 ;
-      RECT 1.135000 0.255000 1.325000 0.655000 ;
-      RECT 1.135000 0.655000 2.335000 0.825000 ;
-      RECT 1.135000 0.825000 1.315000 1.065000 ;
-      RECT 1.485000 0.995000 2.760000 1.175000 ;
-      RECT 1.485000 1.175000 1.665000 1.930000 ;
-      RECT 2.005000 0.255000 3.125000 0.435000 ;
-      RECT 2.005000 0.435000 2.335000 0.655000 ;
-      RECT 2.505000 0.605000 2.760000 0.995000 ;
-      RECT 2.590000 1.175000 2.760000 1.730000 ;
-      RECT 2.590000 1.730000 2.930000 2.430000 ;
-      RECT 2.590000 2.430000 5.510000 2.610000 ;
-      RECT 2.590000 2.610000 2.860000 3.075000 ;
-      RECT 2.930000 0.435000 3.125000 1.015000 ;
-      RECT 2.930000 1.185000 3.475000 1.515000 ;
-      RECT 3.295000 0.725000 4.575000 0.915000 ;
-      RECT 3.295000 0.915000 3.475000 1.185000 ;
-      RECT 3.295000 1.515000 3.475000 1.930000 ;
-      RECT 3.295000 1.930000 4.945000 2.260000 ;
-      RECT 3.815000 0.255000 5.005000 0.485000 ;
-      RECT 4.245000 0.655000 4.575000 0.725000 ;
-      RECT 4.745000 0.485000 5.005000 0.915000 ;
-      RECT 5.340000 1.405000 7.175000 1.575000 ;
-      RECT 5.340000 1.575000 5.510000 2.430000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.205000  0.255000 0.465000 1.065000 ;
+      RECT 0.205000  1.065000 1.315000 1.235000 ;
+      RECT 0.205000  1.815000 0.455000 3.245000 ;
+      RECT 0.625000  2.670000 1.765000 3.000000 ;
+      RECT 0.635000  0.085000 0.965000 0.895000 ;
+      RECT 0.985000  1.930000 1.665000 2.140000 ;
+      RECT 1.135000  0.255000 1.325000 0.655000 ;
+      RECT 1.135000  0.655000 2.335000 0.825000 ;
+      RECT 1.135000  0.825000 1.315000 1.065000 ;
+      RECT 1.485000  0.995000 2.760000 1.175000 ;
+      RECT 1.485000  1.175000 1.665000 1.930000 ;
+      RECT 1.495000  0.085000 1.825000 0.485000 ;
+      RECT 1.935000  2.670000 2.420000 3.245000 ;
+      RECT 2.005000  0.255000 3.125000 0.435000 ;
+      RECT 2.005000  0.435000 2.335000 0.655000 ;
+      RECT 2.195000  1.795000 2.420000 2.670000 ;
+      RECT 2.505000  0.605000 2.760000 0.995000 ;
+      RECT 2.590000  1.175000 2.760000 1.730000 ;
+      RECT 2.590000  1.730000 2.930000 2.430000 ;
+      RECT 2.590000  2.430000 5.510000 2.610000 ;
+      RECT 2.590000  2.610000 2.860000 3.075000 ;
+      RECT 2.930000  0.435000 3.125000 1.015000 ;
+      RECT 2.930000  1.185000 3.475000 1.515000 ;
+      RECT 3.030000  2.780000 3.700000 3.245000 ;
+      RECT 3.295000  0.725000 4.575000 0.915000 ;
+      RECT 3.295000  0.915000 3.475000 1.185000 ;
+      RECT 3.295000  1.515000 3.475000 1.930000 ;
+      RECT 3.295000  1.930000 4.945000 2.260000 ;
+      RECT 3.385000  0.085000 3.645000 0.555000 ;
+      RECT 3.815000  0.255000 5.005000 0.485000 ;
+      RECT 4.230000  2.780000 4.560000 3.245000 ;
+      RECT 4.245000  0.655000 4.575000 0.725000 ;
+      RECT 4.745000  0.485000 5.005000 0.915000 ;
+      RECT 5.105000  2.780000 5.435000 3.245000 ;
+      RECT 5.175000  0.085000 5.705000 0.915000 ;
+      RECT 5.340000  1.405000 7.175000 1.575000 ;
+      RECT 5.340000  1.575000 5.510000 2.430000 ;
+      RECT 6.040000  2.095000 6.370000 3.245000 ;
+      RECT 6.305000  0.085000 6.635000 0.875000 ;
+      RECT 6.900000  2.095000 7.230000 3.245000 ;
+      RECT 7.165000  0.085000 7.495000 0.875000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2bb2a_4
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef
index cfdb7d8..9e783ca 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.magic.lef
@@ -79,20 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.915000  0.085000 1.245000 0.680000 ;
-        RECT 3.445000  0.085000 3.695000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -101,42 +87,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.655000 2.840000 0.985000 3.245000 ;
-        RECT 2.025000 2.840000 2.355000 3.245000 ;
-        RECT 3.875000 2.060000 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.635000 0.860000 2.835000 1.030000 ;
-      RECT 0.635000 1.030000 0.965000 1.190000 ;
-      RECT 0.635000 1.190000 0.805000 2.490000 ;
-      RECT 0.635000 2.490000 3.145000 2.660000 ;
-      RECT 1.495000 2.060000 2.625000 2.310000 ;
-      RECT 1.735000 0.265000 2.835000 0.595000 ;
-      RECT 1.735000 0.595000 2.065000 0.680000 ;
-      RECT 2.455000 1.500000 2.785000 1.830000 ;
-      RECT 2.455000 1.830000 2.625000 2.060000 ;
-      RECT 2.505000 0.775000 2.835000 0.860000 ;
-      RECT 2.505000 1.030000 2.835000 1.150000 ;
-      RECT 2.815000 2.060000 3.145000 2.490000 ;
-      RECT 2.815000 2.660000 3.145000 3.065000 ;
-      RECT 3.015000 0.690000 3.265000 1.200000 ;
-      RECT 3.015000 1.200000 4.205000 1.370000 ;
-      RECT 3.875000 0.850000 4.205000 1.200000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.635000  0.860000 2.835000 1.030000 ;
+      RECT 0.635000  1.030000 0.965000 1.190000 ;
+      RECT 0.635000  1.190000 0.805000 2.490000 ;
+      RECT 0.635000  2.490000 3.145000 2.660000 ;
+      RECT 0.655000  2.840000 0.985000 3.245000 ;
+      RECT 0.915000  0.085000 1.245000 0.680000 ;
+      RECT 1.495000  2.060000 2.625000 2.310000 ;
+      RECT 1.735000  0.265000 2.835000 0.595000 ;
+      RECT 1.735000  0.595000 2.065000 0.680000 ;
+      RECT 2.025000  2.840000 2.355000 3.245000 ;
+      RECT 2.455000  1.500000 2.785000 1.830000 ;
+      RECT 2.455000  1.830000 2.625000 2.060000 ;
+      RECT 2.505000  0.775000 2.835000 0.860000 ;
+      RECT 2.505000  1.030000 2.835000 1.150000 ;
+      RECT 2.815000  2.060000 3.145000 2.490000 ;
+      RECT 2.815000  2.660000 3.145000 3.065000 ;
+      RECT 3.015000  0.690000 3.265000 1.200000 ;
+      RECT 3.015000  1.200000 4.205000 1.370000 ;
+      RECT 3.445000  0.085000 3.695000 1.020000 ;
+      RECT 3.875000  0.850000 4.205000 1.200000 ;
+      RECT 3.875000  2.060000 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_lp__o2bb2a_lp
diff --git a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef
index 2e1f246..e01e77c 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.magic.lef
@@ -81,19 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.720000  0.085000 0.930000 0.545000 ;
-        RECT 2.860000  0.085000 3.190000 1.045000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,38 +89,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.570000 2.845000 0.900000 3.245000 ;
-        RECT 1.695000 2.845000 2.025000 3.245000 ;
-        RECT 3.130000 2.845000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 0.935000 0.675000 1.575000 ;
-      RECT 0.505000 1.575000 2.375000 1.745000 ;
-      RECT 1.080000 2.670000 1.515000 3.000000 ;
-      RECT 1.345000 2.265000 2.025000 2.435000 ;
-      RECT 1.345000 2.435000 1.515000 2.670000 ;
-      RECT 1.695000 1.925000 2.025000 2.265000 ;
-      RECT 1.835000 0.275000 2.425000 0.605000 ;
-      RECT 2.040000 0.945000 2.250000 1.575000 ;
-      RECT 2.205000 1.745000 2.375000 2.670000 ;
-      RECT 2.205000 2.670000 2.610000 3.000000 ;
-      RECT 2.470000 0.945000 2.680000 1.225000 ;
-      RECT 2.470000 1.225000 3.580000 1.395000 ;
-      RECT 3.370000 0.945000 3.580000 1.225000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.505000  0.935000 0.675000 1.575000 ;
+      RECT 0.505000  1.575000 2.375000 1.745000 ;
+      RECT 0.570000  2.845000 0.900000 3.245000 ;
+      RECT 0.720000  0.085000 0.930000 0.545000 ;
+      RECT 1.080000  2.670000 1.515000 3.000000 ;
+      RECT 1.345000  2.265000 2.025000 2.435000 ;
+      RECT 1.345000  2.435000 1.515000 2.670000 ;
+      RECT 1.695000  1.925000 2.025000 2.265000 ;
+      RECT 1.695000  2.845000 2.025000 3.245000 ;
+      RECT 1.835000  0.275000 2.425000 0.605000 ;
+      RECT 2.040000  0.945000 2.250000 1.575000 ;
+      RECT 2.205000  1.745000 2.375000 2.670000 ;
+      RECT 2.205000  2.670000 2.610000 3.000000 ;
+      RECT 2.470000  0.945000 2.680000 1.225000 ;
+      RECT 2.470000  1.225000 3.580000 1.395000 ;
+      RECT 2.860000  0.085000 3.190000 1.045000 ;
+      RECT 3.130000  2.845000 3.460000 3.245000 ;
+      RECT 3.370000  0.945000 3.580000 1.225000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2bb2a_m
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef
index 03c1a3f..cddc403 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.magic.lef
@@ -83,18 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.130000  0.085000 0.460000 0.655000 ;
-        RECT 2.475000  0.085000 2.735000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -103,32 +91,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.685000 2.395000 0.980000 3.245000 ;
-        RECT 1.555000 2.395000 1.865000 3.245000 ;
-        RECT 2.795000 2.395000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.950000 0.325000 1.365000 0.655000 ;
-      RECT 1.150000 2.395000 1.385000 3.065000 ;
-      RECT 1.195000 0.655000 1.365000 0.810000 ;
-      RECT 1.195000 0.810000 1.545000 1.400000 ;
-      RECT 1.195000 1.400000 1.385000 2.395000 ;
-      RECT 2.065000 0.280000 2.305000 0.780000 ;
-      RECT 2.065000 0.780000 3.205000 0.950000 ;
-      RECT 2.905000 0.280000 3.205000 0.780000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.130000  0.085000 0.460000 0.655000 ;
+      RECT 0.685000  2.395000 0.980000 3.245000 ;
+      RECT 0.950000  0.325000 1.365000 0.655000 ;
+      RECT 1.150000  2.395000 1.385000 3.065000 ;
+      RECT 1.195000  0.655000 1.365000 0.810000 ;
+      RECT 1.195000  0.810000 1.545000 1.400000 ;
+      RECT 1.195000  1.400000 1.385000 2.395000 ;
+      RECT 1.555000  2.395000 1.865000 3.245000 ;
+      RECT 2.065000  0.280000 2.305000 0.780000 ;
+      RECT 2.065000  0.780000 3.205000 0.950000 ;
+      RECT 2.475000  0.085000 2.735000 0.610000 ;
+      RECT 2.795000  2.395000 3.125000 3.245000 ;
+      RECT 2.905000  0.280000 3.205000 0.780000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o2bb2ai_0
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef
index 671efb1..422c992 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.magic.lef
@@ -85,18 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.120000  0.085000 0.450000 1.040000 ;
-        RECT 2.455000  0.085000 2.785000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -105,35 +93,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.120000 1.920000 0.450000 3.245000 ;
-        RECT 0.980000 2.095000 1.820000 3.245000 ;
-        RECT 2.915000 1.920000 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.620000 1.755000 1.415000 1.925000 ;
-      RECT 0.620000 1.925000 0.810000 3.075000 ;
-      RECT 0.985000 0.255000 1.315000 0.820000 ;
-      RECT 0.985000 0.820000 1.375000 1.040000 ;
-      RECT 1.205000 1.040000 1.375000 1.405000 ;
-      RECT 1.205000 1.405000 1.760000 1.675000 ;
-      RECT 1.205000 1.675000 1.415000 1.755000 ;
-      RECT 1.955000 0.285000 2.285000 0.725000 ;
-      RECT 1.955000 0.725000 3.245000 0.895000 ;
-      RECT 2.270000 0.895000 3.245000 1.015000 ;
-      RECT 2.975000 0.265000 3.245000 0.725000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.120000  0.085000 0.450000 1.040000 ;
+      RECT 0.120000  1.920000 0.450000 3.245000 ;
+      RECT 0.620000  1.755000 1.415000 1.925000 ;
+      RECT 0.620000  1.925000 0.810000 3.075000 ;
+      RECT 0.980000  2.095000 1.820000 3.245000 ;
+      RECT 0.985000  0.255000 1.315000 0.820000 ;
+      RECT 0.985000  0.820000 1.375000 1.040000 ;
+      RECT 1.205000  1.040000 1.375000 1.405000 ;
+      RECT 1.205000  1.405000 1.760000 1.675000 ;
+      RECT 1.205000  1.675000 1.415000 1.755000 ;
+      RECT 1.955000  0.285000 2.285000 0.725000 ;
+      RECT 1.955000  0.725000 3.245000 0.895000 ;
+      RECT 2.270000  0.895000 3.245000 1.015000 ;
+      RECT 2.455000  0.085000 2.785000 0.555000 ;
+      RECT 2.915000  1.920000 3.245000 3.245000 ;
+      RECT 2.975000  0.265000 3.245000 0.725000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o2bb2ai_1
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef
index e5a09fb..7e79ed1 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.magic.lef
@@ -85,25 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.760000 0.085000 ;
-        RECT 0.170000  0.085000 0.475000 1.205000 ;
-        RECT 1.890000  0.085000 2.220000 0.660000 ;
-        RECT 3.840000  0.085000 4.170000 0.700000 ;
-        RECT 4.700000  0.085000 5.030000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -112,50 +93,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.170000 2.270000 0.500000 3.245000 ;
-        RECT 1.030000 2.600000 1.360000 3.245000 ;
-        RECT 1.925000 2.620000 2.730000 3.245000 ;
-        RECT 2.520000 1.815000 2.730000 2.620000 ;
-        RECT 3.400000 2.760000 3.630000 3.245000 ;
-        RECT 5.130000 2.260000 5.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.760000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.645000 0.305000 1.710000 0.660000 ;
-      RECT 0.645000 0.660000 0.860000 1.090000 ;
-      RECT 0.670000 2.260000 2.350000 2.430000 ;
-      RECT 0.670000 2.430000 0.860000 3.075000 ;
-      RECT 1.030000 0.830000 2.350000 1.040000 ;
-      RECT 1.530000 2.430000 2.350000 2.450000 ;
-      RECT 1.530000 2.450000 1.755000 3.075000 ;
-      RECT 2.180000 1.040000 2.350000 1.375000 ;
-      RECT 2.180000 1.375000 2.565000 1.625000 ;
-      RECT 2.180000 1.625000 2.350000 2.260000 ;
-      RECT 2.520000 0.255000 3.670000 0.425000 ;
-      RECT 2.520000 0.425000 2.730000 1.205000 ;
-      RECT 3.410000 0.425000 3.670000 0.870000 ;
-      RECT 3.410000 0.870000 5.460000 1.040000 ;
-      RECT 3.800000 2.760000 4.950000 3.075000 ;
-      RECT 4.340000 0.325000 4.530000 0.870000 ;
-      RECT 4.720000 2.260000 4.950000 2.760000 ;
-      RECT 5.200000 0.325000 5.460000 0.870000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.170000  0.085000 0.475000 1.205000 ;
+      RECT 0.170000  2.270000 0.500000 3.245000 ;
+      RECT 0.645000  0.305000 1.710000 0.660000 ;
+      RECT 0.645000  0.660000 0.860000 1.090000 ;
+      RECT 0.670000  2.260000 2.350000 2.430000 ;
+      RECT 0.670000  2.430000 0.860000 3.075000 ;
+      RECT 1.030000  0.830000 2.350000 1.040000 ;
+      RECT 1.030000  2.600000 1.360000 3.245000 ;
+      RECT 1.530000  2.430000 2.350000 2.450000 ;
+      RECT 1.530000  2.450000 1.755000 3.075000 ;
+      RECT 1.890000  0.085000 2.220000 0.660000 ;
+      RECT 1.925000  2.620000 2.730000 3.245000 ;
+      RECT 2.180000  1.040000 2.350000 1.375000 ;
+      RECT 2.180000  1.375000 2.565000 1.625000 ;
+      RECT 2.180000  1.625000 2.350000 2.260000 ;
+      RECT 2.520000  0.255000 3.670000 0.425000 ;
+      RECT 2.520000  0.425000 2.730000 1.205000 ;
+      RECT 2.520000  1.815000 2.730000 2.620000 ;
+      RECT 3.400000  2.760000 3.630000 3.245000 ;
+      RECT 3.410000  0.425000 3.670000 0.870000 ;
+      RECT 3.410000  0.870000 5.460000 1.040000 ;
+      RECT 3.800000  2.760000 4.950000 3.075000 ;
+      RECT 3.840000  0.085000 4.170000 0.700000 ;
+      RECT 4.340000  0.325000 4.530000 0.870000 ;
+      RECT 4.700000  0.085000 5.030000 0.700000 ;
+      RECT 4.720000  2.260000 4.950000 2.760000 ;
+      RECT 5.130000  2.260000 5.460000 3.245000 ;
+      RECT 5.200000  0.325000 5.460000 0.870000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2bb2ai_2
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef
index 1a8f1d5..4bf11e6 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.magic.lef
@@ -92,36 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.565000  0.085000  0.895000 0.905000 ;
-        RECT 1.425000  0.085000  1.755000 0.905000 ;
-        RECT 2.285000  0.085000  2.615000 0.905000 ;
-        RECT 3.145000  0.085000  3.485000 0.915000 ;
-        RECT 6.565000  0.085000  6.895000 0.700000 ;
-        RECT 7.425000  0.085000  7.755000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -130,82 +100,109 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.265000 1.815000  0.475000 3.245000 ;
-        RECT 1.065000 2.690000  1.395000 3.245000 ;
-        RECT 3.745000 2.800000  4.045000 3.245000 ;
-        RECT 4.575000 2.115000  4.905000 3.245000 ;
-        RECT 5.435000 2.125000  6.110000 3.245000 ;
-        RECT 6.640000 2.125000  6.970000 3.245000 ;
-        RECT 7.500000 2.125000  8.170000 3.245000 ;
-        RECT 8.700000 2.125000  9.030000 3.245000 ;
-        RECT 9.560000 2.115000  9.890000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.135000 0.305000 0.385000 1.075000 ;
-      RECT 0.135000 1.075000 2.975000 1.085000 ;
-      RECT 0.135000 1.085000 3.825000 1.255000 ;
-      RECT 0.695000 1.815000 0.885000 2.350000 ;
-      RECT 0.695000 2.350000 1.785000 2.520000 ;
-      RECT 0.695000 2.520000 0.895000 3.075000 ;
-      RECT 1.065000 0.305000 1.255000 1.075000 ;
-      RECT 1.575000 2.520000 1.785000 2.800000 ;
-      RECT 1.575000 2.800000 3.575000 3.075000 ;
-      RECT 1.925000 0.305000 2.115000 1.075000 ;
-      RECT 2.785000 0.305000 2.975000 1.075000 ;
-      RECT 3.655000 0.265000 5.945000 0.435000 ;
-      RECT 3.655000 0.435000 3.985000 0.905000 ;
-      RECT 3.655000 0.905000 3.825000 1.085000 ;
-      RECT 4.345000 1.425000 5.725000 1.595000 ;
-      RECT 4.675000 0.435000 5.005000 0.895000 ;
-      RECT 5.555000 1.595000 5.725000 1.765000 ;
-      RECT 5.555000 1.765000 9.995000 1.945000 ;
-      RECT 5.685000 0.435000 5.945000 1.040000 ;
-      RECT 6.135000 0.305000 6.395000 0.870000 ;
-      RECT 6.135000 0.870000 7.255000 1.040000 ;
-      RECT 6.280000 1.945000 6.470000 3.075000 ;
-      RECT 7.055000 1.040000 7.255000 1.075000 ;
-      RECT 7.055000 1.075000 8.115000 1.245000 ;
-      RECT 7.065000 0.305000 7.255000 0.870000 ;
-      RECT 7.140000 1.945000 7.330000 3.075000 ;
-      RECT 7.925000 0.265000 9.985000 0.435000 ;
-      RECT 7.925000 0.435000 8.115000 1.075000 ;
-      RECT 8.285000 0.605000 8.585000 0.815000 ;
-      RECT 8.285000 0.815000 9.475000 1.000000 ;
-      RECT 8.340000 1.945000 8.530000 3.075000 ;
-      RECT 8.755000 0.435000 8.975000 0.635000 ;
-      RECT 9.145000 0.605000 9.475000 0.815000 ;
-      RECT 9.145000 1.000000 9.475000 1.075000 ;
-      RECT 9.145000 1.075000 9.995000 1.255000 ;
-      RECT 9.210000 1.945000 9.390000 3.075000 ;
-      RECT 9.655000 0.435000 9.985000 0.905000 ;
-      RECT 9.815000 1.255000 9.995000 1.765000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.135000  0.305000  0.385000 1.075000 ;
+      RECT 0.135000  1.075000  2.975000 1.085000 ;
+      RECT 0.135000  1.085000  3.825000 1.255000 ;
+      RECT 0.265000  1.815000  0.475000 3.245000 ;
+      RECT 0.565000  0.085000  0.895000 0.905000 ;
+      RECT 0.695000  1.815000  0.885000 2.350000 ;
+      RECT 0.695000  2.350000  1.785000 2.520000 ;
+      RECT 0.695000  2.520000  0.895000 3.075000 ;
+      RECT 1.065000  0.305000  1.255000 1.075000 ;
+      RECT 1.065000  2.690000  1.395000 3.245000 ;
+      RECT 1.425000  0.085000  1.755000 0.905000 ;
+      RECT 1.575000  2.520000  1.785000 2.800000 ;
+      RECT 1.575000  2.800000  3.575000 3.075000 ;
+      RECT 1.925000  0.305000  2.115000 1.075000 ;
+      RECT 2.285000  0.085000  2.615000 0.905000 ;
+      RECT 2.785000  0.305000  2.975000 1.075000 ;
+      RECT 3.145000  0.085000  3.485000 0.915000 ;
+      RECT 3.655000  0.265000  5.945000 0.435000 ;
+      RECT 3.655000  0.435000  3.985000 0.905000 ;
+      RECT 3.655000  0.905000  3.825000 1.085000 ;
+      RECT 3.745000  2.800000  4.045000 3.245000 ;
+      RECT 4.345000  1.425000  5.725000 1.595000 ;
+      RECT 4.575000  2.115000  4.905000 3.245000 ;
+      RECT 4.675000  0.435000  5.005000 0.895000 ;
+      RECT 5.435000  2.125000  6.110000 3.245000 ;
+      RECT 5.555000  1.595000  5.725000 1.765000 ;
+      RECT 5.555000  1.765000  9.995000 1.945000 ;
+      RECT 5.685000  0.435000  5.945000 1.040000 ;
+      RECT 6.135000  0.305000  6.395000 0.870000 ;
+      RECT 6.135000  0.870000  7.255000 1.040000 ;
+      RECT 6.280000  1.945000  6.470000 3.075000 ;
+      RECT 6.565000  0.085000  6.895000 0.700000 ;
+      RECT 6.640000  2.125000  6.970000 3.245000 ;
+      RECT 7.055000  1.040000  7.255000 1.075000 ;
+      RECT 7.055000  1.075000  8.115000 1.245000 ;
+      RECT 7.065000  0.305000  7.255000 0.870000 ;
+      RECT 7.140000  1.945000  7.330000 3.075000 ;
+      RECT 7.425000  0.085000  7.755000 0.905000 ;
+      RECT 7.500000  2.125000  8.170000 3.245000 ;
+      RECT 7.925000  0.265000  9.985000 0.435000 ;
+      RECT 7.925000  0.435000  8.115000 1.075000 ;
+      RECT 8.285000  0.605000  8.585000 0.815000 ;
+      RECT 8.285000  0.815000  9.475000 1.000000 ;
+      RECT 8.340000  1.945000  8.530000 3.075000 ;
+      RECT 8.700000  2.125000  9.030000 3.245000 ;
+      RECT 8.755000  0.435000  8.975000 0.635000 ;
+      RECT 9.145000  0.605000  9.475000 0.815000 ;
+      RECT 9.145000  1.000000  9.475000 1.075000 ;
+      RECT 9.145000  1.075000  9.995000 1.255000 ;
+      RECT 9.210000  1.945000  9.390000 3.075000 ;
+      RECT 9.560000  2.115000  9.890000 3.245000 ;
+      RECT 9.655000  0.435000  9.985000 0.905000 ;
+      RECT 9.815000  1.255000  9.995000 1.765000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o2bb2ai_4
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.magic.lef
index 35aeff3..cfeff1c 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.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.725000 ;
-        RECT 2.405000  0.085000 2.735000 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 ;
       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.160000 2.075000 0.490000 3.245000 ;
-        RECT 1.230000 2.115000 1.560000 3.245000 ;
-        RECT 2.915000 2.075000 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.670000 0.555000 1.265000 0.725000 ;
-      RECT 0.670000 0.725000 0.840000 1.765000 ;
-      RECT 0.670000 1.765000 1.755000 1.935000 ;
-      RECT 0.670000 1.935000 1.030000 3.065000 ;
-      RECT 0.935000 0.265000 1.265000 0.555000 ;
-      RECT 1.505000 1.605000 1.755000 1.765000 ;
-      RECT 2.055000 0.460000 2.225000 0.845000 ;
-      RECT 2.055000 0.845000 3.195000 1.015000 ;
-      RECT 2.915000 0.460000 3.195000 0.845000 ;
+      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.725000 ;
+      RECT 0.160000  2.075000 0.490000 3.245000 ;
+      RECT 0.670000  0.555000 1.265000 0.725000 ;
+      RECT 0.670000  0.725000 0.840000 1.765000 ;
+      RECT 0.670000  1.765000 1.755000 1.935000 ;
+      RECT 0.670000  1.935000 1.030000 3.065000 ;
+      RECT 0.935000  0.265000 1.265000 0.555000 ;
+      RECT 1.230000  2.115000 1.560000 3.245000 ;
+      RECT 1.505000  1.605000 1.755000 1.765000 ;
+      RECT 2.055000  0.460000 2.225000 0.845000 ;
+      RECT 2.055000  0.845000 3.195000 1.015000 ;
+      RECT 2.405000  0.085000 2.735000 0.675000 ;
+      RECT 2.915000  0.460000 3.195000 0.845000 ;
+      RECT 2.915000  2.075000 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_lp__o2bb2ai_lp
diff --git a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef
index 9956bee..3ca6e15 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.magic.lef
@@ -83,18 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.125000  0.085000 0.455000 0.655000 ;
-        RECT 2.515000  0.085000 2.725000 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
@@ -103,31 +91,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.095000 2.845000 0.425000 3.245000 ;
-        RECT 0.975000 2.845000 1.305000 3.245000 ;
-        RECT 2.285000 2.845000 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.605000 2.345000 1.440000 2.515000 ;
-      RECT 0.605000 2.515000 0.795000 2.985000 ;
-      RECT 0.915000 0.450000 1.440000 0.660000 ;
-      RECT 1.270000 0.660000 1.440000 2.345000 ;
-      RECT 2.085000 0.520000 2.295000 0.860000 ;
-      RECT 2.085000 0.860000 3.155000 1.030000 ;
-      RECT 2.945000 0.500000 3.155000 0.860000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  2.845000 0.425000 3.245000 ;
+      RECT 0.125000  0.085000 0.455000 0.655000 ;
+      RECT 0.605000  2.345000 1.440000 2.515000 ;
+      RECT 0.605000  2.515000 0.795000 2.985000 ;
+      RECT 0.915000  0.450000 1.440000 0.660000 ;
+      RECT 0.975000  2.845000 1.305000 3.245000 ;
+      RECT 1.270000  0.660000 1.440000 2.345000 ;
+      RECT 2.085000  0.520000 2.295000 0.860000 ;
+      RECT 2.085000  0.860000 3.155000 1.030000 ;
+      RECT 2.285000  2.845000 2.615000 3.245000 ;
+      RECT 2.515000  0.085000 2.725000 0.680000 ;
+      RECT 2.945000  0.500000 3.155000 0.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 ;
   END
 END sky130_fd_sc_lp__o2bb2ai_m
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef
index 35b32d4..c6ad453 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_0.magic.lef
@@ -91,19 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.985000  0.085000 1.315000 0.650000 ;
-        RECT 1.865000  0.085000 2.195000 0.570000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,33 +99,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.840000 2.385000 1.170000 3.245000 ;
-        RECT 2.740000 2.395000 3.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.550000 1.545000 0.855000 2.045000 ;
-      RECT 0.550000 2.045000 3.515000 2.215000 ;
-      RECT 1.505000 0.320000 1.695000 0.740000 ;
-      RECT 1.505000 0.740000 2.695000 0.910000 ;
-      RECT 2.240000 2.215000 2.570000 3.065000 ;
-      RECT 2.365000 0.320000 2.695000 0.740000 ;
-      RECT 3.090000 0.320000 3.485000 0.650000 ;
-      RECT 3.090000 0.650000 3.305000 2.045000 ;
-      RECT 3.240000 2.215000 3.515000 3.065000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.550000  1.545000 0.855000 2.045000 ;
+      RECT 0.550000  2.045000 3.515000 2.215000 ;
+      RECT 0.840000  2.385000 1.170000 3.245000 ;
+      RECT 0.985000  0.085000 1.315000 0.650000 ;
+      RECT 1.505000  0.320000 1.695000 0.740000 ;
+      RECT 1.505000  0.740000 2.695000 0.910000 ;
+      RECT 1.865000  0.085000 2.195000 0.570000 ;
+      RECT 2.240000  2.215000 2.570000 3.065000 ;
+      RECT 2.365000  0.320000 2.695000 0.740000 ;
+      RECT 2.740000  2.395000 3.070000 3.245000 ;
+      RECT 3.090000  0.320000 3.485000 0.650000 ;
+      RECT 3.090000  0.650000 3.305000 2.045000 ;
+      RECT 3.240000  2.215000 3.515000 3.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o311a_0
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_1.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_1.magic.lef
index 885c606..b258811 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_1.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_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.585000  0.085000 0.915000 1.095000 ;
-        RECT 1.885000  0.085000 2.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
@@ -111,33 +98,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.840000 2.045000 1.170000 3.245000 ;
-        RECT 2.800000 2.045000 3.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.535000 1.345000 0.795000 1.705000 ;
-      RECT 0.535000 1.705000 3.650000 1.875000 ;
-      RECT 1.455000 0.255000 1.675000 0.845000 ;
-      RECT 1.455000 0.845000 2.780000 1.015000 ;
-      RECT 2.260000 1.875000 2.590000 3.075000 ;
-      RECT 2.450000 0.255000 2.780000 0.845000 ;
-      RECT 3.075000 0.255000 3.620000 1.015000 ;
-      RECT 3.075000 1.015000 3.245000 1.705000 ;
-      RECT 3.380000 1.875000 3.650000 3.075000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.535000  1.345000 0.795000 1.705000 ;
+      RECT 0.535000  1.705000 3.650000 1.875000 ;
+      RECT 0.585000  0.085000 0.915000 1.095000 ;
+      RECT 0.840000  2.045000 1.170000 3.245000 ;
+      RECT 1.455000  0.255000 1.675000 0.845000 ;
+      RECT 1.455000  0.845000 2.780000 1.015000 ;
+      RECT 1.885000  0.085000 2.215000 0.675000 ;
+      RECT 2.260000  1.875000 2.590000 3.075000 ;
+      RECT 2.450000  0.255000 2.780000 0.845000 ;
+      RECT 2.800000  2.045000 3.130000 3.245000 ;
+      RECT 3.075000  0.255000 3.620000 1.015000 ;
+      RECT 3.075000  1.015000 3.245000 1.705000 ;
+      RECT 3.380000  1.875000 3.650000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o311a_1
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef
index 56f06d2..b2a39df 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_2.magic.lef
@@ -91,21 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.120000  0.085000 0.425000 1.095000 ;
-        RECT 0.980000  0.085000 1.650000 0.835000 ;
-        RECT 2.345000  0.085000 2.675000 0.495000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -114,38 +99,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.155000 1.815000 0.425000 3.245000 ;
-        RECT 1.155000 1.855000 1.425000 3.245000 ;
-        RECT 3.305000 2.270000 3.635000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.980000 1.005000 4.060000 1.165000 ;
-      RECT 0.980000 1.165000 3.675000 1.175000 ;
-      RECT 0.980000 1.175000 1.235000 1.515000 ;
-      RECT 1.820000 0.255000 2.150000 0.665000 ;
-      RECT 1.820000 0.665000 3.215000 0.835000 ;
-      RECT 2.885000 0.255000 3.215000 0.665000 ;
-      RECT 2.895000 1.920000 3.675000 1.930000 ;
-      RECT 2.895000 1.930000 4.065000 2.100000 ;
-      RECT 2.895000 2.100000 3.135000 3.075000 ;
-      RECT 3.485000 1.175000 3.675000 1.920000 ;
-      RECT 3.520000 0.255000 4.060000 1.005000 ;
-      RECT 3.805000 2.100000 4.065000 3.075000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.120000  0.085000 0.425000 1.095000 ;
+      RECT 0.155000  1.815000 0.425000 3.245000 ;
+      RECT 0.980000  0.085000 1.650000 0.835000 ;
+      RECT 0.980000  1.005000 4.060000 1.165000 ;
+      RECT 0.980000  1.165000 3.675000 1.175000 ;
+      RECT 0.980000  1.175000 1.235000 1.515000 ;
+      RECT 1.155000  1.855000 1.425000 3.245000 ;
+      RECT 1.820000  0.255000 2.150000 0.665000 ;
+      RECT 1.820000  0.665000 3.215000 0.835000 ;
+      RECT 2.345000  0.085000 2.675000 0.495000 ;
+      RECT 2.885000  0.255000 3.215000 0.665000 ;
+      RECT 2.895000  1.920000 3.675000 1.930000 ;
+      RECT 2.895000  1.930000 4.065000 2.100000 ;
+      RECT 2.895000  2.100000 3.135000 3.075000 ;
+      RECT 3.305000  2.270000 3.635000 3.245000 ;
+      RECT 3.485000  1.175000 3.675000 1.920000 ;
+      RECT 3.520000  0.255000 4.060000 1.005000 ;
+      RECT 3.805000  2.100000 4.065000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o311a_2
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef
index 60e0a2a..4a4273a 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_4.magic.lef
@@ -95,32 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.100000  0.085000 0.430000 0.885000 ;
-        RECT 0.960000  0.085000 1.290000 0.895000 ;
-        RECT 1.860000  0.085000 2.150000 1.105000 ;
-        RECT 5.010000  0.085000 5.840000 0.700000 ;
-        RECT 6.370000  0.085000 6.700000 0.915000 ;
-        RECT 7.230000  0.085000 7.560000 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
@@ -129,67 +103,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.475000 2.095000 0.805000 3.245000 ;
-        RECT 1.335000 2.105000 1.665000 3.245000 ;
-        RECT 2.195000 2.045000 2.525000 3.245000 ;
-        RECT 3.095000 2.045000 3.425000 3.245000 ;
-        RECT 3.990000 2.045000 4.320000 3.245000 ;
-        RECT 7.230000 2.270000 7.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 ;
-        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.530000 1.405000 2.795000 1.585000 ;
-      RECT 2.195000 1.585000 2.795000 1.705000 ;
-      RECT 2.195000 1.705000 5.235000 1.875000 ;
-      RECT 2.320000 0.765000 3.100000 1.015000 ;
-      RECT 2.320000 1.015000 2.795000 1.405000 ;
-      RECT 2.340000 0.255000 4.390000 0.435000 ;
-      RECT 2.340000 0.435000 3.460000 0.595000 ;
-      RECT 2.695000 1.875000 2.925000 3.075000 ;
-      RECT 3.270000 0.595000 3.460000 1.025000 ;
-      RECT 3.595000 1.875000 3.820000 3.075000 ;
-      RECT 3.630000 0.615000 3.960000 0.855000 ;
-      RECT 3.630000 0.855000 4.840000 0.870000 ;
-      RECT 3.630000 0.870000 6.200000 1.025000 ;
-      RECT 3.955000 1.025000 6.200000 1.040000 ;
-      RECT 4.130000 0.435000 4.390000 0.685000 ;
-      RECT 4.510000 2.045000 4.840000 2.905000 ;
-      RECT 4.510000 2.905000 6.700000 3.075000 ;
-      RECT 4.580000 0.255000 4.840000 0.855000 ;
-      RECT 5.010000 1.875000 5.235000 2.735000 ;
-      RECT 5.405000 1.705000 5.680000 2.905000 ;
-      RECT 5.940000 1.930000 7.990000 2.100000 ;
-      RECT 5.940000 2.100000 6.200000 2.735000 ;
-      RECT 6.000000 1.040000 6.200000 1.085000 ;
-      RECT 6.000000 1.085000 7.990000 1.255000 ;
-      RECT 6.010000 0.255000 6.200000 0.870000 ;
-      RECT 6.370000 2.270000 6.700000 2.905000 ;
-      RECT 6.870000 0.255000 7.060000 1.085000 ;
-      RECT 6.870000 2.100000 7.060000 3.075000 ;
-      RECT 7.730000 0.255000 7.990000 1.085000 ;
-      RECT 7.730000 2.100000 7.990000 3.075000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.100000  0.085000 0.430000 0.885000 ;
+      RECT 0.475000  2.095000 0.805000 3.245000 ;
+      RECT 0.530000  1.405000 2.795000 1.585000 ;
+      RECT 0.960000  0.085000 1.290000 0.895000 ;
+      RECT 1.335000  2.105000 1.665000 3.245000 ;
+      RECT 1.860000  0.085000 2.150000 1.105000 ;
+      RECT 2.195000  1.585000 2.795000 1.705000 ;
+      RECT 2.195000  1.705000 5.235000 1.875000 ;
+      RECT 2.195000  2.045000 2.525000 3.245000 ;
+      RECT 2.320000  0.765000 3.100000 1.015000 ;
+      RECT 2.320000  1.015000 2.795000 1.405000 ;
+      RECT 2.340000  0.255000 4.390000 0.435000 ;
+      RECT 2.340000  0.435000 3.460000 0.595000 ;
+      RECT 2.695000  1.875000 2.925000 3.075000 ;
+      RECT 3.095000  2.045000 3.425000 3.245000 ;
+      RECT 3.270000  0.595000 3.460000 1.025000 ;
+      RECT 3.595000  1.875000 3.820000 3.075000 ;
+      RECT 3.630000  0.615000 3.960000 0.855000 ;
+      RECT 3.630000  0.855000 4.840000 0.870000 ;
+      RECT 3.630000  0.870000 6.200000 1.025000 ;
+      RECT 3.955000  1.025000 6.200000 1.040000 ;
+      RECT 3.990000  2.045000 4.320000 3.245000 ;
+      RECT 4.130000  0.435000 4.390000 0.685000 ;
+      RECT 4.510000  2.045000 4.840000 2.905000 ;
+      RECT 4.510000  2.905000 6.700000 3.075000 ;
+      RECT 4.580000  0.255000 4.840000 0.855000 ;
+      RECT 5.010000  0.085000 5.840000 0.700000 ;
+      RECT 5.010000  1.875000 5.235000 2.735000 ;
+      RECT 5.405000  1.705000 5.680000 2.905000 ;
+      RECT 5.940000  1.930000 7.990000 2.100000 ;
+      RECT 5.940000  2.100000 6.200000 2.735000 ;
+      RECT 6.000000  1.040000 6.200000 1.085000 ;
+      RECT 6.000000  1.085000 7.990000 1.255000 ;
+      RECT 6.010000  0.255000 6.200000 0.870000 ;
+      RECT 6.370000  0.085000 6.700000 0.915000 ;
+      RECT 6.370000  2.270000 6.700000 2.905000 ;
+      RECT 6.870000  0.255000 7.060000 1.085000 ;
+      RECT 6.870000  2.100000 7.060000 3.075000 ;
+      RECT 7.230000  0.085000 7.560000 0.915000 ;
+      RECT 7.230000  2.270000 7.560000 3.245000 ;
+      RECT 7.730000  0.255000 7.990000 1.085000 ;
+      RECT 7.730000  2.100000 7.990000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o311a_4
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef
index 9142526..c2e4ff4 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_lp.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.905000  0.085000 1.155000 1.085000 ;
-        RECT 1.850000  0.085000 2.180000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -111,35 +98,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.660000 2.450000 0.990000 3.245000 ;
-        RECT 2.835000 2.450000 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 ;
-        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.450000 1.265000 0.810000 1.935000 ;
-      RECT 0.640000 1.935000 0.810000 2.100000 ;
-      RECT 0.640000 2.100000 3.750000 2.270000 ;
-      RECT 1.340000 0.685000 1.670000 1.145000 ;
-      RECT 1.500000 1.145000 1.670000 1.200000 ;
-      RECT 1.500000 1.200000 2.690000 1.370000 ;
-      RECT 2.295000 2.270000 2.625000 3.065000 ;
-      RECT 2.360000 0.685000 2.690000 1.200000 ;
-      RECT 3.150000 0.740000 3.750000 1.070000 ;
-      RECT 3.455000 2.270000 3.750000 3.065000 ;
-      RECT 3.580000 1.070000 3.750000 2.100000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.450000  1.265000 0.810000 1.935000 ;
+      RECT 0.640000  1.935000 0.810000 2.100000 ;
+      RECT 0.640000  2.100000 3.750000 2.270000 ;
+      RECT 0.660000  2.450000 0.990000 3.245000 ;
+      RECT 0.905000  0.085000 1.155000 1.085000 ;
+      RECT 1.340000  0.685000 1.670000 1.145000 ;
+      RECT 1.500000  1.145000 1.670000 1.200000 ;
+      RECT 1.500000  1.200000 2.690000 1.370000 ;
+      RECT 1.850000  0.085000 2.180000 1.020000 ;
+      RECT 2.295000  2.270000 2.625000 3.065000 ;
+      RECT 2.360000  0.685000 2.690000 1.200000 ;
+      RECT 2.835000  2.450000 3.165000 3.245000 ;
+      RECT 3.150000  0.740000 3.750000 1.070000 ;
+      RECT 3.455000  2.270000 3.750000 3.065000 ;
+      RECT 3.580000  1.070000 3.750000 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 ;
   END
 END sky130_fd_sc_lp__o311a_lp
diff --git a/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef b/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef
index bc629e5..9391052 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_m.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.855000  0.085000 1.065000 0.545000 ;
-        RECT 1.715000  0.085000 1.925000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,33 +98,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.590000 2.155000 0.920000 3.245000 ;
-        RECT 2.685000 2.115000 2.895000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.285000 0.345000 1.495000 0.725000 ;
-      RECT 1.285000 0.725000 2.335000 0.895000 ;
-      RECT 2.025000 2.855000 2.355000 3.025000 ;
-      RECT 2.145000 0.345000 2.335000 0.725000 ;
-      RECT 2.145000 1.765000 3.305000 1.935000 ;
-      RECT 2.145000 1.935000 2.355000 2.855000 ;
-      RECT 3.115000 1.935000 3.305000 2.275000 ;
-      RECT 3.135000 0.405000 3.495000 0.615000 ;
-      RECT 3.135000 0.615000 3.305000 1.765000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.590000  2.155000 0.920000 3.245000 ;
+      RECT 0.855000  0.085000 1.065000 0.545000 ;
+      RECT 1.285000  0.345000 1.495000 0.725000 ;
+      RECT 1.285000  0.725000 2.335000 0.895000 ;
+      RECT 1.715000  0.085000 1.925000 0.545000 ;
+      RECT 2.025000  2.855000 2.355000 3.025000 ;
+      RECT 2.145000  0.345000 2.335000 0.725000 ;
+      RECT 2.145000  1.765000 3.305000 1.935000 ;
+      RECT 2.145000  1.935000 2.355000 2.855000 ;
+      RECT 2.685000  2.115000 2.895000 3.245000 ;
+      RECT 3.115000  1.935000 3.305000 2.275000 ;
+      RECT 3.135000  0.405000 3.495000 0.615000 ;
+      RECT 3.135000  0.615000 3.305000 1.765000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o311a_m
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef
index 464af90..fe0cf4b 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.510000  0.085000 0.840000 0.600000 ;
-        RECT 1.430000  0.085000 1.715000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,26 +100,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.510000 2.320000 0.840000 3.245000 ;
-        RECT 2.205000 2.320000 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 1.010000 0.285000 1.260000 0.785000 ;
-      RECT 1.010000 0.785000 2.190000 0.990000 ;
-      RECT 1.885000 0.285000 2.190000 0.785000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.510000  0.085000 0.840000 0.600000 ;
+      RECT 0.510000  2.320000 0.840000 3.245000 ;
+      RECT 1.010000  0.285000 1.260000 0.785000 ;
+      RECT 1.010000  0.785000 2.190000 0.990000 ;
+      RECT 1.430000  0.085000 1.715000 0.615000 ;
+      RECT 1.885000  0.285000 2.190000 0.785000 ;
+      RECT 2.205000  2.320000 2.535000 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_lp__o311ai_0
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.magic.lef
index 00d46c7..eff0f68 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_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.410000  0.085000 0.670000 1.095000 ;
-        RECT 1.310000  0.085000 1.640000 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 ;
       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.410000 1.920000 0.740000 3.245000 ;
-        RECT 2.380000 2.290000 2.710000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.840000 0.265000 1.140000 1.005000 ;
-      RECT 0.840000 1.005000 2.405000 1.175000 ;
-      RECT 1.810000 0.265000 2.405000 1.005000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.410000  0.085000 0.670000 1.095000 ;
+      RECT 0.410000  1.920000 0.740000 3.245000 ;
+      RECT 0.840000  0.265000 1.140000 1.005000 ;
+      RECT 0.840000  1.005000 2.405000 1.175000 ;
+      RECT 1.310000  0.085000 1.640000 0.835000 ;
+      RECT 1.810000  0.265000 2.405000 1.005000 ;
+      RECT 2.380000  2.290000 2.710000 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_lp__o311ai_1
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef
index afe3507..7b9aec4 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.magic.lef
@@ -99,24 +99,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.675000 ;
-        RECT 1.425000  0.085000 1.755000 0.675000 ;
-        RECT 2.325000  0.085000 3.000000 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 ;
-        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
@@ -125,45 +107,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.760000 3.415000 ;
-        RECT 0.565000 1.945000 0.895000 3.245000 ;
-        RECT 3.665000 2.035000 4.375000 3.245000 ;
-        RECT 4.905000 2.055000 5.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 ;
-        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.255000 0.395000 0.845000 ;
-      RECT 0.135000 0.845000 4.285000 1.015000 ;
-      RECT 0.135000 1.605000 2.185000 1.775000 ;
-      RECT 0.135000 1.775000 0.395000 3.075000 ;
-      RECT 1.065000 0.255000 1.255000 0.845000 ;
-      RECT 1.065000 1.775000 1.255000 3.075000 ;
-      RECT 1.425000 1.945000 1.755000 2.905000 ;
-      RECT 1.425000 2.905000 3.135000 3.075000 ;
-      RECT 1.925000 0.255000 2.155000 0.845000 ;
-      RECT 1.925000 1.775000 2.185000 2.735000 ;
-      RECT 2.805000 2.035000 3.135000 2.905000 ;
-      RECT 3.170000 0.255000 3.355000 0.845000 ;
-      RECT 3.525000 0.255000 5.225000 0.425000 ;
-      RECT 3.525000 0.425000 3.855000 0.675000 ;
-      RECT 4.025000 0.595000 4.285000 0.845000 ;
-      RECT 4.975000 0.425000 5.225000 0.700000 ;
+      RECT 0.000000 -0.085000 5.760000 0.085000 ;
+      RECT 0.000000  3.245000 5.760000 3.415000 ;
+      RECT 0.135000  0.255000 0.395000 0.845000 ;
+      RECT 0.135000  0.845000 4.285000 1.015000 ;
+      RECT 0.135000  1.605000 2.185000 1.775000 ;
+      RECT 0.135000  1.775000 0.395000 3.075000 ;
+      RECT 0.565000  0.085000 0.895000 0.675000 ;
+      RECT 0.565000  1.945000 0.895000 3.245000 ;
+      RECT 1.065000  0.255000 1.255000 0.845000 ;
+      RECT 1.065000  1.775000 1.255000 3.075000 ;
+      RECT 1.425000  0.085000 1.755000 0.675000 ;
+      RECT 1.425000  1.945000 1.755000 2.905000 ;
+      RECT 1.425000  2.905000 3.135000 3.075000 ;
+      RECT 1.925000  0.255000 2.155000 0.845000 ;
+      RECT 1.925000  1.775000 2.185000 2.735000 ;
+      RECT 2.325000  0.085000 3.000000 0.675000 ;
+      RECT 2.805000  2.035000 3.135000 2.905000 ;
+      RECT 3.170000  0.255000 3.355000 0.845000 ;
+      RECT 3.525000  0.255000 5.225000 0.425000 ;
+      RECT 3.525000  0.425000 3.855000 0.675000 ;
+      RECT 3.665000  2.035000 4.375000 3.245000 ;
+      RECT 4.025000  0.595000 4.285000 0.845000 ;
+      RECT 4.905000  2.055000 5.235000 3.245000 ;
+      RECT 4.975000  0.425000 5.225000 0.700000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o311ai_2
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef
index dc96508..12067ed 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.magic.lef
@@ -100,37 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.110000  0.085000  0.440000 1.010000 ;
-        RECT 0.970000  0.085000  1.300000 0.670000 ;
-        RECT 1.830000  0.085000  2.160000 0.670000 ;
-        RECT 2.690000  0.085000  3.020000 0.670000 ;
-        RECT 3.550000  0.085000  3.880000 0.575000 ;
-        RECT 4.410000  0.085000  4.740000 0.575000 ;
-        RECT 5.270000  0.085000  5.600000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,67 +108,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.540000 1.945000  0.870000 3.245000 ;
-        RECT 1.400000 1.945000  1.730000 3.245000 ;
-        RECT 6.230000 2.290000  6.560000 3.245000 ;
-        RECT 7.090000 2.260000  7.420000 3.245000 ;
-        RECT 7.950000 2.260000  8.280000 3.245000 ;
-        RECT 8.810000 2.260000  9.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 ;
-        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.110000 1.605000 3.880000 1.775000 ;
-      RECT 0.110000 1.775000 0.370000 3.075000 ;
-      RECT 0.610000 0.255000 0.800000 0.840000 ;
-      RECT 0.610000 0.840000 7.430000 0.915000 ;
-      RECT 0.610000 0.915000 3.910000 1.010000 ;
-      RECT 1.040000 1.775000 1.230000 3.075000 ;
-      RECT 1.470000 0.255000 1.660000 0.840000 ;
-      RECT 1.900000 1.775000 2.090000 3.075000 ;
-      RECT 2.260000 1.945000 2.590000 2.905000 ;
-      RECT 2.260000 2.905000 5.700000 3.075000 ;
-      RECT 2.330000 0.255000 2.520000 0.840000 ;
-      RECT 2.760000 1.775000 2.950000 2.735000 ;
-      RECT 3.120000 1.945000 3.450000 2.905000 ;
-      RECT 3.190000 0.255000 3.380000 0.745000 ;
-      RECT 3.190000 0.745000 7.430000 0.840000 ;
-      RECT 3.620000 1.775000 3.880000 2.735000 ;
-      RECT 4.050000 0.255000 4.240000 0.745000 ;
-      RECT 4.510000 2.290000 4.840000 2.905000 ;
-      RECT 4.910000 0.255000 5.100000 0.725000 ;
-      RECT 4.910000 0.725000 7.430000 0.745000 ;
-      RECT 5.370000 2.290000 5.700000 2.905000 ;
-      RECT 5.810000 0.255000 9.860000 0.425000 ;
-      RECT 5.810000 0.425000 7.930000 0.555000 ;
-      RECT 7.600000 0.555000 7.930000 0.915000 ;
-      RECT 8.600000 0.425000 8.930000 0.915000 ;
-      RECT 9.600000 0.425000 9.860000 1.190000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.110000  0.085000  0.440000 1.010000 ;
+      RECT 0.110000  1.605000  3.880000 1.775000 ;
+      RECT 0.110000  1.775000  0.370000 3.075000 ;
+      RECT 0.540000  1.945000  0.870000 3.245000 ;
+      RECT 0.610000  0.255000  0.800000 0.840000 ;
+      RECT 0.610000  0.840000  7.430000 0.915000 ;
+      RECT 0.610000  0.915000  3.910000 1.010000 ;
+      RECT 0.970000  0.085000  1.300000 0.670000 ;
+      RECT 1.040000  1.775000  1.230000 3.075000 ;
+      RECT 1.400000  1.945000  1.730000 3.245000 ;
+      RECT 1.470000  0.255000  1.660000 0.840000 ;
+      RECT 1.830000  0.085000  2.160000 0.670000 ;
+      RECT 1.900000  1.775000  2.090000 3.075000 ;
+      RECT 2.260000  1.945000  2.590000 2.905000 ;
+      RECT 2.260000  2.905000  5.700000 3.075000 ;
+      RECT 2.330000  0.255000  2.520000 0.840000 ;
+      RECT 2.690000  0.085000  3.020000 0.670000 ;
+      RECT 2.760000  1.775000  2.950000 2.735000 ;
+      RECT 3.120000  1.945000  3.450000 2.905000 ;
+      RECT 3.190000  0.255000  3.380000 0.745000 ;
+      RECT 3.190000  0.745000  7.430000 0.840000 ;
+      RECT 3.550000  0.085000  3.880000 0.575000 ;
+      RECT 3.620000  1.775000  3.880000 2.735000 ;
+      RECT 4.050000  0.255000  4.240000 0.745000 ;
+      RECT 4.410000  0.085000  4.740000 0.575000 ;
+      RECT 4.510000  2.290000  4.840000 2.905000 ;
+      RECT 4.910000  0.255000  5.100000 0.725000 ;
+      RECT 4.910000  0.725000  7.430000 0.745000 ;
+      RECT 5.270000  0.085000  5.600000 0.555000 ;
+      RECT 5.370000  2.290000  5.700000 2.905000 ;
+      RECT 5.810000  0.255000  9.860000 0.425000 ;
+      RECT 5.810000  0.425000  7.930000 0.555000 ;
+      RECT 6.230000  2.290000  6.560000 3.245000 ;
+      RECT 7.090000  2.260000  7.420000 3.245000 ;
+      RECT 7.600000  0.555000  7.930000 0.915000 ;
+      RECT 7.950000  2.260000  8.280000 3.245000 ;
+      RECT 8.600000  0.425000  8.930000 0.915000 ;
+      RECT 8.810000  2.260000  9.140000 3.245000 ;
+      RECT 9.600000  0.425000  9.860000 1.190000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o311ai_4
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef
index e1c509a..4ea952c 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.magic.lef
@@ -94,18 +94,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.115000 ;
-        RECT 1.055000  0.085000 1.385000 1.075000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -114,26 +102,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 2.075000 0.445000 3.245000 ;
-        RECT 2.175000 2.680000 2.505000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.625000 0.720000 0.875000 1.255000 ;
-      RECT 0.625000 1.255000 2.055000 1.425000 ;
-      RECT 1.725000 0.850000 2.055000 1.255000 ;
+      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.115000 ;
+      RECT 0.115000  2.075000 0.445000 3.245000 ;
+      RECT 0.625000  0.720000 0.875000 1.255000 ;
+      RECT 0.625000  1.255000 2.055000 1.425000 ;
+      RECT 1.055000  0.085000 1.385000 1.075000 ;
+      RECT 1.725000  0.850000 2.055000 1.255000 ;
+      RECT 2.175000  2.680000 2.505000 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_lp__o311ai_lp
diff --git a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef
index 3f69253..81df370 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.magic.lef
@@ -96,17 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.225000  0.085000 0.555000 0.660000 ;
-        RECT 1.085000  0.085000 1.415000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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
@@ -115,25 +104,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.235000 2.125000 0.425000 3.245000 ;
-        RECT 1.945000 2.280000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.735000 0.520000 0.905000 0.840000 ;
-      RECT 0.735000 0.840000 1.785000 1.010000 ;
-      RECT 1.595000 0.520000 1.785000 0.840000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.225000  0.085000 0.555000 0.660000 ;
+      RECT 0.235000  2.125000 0.425000 3.245000 ;
+      RECT 0.735000  0.520000 0.905000 0.840000 ;
+      RECT 0.735000  0.840000 1.785000 1.010000 ;
+      RECT 1.085000  0.085000 1.415000 0.660000 ;
+      RECT 1.595000  0.520000 1.785000 0.840000 ;
+      RECT 1.945000  2.280000 2.275000 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_lp__o311ai_m
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef
index ee87f4e..9147f01 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_0.magic.lef
@@ -82,18 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.825000  0.085000 1.155000 0.650000 ;
-        RECT 1.855000  0.085000 2.185000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,32 +90,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.815000 2.385000 1.145000 3.245000 ;
-        RECT 2.615000 2.385000 2.945000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.530000 1.545000 0.845000 2.035000 ;
-      RECT 0.530000 2.035000 3.275000 2.215000 ;
-      RECT 1.365000 0.320000 1.685000 0.650000 ;
-      RECT 1.465000 0.650000 1.685000 0.715000 ;
-      RECT 1.465000 0.715000 2.605000 0.885000 ;
-      RECT 2.115000 2.215000 2.445000 3.055000 ;
-      RECT 2.355000 0.320000 2.605000 0.715000 ;
-      RECT 2.775000 0.320000 3.275000 0.650000 ;
-      RECT 3.090000 0.650000 3.275000 2.035000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.530000  1.545000 0.845000 2.035000 ;
+      RECT 0.530000  2.035000 3.275000 2.215000 ;
+      RECT 0.815000  2.385000 1.145000 3.245000 ;
+      RECT 0.825000  0.085000 1.155000 0.650000 ;
+      RECT 1.365000  0.320000 1.685000 0.650000 ;
+      RECT 1.465000  0.650000 1.685000 0.715000 ;
+      RECT 1.465000  0.715000 2.605000 0.885000 ;
+      RECT 1.855000  0.085000 2.185000 0.545000 ;
+      RECT 2.115000  2.215000 2.445000 3.055000 ;
+      RECT 2.355000  0.320000 2.605000 0.715000 ;
+      RECT 2.615000  2.385000 2.945000 3.245000 ;
+      RECT 2.775000  0.320000 3.275000 0.650000 ;
+      RECT 3.090000  0.650000 3.275000 2.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o31a_0
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef
index 2d56ce6..9039b00 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_1.magic.lef
@@ -79,18 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.555000  0.085000 1.250000 1.025000 ;
-        RECT 1.870000  0.085000 2.200000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -99,31 +87,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.555000 2.270000 1.250000 3.245000 ;
-        RECT 2.790000 2.270000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.555000 1.195000 0.805000 1.930000 ;
-      RECT 0.555000 1.930000 3.275000 2.100000 ;
-      RECT 1.455000 0.255000 1.700000 1.005000 ;
-      RECT 1.455000 1.005000 2.655000 1.175000 ;
-      RECT 2.290000 2.100000 2.620000 3.075000 ;
-      RECT 2.370000 0.255000 2.655000 1.005000 ;
-      RECT 2.825000 0.255000 3.275000 1.105000 ;
-      RECT 3.095000 1.105000 3.275000 1.930000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.555000  0.085000 1.250000 1.025000 ;
+      RECT 0.555000  1.195000 0.805000 1.930000 ;
+      RECT 0.555000  1.930000 3.275000 2.100000 ;
+      RECT 0.555000  2.270000 1.250000 3.245000 ;
+      RECT 1.455000  0.255000 1.700000 1.005000 ;
+      RECT 1.455000  1.005000 2.655000 1.175000 ;
+      RECT 1.870000  0.085000 2.200000 0.835000 ;
+      RECT 2.290000  2.100000 2.620000 3.075000 ;
+      RECT 2.370000  0.255000 2.655000 1.005000 ;
+      RECT 2.790000  2.270000 3.120000 3.245000 ;
+      RECT 2.825000  0.255000 3.275000 1.105000 ;
+      RECT 3.095000  1.105000 3.275000 1.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 ;
   END
 END sky130_fd_sc_lp__o31a_1
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_2.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_2.magic.lef
index 48ede94..02fb4c4 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_2.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__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.120000  0.085000 0.395000 1.095000 ;
-        RECT 0.985000  0.085000 1.590000 0.865000 ;
-        RECT 2.260000  0.085000 2.590000 0.495000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.155000 1.815000 0.425000 3.245000 ;
-        RECT 1.105000 1.820000 1.355000 3.245000 ;
-        RECT 3.295000 1.920000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.035000 3.520000 1.175000 ;
-      RECT 0.985000 1.175000 1.930000 1.205000 ;
-      RECT 0.985000 1.205000 1.235000 1.515000 ;
-      RECT 1.760000 0.255000 2.090000 0.665000 ;
-      RECT 1.760000 0.665000 3.090000 0.835000 ;
-      RECT 1.760000 1.005000 3.520000 1.035000 ;
-      RECT 2.710000 1.930000 3.125000 3.075000 ;
-      RECT 2.760000 0.255000 3.090000 0.665000 ;
-      RECT 2.955000 1.175000 3.125000 1.930000 ;
-      RECT 3.260000 0.255000 3.520000 1.005000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.120000  0.085000 0.395000 1.095000 ;
+      RECT 0.155000  1.815000 0.425000 3.245000 ;
+      RECT 0.985000  0.085000 1.590000 0.865000 ;
+      RECT 0.985000  1.035000 3.520000 1.175000 ;
+      RECT 0.985000  1.175000 1.930000 1.205000 ;
+      RECT 0.985000  1.205000 1.235000 1.515000 ;
+      RECT 1.105000  1.820000 1.355000 3.245000 ;
+      RECT 1.760000  0.255000 2.090000 0.665000 ;
+      RECT 1.760000  0.665000 3.090000 0.835000 ;
+      RECT 1.760000  1.005000 3.520000 1.035000 ;
+      RECT 2.260000  0.085000 2.590000 0.495000 ;
+      RECT 2.710000  1.930000 3.125000 3.075000 ;
+      RECT 2.760000  0.255000 3.090000 0.665000 ;
+      RECT 2.955000  1.175000 3.125000 1.930000 ;
+      RECT 3.260000  0.255000 3.520000 1.005000 ;
+      RECT 3.295000  1.920000 3.515000 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_lp__o31a_2
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef
index 8dabb62..387d8eb 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_4.magic.lef
@@ -88,29 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.720000 0.085000 ;
-        RECT 0.200000  0.085000 0.530000 0.885000 ;
-        RECT 1.060000  0.085000 1.390000 0.885000 ;
-        RECT 1.920000  0.085000 2.250000 1.105000 ;
-        RECT 3.990000  0.085000 4.320000 0.895000 ;
-        RECT 4.925000  0.085000 5.255000 0.700000 ;
-        RECT 5.865000  0.085000 6.195000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,57 +96,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.720000 3.415000 ;
-        RECT 0.425000 2.095000 0.755000 3.245000 ;
-        RECT 1.285000 2.095000 1.615000 3.245000 ;
-        RECT 2.145000 1.815000 2.475000 3.245000 ;
-        RECT 3.005000 2.630000 3.335000 3.245000 ;
-        RECT 5.425000 2.435000 6.625000 2.665000 ;
-        RECT 6.365000 2.665000 6.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 ;
-        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.505000 1.405000 2.835000 1.575000 ;
-      RECT 2.620000 0.255000 3.820000 0.435000 ;
-      RECT 2.620000 0.435000 2.950000 0.905000 ;
-      RECT 2.635000 1.075000 3.460000 1.245000 ;
-      RECT 2.635000 1.245000 2.835000 1.405000 ;
-      RECT 2.645000 1.575000 2.835000 2.290000 ;
-      RECT 2.645000 2.290000 4.260000 2.460000 ;
-      RECT 2.645000 2.460000 2.825000 3.075000 ;
-      RECT 3.130000 0.605000 3.460000 1.075000 ;
-      RECT 3.560000 1.920000 4.750000 2.045000 ;
-      RECT 3.560000 2.045000 6.625000 2.120000 ;
-      RECT 3.630000 0.435000 3.820000 1.075000 ;
-      RECT 3.630000 1.075000 4.710000 1.245000 ;
-      RECT 3.990000 2.460000 4.260000 3.075000 ;
-      RECT 4.430000 2.120000 6.625000 2.265000 ;
-      RECT 4.430000 2.265000 4.750000 3.075000 ;
-      RECT 4.490000 0.305000 4.750000 0.870000 ;
-      RECT 4.490000 0.870000 6.625000 1.040000 ;
-      RECT 4.490000 1.040000 4.710000 1.075000 ;
-      RECT 4.925000 2.435000 5.255000 2.835000 ;
-      RECT 4.925000 2.835000 6.195000 3.075000 ;
-      RECT 5.435000 0.305000 5.695000 0.870000 ;
-      RECT 6.365000 0.305000 6.625000 0.870000 ;
+      RECT 0.000000 -0.085000 6.720000 0.085000 ;
+      RECT 0.000000  3.245000 6.720000 3.415000 ;
+      RECT 0.200000  0.085000 0.530000 0.885000 ;
+      RECT 0.425000  2.095000 0.755000 3.245000 ;
+      RECT 0.505000  1.405000 2.835000 1.575000 ;
+      RECT 1.060000  0.085000 1.390000 0.885000 ;
+      RECT 1.285000  2.095000 1.615000 3.245000 ;
+      RECT 1.920000  0.085000 2.250000 1.105000 ;
+      RECT 2.145000  1.815000 2.475000 3.245000 ;
+      RECT 2.620000  0.255000 3.820000 0.435000 ;
+      RECT 2.620000  0.435000 2.950000 0.905000 ;
+      RECT 2.635000  1.075000 3.460000 1.245000 ;
+      RECT 2.635000  1.245000 2.835000 1.405000 ;
+      RECT 2.645000  1.575000 2.835000 2.290000 ;
+      RECT 2.645000  2.290000 4.260000 2.460000 ;
+      RECT 2.645000  2.460000 2.825000 3.075000 ;
+      RECT 3.005000  2.630000 3.335000 3.245000 ;
+      RECT 3.130000  0.605000 3.460000 1.075000 ;
+      RECT 3.560000  1.920000 4.750000 2.045000 ;
+      RECT 3.560000  2.045000 6.625000 2.120000 ;
+      RECT 3.630000  0.435000 3.820000 1.075000 ;
+      RECT 3.630000  1.075000 4.710000 1.245000 ;
+      RECT 3.990000  0.085000 4.320000 0.895000 ;
+      RECT 3.990000  2.460000 4.260000 3.075000 ;
+      RECT 4.430000  2.120000 6.625000 2.265000 ;
+      RECT 4.430000  2.265000 4.750000 3.075000 ;
+      RECT 4.490000  0.305000 4.750000 0.870000 ;
+      RECT 4.490000  0.870000 6.625000 1.040000 ;
+      RECT 4.490000  1.040000 4.710000 1.075000 ;
+      RECT 4.925000  0.085000 5.255000 0.700000 ;
+      RECT 4.925000  2.435000 5.255000 2.835000 ;
+      RECT 4.925000  2.835000 6.195000 3.075000 ;
+      RECT 5.425000  2.435000 6.625000 2.665000 ;
+      RECT 5.435000  0.305000 5.695000 0.870000 ;
+      RECT 5.865000  0.085000 6.195000 0.700000 ;
+      RECT 6.365000  0.305000 6.625000 0.870000 ;
+      RECT 6.365000  2.665000 6.625000 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_lp__o31a_4
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef
index 29ba213..30cedfa 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_lp.magic.lef
@@ -81,18 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.185000  0.085000 1.515000 0.595000 ;
-        RECT 2.125000  0.085000 2.455000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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 +89,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.195000 2.325000 0.525000 3.245000 ;
-        RECT 2.315000 2.370000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.265000 0.495000 0.725000 ;
-      RECT 0.090000 0.725000 0.260000 1.975000 ;
-      RECT 0.090000 1.975000 1.055000 2.020000 ;
-      RECT 0.090000 2.020000 2.745000 2.145000 ;
-      RECT 0.675000 0.265000 1.005000 0.775000 ;
-      RECT 0.675000 0.775000 1.945000 0.945000 ;
-      RECT 0.725000 2.145000 2.745000 2.190000 ;
-      RECT 0.725000 2.190000 1.055000 3.065000 ;
-      RECT 1.695000 0.265000 1.945000 0.775000 ;
-      RECT 2.575000 0.930000 2.920000 1.600000 ;
-      RECT 2.575000 1.600000 2.745000 2.020000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.090000  0.265000 0.495000 0.725000 ;
+      RECT 0.090000  0.725000 0.260000 1.975000 ;
+      RECT 0.090000  1.975000 1.055000 2.020000 ;
+      RECT 0.090000  2.020000 2.745000 2.145000 ;
+      RECT 0.195000  2.325000 0.525000 3.245000 ;
+      RECT 0.675000  0.265000 1.005000 0.775000 ;
+      RECT 0.675000  0.775000 1.945000 0.945000 ;
+      RECT 0.725000  2.145000 2.745000 2.190000 ;
+      RECT 0.725000  2.190000 1.055000 3.065000 ;
+      RECT 1.185000  0.085000 1.515000 0.595000 ;
+      RECT 1.695000  0.265000 1.945000 0.775000 ;
+      RECT 2.125000  0.085000 2.455000 0.725000 ;
+      RECT 2.315000  2.370000 2.645000 3.245000 ;
+      RECT 2.575000  0.930000 2.920000 1.600000 ;
+      RECT 2.575000  1.600000 2.745000 2.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 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o31a_lp
diff --git a/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef b/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef
index b43f722..0bf13cc 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_m.magic.lef
@@ -80,18 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.800000  0.085000 1.010000 0.545000 ;
-        RECT 1.620000  0.085000 1.950000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,31 +88,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.760000 2.095000 0.970000 3.245000 ;
-        RECT 2.610000 2.155000 2.940000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.150000 2.670000 2.340000 2.840000 ;
-      RECT 1.150000 2.840000 1.480000 3.025000 ;
-      RECT 1.230000 0.345000 1.440000 0.665000 ;
-      RECT 1.230000 0.665000 2.375000 0.835000 ;
-      RECT 2.130000 1.805000 3.105000 1.975000 ;
-      RECT 2.130000 1.975000 2.340000 2.670000 ;
-      RECT 2.185000 0.345000 2.375000 0.665000 ;
-      RECT 2.915000 0.345000 3.105000 1.805000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.760000  2.095000 0.970000 3.245000 ;
+      RECT 0.800000  0.085000 1.010000 0.545000 ;
+      RECT 1.150000  2.670000 2.340000 2.840000 ;
+      RECT 1.150000  2.840000 1.480000 3.025000 ;
+      RECT 1.230000  0.345000 1.440000 0.665000 ;
+      RECT 1.230000  0.665000 2.375000 0.835000 ;
+      RECT 1.620000  0.085000 1.950000 0.485000 ;
+      RECT 2.130000  1.805000 3.105000 1.975000 ;
+      RECT 2.130000  1.975000 2.340000 2.670000 ;
+      RECT 2.185000  0.345000 2.375000 0.665000 ;
+      RECT 2.610000  2.155000 2.940000 3.245000 ;
+      RECT 2.915000  0.345000 3.105000 1.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 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o31a_m
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef
index 89cfda6..9546722 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.magic.lef
@@ -82,17 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.235000  0.085000 0.565000 0.670000 ;
-        RECT 1.145000  0.085000 1.475000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,25 +90,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.275000 2.395000 0.605000 3.245000 ;
-        RECT 1.985000 2.395000 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.735000 0.370000 0.975000 0.765000 ;
-      RECT 0.735000 0.765000 1.895000 0.935000 ;
-      RECT 1.645000 0.370000 1.895000 0.765000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.235000  0.085000 0.565000 0.670000 ;
+      RECT 0.275000  2.395000 0.605000 3.245000 ;
+      RECT 0.735000  0.370000 0.975000 0.765000 ;
+      RECT 0.735000  0.765000 1.895000 0.935000 ;
+      RECT 1.145000  0.085000 1.475000 0.595000 ;
+      RECT 1.645000  0.370000 1.895000 0.765000 ;
+      RECT 1.985000  2.395000 2.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 ;
   END
 END sky130_fd_sc_lp__o31ai_0
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.magic.lef
index 35da228..cc232cf 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_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.095000  0.085000 0.425000 1.040000 ;
-        RECT 0.945000  0.085000 1.625000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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 0.095000 1.920000 0.425000 3.245000 ;
-        RECT 2.280000 1.920000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 0.255000 0.775000 0.695000 ;
-      RECT 0.595000 0.695000 2.125000 0.865000 ;
-      RECT 0.595000 0.865000 0.855000 1.095000 ;
-      RECT 1.795000 0.265000 2.125000 0.695000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 1.040000 ;
+      RECT 0.095000  1.920000 0.425000 3.245000 ;
+      RECT 0.595000  0.255000 0.775000 0.695000 ;
+      RECT 0.595000  0.695000 2.125000 0.865000 ;
+      RECT 0.595000  0.865000 0.855000 1.095000 ;
+      RECT 0.945000  0.085000 1.625000 0.525000 ;
+      RECT 1.795000  0.265000 2.125000 0.695000 ;
+      RECT 2.280000  1.920000 2.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 ;
   END
 END sky130_fd_sc_lp__o31ai_1
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef
index 15b0ef2..21788be 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.magic.lef
@@ -88,22 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.680000  0.085000 1.010000 0.700000 ;
-        RECT 1.580000  0.085000 2.175000 0.700000 ;
-        RECT 2.820000  0.085000 3.150000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,42 +96,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.680000 2.035000 0.870000 3.245000 ;
-        RECT 3.945000 2.095000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.180000 1.695000 2.230000 1.865000 ;
-      RECT 0.180000 1.865000 0.510000 3.075000 ;
-      RECT 0.250000 0.315000 0.510000 0.870000 ;
-      RECT 0.250000 0.870000 3.580000 0.905000 ;
-      RECT 0.250000 0.905000 2.515000 1.040000 ;
-      RECT 1.040000 1.865000 1.370000 3.075000 ;
-      RECT 1.180000 0.315000 1.410000 0.870000 ;
-      RECT 1.540000 2.035000 1.730000 2.905000 ;
-      RECT 1.540000 2.905000 3.180000 3.075000 ;
-      RECT 1.900000 1.865000 2.230000 2.735000 ;
-      RECT 2.345000 0.285000 2.650000 0.735000 ;
-      RECT 2.345000 0.735000 3.580000 0.870000 ;
-      RECT 2.920000 2.290000 3.180000 2.905000 ;
-      RECT 3.320000 0.255000 4.510000 0.425000 ;
-      RECT 3.320000 0.425000 3.580000 0.735000 ;
-      RECT 4.250000 0.425000 4.510000 1.040000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.180000  1.695000 2.230000 1.865000 ;
+      RECT 0.180000  1.865000 0.510000 3.075000 ;
+      RECT 0.250000  0.315000 0.510000 0.870000 ;
+      RECT 0.250000  0.870000 3.580000 0.905000 ;
+      RECT 0.250000  0.905000 2.515000 1.040000 ;
+      RECT 0.680000  0.085000 1.010000 0.700000 ;
+      RECT 0.680000  2.035000 0.870000 3.245000 ;
+      RECT 1.040000  1.865000 1.370000 3.075000 ;
+      RECT 1.180000  0.315000 1.410000 0.870000 ;
+      RECT 1.540000  2.035000 1.730000 2.905000 ;
+      RECT 1.540000  2.905000 3.180000 3.075000 ;
+      RECT 1.580000  0.085000 2.175000 0.700000 ;
+      RECT 1.900000  1.865000 2.230000 2.735000 ;
+      RECT 2.345000  0.285000 2.650000 0.735000 ;
+      RECT 2.345000  0.735000 3.580000 0.870000 ;
+      RECT 2.820000  0.085000 3.150000 0.565000 ;
+      RECT 2.920000  2.290000 3.180000 2.905000 ;
+      RECT 3.320000  0.255000 4.510000 0.425000 ;
+      RECT 3.320000  0.425000 3.580000 0.735000 ;
+      RECT 3.945000  2.095000 4.275000 3.245000 ;
+      RECT 4.250000  0.425000 4.510000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o31ai_2
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.magic.lef
index d478061..c8607d0 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_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.205000  0.085000 0.465000 0.905000 ;
-        RECT 1.065000  0.085000 1.395000 0.565000 ;
-        RECT 1.925000  0.085000 2.255000 0.565000 ;
-        RECT 2.785000  0.085000 3.115000 0.565000 ;
-        RECT 3.645000  0.085000 3.975000 0.805000 ;
-        RECT 4.550000  0.085000 4.880000 0.805000 ;
-        RECT 7.605000  0.085000 7.935000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,72 +105,96 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 1.135000 2.610000 1.325000 3.245000 ;
-        RECT 1.995000 2.610000 2.185000 3.245000 ;
-        RECT 5.695000 2.750000 5.905000 3.245000 ;
-        RECT 6.555000 2.750000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.160000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.205000 1.815000 1.315000 1.930000 ;
-      RECT 0.205000 1.930000 3.075000 1.985000 ;
-      RECT 0.205000 1.985000 0.465000 3.075000 ;
-      RECT 0.635000 0.255000 0.895000 0.735000 ;
-      RECT 0.635000 0.735000 3.475000 0.905000 ;
-      RECT 0.635000 2.155000 0.965000 2.270000 ;
-      RECT 0.635000 2.270000 2.685000 2.440000 ;
-      RECT 0.635000 2.440000 0.965000 3.075000 ;
-      RECT 1.145000 1.985000 2.175000 2.100000 ;
-      RECT 1.495000 2.440000 1.825000 3.075000 ;
-      RECT 1.565000 0.255000 1.755000 0.735000 ;
-      RECT 2.005000 1.815000 3.815000 1.875000 ;
-      RECT 2.005000 1.875000 3.075000 1.930000 ;
-      RECT 2.355000 2.155000 2.685000 2.270000 ;
-      RECT 2.355000 2.440000 2.685000 2.885000 ;
-      RECT 2.355000 2.885000 3.475000 3.075000 ;
-      RECT 2.425000 0.255000 2.615000 0.735000 ;
-      RECT 2.855000 1.985000 3.075000 2.715000 ;
-      RECT 2.865000 1.705000 3.815000 1.815000 ;
-      RECT 3.245000 2.055000 3.475000 2.885000 ;
-      RECT 3.275000 0.905000 3.475000 0.985000 ;
-      RECT 3.275000 0.985000 5.265000 1.155000 ;
-      RECT 3.285000 0.255000 3.475000 0.735000 ;
-      RECT 3.645000 1.875000 3.815000 2.035000 ;
-      RECT 3.645000 2.035000 3.975000 2.905000 ;
-      RECT 3.645000 2.905000 5.525000 3.075000 ;
-      RECT 4.155000 0.425000 4.380000 0.985000 ;
-      RECT 4.505000 2.385000 4.835000 2.895000 ;
-      RECT 4.505000 2.895000 5.525000 2.905000 ;
-      RECT 5.065000 0.255000 7.425000 0.530000 ;
-      RECT 5.065000 0.530000 5.265000 0.985000 ;
-      RECT 5.355000 2.410000 7.165000 2.580000 ;
-      RECT 5.355000 2.580000 5.525000 2.895000 ;
-      RECT 6.995000 2.580000 7.165000 2.895000 ;
-      RECT 6.995000 2.895000 8.060000 3.065000 ;
-      RECT 7.095000 0.530000 7.425000 0.825000 ;
-      RECT 7.800000 2.045000 8.060000 2.895000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.205000  0.085000 0.465000 0.905000 ;
+      RECT 0.205000  1.815000 1.315000 1.930000 ;
+      RECT 0.205000  1.930000 3.075000 1.985000 ;
+      RECT 0.205000  1.985000 0.465000 3.075000 ;
+      RECT 0.635000  0.255000 0.895000 0.735000 ;
+      RECT 0.635000  0.735000 3.475000 0.905000 ;
+      RECT 0.635000  2.155000 0.965000 2.270000 ;
+      RECT 0.635000  2.270000 2.685000 2.440000 ;
+      RECT 0.635000  2.440000 0.965000 3.075000 ;
+      RECT 1.065000  0.085000 1.395000 0.565000 ;
+      RECT 1.135000  2.610000 1.325000 3.245000 ;
+      RECT 1.145000  1.985000 2.175000 2.100000 ;
+      RECT 1.495000  2.440000 1.825000 3.075000 ;
+      RECT 1.565000  0.255000 1.755000 0.735000 ;
+      RECT 1.925000  0.085000 2.255000 0.565000 ;
+      RECT 1.995000  2.610000 2.185000 3.245000 ;
+      RECT 2.005000  1.815000 3.815000 1.875000 ;
+      RECT 2.005000  1.875000 3.075000 1.930000 ;
+      RECT 2.355000  2.155000 2.685000 2.270000 ;
+      RECT 2.355000  2.440000 2.685000 2.885000 ;
+      RECT 2.355000  2.885000 3.475000 3.075000 ;
+      RECT 2.425000  0.255000 2.615000 0.735000 ;
+      RECT 2.785000  0.085000 3.115000 0.565000 ;
+      RECT 2.855000  1.985000 3.075000 2.715000 ;
+      RECT 2.865000  1.705000 3.815000 1.815000 ;
+      RECT 3.245000  2.055000 3.475000 2.885000 ;
+      RECT 3.275000  0.905000 3.475000 0.985000 ;
+      RECT 3.275000  0.985000 5.265000 1.155000 ;
+      RECT 3.285000  0.255000 3.475000 0.735000 ;
+      RECT 3.645000  0.085000 3.975000 0.805000 ;
+      RECT 3.645000  1.875000 3.815000 2.035000 ;
+      RECT 3.645000  2.035000 3.975000 2.905000 ;
+      RECT 3.645000  2.905000 5.525000 3.075000 ;
+      RECT 4.155000  0.425000 4.380000 0.985000 ;
+      RECT 4.505000  2.385000 4.835000 2.895000 ;
+      RECT 4.505000  2.895000 5.525000 2.905000 ;
+      RECT 4.550000  0.085000 4.880000 0.805000 ;
+      RECT 5.065000  0.255000 7.425000 0.530000 ;
+      RECT 5.065000  0.530000 5.265000 0.985000 ;
+      RECT 5.355000  2.410000 7.165000 2.580000 ;
+      RECT 5.355000  2.580000 5.525000 2.895000 ;
+      RECT 5.695000  2.750000 5.905000 3.245000 ;
+      RECT 6.555000  2.750000 6.825000 3.245000 ;
+      RECT 6.995000  2.580000 7.165000 2.895000 ;
+      RECT 6.995000  2.895000 8.060000 3.065000 ;
+      RECT 7.095000  0.530000 7.425000 0.825000 ;
+      RECT 7.605000  0.085000 7.935000 0.825000 ;
+      RECT 7.800000  2.045000 8.060000 2.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o31ai_4
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef
index 59a7036..b57b0a3 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.magic.lef
@@ -83,17 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.270000  0.085000 0.600000 0.725000 ;
-        RECT 1.290000  0.085000 1.620000 0.695000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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.130000 2.075000 0.460000 3.245000 ;
-        RECT 2.290000 2.700000 2.620000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.780000 0.265000 1.110000 0.875000 ;
-      RECT 0.780000 0.875000 2.130000 1.045000 ;
-      RECT 1.800000 0.265000 2.130000 0.875000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.130000  2.075000 0.460000 3.245000 ;
+      RECT 0.270000  0.085000 0.600000 0.725000 ;
+      RECT 0.780000  0.265000 1.110000 0.875000 ;
+      RECT 0.780000  0.875000 2.130000 1.045000 ;
+      RECT 1.290000  0.085000 1.620000 0.695000 ;
+      RECT 1.800000  0.265000 2.130000 0.875000 ;
+      RECT 2.290000  2.700000 2.620000 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_lp__o31ai_lp
diff --git a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef
index ea7e7bf..0fc0b65 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.magic.lef
@@ -82,16 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.235000  0.085000 0.445000 0.955000 ;
-        RECT 1.095000  0.085000 1.285000 0.935000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -100,24 +90,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.315000 2.845000 0.645000 3.245000 ;
-        RECT 1.955000 2.785000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.665000 0.775000 0.875000 1.115000 ;
-      RECT 0.665000 1.115000 1.795000 1.285000 ;
-      RECT 1.465000 0.835000 1.795000 1.115000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.235000  0.085000 0.445000 0.955000 ;
+      RECT 0.315000  2.845000 0.645000 3.245000 ;
+      RECT 0.665000  0.775000 0.875000 1.115000 ;
+      RECT 0.665000  1.115000 1.795000 1.285000 ;
+      RECT 1.095000  0.085000 1.285000 0.935000 ;
+      RECT 1.465000  0.835000 1.795000 1.115000 ;
+      RECT 1.955000  2.785000 2.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 ;
   END
 END sky130_fd_sc_lp__o31ai_m
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef
index 1e74289..c742b30 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_0.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.830000  0.085000 1.160000 0.670000 ;
-        RECT 1.870000  0.085000 2.200000 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
@@ -111,36 +98,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.920000 2.385000 1.250000 3.245000 ;
-        RECT 3.160000 2.395000 3.490000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.555000 1.545000 0.815000 2.025000 ;
-      RECT 0.555000 2.025000 3.255000 2.215000 ;
-      RECT 1.330000 0.385000 1.660000 0.670000 ;
-      RECT 1.465000 0.670000 1.660000 0.845000 ;
-      RECT 1.465000 0.845000 2.680000 1.015000 ;
-      RECT 2.310000 2.215000 2.640000 3.075000 ;
-      RECT 2.410000 0.255000 3.670000 0.425000 ;
-      RECT 2.410000 0.425000 2.680000 0.845000 ;
-      RECT 2.910000 0.595000 3.245000 0.845000 ;
-      RECT 2.910000 0.845000 3.255000 0.855000 ;
-      RECT 3.065000 0.855000 3.255000 2.025000 ;
-      RECT 3.415000 0.425000 3.670000 0.785000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.555000  1.545000 0.815000 2.025000 ;
+      RECT 0.555000  2.025000 3.255000 2.215000 ;
+      RECT 0.830000  0.085000 1.160000 0.670000 ;
+      RECT 0.920000  2.385000 1.250000 3.245000 ;
+      RECT 1.330000  0.385000 1.660000 0.670000 ;
+      RECT 1.465000  0.670000 1.660000 0.845000 ;
+      RECT 1.465000  0.845000 2.680000 1.015000 ;
+      RECT 1.870000  0.085000 2.200000 0.675000 ;
+      RECT 2.310000  2.215000 2.640000 3.075000 ;
+      RECT 2.410000  0.255000 3.670000 0.425000 ;
+      RECT 2.410000  0.425000 2.680000 0.845000 ;
+      RECT 2.910000  0.595000 3.245000 0.845000 ;
+      RECT 2.910000  0.845000 3.255000 0.855000 ;
+      RECT 3.065000  0.855000 3.255000 2.025000 ;
+      RECT 3.160000  2.395000 3.490000 3.245000 ;
+      RECT 3.415000  0.425000 3.670000 0.785000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o32a_0
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_1.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_1.magic.lef
index 2962897..9259ab6 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_1.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__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.770000  0.085000 1.100000 1.040000 ;
-        RECT 1.655000  0.085000 2.325000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,35 +98,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.800000 2.270000 1.130000 3.245000 ;
-        RECT 3.355000 2.290000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.440000 1.345000 0.900000 1.645000 ;
-      RECT 0.730000 1.645000 0.900000 1.930000 ;
-      RECT 0.730000 1.930000 3.260000 2.100000 ;
-      RECT 1.270000 0.305000 1.485000 0.870000 ;
-      RECT 1.270000 0.870000 2.730000 1.040000 ;
-      RECT 2.215000 2.100000 2.910000 3.075000 ;
-      RECT 2.495000 0.255000 3.710000 0.425000 ;
-      RECT 2.495000 0.425000 2.730000 0.870000 ;
-      RECT 2.900000 0.595000 3.260000 1.175000 ;
-      RECT 3.090000 1.175000 3.260000 1.930000 ;
-      RECT 3.430000 0.425000 3.710000 1.040000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.440000  1.345000 0.900000 1.645000 ;
+      RECT 0.730000  1.645000 0.900000 1.930000 ;
+      RECT 0.730000  1.930000 3.260000 2.100000 ;
+      RECT 0.770000  0.085000 1.100000 1.040000 ;
+      RECT 0.800000  2.270000 1.130000 3.245000 ;
+      RECT 1.270000  0.305000 1.485000 0.870000 ;
+      RECT 1.270000  0.870000 2.730000 1.040000 ;
+      RECT 1.655000  0.085000 2.325000 0.700000 ;
+      RECT 2.215000  2.100000 2.910000 3.075000 ;
+      RECT 2.495000  0.255000 3.710000 0.425000 ;
+      RECT 2.495000  0.425000 2.730000 0.870000 ;
+      RECT 2.900000  0.595000 3.260000 1.175000 ;
+      RECT 3.090000  1.175000 3.260000 1.930000 ;
+      RECT 3.355000  2.290000 3.685000 3.245000 ;
+      RECT 3.430000  0.425000 3.710000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o32a_1
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef
index b4ed86f..e54320c 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_2.magic.lef
@@ -88,21 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.120000  0.085000 0.415000 1.090000 ;
-        RECT 1.110000  0.085000 1.440000 1.035000 ;
-        RECT 2.250000  0.085000 2.580000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,40 +96,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.120000 1.815000 0.415000 3.245000 ;
-        RECT 0.980000 2.025000 1.650000 3.245000 ;
-        RECT 3.810000 2.000000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 1.340000 1.345000 1.670000 ;
-      RECT 1.175000 1.670000 1.345000 1.685000 ;
-      RECT 1.175000 1.685000 2.915000 1.710000 ;
-      RECT 1.175000 1.710000 3.655000 1.855000 ;
-      RECT 1.680000 0.255000 2.010000 0.870000 ;
-      RECT 1.680000 0.870000 3.130000 1.015000 ;
-      RECT 1.910000 1.015000 3.130000 1.040000 ;
-      RECT 2.700000 1.855000 3.655000 1.925000 ;
-      RECT 2.700000 1.925000 3.030000 3.075000 ;
-      RECT 2.830000 0.255000 4.095000 0.425000 ;
-      RECT 2.830000 0.425000 3.130000 0.870000 ;
-      RECT 3.300000 0.595000 3.655000 0.935000 ;
-      RECT 3.485000 0.935000 3.655000 1.710000 ;
-      RECT 3.825000 0.425000 4.095000 1.040000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.120000  0.085000 0.415000 1.090000 ;
+      RECT 0.120000  1.815000 0.415000 3.245000 ;
+      RECT 0.980000  2.025000 1.650000 3.245000 ;
+      RECT 0.985000  1.340000 1.345000 1.670000 ;
+      RECT 1.110000  0.085000 1.440000 1.035000 ;
+      RECT 1.175000  1.670000 1.345000 1.685000 ;
+      RECT 1.175000  1.685000 2.915000 1.710000 ;
+      RECT 1.175000  1.710000 3.655000 1.855000 ;
+      RECT 1.680000  0.255000 2.010000 0.870000 ;
+      RECT 1.680000  0.870000 3.130000 1.015000 ;
+      RECT 1.910000  1.015000 3.130000 1.040000 ;
+      RECT 2.250000  0.085000 2.580000 0.700000 ;
+      RECT 2.700000  1.855000 3.655000 1.925000 ;
+      RECT 2.700000  1.925000 3.030000 3.075000 ;
+      RECT 2.830000  0.255000 4.095000 0.425000 ;
+      RECT 2.830000  0.425000 3.130000 0.870000 ;
+      RECT 3.300000  0.595000 3.655000 0.935000 ;
+      RECT 3.485000  0.935000 3.655000 1.710000 ;
+      RECT 3.810000  2.000000 4.060000 3.245000 ;
+      RECT 3.825000  0.425000 4.095000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o32a_2
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef
index e1389fd..d444bf3 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_4.magic.lef
@@ -99,33 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.160000 0.085000 ;
-        RECT 0.610000  0.085000 1.235000 0.700000 ;
-        RECT 0.610000  0.700000 0.940000 0.915000 ;
-        RECT 1.810000  0.085000 2.140000 0.700000 ;
-        RECT 2.730000  0.085000 3.060000 0.700000 ;
-        RECT 5.985000  0.085000 6.315000 0.905000 ;
-        RECT 6.845000  0.085000 7.175000 0.885000 ;
-        RECT 7.705000  0.085000 8.035000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -134,73 +107,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 1.380000 2.715000 1.710000 3.245000 ;
-        RECT 4.525000 2.715000 4.855000 3.245000 ;
-        RECT 5.985000 2.375000 6.315000 3.245000 ;
-        RECT 6.845000 2.095000 7.175000 3.245000 ;
-        RECT 7.705000 2.095000 8.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 ;
-        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.180000 0.305000 0.440000 1.085000 ;
-      RECT 0.180000 1.085000 1.330000 1.255000 ;
-      RECT 0.520000 2.035000 2.540000 2.205000 ;
-      RECT 0.520000 2.205000 0.780000 3.065000 ;
-      RECT 0.950000 2.375000 2.180000 2.545000 ;
-      RECT 0.950000 2.545000 1.210000 3.075000 ;
-      RECT 1.160000 0.870000 3.855000 1.040000 ;
-      RECT 1.160000 1.040000 1.330000 1.085000 ;
-      RECT 1.405000 0.255000 1.640000 0.870000 ;
-      RECT 1.880000 2.545000 2.180000 3.075000 ;
-      RECT 2.310000 0.305000 2.560000 0.870000 ;
-      RECT 2.350000 1.705000 3.470000 1.875000 ;
-      RECT 2.350000 1.875000 2.540000 2.035000 ;
-      RECT 2.350000 2.205000 2.540000 3.075000 ;
-      RECT 2.710000 2.045000 3.040000 2.905000 ;
-      RECT 2.710000 2.905000 3.920000 3.075000 ;
-      RECT 3.210000 1.875000 3.470000 2.735000 ;
-      RECT 3.230000 0.255000 5.795000 0.425000 ;
-      RECT 3.230000 0.425000 3.855000 0.870000 ;
-      RECT 3.660000 2.035000 6.300000 2.205000 ;
-      RECT 3.660000 2.205000 3.920000 2.905000 ;
-      RECT 4.025000 0.595000 4.355000 0.870000 ;
-      RECT 4.025000 0.870000 5.285000 1.040000 ;
-      RECT 4.025000 1.040000 4.275000 1.185000 ;
-      RECT 4.090000 2.375000 5.285000 2.545000 ;
-      RECT 4.090000 2.545000 4.355000 3.075000 ;
-      RECT 4.525000 0.425000 5.795000 0.435000 ;
-      RECT 4.525000 0.435000 4.785000 0.700000 ;
-      RECT 4.955000 0.615000 5.285000 0.870000 ;
-      RECT 4.955000 1.040000 5.285000 1.075000 ;
-      RECT 4.955000 1.075000 6.300000 1.255000 ;
-      RECT 5.025000 2.545000 5.285000 3.075000 ;
-      RECT 5.455000 2.205000 5.715000 3.075000 ;
-      RECT 5.465000 0.435000 5.795000 0.895000 ;
-      RECT 5.795000 1.255000 6.300000 1.395000 ;
-      RECT 5.795000 1.395000 7.640000 1.585000 ;
-      RECT 5.795000 1.585000 6.300000 2.035000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.180000  0.305000 0.440000 1.085000 ;
+      RECT 0.180000  1.085000 1.330000 1.255000 ;
+      RECT 0.520000  2.035000 2.540000 2.205000 ;
+      RECT 0.520000  2.205000 0.780000 3.065000 ;
+      RECT 0.610000  0.085000 1.235000 0.700000 ;
+      RECT 0.610000  0.700000 0.940000 0.915000 ;
+      RECT 0.950000  2.375000 2.180000 2.545000 ;
+      RECT 0.950000  2.545000 1.210000 3.075000 ;
+      RECT 1.160000  0.870000 3.855000 1.040000 ;
+      RECT 1.160000  1.040000 1.330000 1.085000 ;
+      RECT 1.380000  2.715000 1.710000 3.245000 ;
+      RECT 1.405000  0.255000 1.640000 0.870000 ;
+      RECT 1.810000  0.085000 2.140000 0.700000 ;
+      RECT 1.880000  2.545000 2.180000 3.075000 ;
+      RECT 2.310000  0.305000 2.560000 0.870000 ;
+      RECT 2.350000  1.705000 3.470000 1.875000 ;
+      RECT 2.350000  1.875000 2.540000 2.035000 ;
+      RECT 2.350000  2.205000 2.540000 3.075000 ;
+      RECT 2.710000  2.045000 3.040000 2.905000 ;
+      RECT 2.710000  2.905000 3.920000 3.075000 ;
+      RECT 2.730000  0.085000 3.060000 0.700000 ;
+      RECT 3.210000  1.875000 3.470000 2.735000 ;
+      RECT 3.230000  0.255000 5.795000 0.425000 ;
+      RECT 3.230000  0.425000 3.855000 0.870000 ;
+      RECT 3.660000  2.035000 6.300000 2.205000 ;
+      RECT 3.660000  2.205000 3.920000 2.905000 ;
+      RECT 4.025000  0.595000 4.355000 0.870000 ;
+      RECT 4.025000  0.870000 5.285000 1.040000 ;
+      RECT 4.025000  1.040000 4.275000 1.185000 ;
+      RECT 4.090000  2.375000 5.285000 2.545000 ;
+      RECT 4.090000  2.545000 4.355000 3.075000 ;
+      RECT 4.525000  0.425000 5.795000 0.435000 ;
+      RECT 4.525000  0.435000 4.785000 0.700000 ;
+      RECT 4.525000  2.715000 4.855000 3.245000 ;
+      RECT 4.955000  0.615000 5.285000 0.870000 ;
+      RECT 4.955000  1.040000 5.285000 1.075000 ;
+      RECT 4.955000  1.075000 6.300000 1.255000 ;
+      RECT 5.025000  2.545000 5.285000 3.075000 ;
+      RECT 5.455000  2.205000 5.715000 3.075000 ;
+      RECT 5.465000  0.435000 5.795000 0.895000 ;
+      RECT 5.795000  1.255000 6.300000 1.395000 ;
+      RECT 5.795000  1.395000 7.640000 1.585000 ;
+      RECT 5.795000  1.585000 6.300000 2.035000 ;
+      RECT 5.985000  0.085000 6.315000 0.905000 ;
+      RECT 5.985000  2.375000 6.315000 3.245000 ;
+      RECT 6.845000  0.085000 7.175000 0.885000 ;
+      RECT 6.845000  2.095000 7.175000 3.245000 ;
+      RECT 7.705000  0.085000 8.035000 0.885000 ;
+      RECT 7.705000  2.095000 8.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 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o32a_4
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef
index 6bda1fd..12cd6ea 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_lp.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.665000  0.085000 1.995000 0.450000 ;
-        RECT 2.605000  0.085000 2.935000 0.800000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.185000 2.075000 0.435000 3.245000 ;
-        RECT 2.835000 2.310000 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 ;
-        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.135000 0.265000 1.485000 0.435000 ;
-      RECT 0.135000 0.435000 0.465000 0.945000 ;
-      RECT 0.645000 0.615000 0.975000 0.980000 ;
-      RECT 0.645000 0.980000 3.195000 1.070000 ;
-      RECT 0.645000 1.070000 3.385000 1.150000 ;
-      RECT 1.155000 0.435000 1.485000 0.630000 ;
-      RECT 1.155000 0.630000 2.425000 0.800000 ;
-      RECT 1.405000 1.960000 3.195000 2.130000 ;
-      RECT 1.405000 2.130000 1.655000 3.065000 ;
-      RECT 2.175000 0.425000 2.425000 0.630000 ;
-      RECT 3.025000 1.150000 3.385000 1.740000 ;
-      RECT 3.025000 1.740000 3.195000 1.960000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.135000  0.265000 1.485000 0.435000 ;
+      RECT 0.135000  0.435000 0.465000 0.945000 ;
+      RECT 0.185000  2.075000 0.435000 3.245000 ;
+      RECT 0.645000  0.615000 0.975000 0.980000 ;
+      RECT 0.645000  0.980000 3.195000 1.070000 ;
+      RECT 0.645000  1.070000 3.385000 1.150000 ;
+      RECT 1.155000  0.435000 1.485000 0.630000 ;
+      RECT 1.155000  0.630000 2.425000 0.800000 ;
+      RECT 1.405000  1.960000 3.195000 2.130000 ;
+      RECT 1.405000  2.130000 1.655000 3.065000 ;
+      RECT 1.665000  0.085000 1.995000 0.450000 ;
+      RECT 2.175000  0.425000 2.425000 0.630000 ;
+      RECT 2.605000  0.085000 2.935000 0.800000 ;
+      RECT 2.835000  2.310000 3.165000 3.245000 ;
+      RECT 3.025000  1.150000 3.385000 1.740000 ;
+      RECT 3.025000  1.740000 3.195000 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 ;
   END
 END sky130_fd_sc_lp__o32a_lp
diff --git a/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef b/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef
index d3c8580..0138671 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_m.magic.lef
@@ -90,19 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.575000  0.085000 0.905000 0.655000 ;
-        RECT 1.670000  0.085000 2.000000 0.655000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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.575000 2.185000 0.905000 3.245000 ;
-        RECT 3.200000 2.225000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.300000 0.515000 1.490000 0.835000 ;
-      RECT 1.300000 0.835000 2.550000 1.005000 ;
-      RECT 2.110000 2.855000 2.635000 3.025000 ;
-      RECT 2.360000 0.265000 3.570000 0.435000 ;
-      RECT 2.360000 0.435000 2.550000 0.835000 ;
-      RECT 2.425000 2.125000 2.635000 2.855000 ;
-      RECT 2.465000 1.875000 3.215000 2.045000 ;
-      RECT 2.465000 2.045000 2.635000 2.125000 ;
-      RECT 2.730000 0.615000 3.060000 0.835000 ;
-      RECT 2.730000 0.835000 3.215000 1.005000 ;
-      RECT 3.045000 1.005000 3.215000 1.875000 ;
-      RECT 3.240000 0.435000 3.570000 0.655000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.575000  0.085000 0.905000 0.655000 ;
+      RECT 0.575000  2.185000 0.905000 3.245000 ;
+      RECT 1.300000  0.515000 1.490000 0.835000 ;
+      RECT 1.300000  0.835000 2.550000 1.005000 ;
+      RECT 1.670000  0.085000 2.000000 0.655000 ;
+      RECT 2.110000  2.855000 2.635000 3.025000 ;
+      RECT 2.360000  0.265000 3.570000 0.435000 ;
+      RECT 2.360000  0.435000 2.550000 0.835000 ;
+      RECT 2.425000  2.125000 2.635000 2.855000 ;
+      RECT 2.465000  1.875000 3.215000 2.045000 ;
+      RECT 2.465000  2.045000 2.635000 2.125000 ;
+      RECT 2.730000  0.615000 3.060000 0.835000 ;
+      RECT 2.730000  0.835000 3.215000 1.005000 ;
+      RECT 3.045000  1.005000 3.215000 1.875000 ;
+      RECT 3.200000  2.225000 3.530000 3.245000 ;
+      RECT 3.240000  0.435000 3.570000 0.655000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o32a_m
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef
index 3dbc22e..945895f 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.magic.lef
@@ -91,18 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.485000  0.085000 2.210000 0.700000 ;
-        RECT 2.800000  0.085000 3.070000 0.785000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,28 +99,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.205000 2.435000 0.455000 3.245000 ;
-        RECT 2.620000 2.445000 2.830000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.125000 0.255000 1.315000 0.425000 ;
-      RECT 0.125000 0.425000 0.455000 0.670000 ;
-      RECT 1.125000 0.425000 1.315000 0.870000 ;
-      RECT 1.125000 0.870000 2.580000 1.040000 ;
-      RECT 2.380000 0.455000 2.580000 0.870000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  0.255000 1.315000 0.425000 ;
+      RECT 0.125000  0.425000 0.455000 0.670000 ;
+      RECT 0.205000  2.435000 0.455000 3.245000 ;
+      RECT 1.125000  0.425000 1.315000 0.870000 ;
+      RECT 1.125000  0.870000 2.580000 1.040000 ;
+      RECT 1.485000  0.085000 2.210000 0.700000 ;
+      RECT 2.380000  0.455000 2.580000 0.870000 ;
+      RECT 2.620000  2.445000 2.830000 3.245000 ;
+      RECT 2.800000  0.085000 3.070000 0.785000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o32ai_0
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef
index 090d568..a1fa27c 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.700000  0.085000 2.370000 0.700000 ;
-        RECT 2.900000  0.085000 3.230000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -112,28 +100,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.340000 1.920000 0.605000 3.245000 ;
-        RECT 2.870000 1.920000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.340000 0.255000 1.530000 0.425000 ;
-      RECT 0.340000 0.425000 0.600000 0.670000 ;
-      RECT 1.270000 0.425000 1.530000 0.870000 ;
-      RECT 1.270000 0.870000 2.730000 1.040000 ;
-      RECT 2.540000 0.325000 2.730000 0.870000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.340000  0.255000 1.530000 0.425000 ;
+      RECT 0.340000  0.425000 0.600000 0.670000 ;
+      RECT 0.340000  1.920000 0.605000 3.245000 ;
+      RECT 1.270000  0.425000 1.530000 0.870000 ;
+      RECT 1.270000  0.870000 2.730000 1.040000 ;
+      RECT 1.700000  0.085000 2.370000 0.700000 ;
+      RECT 2.540000  0.325000 2.730000 0.870000 ;
+      RECT 2.870000  1.920000 3.200000 3.245000 ;
+      RECT 2.900000  0.085000 3.230000 1.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o32ai_1
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef
index d040dc9..89d9998 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.magic.lef
@@ -94,25 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 2.615000  0.085000 3.405000 0.565000 ;
-        RECT 3.945000  0.085000 4.275000 0.700000 ;
-        RECT 4.835000  0.085000 5.165000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -121,52 +102,68 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 1.445000 2.620000 1.775000 3.245000 ;
-        RECT 4.815000 2.045000 5.145000 3.245000 ;
-        RECT 5.710000 1.815000 6.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 6.240000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.255000 2.445000 0.425000 ;
-      RECT 0.155000 0.425000 0.415000 1.185000 ;
-      RECT 0.155000 1.920000 0.415000 2.905000 ;
-      RECT 0.155000 2.905000 1.275000 3.075000 ;
-      RECT 1.085000 2.260000 2.205000 2.450000 ;
-      RECT 1.085000 2.450000 1.275000 2.905000 ;
-      RECT 1.095000 0.425000 1.425000 0.905000 ;
-      RECT 1.945000 2.450000 2.205000 3.075000 ;
-      RECT 2.115000 0.425000 2.445000 0.735000 ;
-      RECT 2.115000 0.735000 3.775000 0.870000 ;
-      RECT 2.115000 0.870000 5.595000 0.905000 ;
-      RECT 2.555000 2.260000 2.825000 2.905000 ;
-      RECT 2.555000 2.905000 4.625000 3.075000 ;
-      RECT 3.505000 0.905000 5.595000 1.040000 ;
-      RECT 3.505000 1.815000 3.695000 2.905000 ;
-      RECT 3.575000 0.315000 3.775000 0.735000 ;
-      RECT 3.865000 1.705000 5.540000 1.875000 ;
-      RECT 3.865000 1.875000 4.195000 2.735000 ;
-      RECT 4.365000 2.045000 4.625000 2.905000 ;
-      RECT 4.465000 0.315000 4.665000 0.870000 ;
-      RECT 5.315000 1.875000 5.540000 3.075000 ;
-      RECT 5.335000 0.315000 5.595000 0.870000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.155000  0.255000 2.445000 0.425000 ;
+      RECT 0.155000  0.425000 0.415000 1.185000 ;
+      RECT 0.155000  1.920000 0.415000 2.905000 ;
+      RECT 0.155000  2.905000 1.275000 3.075000 ;
+      RECT 1.085000  2.260000 2.205000 2.450000 ;
+      RECT 1.085000  2.450000 1.275000 2.905000 ;
+      RECT 1.095000  0.425000 1.425000 0.905000 ;
+      RECT 1.445000  2.620000 1.775000 3.245000 ;
+      RECT 1.945000  2.450000 2.205000 3.075000 ;
+      RECT 2.115000  0.425000 2.445000 0.735000 ;
+      RECT 2.115000  0.735000 3.775000 0.870000 ;
+      RECT 2.115000  0.870000 5.595000 0.905000 ;
+      RECT 2.555000  2.260000 2.825000 2.905000 ;
+      RECT 2.555000  2.905000 4.625000 3.075000 ;
+      RECT 2.615000  0.085000 3.405000 0.565000 ;
+      RECT 3.505000  0.905000 5.595000 1.040000 ;
+      RECT 3.505000  1.815000 3.695000 2.905000 ;
+      RECT 3.575000  0.315000 3.775000 0.735000 ;
+      RECT 3.865000  1.705000 5.540000 1.875000 ;
+      RECT 3.865000  1.875000 4.195000 2.735000 ;
+      RECT 3.945000  0.085000 4.275000 0.700000 ;
+      RECT 4.365000  2.045000 4.625000 2.905000 ;
+      RECT 4.465000  0.315000 4.665000 0.870000 ;
+      RECT 4.815000  2.045000 5.145000 3.245000 ;
+      RECT 4.835000  0.085000 5.165000 0.700000 ;
+      RECT 5.315000  1.875000 5.540000 3.075000 ;
+      RECT 5.335000  0.315000 5.595000 0.870000 ;
+      RECT 5.710000  1.815000 6.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 ;
   END
 END sky130_fd_sc_lp__o32ai_2
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef
index b4983b2..a64a4a9 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.magic.lef
@@ -100,37 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 4.090000  0.085000  4.420000 0.485000 ;
-        RECT 5.090000  0.085000  5.420000 0.485000 ;
-        RECT 6.405000  0.085000  6.745000 0.475000 ;
-        RECT 7.310000  0.085000  7.940000 0.700000 ;
-        RECT 8.550000  0.085000  8.880000 0.700000 ;
-        RECT 9.410000  0.085000  9.740000 0.700000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -139,76 +108,104 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 2.295000 2.620000  2.625000 3.245000 ;
-        RECT 3.155000 2.620000  3.485000 3.245000 ;
-        RECT 8.120000 2.005000  8.450000 3.245000 ;
-        RECT 8.980000 2.005000  9.310000 3.245000 ;
-        RECT 9.880000 1.815000 10.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 ;
-        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.110000 0.255000  3.880000 0.425000 ;
-      RECT 0.110000 0.425000  0.400000 1.095000 ;
-      RECT 0.110000 1.940000  0.370000 2.905000 ;
-      RECT 0.110000 2.905000  2.125000 3.075000 ;
-      RECT 0.970000 0.425000  1.300000 0.835000 ;
-      RECT 1.040000 2.270000  1.230000 2.905000 ;
-      RECT 1.830000 0.425000  2.160000 0.835000 ;
-      RECT 1.935000 2.270000  3.915000 2.450000 ;
-      RECT 1.935000 2.450000  2.125000 2.905000 ;
-      RECT 2.690000 0.425000  3.880000 0.445000 ;
-      RECT 2.690000 0.445000  3.020000 0.835000 ;
-      RECT 2.795000 2.450000  2.985000 3.075000 ;
-      RECT 3.550000 0.445000  3.880000 0.655000 ;
-      RECT 3.550000 0.655000  6.345000 0.825000 ;
-      RECT 3.655000 2.450000  3.915000 3.075000 ;
-      RECT 4.105000 2.270000  4.375000 2.905000 ;
-      RECT 4.105000 2.905000  7.875000 3.075000 ;
-      RECT 4.590000 0.255000  4.920000 0.655000 ;
-      RECT 4.990000 2.270000  5.245000 2.905000 ;
-      RECT 5.590000 0.255000  6.235000 0.645000 ;
-      RECT 5.590000 0.645000  6.345000 0.655000 ;
-      RECT 5.850000 2.270000  6.120000 2.905000 ;
-      RECT 6.175000 0.825000  6.345000 0.870000 ;
-      RECT 6.175000 0.870000 10.170000 1.040000 ;
-      RECT 6.290000 1.665000  9.710000 1.835000 ;
-      RECT 6.290000 1.835000  6.545000 2.735000 ;
-      RECT 6.715000 2.005000  6.975000 2.905000 ;
-      RECT 6.915000 0.255000  7.140000 0.870000 ;
-      RECT 7.145000 1.835000  7.410000 2.735000 ;
-      RECT 7.580000 2.005000  7.875000 2.905000 ;
-      RECT 8.110000 0.255000  8.380000 0.870000 ;
-      RECT 8.620000 1.835000  8.810000 3.075000 ;
-      RECT 9.050000 0.255000  9.240000 0.870000 ;
-      RECT 9.480000 1.835000  9.710000 3.075000 ;
-      RECT 9.910000 0.255000 10.170000 0.870000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.110000  0.255000  3.880000 0.425000 ;
+      RECT 0.110000  0.425000  0.400000 1.095000 ;
+      RECT 0.110000  1.940000  0.370000 2.905000 ;
+      RECT 0.110000  2.905000  2.125000 3.075000 ;
+      RECT 0.970000  0.425000  1.300000 0.835000 ;
+      RECT 1.040000  2.270000  1.230000 2.905000 ;
+      RECT 1.830000  0.425000  2.160000 0.835000 ;
+      RECT 1.935000  2.270000  3.915000 2.450000 ;
+      RECT 1.935000  2.450000  2.125000 2.905000 ;
+      RECT 2.295000  2.620000  2.625000 3.245000 ;
+      RECT 2.690000  0.425000  3.880000 0.445000 ;
+      RECT 2.690000  0.445000  3.020000 0.835000 ;
+      RECT 2.795000  2.450000  2.985000 3.075000 ;
+      RECT 3.155000  2.620000  3.485000 3.245000 ;
+      RECT 3.550000  0.445000  3.880000 0.655000 ;
+      RECT 3.550000  0.655000  6.345000 0.825000 ;
+      RECT 3.655000  2.450000  3.915000 3.075000 ;
+      RECT 4.090000  0.085000  4.420000 0.485000 ;
+      RECT 4.105000  2.270000  4.375000 2.905000 ;
+      RECT 4.105000  2.905000  7.875000 3.075000 ;
+      RECT 4.590000  0.255000  4.920000 0.655000 ;
+      RECT 4.990000  2.270000  5.245000 2.905000 ;
+      RECT 5.090000  0.085000  5.420000 0.485000 ;
+      RECT 5.590000  0.255000  6.235000 0.645000 ;
+      RECT 5.590000  0.645000  6.345000 0.655000 ;
+      RECT 5.850000  2.270000  6.120000 2.905000 ;
+      RECT 6.175000  0.825000  6.345000 0.870000 ;
+      RECT 6.175000  0.870000 10.170000 1.040000 ;
+      RECT 6.290000  1.665000  9.710000 1.835000 ;
+      RECT 6.290000  1.835000  6.545000 2.735000 ;
+      RECT 6.405000  0.085000  6.745000 0.475000 ;
+      RECT 6.715000  2.005000  6.975000 2.905000 ;
+      RECT 6.915000  0.255000  7.140000 0.870000 ;
+      RECT 7.145000  1.835000  7.410000 2.735000 ;
+      RECT 7.310000  0.085000  7.940000 0.700000 ;
+      RECT 7.580000  2.005000  7.875000 2.905000 ;
+      RECT 8.110000  0.255000  8.380000 0.870000 ;
+      RECT 8.120000  2.005000  8.450000 3.245000 ;
+      RECT 8.550000  0.085000  8.880000 0.700000 ;
+      RECT 8.620000  1.835000  8.810000 3.075000 ;
+      RECT 8.980000  2.005000  9.310000 3.245000 ;
+      RECT 9.050000  0.255000  9.240000 0.870000 ;
+      RECT 9.410000  0.085000  9.740000 0.700000 ;
+      RECT 9.480000  1.835000  9.710000 3.075000 ;
+      RECT 9.880000  1.815000 10.170000 3.245000 ;
+      RECT 9.910000  0.255000 10.170000 0.870000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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_lp__o32ai_4
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef
index ad44963..224bf34 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.magic.lef
@@ -94,18 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.975000  0.085000 2.225000 1.075000 ;
-        RECT 2.915000  0.085000 3.245000 1.115000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -114,28 +102,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.115000 2.075000 0.445000 3.245000 ;
-        RECT 2.860000 2.075000 3.190000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.735000 1.385000 0.905000 ;
-      RECT 0.115000 0.905000 0.445000 1.335000 ;
-      RECT 1.135000 0.905000 1.385000 1.255000 ;
-      RECT 1.135000 1.255000 2.735000 1.425000 ;
-      RECT 2.405000 0.745000 2.735000 1.255000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.115000  0.735000 1.385000 0.905000 ;
+      RECT 0.115000  0.905000 0.445000 1.335000 ;
+      RECT 0.115000  2.075000 0.445000 3.245000 ;
+      RECT 1.135000  0.905000 1.385000 1.255000 ;
+      RECT 1.135000  1.255000 2.735000 1.425000 ;
+      RECT 1.975000  0.085000 2.225000 1.075000 ;
+      RECT 2.405000  0.745000 2.735000 1.255000 ;
+      RECT 2.860000  2.075000 3.190000 3.245000 ;
+      RECT 2.915000  0.085000 3.245000 1.115000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o32ai_lp
diff --git a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef
index d139af7..fcad937 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.magic.lef
@@ -91,18 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.680000  0.085000 2.010000 0.640000 ;
-        RECT 2.560000  0.085000 2.890000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,28 +99,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.265000 2.785000 0.455000 3.245000 ;
-        RECT 2.905000 2.785000 3.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.290000 0.270000 1.500000 0.440000 ;
-      RECT 0.290000 0.440000 0.620000 0.660000 ;
-      RECT 1.310000 0.440000 1.500000 0.820000 ;
-      RECT 1.310000 0.820000 2.380000 0.990000 ;
-      RECT 2.190000 0.520000 2.380000 0.820000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.265000  2.785000 0.455000 3.245000 ;
+      RECT 0.290000  0.270000 1.500000 0.440000 ;
+      RECT 0.290000  0.440000 0.620000 0.660000 ;
+      RECT 1.310000  0.440000 1.500000 0.820000 ;
+      RECT 1.310000  0.820000 2.380000 0.990000 ;
+      RECT 1.680000  0.085000 2.010000 0.640000 ;
+      RECT 2.190000  0.520000 2.380000 0.820000 ;
+      RECT 2.560000  0.085000 2.890000 0.660000 ;
+      RECT 2.905000  2.785000 3.095000 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_lp__o32ai_m
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef
index 6e48052..caffea5 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_0.magic.lef
@@ -90,20 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.525000  0.085000 0.855000 0.570000 ;
-        RECT 2.035000  0.085000 2.315000 0.630000 ;
-        RECT 2.900000  0.085000 3.230000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,36 +98,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.710000 2.395000 1.040000 3.245000 ;
-        RECT 3.375000 2.395000 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.525000 0.740000 1.440000 0.910000 ;
-      RECT 0.525000 0.910000 0.775000 2.045000 ;
-      RECT 0.525000 2.045000 1.425000 2.215000 ;
-      RECT 1.140000 0.300000 1.440000 0.740000 ;
-      RECT 1.210000 2.215000 1.425000 2.395000 ;
-      RECT 1.210000 2.395000 1.990000 3.075000 ;
-      RECT 1.610000 0.300000 1.865000 0.800000 ;
-      RECT 1.610000 0.800000 3.705000 0.865000 ;
-      RECT 1.610000 0.865000 2.700000 0.970000 ;
-      RECT 2.485000 0.300000 2.730000 0.695000 ;
-      RECT 2.485000 0.695000 3.705000 0.800000 ;
-      RECT 3.400000 0.300000 3.705000 0.695000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.525000  0.085000 0.855000 0.570000 ;
+      RECT 0.525000  0.740000 1.440000 0.910000 ;
+      RECT 0.525000  0.910000 0.775000 2.045000 ;
+      RECT 0.525000  2.045000 1.425000 2.215000 ;
+      RECT 0.710000  2.395000 1.040000 3.245000 ;
+      RECT 1.140000  0.300000 1.440000 0.740000 ;
+      RECT 1.210000  2.215000 1.425000 2.395000 ;
+      RECT 1.210000  2.395000 1.990000 3.075000 ;
+      RECT 1.610000  0.300000 1.865000 0.800000 ;
+      RECT 1.610000  0.800000 3.705000 0.865000 ;
+      RECT 1.610000  0.865000 2.700000 0.970000 ;
+      RECT 2.035000  0.085000 2.315000 0.630000 ;
+      RECT 2.485000  0.300000 2.730000 0.695000 ;
+      RECT 2.485000  0.695000 3.705000 0.800000 ;
+      RECT 2.900000  0.085000 3.230000 0.525000 ;
+      RECT 3.375000  2.395000 3.690000 3.245000 ;
+      RECT 3.400000  0.300000 3.705000 0.695000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o41a_0
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef
index f78758d..0290cf6 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_1.magic.lef
@@ -92,21 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.900000  0.085000 1.230000 0.815000 ;
-        RECT 2.350000  0.085000 2.680000 0.835000 ;
-        RECT 3.360000  0.085000 3.690000 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 ;
       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 1.155000 2.270000 1.485000 3.245000 ;
-        RECT 3.865000 1.920000 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.780000 1.095000 1.710000 1.165000 ;
-      RECT 0.780000 1.165000 1.425000 1.525000 ;
-      RECT 0.900000 0.995000 1.710000 1.095000 ;
-      RECT 1.255000 1.525000 1.425000 1.925000 ;
-      RECT 1.255000 1.925000 1.905000 2.100000 ;
-      RECT 1.420000 0.255000 1.710000 0.995000 ;
-      RECT 1.655000 2.100000 1.905000 3.075000 ;
-      RECT 1.880000 0.255000 2.150000 1.005000 ;
-      RECT 1.880000 1.005000 4.160000 1.175000 ;
-      RECT 2.860000 0.255000 3.190000 1.005000 ;
-      RECT 3.860000 0.255000 4.160000 1.005000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.780000  1.095000 1.710000 1.165000 ;
+      RECT 0.780000  1.165000 1.425000 1.525000 ;
+      RECT 0.900000  0.085000 1.230000 0.815000 ;
+      RECT 0.900000  0.995000 1.710000 1.095000 ;
+      RECT 1.155000  2.270000 1.485000 3.245000 ;
+      RECT 1.255000  1.525000 1.425000 1.925000 ;
+      RECT 1.255000  1.925000 1.905000 2.100000 ;
+      RECT 1.420000  0.255000 1.710000 0.995000 ;
+      RECT 1.655000  2.100000 1.905000 3.075000 ;
+      RECT 1.880000  0.255000 2.150000 1.005000 ;
+      RECT 1.880000  1.005000 4.160000 1.175000 ;
+      RECT 2.350000  0.085000 2.680000 0.835000 ;
+      RECT 2.860000  0.255000 3.190000 1.005000 ;
+      RECT 3.360000  0.085000 3.690000 0.835000 ;
+      RECT 3.860000  0.255000 4.160000 1.005000 ;
+      RECT 3.865000  1.920000 4.160000 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_lp__o41a_1
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef
index c3a110f..4b5d7e2 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_2.magic.lef
@@ -88,23 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.205000  0.085000 0.465000 1.255000 ;
-        RECT 1.065000  0.085000 1.395000 1.175000 ;
-        RECT 2.830000  0.085000 3.160000 0.835000 ;
-        RECT 3.800000  0.085000 4.130000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -113,39 +96,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.205000 1.815000 0.465000 3.245000 ;
-        RECT 1.065000 1.845000 1.450000 2.310000 ;
-        RECT 1.065000 2.310000 1.900000 3.245000 ;
-        RECT 4.345000 1.925000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.065000 1.345000 1.895000 1.675000 ;
-      RECT 1.620000 0.255000 2.200000 1.040000 ;
-      RECT 1.620000 1.040000 1.895000 1.345000 ;
-      RECT 1.620000 1.675000 1.895000 1.960000 ;
-      RECT 1.620000 1.960000 2.325000 2.140000 ;
-      RECT 2.070000 2.140000 2.325000 2.330000 ;
-      RECT 2.070000 2.330000 2.740000 3.075000 ;
-      RECT 2.425000 0.255000 2.660000 1.005000 ;
-      RECT 2.425000 1.005000 4.610000 1.175000 ;
-      RECT 3.330000 0.255000 3.630000 1.005000 ;
-      RECT 4.300000 0.255000 4.610000 1.005000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.205000  0.085000 0.465000 1.255000 ;
+      RECT 0.205000  1.815000 0.465000 3.245000 ;
+      RECT 1.065000  0.085000 1.395000 1.175000 ;
+      RECT 1.065000  1.345000 1.895000 1.675000 ;
+      RECT 1.065000  1.845000 1.450000 2.310000 ;
+      RECT 1.065000  2.310000 1.900000 3.245000 ;
+      RECT 1.620000  0.255000 2.200000 1.040000 ;
+      RECT 1.620000  1.040000 1.895000 1.345000 ;
+      RECT 1.620000  1.675000 1.895000 1.960000 ;
+      RECT 1.620000  1.960000 2.325000 2.140000 ;
+      RECT 2.070000  2.140000 2.325000 2.330000 ;
+      RECT 2.070000  2.330000 2.740000 3.075000 ;
+      RECT 2.425000  0.255000 2.660000 1.005000 ;
+      RECT 2.425000  1.005000 4.610000 1.175000 ;
+      RECT 2.830000  0.085000 3.160000 0.835000 ;
+      RECT 3.330000  0.255000 3.630000 1.005000 ;
+      RECT 3.800000  0.085000 4.130000 0.835000 ;
+      RECT 4.300000  0.255000 4.610000 1.005000 ;
+      RECT 4.345000  1.925000 4.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 ;
+      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_lp__o41a_2
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef
index 5371632..bcfdd9f 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_4.magic.lef
@@ -94,32 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 0.885000 ;
-        RECT 0.970000  0.085000 1.300000 0.885000 ;
-        RECT 1.830000  0.085000 2.150000 1.105000 ;
-        RECT 3.685000  0.085000 3.945000 0.700000 ;
-        RECT 4.545000  0.085000 4.800000 0.700000 ;
-        RECT 5.405000  0.085000 6.150000 0.700000 ;
-        RECT 6.755000  0.085000 7.015000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,63 +102,86 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.110000 2.095000 0.440000 3.245000 ;
-        RECT 0.970000 2.105000 1.300000 3.245000 ;
-        RECT 1.830000 1.815000 2.160000 3.245000 ;
-        RECT 2.690000 1.985000 3.020000 3.245000 ;
-        RECT 6.790000 2.105000 7.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 ;
-        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.505000 1.395000 2.510000 1.585000 ;
-      RECT 2.320000 0.860000 3.120000 1.040000 ;
-      RECT 2.320000 1.040000 2.510000 1.395000 ;
-      RECT 2.330000 1.585000 2.510000 1.605000 ;
-      RECT 2.330000 1.605000 3.910000 1.815000 ;
-      RECT 2.330000 1.815000 2.520000 3.075000 ;
-      RECT 2.360000 0.255000 3.515000 0.425000 ;
-      RECT 2.360000 0.425000 2.620000 0.690000 ;
-      RECT 2.790000 0.595000 3.120000 0.860000 ;
-      RECT 3.220000 1.985000 3.550000 2.905000 ;
-      RECT 3.220000 2.905000 4.410000 3.075000 ;
-      RECT 3.290000 0.425000 3.515000 0.870000 ;
-      RECT 3.290000 0.870000 7.500000 1.040000 ;
-      RECT 3.720000 1.815000 3.910000 2.735000 ;
-      RECT 4.080000 1.605000 5.270000 1.775000 ;
-      RECT 4.080000 1.775000 4.410000 2.905000 ;
-      RECT 4.115000 0.255000 4.375000 0.870000 ;
-      RECT 4.580000 1.945000 4.770000 2.895000 ;
-      RECT 4.580000 2.895000 6.260000 3.075000 ;
-      RECT 4.940000 1.775000 5.270000 2.725000 ;
-      RECT 4.970000 0.255000 5.235000 0.870000 ;
-      RECT 5.500000 1.705000 7.490000 1.875000 ;
-      RECT 5.500000 1.875000 5.760000 2.725000 ;
-      RECT 5.930000 2.055000 6.260000 2.895000 ;
-      RECT 6.320000 0.255000 6.585000 0.870000 ;
-      RECT 6.430000 1.875000 6.620000 3.075000 ;
-      RECT 7.185000 0.265000 7.500000 0.870000 ;
-      RECT 7.290000 1.875000 7.490000 3.075000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.110000  0.085000 0.440000 0.885000 ;
+      RECT 0.110000  2.095000 0.440000 3.245000 ;
+      RECT 0.505000  1.395000 2.510000 1.585000 ;
+      RECT 0.970000  0.085000 1.300000 0.885000 ;
+      RECT 0.970000  2.105000 1.300000 3.245000 ;
+      RECT 1.830000  0.085000 2.150000 1.105000 ;
+      RECT 1.830000  1.815000 2.160000 3.245000 ;
+      RECT 2.320000  0.860000 3.120000 1.040000 ;
+      RECT 2.320000  1.040000 2.510000 1.395000 ;
+      RECT 2.330000  1.585000 2.510000 1.605000 ;
+      RECT 2.330000  1.605000 3.910000 1.815000 ;
+      RECT 2.330000  1.815000 2.520000 3.075000 ;
+      RECT 2.360000  0.255000 3.515000 0.425000 ;
+      RECT 2.360000  0.425000 2.620000 0.690000 ;
+      RECT 2.690000  1.985000 3.020000 3.245000 ;
+      RECT 2.790000  0.595000 3.120000 0.860000 ;
+      RECT 3.220000  1.985000 3.550000 2.905000 ;
+      RECT 3.220000  2.905000 4.410000 3.075000 ;
+      RECT 3.290000  0.425000 3.515000 0.870000 ;
+      RECT 3.290000  0.870000 7.500000 1.040000 ;
+      RECT 3.685000  0.085000 3.945000 0.700000 ;
+      RECT 3.720000  1.815000 3.910000 2.735000 ;
+      RECT 4.080000  1.605000 5.270000 1.775000 ;
+      RECT 4.080000  1.775000 4.410000 2.905000 ;
+      RECT 4.115000  0.255000 4.375000 0.870000 ;
+      RECT 4.545000  0.085000 4.800000 0.700000 ;
+      RECT 4.580000  1.945000 4.770000 2.895000 ;
+      RECT 4.580000  2.895000 6.260000 3.075000 ;
+      RECT 4.940000  1.775000 5.270000 2.725000 ;
+      RECT 4.970000  0.255000 5.235000 0.870000 ;
+      RECT 5.405000  0.085000 6.150000 0.700000 ;
+      RECT 5.500000  1.705000 7.490000 1.875000 ;
+      RECT 5.500000  1.875000 5.760000 2.725000 ;
+      RECT 5.930000  2.055000 6.260000 2.895000 ;
+      RECT 6.320000  0.255000 6.585000 0.870000 ;
+      RECT 6.430000  1.875000 6.620000 3.075000 ;
+      RECT 6.755000  0.085000 7.015000 0.700000 ;
+      RECT 6.790000  2.105000 7.120000 3.245000 ;
+      RECT 7.185000  0.265000 7.500000 0.870000 ;
+      RECT 7.290000  1.875000 7.490000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o41a_4
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef
index b019938..167afac 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_lp.magic.lef
@@ -90,21 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.645000  0.085000 0.975000 0.660000 ;
-        RECT 1.665000  0.085000 1.915000 0.700000 ;
-        RECT 3.085000  0.085000 3.415000 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 ;
-        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,37 +98,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.130000 2.040000 0.460000 3.245000 ;
-        RECT 3.075000 2.040000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 0.265000 0.465000 0.840000 ;
-      RECT 0.135000 0.840000 1.485000 0.880000 ;
-      RECT 0.135000 0.880000 2.345000 1.010000 ;
-      RECT 1.155000 0.265000 1.485000 0.840000 ;
-      RECT 1.155000 1.010000 2.345000 1.050000 ;
-      RECT 2.095000 0.265000 2.345000 0.880000 ;
-      RECT 2.525000 0.265000 2.855000 0.830000 ;
-      RECT 2.525000 0.830000 3.585000 1.000000 ;
-      RECT 2.545000 1.690000 3.745000 1.860000 ;
-      RECT 2.545000 1.860000 2.875000 3.065000 ;
-      RECT 3.415000 1.000000 3.585000 1.190000 ;
-      RECT 3.415000 1.190000 3.745000 1.690000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.130000  2.040000 0.460000 3.245000 ;
+      RECT 0.135000  0.265000 0.465000 0.840000 ;
+      RECT 0.135000  0.840000 1.485000 0.880000 ;
+      RECT 0.135000  0.880000 2.345000 1.010000 ;
+      RECT 0.645000  0.085000 0.975000 0.660000 ;
+      RECT 1.155000  0.265000 1.485000 0.840000 ;
+      RECT 1.155000  1.010000 2.345000 1.050000 ;
+      RECT 1.665000  0.085000 1.915000 0.700000 ;
+      RECT 2.095000  0.265000 2.345000 0.880000 ;
+      RECT 2.525000  0.265000 2.855000 0.830000 ;
+      RECT 2.525000  0.830000 3.585000 1.000000 ;
+      RECT 2.545000  1.690000 3.745000 1.860000 ;
+      RECT 2.545000  1.860000 2.875000 3.065000 ;
+      RECT 3.075000  2.040000 3.405000 3.245000 ;
+      RECT 3.085000  0.085000 3.415000 0.650000 ;
+      RECT 3.415000  1.000000 3.585000 1.190000 ;
+      RECT 3.415000  1.190000 3.745000 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 ;
   END
 END sky130_fd_sc_lp__o41a_lp
diff --git a/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef b/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef
index de37cb2..6a131cd 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_m.magic.lef
@@ -89,20 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.585000  0.085000 0.795000 0.545000 ;
-        RECT 1.965000  0.085000 2.175000 0.565000 ;
-        RECT 2.825000  0.085000 3.035000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,33 +97,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.800000 2.805000 0.990000 3.245000 ;
-        RECT 2.915000 2.845000 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 ;
-        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.725000 1.315000 0.895000 ;
-      RECT 0.545000 0.895000 0.715000 2.445000 ;
-      RECT 0.545000 2.445000 1.415000 2.615000 ;
-      RECT 1.105000 0.365000 1.315000 0.725000 ;
-      RECT 1.225000 2.615000 1.415000 2.985000 ;
-      RECT 1.535000 0.365000 1.745000 0.745000 ;
-      RECT 1.535000 0.745000 3.465000 0.915000 ;
-      RECT 2.395000 0.365000 2.605000 0.745000 ;
-      RECT 3.255000 0.365000 3.465000 0.745000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.545000  0.725000 1.315000 0.895000 ;
+      RECT 0.545000  0.895000 0.715000 2.445000 ;
+      RECT 0.545000  2.445000 1.415000 2.615000 ;
+      RECT 0.585000  0.085000 0.795000 0.545000 ;
+      RECT 0.800000  2.805000 0.990000 3.245000 ;
+      RECT 1.105000  0.365000 1.315000 0.725000 ;
+      RECT 1.225000  2.615000 1.415000 2.985000 ;
+      RECT 1.535000  0.365000 1.745000 0.745000 ;
+      RECT 1.535000  0.745000 3.465000 0.915000 ;
+      RECT 1.965000  0.085000 2.175000 0.565000 ;
+      RECT 2.395000  0.365000 2.605000 0.745000 ;
+      RECT 2.825000  0.085000 3.035000 0.565000 ;
+      RECT 2.915000  2.845000 3.245000 3.245000 ;
+      RECT 3.255000  0.365000 3.465000 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_lp__o41a_m
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef
index 608dc6d..aa33bb7 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.540000  0.085000 1.870000 0.660000 ;
-        RECT 2.480000  0.085000 2.800000 0.660000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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.570000 2.405000 0.860000 3.245000 ;
-        RECT 2.710000 2.405000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.100000 0.330000 1.370000 0.830000 ;
-      RECT 1.100000 0.830000 3.265000 1.000000 ;
-      RECT 2.040000 0.330000 2.310000 0.830000 ;
-      RECT 2.970000 0.330000 3.265000 0.830000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.570000  2.405000 0.860000 3.245000 ;
+      RECT 1.100000  0.330000 1.370000 0.830000 ;
+      RECT 1.100000  0.830000 3.265000 1.000000 ;
+      RECT 1.540000  0.085000 1.870000 0.660000 ;
+      RECT 2.040000  0.330000 2.310000 0.830000 ;
+      RECT 2.480000  0.085000 2.800000 0.660000 ;
+      RECT 2.710000  2.405000 3.085000 3.245000 ;
+      RECT 2.970000  0.330000 3.265000 0.830000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o41ai_0
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef
index ef4ac0d..2a6bd1f 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.magic.lef
@@ -94,18 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.305000  0.085000 1.635000 0.835000 ;
-        RECT 2.255000  0.085000 2.585000 0.700000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -114,31 +102,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.310000 1.925000 0.560000 2.340000 ;
-        RECT 0.310000 2.340000 0.695000 3.245000 ;
-        RECT 2.695000 1.925000 3.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 ;
-        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.805000 0.255000 1.135000 0.855000 ;
-      RECT 0.965000 0.855000 1.135000 1.005000 ;
-      RECT 0.965000 1.005000 3.085000 1.040000 ;
-      RECT 0.965000 1.040000 2.735000 1.175000 ;
-      RECT 1.805000 0.255000 2.085000 0.870000 ;
-      RECT 1.805000 0.870000 3.085000 1.005000 ;
-      RECT 2.755000 0.255000 3.085000 0.870000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.310000  1.925000 0.560000 2.340000 ;
+      RECT 0.310000  2.340000 0.695000 3.245000 ;
+      RECT 0.805000  0.255000 1.135000 0.855000 ;
+      RECT 0.965000  0.855000 1.135000 1.005000 ;
+      RECT 0.965000  1.005000 3.085000 1.040000 ;
+      RECT 0.965000  1.040000 2.735000 1.175000 ;
+      RECT 1.305000  0.085000 1.635000 0.835000 ;
+      RECT 1.805000  0.255000 2.085000 0.870000 ;
+      RECT 1.805000  0.870000 3.085000 1.005000 ;
+      RECT 2.255000  0.085000 2.585000 0.700000 ;
+      RECT 2.695000  1.925000 3.065000 3.245000 ;
+      RECT 2.755000  0.255000 3.085000 0.870000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__o41ai_1
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef
index 0f1f73f..9cf27fd 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.magic.lef
@@ -92,26 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 2.100000  0.085000 2.430000 0.825000 ;
-        RECT 3.070000  0.085000 3.400000 0.825000 ;
-        RECT 3.970000  0.085000 4.300000 0.825000 ;
-        RECT 4.830000  0.085000 5.160000 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 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -120,50 +100,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.145000 1.815000 0.445000 3.245000 ;
-        RECT 1.005000 2.045000 1.335000 3.245000 ;
-        RECT 5.290000 2.260000 5.620000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.735000 0.255000 1.925000 0.425000 ;
-      RECT 0.735000 0.425000 1.065000 0.845000 ;
-      RECT 1.525000 2.045000 1.785000 2.895000 ;
-      RECT 1.525000 2.895000 2.840000 3.075000 ;
-      RECT 1.655000 0.425000 1.925000 0.995000 ;
-      RECT 1.655000 0.995000 5.610000 1.165000 ;
-      RECT 2.510000 1.920000 3.810000 2.090000 ;
-      RECT 2.510000 2.090000 2.840000 2.895000 ;
-      RECT 2.620000 0.255000 2.900000 0.995000 ;
-      RECT 3.050000 2.260000 3.380000 2.905000 ;
-      RECT 3.050000 2.905000 4.760000 3.075000 ;
-      RECT 3.550000 2.090000 3.810000 2.735000 ;
-      RECT 3.570000 0.255000 3.800000 0.995000 ;
-      RECT 4.000000 1.920000 6.050000 2.090000 ;
-      RECT 4.000000 2.090000 4.260000 2.735000 ;
-      RECT 4.430000 2.260000 4.760000 2.905000 ;
-      RECT 4.470000 0.255000 4.660000 0.995000 ;
-      RECT 4.930000 2.090000 5.120000 3.075000 ;
-      RECT 5.340000 0.255000 5.610000 0.995000 ;
-      RECT 5.790000 2.090000 6.050000 3.075000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.145000  1.815000 0.445000 3.245000 ;
+      RECT 0.735000  0.255000 1.925000 0.425000 ;
+      RECT 0.735000  0.425000 1.065000 0.845000 ;
+      RECT 1.005000  2.045000 1.335000 3.245000 ;
+      RECT 1.525000  2.045000 1.785000 2.895000 ;
+      RECT 1.525000  2.895000 2.840000 3.075000 ;
+      RECT 1.655000  0.425000 1.925000 0.995000 ;
+      RECT 1.655000  0.995000 5.610000 1.165000 ;
+      RECT 2.100000  0.085000 2.430000 0.825000 ;
+      RECT 2.510000  1.920000 3.810000 2.090000 ;
+      RECT 2.510000  2.090000 2.840000 2.895000 ;
+      RECT 2.620000  0.255000 2.900000 0.995000 ;
+      RECT 3.050000  2.260000 3.380000 2.905000 ;
+      RECT 3.050000  2.905000 4.760000 3.075000 ;
+      RECT 3.070000  0.085000 3.400000 0.825000 ;
+      RECT 3.550000  2.090000 3.810000 2.735000 ;
+      RECT 3.570000  0.255000 3.800000 0.995000 ;
+      RECT 3.970000  0.085000 4.300000 0.825000 ;
+      RECT 4.000000  1.920000 6.050000 2.090000 ;
+      RECT 4.000000  2.090000 4.260000 2.735000 ;
+      RECT 4.430000  2.260000 4.760000 2.905000 ;
+      RECT 4.470000  0.255000 4.660000 0.995000 ;
+      RECT 4.830000  0.085000 5.160000 0.825000 ;
+      RECT 4.930000  2.090000 5.120000 3.075000 ;
+      RECT 5.290000  2.260000 5.620000 3.245000 ;
+      RECT 5.340000  0.255000 5.610000 0.995000 ;
+      RECT 5.790000  2.090000 6.050000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__o41ai_2
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef
index e645dde..4f90400 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.magic.lef
@@ -100,39 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 3.150000  0.085000  3.480000 0.505000 ;
-        RECT 4.170000  0.085000  4.500000 0.505000 ;
-        RECT 5.185000  0.085000  5.515000 0.835000 ;
-        RECT 6.050000  0.085000  6.380000 0.835000 ;
-        RECT 6.910000  0.085000  7.240000 0.835000 ;
-        RECT 7.840000  0.085000  8.170000 0.835000 ;
-        RECT 8.795000  0.085000  9.070000 0.700000 ;
-        RECT 9.660000  0.085000  9.940000 0.700000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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,80 +108,110 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 0.490000 1.930000  0.820000 3.245000 ;
-        RECT 1.350000 2.270000  1.680000 3.245000 ;
-        RECT 2.210000 2.270000  2.540000 3.245000 ;
-        RECT 8.840000 2.045000  9.170000 3.245000 ;
-        RECT 9.700000 2.045000 10.030000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.920000 0.255000  2.970000 0.425000 ;
-      RECT  0.920000 0.425000  1.215000 1.095000 ;
-      RECT  1.780000 0.425000  2.110000 0.845000 ;
-      RECT  2.640000 0.425000  2.970000 0.675000 ;
-      RECT  2.640000 0.675000  5.015000 0.845000 ;
-      RECT  2.730000 2.270000  2.990000 2.895000 ;
-      RECT  2.730000 2.895000  4.710000 3.075000 ;
-      RECT  3.660000 0.255000  3.990000 0.675000 ;
-      RECT  3.660000 2.270000  3.850000 2.895000 ;
-      RECT  4.520000 2.045000  6.500000 2.225000 ;
-      RECT  4.520000 2.225000  4.710000 2.895000 ;
-      RECT  4.680000 0.255000  5.015000 0.675000 ;
-      RECT  4.845000 0.845000  5.015000 1.005000 ;
-      RECT  4.845000 1.005000 10.390000 1.040000 ;
-      RECT  4.845000 1.040000  8.585000 1.175000 ;
-      RECT  4.845000 1.920000  6.500000 2.045000 ;
-      RECT  4.880000 2.395000  5.210000 2.855000 ;
-      RECT  4.880000 2.855000  8.310000 3.075000 ;
-      RECT  5.380000 2.225000  5.570000 2.685000 ;
-      RECT  5.690000 0.255000  5.880000 1.005000 ;
-      RECT  5.740000 2.395000  6.070000 2.855000 ;
-      RECT  6.240000 2.225000  6.500000 2.685000 ;
-      RECT  6.550000 0.255000  6.740000 1.005000 ;
-      RECT  6.690000 1.920000  7.880000 2.100000 ;
-      RECT  6.690000 2.100000  6.950000 2.685000 ;
-      RECT  7.120000 2.270000  7.450000 2.735000 ;
-      RECT  7.120000 2.735000  8.310000 2.855000 ;
-      RECT  7.410000 0.255000  7.670000 1.005000 ;
-      RECT  7.620000 1.695000 10.460000 1.875000 ;
-      RECT  7.620000 1.875000  7.880000 1.920000 ;
-      RECT  7.620000 2.100000  7.880000 2.490000 ;
-      RECT  8.050000 2.045000  8.310000 2.735000 ;
-      RECT  8.340000 0.255000  8.625000 0.870000 ;
-      RECT  8.340000 0.870000 10.390000 1.005000 ;
-      RECT  8.480000 1.875000  8.670000 3.075000 ;
-      RECT  9.240000 0.255000  9.490000 0.870000 ;
-      RECT  9.340000 1.875000  9.530000 3.075000 ;
-      RECT 10.110000 0.255000 10.390000 0.870000 ;
-      RECT 10.200000 1.875000 10.460000 3.075000 ;
+      RECT  0.000000 -0.085000 10.560000 0.085000 ;
+      RECT  0.000000  3.245000 10.560000 3.415000 ;
+      RECT  0.490000  1.930000  0.820000 3.245000 ;
+      RECT  0.920000  0.255000  2.970000 0.425000 ;
+      RECT  0.920000  0.425000  1.215000 1.095000 ;
+      RECT  1.350000  2.270000  1.680000 3.245000 ;
+      RECT  1.780000  0.425000  2.110000 0.845000 ;
+      RECT  2.210000  2.270000  2.540000 3.245000 ;
+      RECT  2.640000  0.425000  2.970000 0.675000 ;
+      RECT  2.640000  0.675000  5.015000 0.845000 ;
+      RECT  2.730000  2.270000  2.990000 2.895000 ;
+      RECT  2.730000  2.895000  4.710000 3.075000 ;
+      RECT  3.150000  0.085000  3.480000 0.505000 ;
+      RECT  3.660000  0.255000  3.990000 0.675000 ;
+      RECT  3.660000  2.270000  3.850000 2.895000 ;
+      RECT  4.170000  0.085000  4.500000 0.505000 ;
+      RECT  4.520000  2.045000  6.500000 2.225000 ;
+      RECT  4.520000  2.225000  4.710000 2.895000 ;
+      RECT  4.680000  0.255000  5.015000 0.675000 ;
+      RECT  4.845000  0.845000  5.015000 1.005000 ;
+      RECT  4.845000  1.005000 10.390000 1.040000 ;
+      RECT  4.845000  1.040000  8.585000 1.175000 ;
+      RECT  4.845000  1.920000  6.500000 2.045000 ;
+      RECT  4.880000  2.395000  5.210000 2.855000 ;
+      RECT  4.880000  2.855000  8.310000 3.075000 ;
+      RECT  5.185000  0.085000  5.515000 0.835000 ;
+      RECT  5.380000  2.225000  5.570000 2.685000 ;
+      RECT  5.690000  0.255000  5.880000 1.005000 ;
+      RECT  5.740000  2.395000  6.070000 2.855000 ;
+      RECT  6.050000  0.085000  6.380000 0.835000 ;
+      RECT  6.240000  2.225000  6.500000 2.685000 ;
+      RECT  6.550000  0.255000  6.740000 1.005000 ;
+      RECT  6.690000  1.920000  7.880000 2.100000 ;
+      RECT  6.690000  2.100000  6.950000 2.685000 ;
+      RECT  6.910000  0.085000  7.240000 0.835000 ;
+      RECT  7.120000  2.270000  7.450000 2.735000 ;
+      RECT  7.120000  2.735000  8.310000 2.855000 ;
+      RECT  7.410000  0.255000  7.670000 1.005000 ;
+      RECT  7.620000  1.695000 10.460000 1.875000 ;
+      RECT  7.620000  1.875000  7.880000 1.920000 ;
+      RECT  7.620000  2.100000  7.880000 2.490000 ;
+      RECT  7.840000  0.085000  8.170000 0.835000 ;
+      RECT  8.050000  2.045000  8.310000 2.735000 ;
+      RECT  8.340000  0.255000  8.625000 0.870000 ;
+      RECT  8.340000  0.870000 10.390000 1.005000 ;
+      RECT  8.480000  1.875000  8.670000 3.075000 ;
+      RECT  8.795000  0.085000  9.070000 0.700000 ;
+      RECT  8.840000  2.045000  9.170000 3.245000 ;
+      RECT  9.240000  0.255000  9.490000 0.870000 ;
+      RECT  9.340000  1.875000  9.530000 3.075000 ;
+      RECT  9.660000  0.085000  9.940000 0.700000 ;
+      RECT  9.700000  2.045000 10.030000 3.245000 ;
+      RECT 10.110000  0.255000 10.390000 0.870000 ;
+      RECT 10.200000  1.875000 10.460000 3.075000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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_lp__o41ai_4
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef
index f9aebf2..0f398e5 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.magic.lef
@@ -91,18 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.250000  0.085000 1.580000 0.595000 ;
-        RECT 2.320000  0.085000 2.650000 0.695000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,29 +99,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.210000 2.325000 0.540000 3.245000 ;
-        RECT 2.910000 2.075000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.740000 0.265000 1.070000 0.775000 ;
-      RECT 0.740000 0.775000 2.140000 0.875000 ;
-      RECT 0.740000 0.875000 3.160000 0.945000 ;
-      RECT 1.810000 0.265000 2.140000 0.775000 ;
-      RECT 1.810000 0.945000 3.160000 1.045000 ;
-      RECT 2.830000 0.265000 3.160000 0.875000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.210000  2.325000 0.540000 3.245000 ;
+      RECT 0.740000  0.265000 1.070000 0.775000 ;
+      RECT 0.740000  0.775000 2.140000 0.875000 ;
+      RECT 0.740000  0.875000 3.160000 0.945000 ;
+      RECT 1.250000  0.085000 1.580000 0.595000 ;
+      RECT 1.810000  0.265000 2.140000 0.775000 ;
+      RECT 1.810000  0.945000 3.160000 1.045000 ;
+      RECT 2.320000  0.085000 2.650000 0.695000 ;
+      RECT 2.830000  0.265000 3.160000 0.875000 ;
+      RECT 2.910000  2.075000 3.240000 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_lp__o41ai_lp
diff --git a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef
index b97f329..e2dea43 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.magic.lef
@@ -91,18 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.335000  0.085000 1.665000 0.485000 ;
-        RECT 2.310000  0.085000 2.640000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,28 +99,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.235000 1.965000 0.425000 3.245000 ;
-        RECT 2.650000 1.930000 3.075000 2.140000 ;
-        RECT 2.905000 2.140000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.985000 0.345000 1.155000 0.665000 ;
-      RECT 0.985000 0.665000 3.010000 0.835000 ;
-      RECT 1.920000 0.345000 2.130000 0.665000 ;
-      RECT 2.820000 0.345000 3.010000 0.665000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.235000  1.965000 0.425000 3.245000 ;
+      RECT 0.985000  0.345000 1.155000 0.665000 ;
+      RECT 0.985000  0.665000 3.010000 0.835000 ;
+      RECT 1.335000  0.085000 1.665000 0.485000 ;
+      RECT 1.920000  0.345000 2.130000 0.665000 ;
+      RECT 2.310000  0.085000 2.640000 0.485000 ;
+      RECT 2.650000  1.930000 3.075000 2.140000 ;
+      RECT 2.820000  0.345000 3.010000 0.665000 ;
+      RECT 2.905000  2.140000 3.075000 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_lp__o41ai_m
diff --git a/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef
index 862645a..a2a5845 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_0.magic.lef
@@ -63,16 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.300000  0.085000 0.595000 0.610000 ;
-        RECT 1.195000  0.085000 1.450000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.400000 0.245000 ;
     END
@@ -81,26 +71,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.160000 2.345000 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.340000 2.410000 0.935000 2.740000 ;
-      RECT 0.765000 0.280000 1.025000 0.610000 ;
-      RECT 0.765000 0.610000 0.935000 2.005000 ;
-      RECT 0.765000 2.005000 1.885000 2.175000 ;
-      RECT 0.765000 2.175000 0.935000 2.410000 ;
-      RECT 1.605000 1.505000 1.885000 2.005000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.300000  0.085000 0.595000 0.610000 ;
+      RECT 0.340000  2.410000 0.935000 2.740000 ;
+      RECT 0.765000  0.280000 1.025000 0.610000 ;
+      RECT 0.765000  0.610000 0.935000 2.005000 ;
+      RECT 0.765000  2.005000 1.885000 2.175000 ;
+      RECT 0.765000  2.175000 0.935000 2.410000 ;
+      RECT 1.160000  2.345000 1.785000 3.245000 ;
+      RECT 1.195000  0.085000 1.450000 0.610000 ;
+      RECT 1.605000  1.505000 1.885000 2.005000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__or2_0
diff --git a/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef
index 2f7b6d6..e21fec3 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_1.magic.lef
@@ -62,16 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.340000  0.085000 0.670000 0.975000 ;
-        RECT 1.405000  0.085000 1.735000 0.690000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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 +70,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 1.160000 2.025000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.340000 1.685000 1.875000 1.855000 ;
-      RECT 0.340000 1.855000 0.670000 2.210000 ;
-      RECT 0.840000 0.700000 1.100000 0.860000 ;
-      RECT 0.840000 0.860000 1.715000 1.030000 ;
-      RECT 1.545000 1.030000 1.715000 1.210000 ;
-      RECT 1.545000 1.210000 1.875000 1.685000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.340000  0.085000 0.670000 0.975000 ;
+      RECT 0.340000  1.685000 1.875000 1.855000 ;
+      RECT 0.340000  1.855000 0.670000 2.210000 ;
+      RECT 0.840000  0.700000 1.100000 0.860000 ;
+      RECT 0.840000  0.860000 1.715000 1.030000 ;
+      RECT 1.160000  2.025000 1.875000 3.245000 ;
+      RECT 1.405000  0.085000 1.735000 0.690000 ;
+      RECT 1.545000  1.030000 1.715000 1.210000 ;
+      RECT 1.545000  1.210000 1.875000 1.685000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__or2_1
diff --git a/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef
index a79574c..1cdcde7 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_2.magic.lef
@@ -65,18 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.400000 0.085000 ;
-        RECT 0.130000  0.085000 0.420000 0.610000 ;
-        RECT 1.040000  0.085000 1.370000 0.555000 ;
-        RECT 1.945000  0.085000 2.275000 0.835000 ;
-        RECT 1.985000  0.835000 2.275000 1.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -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
@@ -85,29 +73,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.400000 3.415000 ;
-        RECT 0.960000 1.970000 1.375000 3.245000 ;
-        RECT 1.945000 2.095000 2.275000 3.245000 ;
-        RECT 1.985000 1.815000 2.275000 2.095000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 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 1.630000 1.375000 1.800000 ;
-      RECT 0.260000 1.800000 0.470000 2.260000 ;
-      RECT 0.590000 0.255000 0.870000 0.725000 ;
-      RECT 0.590000 0.725000 1.415000 0.895000 ;
-      RECT 1.185000 0.895000 1.415000 1.275000 ;
-      RECT 1.185000 1.275000 1.475000 1.605000 ;
-      RECT 1.185000 1.605000 1.375000 1.630000 ;
+      RECT 0.000000 -0.085000 2.400000 0.085000 ;
+      RECT 0.000000  3.245000 2.400000 3.415000 ;
+      RECT 0.130000  0.085000 0.420000 0.610000 ;
+      RECT 0.260000  1.630000 1.375000 1.800000 ;
+      RECT 0.260000  1.800000 0.470000 2.260000 ;
+      RECT 0.590000  0.255000 0.870000 0.725000 ;
+      RECT 0.590000  0.725000 1.415000 0.895000 ;
+      RECT 0.960000  1.970000 1.375000 3.245000 ;
+      RECT 1.040000  0.085000 1.370000 0.555000 ;
+      RECT 1.185000  0.895000 1.415000 1.275000 ;
+      RECT 1.185000  1.275000 1.475000 1.605000 ;
+      RECT 1.185000  1.605000 1.375000 1.630000 ;
+      RECT 1.945000  0.085000 2.275000 0.835000 ;
+      RECT 1.945000  2.095000 2.275000 3.245000 ;
+      RECT 1.985000  0.835000 2.275000 1.095000 ;
+      RECT 1.985000  1.815000 2.275000 2.095000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  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_lp__or2_2
diff --git a/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef
index af36391..bf3d17b 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_4.magic.lef
@@ -67,20 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 1.040000 ;
-        RECT 1.000000  0.085000 1.330000 0.815000 ;
-        RECT 1.890000  0.085000 2.220000 0.895000 ;
-        RECT 2.750000  0.085000 3.080000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -89,31 +75,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.960000 2.270000 1.290000 3.245000 ;
-        RECT 1.890000 2.115000 2.220000 3.245000 ;
-        RECT 2.750000 2.115000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.930000 1.360000 2.100000 ;
-      RECT 0.095000 2.100000 0.425000 3.075000 ;
-      RECT 0.610000 0.255000 0.830000 0.985000 ;
-      RECT 0.610000 0.985000 1.360000 1.175000 ;
-      RECT 1.190000 1.175000 1.360000 1.415000 ;
-      RECT 1.190000 1.415000 2.685000 1.585000 ;
-      RECT 1.190000 1.585000 1.360000 1.930000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 1.040000 ;
+      RECT 0.095000  1.930000 1.360000 2.100000 ;
+      RECT 0.095000  2.100000 0.425000 3.075000 ;
+      RECT 0.610000  0.255000 0.830000 0.985000 ;
+      RECT 0.610000  0.985000 1.360000 1.175000 ;
+      RECT 0.960000  2.270000 1.290000 3.245000 ;
+      RECT 1.000000  0.085000 1.330000 0.815000 ;
+      RECT 1.190000  1.175000 1.360000 1.415000 ;
+      RECT 1.190000  1.415000 2.685000 1.585000 ;
+      RECT 1.190000  1.585000 1.360000 1.930000 ;
+      RECT 1.890000  0.085000 2.220000 0.895000 ;
+      RECT 1.890000  2.115000 2.220000 3.245000 ;
+      RECT 2.750000  0.085000 3.080000 0.895000 ;
+      RECT 2.750000  2.115000 3.080000 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_lp__or2_4
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef
index 2349807..28a5a80 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp.magic.lef
@@ -64,18 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.135000  0.085000 0.465000 1.010000 ;
-        RECT 1.965000  0.085000 2.295000 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
@@ -84,28 +72,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.315000 2.320000 0.645000 3.245000 ;
-        RECT 1.720000 2.430000 2.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.955000 0.550000 1.285000 1.010000 ;
-      RECT 1.115000 1.010000 1.285000 2.090000 ;
-      RECT 1.115000 2.090000 2.355000 2.260000 ;
-      RECT 1.115000 2.260000 1.465000 2.780000 ;
-      RECT 2.025000 1.590000 2.355000 2.090000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.135000  0.085000 0.465000 1.010000 ;
+      RECT 0.315000  2.320000 0.645000 3.245000 ;
+      RECT 0.955000  0.550000 1.285000 1.010000 ;
+      RECT 1.115000  1.010000 1.285000 2.090000 ;
+      RECT 1.115000  2.090000 2.355000 2.260000 ;
+      RECT 1.115000  2.260000 1.465000 2.780000 ;
+      RECT 1.720000  2.430000 2.050000 3.245000 ;
+      RECT 1.965000  0.085000 2.295000 1.010000 ;
+      RECT 2.025000  1.590000 2.355000 2.090000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__or2_lp
diff --git a/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef
index 68c3f70..a26a1e4 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp2.magic.lef
@@ -61,18 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.505000  0.085000 0.835000 0.725000 ;
-        RECT 2.115000  0.085000 2.445000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,27 +69,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 2.130000 2.105000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.110000 0.265000 1.655000 0.725000 ;
-      RECT 1.110000 0.725000 1.280000 1.755000 ;
-      RECT 1.110000 1.755000 2.725000 1.925000 ;
-      RECT 1.110000 1.925000 1.440000 3.065000 ;
-      RECT 2.395000 1.215000 2.725000 1.755000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.505000  0.085000 0.835000 0.725000 ;
+      RECT 1.110000  0.265000 1.655000 0.725000 ;
+      RECT 1.110000  0.725000 1.280000 1.755000 ;
+      RECT 1.110000  1.755000 2.725000 1.925000 ;
+      RECT 1.110000  1.925000 1.440000 3.065000 ;
+      RECT 2.115000  0.085000 2.445000 0.725000 ;
+      RECT 2.130000  2.105000 2.460000 3.245000 ;
+      RECT 2.395000  1.215000 2.725000 1.755000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__or2_lp2
diff --git a/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef b/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef
index aec4a5a..bc6b121 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef
+++ b/cells/or2/sky130_fd_sc_lp__or2_m.magic.lef
@@ -61,15 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.920000 0.085000 ;
-        RECT 0.265000  0.085000 0.475000 0.545000 ;
-        RECT 1.125000  0.085000 1.335000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -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
@@ -78,25 +69,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 1.920000 3.415000 ;
-        RECT 1.125000 2.095000 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.335000 1.745000 1.375000 1.915000 ;
-      RECT 0.335000 1.915000 0.945000 2.295000 ;
-      RECT 0.615000 2.295000 0.945000 3.025000 ;
-      RECT 0.695000 0.345000 0.905000 0.725000 ;
-      RECT 0.695000 0.725000 1.375000 0.895000 ;
-      RECT 1.205000 0.895000 1.375000 1.745000 ;
+      RECT 0.000000 -0.085000 1.920000 0.085000 ;
+      RECT 0.000000  3.245000 1.920000 3.415000 ;
+      RECT 0.265000  0.085000 0.475000 0.545000 ;
+      RECT 0.335000  1.745000 1.375000 1.915000 ;
+      RECT 0.335000  1.915000 0.945000 2.295000 ;
+      RECT 0.615000  2.295000 0.945000 3.025000 ;
+      RECT 0.695000  0.345000 0.905000 0.725000 ;
+      RECT 0.695000  0.725000 1.375000 0.895000 ;
+      RECT 1.125000  0.085000 1.335000 0.545000 ;
+      RECT 1.125000  2.095000 1.335000 3.245000 ;
+      RECT 1.205000  0.895000 1.375000 1.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 ;
   END
 END sky130_fd_sc_lp__or2_m
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef
index 8b842ff..9c87d63 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_1.magic.lef
@@ -63,17 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.140000  0.085000 1.370000 0.620000 ;
-        RECT 1.975000  0.085000 2.355000 1.025000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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
@@ -82,32 +71,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.560000 2.720000 0.805000 3.245000 ;
-        RECT 1.955000 1.815000 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 ;
-        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.085000 0.290000 0.970000 0.605000 ;
-      RECT 0.085000 0.605000 0.280000 2.380000 ;
-      RECT 0.085000 2.380000 1.305000 2.550000 ;
-      RECT 0.085000 2.550000 0.390000 3.050000 ;
-      RECT 0.975000 2.550000 1.305000 2.955000 ;
-      RECT 1.080000 1.880000 1.730000 2.120000 ;
-      RECT 1.080000 2.120000 1.380000 2.210000 ;
-      RECT 1.540000 0.290000 1.770000 1.195000 ;
-      RECT 1.540000 1.195000 2.355000 1.525000 ;
-      RECT 1.540000 1.525000 1.730000 1.880000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.085000  0.290000 0.970000 0.605000 ;
+      RECT 0.085000  0.605000 0.280000 2.380000 ;
+      RECT 0.085000  2.380000 1.305000 2.550000 ;
+      RECT 0.085000  2.550000 0.390000 3.050000 ;
+      RECT 0.560000  2.720000 0.805000 3.245000 ;
+      RECT 0.975000  2.550000 1.305000 2.955000 ;
+      RECT 1.080000  1.880000 1.730000 2.120000 ;
+      RECT 1.080000  2.120000 1.380000 2.210000 ;
+      RECT 1.140000  0.085000 1.370000 0.620000 ;
+      RECT 1.540000  0.290000 1.770000 1.195000 ;
+      RECT 1.540000  1.195000 2.355000 1.525000 ;
+      RECT 1.540000  1.525000 1.730000 1.880000 ;
+      RECT 1.955000  1.815000 2.295000 3.245000 ;
+      RECT 1.975000  0.085000 2.355000 1.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__or2b_1
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef
index b85a70d..e6d392e 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_2.magic.lef
@@ -62,20 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.590000  0.085000 0.935000 0.355000 ;
-        RECT 1.625000  0.085000 1.955000 0.355000 ;
-        RECT 3.030000  0.085000 3.360000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -84,37 +70,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.685000 2.055000 0.910000 3.245000 ;
-        RECT 1.580000 2.270000 1.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.095000 0.290000 0.420000 0.525000 ;
-      RECT 0.095000 0.525000 2.860000 0.695000 ;
-      RECT 0.160000 1.715000 0.820000 1.885000 ;
-      RECT 0.160000 1.885000 0.490000 2.210000 ;
-      RECT 0.650000 0.695000 0.820000 1.715000 ;
-      RECT 1.580000 1.155000 1.830000 1.930000 ;
-      RECT 1.580000 1.930000 3.060000 2.100000 ;
-      RECT 1.615000 0.865000 2.520000 1.125000 ;
-      RECT 1.615000 1.125000 1.830000 1.155000 ;
-      RECT 2.690000 0.695000 2.860000 1.075000 ;
-      RECT 2.690000 1.075000 3.635000 1.245000 ;
-      RECT 2.730000 2.100000 3.060000 2.260000 ;
-      RECT 2.945000 1.245000 3.635000 1.525000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.095000  0.290000 0.420000 0.525000 ;
+      RECT 0.095000  0.525000 2.860000 0.695000 ;
+      RECT 0.160000  1.715000 0.820000 1.885000 ;
+      RECT 0.160000  1.885000 0.490000 2.210000 ;
+      RECT 0.590000  0.085000 0.935000 0.355000 ;
+      RECT 0.650000  0.695000 0.820000 1.715000 ;
+      RECT 0.685000  2.055000 0.910000 3.245000 ;
+      RECT 1.580000  1.155000 1.830000 1.930000 ;
+      RECT 1.580000  1.930000 3.060000 2.100000 ;
+      RECT 1.580000  2.270000 1.840000 3.245000 ;
+      RECT 1.615000  0.865000 2.520000 1.125000 ;
+      RECT 1.615000  1.125000 1.830000 1.155000 ;
+      RECT 1.625000  0.085000 1.955000 0.355000 ;
+      RECT 2.690000  0.695000 2.860000 1.075000 ;
+      RECT 2.690000  1.075000 3.635000 1.245000 ;
+      RECT 2.730000  2.100000 3.060000 2.260000 ;
+      RECT 2.945000  1.245000 3.635000 1.525000 ;
+      RECT 3.030000  0.085000 3.360000 0.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_lp__or2b_2
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef
index 737013e..682ca36 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_4.magic.lef
@@ -69,22 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 1.240000  0.085000 1.570000 0.905000 ;
-        RECT 2.135000  0.085000 2.400000 0.905000 ;
-        RECT 3.000000  0.085000 3.330000 0.565000 ;
-        RECT 3.860000  0.085000 4.190000 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 ;
-        RECT 3.995000 -0.085000 4.165000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.320000 0.245000 ;
     END
@@ -93,36 +77,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.525000 2.640000 0.855000 3.245000 ;
-        RECT 2.080000 1.930000 2.410000 3.245000 ;
-        RECT 3.000000 2.115000 3.330000 3.245000 ;
-        RECT 3.860000 2.115000 4.190000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 2.300000 1.045000 2.470000 ;
-      RECT 0.095000 2.470000 0.355000 2.915000 ;
-      RECT 0.715000 0.255000 1.045000 2.300000 ;
-      RECT 1.240000 1.075000 2.790000 1.255000 ;
-      RECT 1.240000 1.255000 1.415000 1.930000 ;
-      RECT 1.240000 1.930000 1.570000 3.075000 ;
-      RECT 1.740000 0.255000 1.965000 1.075000 ;
-      RECT 2.445000 1.255000 2.790000 1.415000 ;
-      RECT 2.445000 1.415000 3.795000 1.585000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.095000  2.300000 1.045000 2.470000 ;
+      RECT 0.095000  2.470000 0.355000 2.915000 ;
+      RECT 0.525000  2.640000 0.855000 3.245000 ;
+      RECT 0.715000  0.255000 1.045000 2.300000 ;
+      RECT 1.240000  0.085000 1.570000 0.905000 ;
+      RECT 1.240000  1.075000 2.790000 1.255000 ;
+      RECT 1.240000  1.255000 1.415000 1.930000 ;
+      RECT 1.240000  1.930000 1.570000 3.075000 ;
+      RECT 1.740000  0.255000 1.965000 1.075000 ;
+      RECT 2.080000  1.930000 2.410000 3.245000 ;
+      RECT 2.135000  0.085000 2.400000 0.905000 ;
+      RECT 2.445000  1.255000 2.790000 1.415000 ;
+      RECT 2.445000  1.415000 3.795000 1.585000 ;
+      RECT 3.000000  0.085000 3.330000 0.565000 ;
+      RECT 3.000000  2.115000 3.330000 3.245000 ;
+      RECT 3.860000  0.085000 4.190000 0.895000 ;
+      RECT 3.860000  2.115000 4.190000 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_lp__or2b_4
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef
index 6f61e7f..d9f3e18 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_lp.magic.lef
@@ -62,19 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.920000  0.085000 1.250000 0.645000 ;
-        RECT 2.530000  0.085000 2.860000 0.685000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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
@@ -83,33 +70,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.660000 2.025000 0.990000 3.245000 ;
-        RECT 2.735000 2.025000 3.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 ;
-        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 0.265000 0.460000 0.825000 ;
-      RECT 0.130000 0.825000 1.515000 0.995000 ;
-      RECT 0.130000 0.995000 0.380000 3.065000 ;
-      RECT 1.185000 0.995000 1.515000 1.495000 ;
-      RECT 1.430000 2.025000 1.865000 3.065000 ;
-      RECT 1.695000 0.265000 2.070000 0.865000 ;
-      RECT 1.695000 0.865000 3.165000 1.035000 ;
-      RECT 1.695000 1.035000 1.865000 2.025000 ;
-      RECT 2.835000 1.035000 3.165000 1.535000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.130000  0.265000 0.460000 0.825000 ;
+      RECT 0.130000  0.825000 1.515000 0.995000 ;
+      RECT 0.130000  0.995000 0.380000 3.065000 ;
+      RECT 0.660000  2.025000 0.990000 3.245000 ;
+      RECT 0.920000  0.085000 1.250000 0.645000 ;
+      RECT 1.185000  0.995000 1.515000 1.495000 ;
+      RECT 1.430000  2.025000 1.865000 3.065000 ;
+      RECT 1.695000  0.265000 2.070000 0.865000 ;
+      RECT 1.695000  0.865000 3.165000 1.035000 ;
+      RECT 1.695000  1.035000 1.865000 2.025000 ;
+      RECT 2.530000  0.085000 2.860000 0.685000 ;
+      RECT 2.735000  2.025000 3.065000 3.245000 ;
+      RECT 2.835000  1.035000 3.165000 1.535000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or2b_lp
diff --git a/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef b/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef
index 756fb3a..e1c792b 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_m.magic.lef
@@ -62,17 +62,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 1.010000  0.085000 1.220000 0.640000 ;
-        RECT 1.945000  0.085000 2.275000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -81,35 +70,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 0.525000 2.650000 0.855000 3.245000 ;
-        RECT 1.945000 1.930000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 2.880000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 2.300000 0.830000 2.470000 ;
-      RECT 0.155000 2.470000 0.345000 2.790000 ;
-      RECT 0.500000 0.500000 0.830000 0.710000 ;
-      RECT 0.660000 0.710000 0.830000 0.860000 ;
-      RECT 0.660000 0.860000 1.415000 1.030000 ;
-      RECT 0.660000 1.030000 0.830000 2.300000 ;
-      RECT 1.080000 1.930000 1.765000 2.140000 ;
-      RECT 1.245000 1.030000 1.415000 1.530000 ;
-      RECT 1.400000 0.470000 1.765000 0.680000 ;
-      RECT 1.595000 0.680000 1.765000 0.860000 ;
-      RECT 1.595000 0.860000 2.355000 1.030000 ;
-      RECT 1.595000 1.030000 1.765000 1.930000 ;
-      RECT 2.185000 1.030000 2.355000 1.530000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.155000  2.300000 0.830000 2.470000 ;
+      RECT 0.155000  2.470000 0.345000 2.790000 ;
+      RECT 0.500000  0.500000 0.830000 0.710000 ;
+      RECT 0.525000  2.650000 0.855000 3.245000 ;
+      RECT 0.660000  0.710000 0.830000 0.860000 ;
+      RECT 0.660000  0.860000 1.415000 1.030000 ;
+      RECT 0.660000  1.030000 0.830000 2.300000 ;
+      RECT 1.010000  0.085000 1.220000 0.640000 ;
+      RECT 1.080000  1.930000 1.765000 2.140000 ;
+      RECT 1.245000  1.030000 1.415000 1.530000 ;
+      RECT 1.400000  0.470000 1.765000 0.680000 ;
+      RECT 1.595000  0.680000 1.765000 0.860000 ;
+      RECT 1.595000  0.860000 2.355000 1.030000 ;
+      RECT 1.595000  1.030000 1.765000 1.930000 ;
+      RECT 1.945000  0.085000 2.275000 0.580000 ;
+      RECT 1.945000  1.930000 2.275000 3.245000 ;
+      RECT 2.185000  1.030000 2.355000 1.530000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__or2b_m
diff --git a/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef
index d22a101..c095cbe 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_0.magic.lef
@@ -73,17 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.555000  0.085000 1.300000 0.635000 ;
-        RECT 1.900000  0.085000 2.160000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -92,29 +81,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.665000 2.385000 2.250000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.320000 0.385000 2.035000 ;
-      RECT 0.105000 2.035000 2.375000 2.215000 ;
-      RECT 0.105000 2.215000 0.830000 2.340000 ;
-      RECT 0.500000 2.340000 0.830000 2.780000 ;
-      RECT 1.470000 0.320000 1.730000 0.820000 ;
-      RECT 1.470000 0.820000 2.185000 1.005000 ;
-      RECT 2.015000 1.005000 2.185000 1.545000 ;
-      RECT 2.015000 1.545000 2.375000 2.035000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.105000  0.320000 0.385000 2.035000 ;
+      RECT 0.105000  2.035000 2.375000 2.215000 ;
+      RECT 0.105000  2.215000 0.830000 2.340000 ;
+      RECT 0.500000  2.340000 0.830000 2.780000 ;
+      RECT 0.555000  0.085000 1.300000 0.635000 ;
+      RECT 1.470000  0.320000 1.730000 0.820000 ;
+      RECT 1.470000  0.820000 2.185000 1.005000 ;
+      RECT 1.665000  2.385000 2.250000 3.245000 ;
+      RECT 1.900000  0.085000 2.160000 0.650000 ;
+      RECT 2.015000  1.005000 2.185000 1.545000 ;
+      RECT 2.015000  1.545000 2.375000 2.035000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__or3_0
diff --git a/cells/or3/sky130_fd_sc_lp__or3_1.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_1.magic.lef
index 28b202e..b1fb36e 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__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.655000  0.085000 1.295000 0.595000 ;
-        RECT 1.885000  0.085000 2.210000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 2.880000 0.245000 ;
     END
@@ -91,28 +80,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.660000 2.310000 2.355000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 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.085000 0.280000 0.485000 0.610000 ;
-      RECT 0.085000 0.610000 0.325000 1.920000 ;
-      RECT 0.085000 1.920000 2.355000 2.140000 ;
-      RECT 0.085000 2.140000 0.660000 2.770000 ;
-      RECT 1.465000 0.280000 1.715000 1.085000 ;
-      RECT 1.465000 1.085000 2.355000 1.255000 ;
-      RECT 2.115000 1.255000 2.355000 1.920000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.085000  0.280000 0.485000 0.610000 ;
+      RECT 0.085000  0.610000 0.325000 1.920000 ;
+      RECT 0.085000  1.920000 2.355000 2.140000 ;
+      RECT 0.085000  2.140000 0.660000 2.770000 ;
+      RECT 0.655000  0.085000 1.295000 0.595000 ;
+      RECT 1.465000  0.280000 1.715000 1.085000 ;
+      RECT 1.465000  1.085000 2.355000 1.255000 ;
+      RECT 1.660000  2.310000 2.355000 3.245000 ;
+      RECT 1.885000  0.085000 2.210000 0.915000 ;
+      RECT 2.115000  1.255000 2.355000 1.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 ;
   END
 END sky130_fd_sc_lp__or3_1
diff --git a/cells/or3/sky130_fd_sc_lp__or3_2.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_2.magic.lef
index dcb4252..11d38fd 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_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.565000  0.085000 1.235000 0.530000 ;
-        RECT 1.845000  0.085000 2.175000 0.400000 ;
-        RECT 2.900000  0.085000 3.230000 0.400000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,32 +81,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.515000 1.920000 2.215000 3.245000 ;
-        RECT 2.895000 1.815000 3.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.085000 0.345000 0.395000 0.700000 ;
-      RECT 0.085000 0.700000 3.255000 0.740000 ;
-      RECT 0.085000 0.740000 2.080000 0.870000 ;
-      RECT 0.085000 0.870000 0.255000 1.945000 ;
-      RECT 0.085000 1.945000 0.455000 2.275000 ;
-      RECT 1.405000 0.280000 1.665000 0.570000 ;
-      RECT 1.405000 0.570000 3.255000 0.700000 ;
-      RECT 2.810000 1.330000 3.255000 1.580000 ;
-      RECT 2.855000 0.740000 3.255000 1.330000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.085000  0.345000 0.395000 0.700000 ;
+      RECT 0.085000  0.700000 3.255000 0.740000 ;
+      RECT 0.085000  0.740000 2.080000 0.870000 ;
+      RECT 0.085000  0.870000 0.255000 1.945000 ;
+      RECT 0.085000  1.945000 0.455000 2.275000 ;
+      RECT 0.565000  0.085000 1.235000 0.530000 ;
+      RECT 1.405000  0.280000 1.665000 0.570000 ;
+      RECT 1.405000  0.570000 3.255000 0.700000 ;
+      RECT 1.515000  1.920000 2.215000 3.245000 ;
+      RECT 1.845000  0.085000 2.175000 0.400000 ;
+      RECT 2.810000  1.330000 3.255000 1.580000 ;
+      RECT 2.855000  0.740000 3.255000 1.330000 ;
+      RECT 2.895000  1.815000 3.145000 3.245000 ;
+      RECT 2.900000  0.085000 3.230000 0.400000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__or3_2
diff --git a/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef
index b50e785..d1679a8 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_4.magic.lef
@@ -77,22 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.810000  0.085000 1.140000 0.825000 ;
-        RECT 1.765000  0.085000 2.130000 0.825000 ;
-        RECT 2.680000  0.085000 3.010000 0.905000 ;
-        RECT 3.575000  0.085000 3.810000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -101,34 +85,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 1.745000 2.270000 2.100000 3.245000 ;
-        RECT 2.680000 2.115000 3.010000 3.245000 ;
-        RECT 3.540000 2.115000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.345000 0.255000 0.640000 0.995000 ;
-      RECT 0.345000 0.995000 2.150000 1.165000 ;
-      RECT 0.345000 1.920000 2.150000 2.100000 ;
-      RECT 0.345000 2.100000 0.675000 3.075000 ;
-      RECT 1.310000 0.255000 1.595000 0.995000 ;
-      RECT 1.980000 1.165000 2.150000 1.425000 ;
-      RECT 1.980000 1.425000 3.815000 1.595000 ;
-      RECT 1.980000 1.595000 2.150000 1.920000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.345000  0.255000 0.640000 0.995000 ;
+      RECT 0.345000  0.995000 2.150000 1.165000 ;
+      RECT 0.345000  1.920000 2.150000 2.100000 ;
+      RECT 0.345000  2.100000 0.675000 3.075000 ;
+      RECT 0.810000  0.085000 1.140000 0.825000 ;
+      RECT 1.310000  0.255000 1.595000 0.995000 ;
+      RECT 1.745000  2.270000 2.100000 3.245000 ;
+      RECT 1.765000  0.085000 2.130000 0.825000 ;
+      RECT 1.980000  1.165000 2.150000 1.425000 ;
+      RECT 1.980000  1.425000 3.815000 1.595000 ;
+      RECT 1.980000  1.595000 2.150000 1.920000 ;
+      RECT 2.680000  0.085000 3.010000 0.905000 ;
+      RECT 2.680000  2.115000 3.010000 3.245000 ;
+      RECT 3.540000  2.115000 3.870000 3.245000 ;
+      RECT 3.575000  0.085000 3.810000 0.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_lp__or3_4
diff --git a/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef
index ad3e65e..fe888bc 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_lp.magic.lef
@@ -71,19 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 1.025000  0.085000 1.355000 0.685000 ;
-        RECT 2.605000  0.085000 2.935000 0.685000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,29 +79,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.045000 2.025000 1.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.840000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.025000 0.865000 3.725000 1.035000 ;
-      RECT 1.025000 1.035000 1.355000 1.840000 ;
-      RECT 1.815000 0.265000 2.145000 0.865000 ;
-      RECT 3.250000 2.065000 3.725000 3.065000 ;
-      RECT 3.395000 0.265000 3.725000 0.865000 ;
-      RECT 3.555000 1.035000 3.725000 2.065000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 1.025000  0.085000 1.355000 0.685000 ;
+      RECT 1.025000  0.865000 3.725000 1.035000 ;
+      RECT 1.025000  1.035000 1.355000 1.840000 ;
+      RECT 1.045000  2.025000 1.375000 3.245000 ;
+      RECT 1.815000  0.265000 2.145000 0.865000 ;
+      RECT 2.605000  0.085000 2.935000 0.685000 ;
+      RECT 3.250000  2.065000 3.725000 3.065000 ;
+      RECT 3.395000  0.265000 3.725000 0.865000 ;
+      RECT 3.555000  1.035000 3.725000 2.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or3_lp
diff --git a/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef b/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef
index 152e4fb..68c2ab3 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef
+++ b/cells/or3/sky130_fd_sc_lp__or3_m.magic.lef
@@ -72,17 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.880000 0.085000 ;
-        RECT 0.985000  0.085000 1.315000 0.485000 ;
-        RECT 1.905000  0.085000 2.115000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -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,28 +80,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 2.880000 3.415000 ;
-        RECT 1.805000 2.155000 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.235000 0.345000 0.425000 1.795000 ;
-      RECT 0.235000 1.795000 2.330000 1.965000 ;
-      RECT 0.685000 1.965000 0.895000 2.295000 ;
-      RECT 1.295000 1.965000 1.625000 3.025000 ;
-      RECT 1.495000 0.345000 1.685000 0.725000 ;
-      RECT 1.495000 0.725000 2.330000 0.895000 ;
-      RECT 2.160000 0.895000 2.330000 1.795000 ;
+      RECT 0.000000 -0.085000 2.880000 0.085000 ;
+      RECT 0.000000  3.245000 2.880000 3.415000 ;
+      RECT 0.235000  0.345000 0.425000 1.795000 ;
+      RECT 0.235000  1.795000 2.330000 1.965000 ;
+      RECT 0.685000  1.965000 0.895000 2.295000 ;
+      RECT 0.985000  0.085000 1.315000 0.485000 ;
+      RECT 1.295000  1.965000 1.625000 3.025000 ;
+      RECT 1.495000  0.345000 1.685000 0.725000 ;
+      RECT 1.495000  0.725000 2.330000 0.895000 ;
+      RECT 1.805000  2.155000 2.135000 3.245000 ;
+      RECT 1.905000  0.085000 2.115000 0.545000 ;
+      RECT 2.160000  0.895000 2.330000 1.795000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  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_lp__or3_m
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef
index c6d7921..a93dd75 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_1.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.670000 ;
-        RECT 1.560000  0.085000 1.790000 0.670000 ;
-        RECT 2.495000  0.085000 2.755000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -93,34 +80,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.095000 2.660000 0.425000 3.245000 ;
-        RECT 2.495000 1.820000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.595000 0.395000 0.855000 1.000000 ;
-      RECT 0.595000 1.000000 1.050000 1.670000 ;
-      RECT 0.595000 1.670000 0.855000 2.935000 ;
-      RECT 1.060000 0.420000 1.390000 0.750000 ;
-      RECT 1.060000 1.880000 1.390000 2.300000 ;
-      RECT 1.060000 2.300000 2.325000 2.470000 ;
-      RECT 1.220000 0.750000 1.390000 1.880000 ;
-      RECT 1.960000 0.390000 2.325000 0.670000 ;
-      RECT 2.155000 0.670000 2.325000 1.320000 ;
-      RECT 2.155000 1.320000 2.905000 1.650000 ;
-      RECT 2.155000 1.650000 2.325000 2.300000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.670000 ;
+      RECT 0.095000  2.660000 0.425000 3.245000 ;
+      RECT 0.595000  0.395000 0.855000 1.000000 ;
+      RECT 0.595000  1.000000 1.050000 1.670000 ;
+      RECT 0.595000  1.670000 0.855000 2.935000 ;
+      RECT 1.060000  0.420000 1.390000 0.750000 ;
+      RECT 1.060000  1.880000 1.390000 2.300000 ;
+      RECT 1.060000  2.300000 2.325000 2.470000 ;
+      RECT 1.220000  0.750000 1.390000 1.880000 ;
+      RECT 1.560000  0.085000 1.790000 0.670000 ;
+      RECT 1.960000  0.390000 2.325000 0.670000 ;
+      RECT 2.155000  0.670000 2.325000 1.320000 ;
+      RECT 2.155000  1.320000 2.905000 1.650000 ;
+      RECT 2.155000  1.650000 2.325000 2.300000 ;
+      RECT 2.495000  0.085000 2.755000 1.150000 ;
+      RECT 2.495000  1.820000 2.755000 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_lp__or3b_1
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef
index d177329..9a5b407 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_2.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.555000  0.085000 0.930000 0.895000 ;
-        RECT 1.530000  0.085000 1.930000 0.895000 ;
-        RECT 2.485000  0.085000 2.815000 0.615000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -93,37 +80,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.815000 2.640000 1.145000 3.245000 ;
-        RECT 1.675000 2.640000 2.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 0.700000 0.385000 1.065000 ;
-      RECT 0.125000 1.065000 0.930000 1.235000 ;
-      RECT 0.290000 1.920000 0.930000 2.290000 ;
-      RECT 0.290000 2.290000 2.815000 2.460000 ;
-      RECT 0.750000 1.235000 0.930000 1.920000 ;
-      RECT 1.440000 1.190000 2.305000 1.235000 ;
-      RECT 1.440000 1.235000 1.720000 1.520000 ;
-      RECT 1.550000 1.065000 2.305000 1.190000 ;
-      RECT 2.100000 0.280000 2.315000 0.785000 ;
-      RECT 2.100000 0.785000 3.265000 0.955000 ;
-      RECT 2.100000 0.955000 2.305000 1.065000 ;
-      RECT 2.485000 2.460000 2.815000 2.965000 ;
-      RECT 2.985000 0.280000 3.265000 0.785000 ;
-      RECT 2.985000 0.955000 3.265000 2.300000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  0.700000 0.385000 1.065000 ;
+      RECT 0.125000  1.065000 0.930000 1.235000 ;
+      RECT 0.290000  1.920000 0.930000 2.290000 ;
+      RECT 0.290000  2.290000 2.815000 2.460000 ;
+      RECT 0.555000  0.085000 0.930000 0.895000 ;
+      RECT 0.750000  1.235000 0.930000 1.920000 ;
+      RECT 0.815000  2.640000 1.145000 3.245000 ;
+      RECT 1.440000  1.190000 2.305000 1.235000 ;
+      RECT 1.440000  1.235000 1.720000 1.520000 ;
+      RECT 1.530000  0.085000 1.930000 0.895000 ;
+      RECT 1.550000  1.065000 2.305000 1.190000 ;
+      RECT 1.675000  2.640000 2.005000 3.245000 ;
+      RECT 2.100000  0.280000 2.315000 0.785000 ;
+      RECT 2.100000  0.785000 3.265000 0.955000 ;
+      RECT 2.100000  0.955000 2.305000 1.065000 ;
+      RECT 2.485000  0.085000 2.815000 0.615000 ;
+      RECT 2.485000  2.460000 2.815000 2.965000 ;
+      RECT 2.985000  0.280000 3.265000 0.785000 ;
+      RECT 2.985000  0.955000 3.265000 2.300000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__or3b_2
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef
index 70ac716..70cbcba 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_4.magic.lef
@@ -74,23 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 1.005000  0.085000 1.260000 0.905000 ;
-        RECT 1.820000  0.085000 2.150000 0.905000 ;
-        RECT 2.720000  0.085000 3.050000 0.835000 ;
-        RECT 3.675000  0.085000 4.005000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -99,39 +82,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.995000 2.655000 1.325000 3.245000 ;
-        RECT 1.855000 2.655000 2.185000 3.245000 ;
-        RECT 2.770000 2.655000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.205000 0.710000 0.455000 2.315000 ;
-      RECT 0.205000 2.315000 4.090000 2.485000 ;
-      RECT 1.355000 1.415000 2.850000 1.645000 ;
-      RECT 2.680000 1.005000 4.710000 1.175000 ;
-      RECT 2.680000 1.175000 2.850000 1.415000 ;
-      RECT 3.220000 0.255000 3.505000 1.005000 ;
-      RECT 3.920000 1.345000 4.360000 1.645000 ;
-      RECT 3.920000 1.645000 4.090000 2.315000 ;
-      RECT 4.155000 2.760000 4.710000 3.075000 ;
-      RECT 4.175000 0.255000 4.710000 1.005000 ;
-      RECT 4.260000 1.815000 4.710000 2.760000 ;
-      RECT 4.530000 1.175000 4.710000 1.815000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.205000  0.710000 0.455000 2.315000 ;
+      RECT 0.205000  2.315000 4.090000 2.485000 ;
+      RECT 0.995000  2.655000 1.325000 3.245000 ;
+      RECT 1.005000  0.085000 1.260000 0.905000 ;
+      RECT 1.355000  1.415000 2.850000 1.645000 ;
+      RECT 1.820000  0.085000 2.150000 0.905000 ;
+      RECT 1.855000  2.655000 2.185000 3.245000 ;
+      RECT 2.680000  1.005000 4.710000 1.175000 ;
+      RECT 2.680000  1.175000 2.850000 1.415000 ;
+      RECT 2.720000  0.085000 3.050000 0.835000 ;
+      RECT 2.770000  2.655000 3.100000 3.245000 ;
+      RECT 3.220000  0.255000 3.505000 1.005000 ;
+      RECT 3.675000  0.085000 4.005000 0.835000 ;
+      RECT 3.920000  1.345000 4.360000 1.645000 ;
+      RECT 3.920000  1.645000 4.090000 2.315000 ;
+      RECT 4.155000  2.760000 4.710000 3.075000 ;
+      RECT 4.175000  0.255000 4.710000 1.005000 ;
+      RECT 4.260000  1.815000 4.710000 2.760000 ;
+      RECT 4.530000  1.175000 4.710000 1.815000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or3b_4
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef
index 7148616..5f64246 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_lp.magic.lef
@@ -73,23 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.645000 ;
-        RECT 1.875000  0.895000 2.405000 1.145000 ;
-        RECT 2.235000  0.085000 2.405000 0.895000 ;
-        RECT 3.565000  0.085000 3.895000 0.855000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,44 +81,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.645000 2.025000 0.975000 3.245000 ;
-        RECT 3.605000 2.680000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.800000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.265000 0.445000 0.825000 ;
-      RECT 0.095000 0.825000 1.345000 0.995000 ;
-      RECT 0.095000 0.995000 0.265000 2.025000 ;
-      RECT 0.095000 2.025000 0.445000 3.065000 ;
-      RECT 1.015000 0.995000 1.345000 1.450000 ;
-      RECT 1.295000 1.845000 1.625000 2.895000 ;
-      RECT 1.295000 2.895000 2.915000 3.065000 ;
-      RECT 1.525000 0.265000 2.055000 0.675000 ;
-      RECT 1.525000 0.675000 1.695000 1.325000 ;
-      RECT 1.525000 1.325000 2.825000 1.495000 ;
-      RECT 1.825000 1.495000 2.155000 2.715000 ;
-      RECT 2.460000 1.495000 2.630000 2.330000 ;
-      RECT 2.460000 2.330000 4.065000 2.500000 ;
-      RECT 2.585000 2.680000 2.915000 2.895000 ;
-      RECT 2.655000 0.485000 3.075000 0.855000 ;
-      RECT 2.655000 0.855000 2.825000 1.325000 ;
-      RECT 3.895000 1.225000 4.225000 1.895000 ;
-      RECT 3.895000 1.895000 4.065000 2.330000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.095000  0.265000 0.445000 0.825000 ;
+      RECT 0.095000  0.825000 1.345000 0.995000 ;
+      RECT 0.095000  0.995000 0.265000 2.025000 ;
+      RECT 0.095000  2.025000 0.445000 3.065000 ;
+      RECT 0.645000  2.025000 0.975000 3.245000 ;
+      RECT 0.905000  0.085000 1.235000 0.645000 ;
+      RECT 1.015000  0.995000 1.345000 1.450000 ;
+      RECT 1.295000  1.845000 1.625000 2.895000 ;
+      RECT 1.295000  2.895000 2.915000 3.065000 ;
+      RECT 1.525000  0.265000 2.055000 0.675000 ;
+      RECT 1.525000  0.675000 1.695000 1.325000 ;
+      RECT 1.525000  1.325000 2.825000 1.495000 ;
+      RECT 1.825000  1.495000 2.155000 2.715000 ;
+      RECT 1.875000  0.895000 2.405000 1.145000 ;
+      RECT 2.235000  0.085000 2.405000 0.895000 ;
+      RECT 2.460000  1.495000 2.630000 2.330000 ;
+      RECT 2.460000  2.330000 4.065000 2.500000 ;
+      RECT 2.585000  2.680000 2.915000 2.895000 ;
+      RECT 2.655000  0.485000 3.075000 0.855000 ;
+      RECT 2.655000  0.855000 2.825000 1.325000 ;
+      RECT 3.565000  0.085000 3.895000 0.855000 ;
+      RECT 3.605000  2.680000 3.935000 3.245000 ;
+      RECT 3.895000  1.225000 4.225000 1.895000 ;
+      RECT 3.895000  1.895000 4.065000 2.330000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or3b_lp
diff --git a/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef b/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef
index 427ad66..6853c77 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_m.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.165000  0.085000 0.375000 0.585000 ;
-        RECT 1.570000  0.085000 1.780000 0.550000 ;
-        RECT 2.430000  0.085000 2.640000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -93,36 +80,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.165000 2.785000 0.355000 3.245000 ;
-        RECT 2.370000 2.280000 2.700000 2.490000 ;
-        RECT 2.530000 2.490000 2.700000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.595000 0.385000 0.805000 1.230000 ;
-      RECT 0.595000 1.230000 0.925000 1.900000 ;
-      RECT 0.595000 1.900000 0.805000 2.985000 ;
-      RECT 1.020000 2.130000 1.700000 2.340000 ;
-      RECT 1.140000 0.350000 1.350000 0.680000 ;
-      RECT 1.180000 0.680000 1.350000 2.130000 ;
-      RECT 1.530000 1.930000 2.745000 2.100000 ;
-      RECT 1.530000 2.100000 1.700000 2.130000 ;
-      RECT 2.000000 0.370000 2.210000 0.775000 ;
-      RECT 2.000000 0.775000 2.855000 0.945000 ;
-      RECT 2.575000 0.945000 2.855000 1.445000 ;
-      RECT 2.575000 1.445000 2.745000 1.930000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.165000  0.085000 0.375000 0.585000 ;
+      RECT 0.165000  2.785000 0.355000 3.245000 ;
+      RECT 0.595000  0.385000 0.805000 1.230000 ;
+      RECT 0.595000  1.230000 0.925000 1.900000 ;
+      RECT 0.595000  1.900000 0.805000 2.985000 ;
+      RECT 1.020000  2.130000 1.700000 2.340000 ;
+      RECT 1.140000  0.350000 1.350000 0.680000 ;
+      RECT 1.180000  0.680000 1.350000 2.130000 ;
+      RECT 1.530000  1.930000 2.745000 2.100000 ;
+      RECT 1.530000  2.100000 1.700000 2.130000 ;
+      RECT 1.570000  0.085000 1.780000 0.550000 ;
+      RECT 2.000000  0.370000 2.210000 0.775000 ;
+      RECT 2.000000  0.775000 2.855000 0.945000 ;
+      RECT 2.370000  2.280000 2.700000 2.490000 ;
+      RECT 2.430000  0.085000 2.640000 0.550000 ;
+      RECT 2.530000  2.490000 2.700000 3.245000 ;
+      RECT 2.575000  0.945000 2.855000 1.445000 ;
+      RECT 2.575000  1.445000 2.745000 1.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 ;
   END
 END sky130_fd_sc_lp__or3b_m
diff --git a/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef
index d010f1a..79abf9a 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_0.magic.lef
@@ -82,19 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.170000  0.085000 0.470000 0.635000 ;
-        RECT 1.080000  0.085000 1.665000 0.635000 ;
-        RECT 2.315000  0.085000 2.590000 0.635000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -103,34 +90,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.920000 2.390000 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 0.200000 2.455000 1.635000 2.785000 ;
-      RECT 0.535000 1.230000 0.900000 1.400000 ;
-      RECT 0.535000 1.400000 0.705000 2.430000 ;
-      RECT 0.535000 2.430000 1.635000 2.455000 ;
-      RECT 0.640000 0.305000 0.900000 1.230000 ;
-      RECT 1.465000 2.050000 2.760000 2.220000 ;
-      RECT 1.465000 2.220000 1.635000 2.430000 ;
-      RECT 1.835000 0.305000 2.145000 0.635000 ;
-      RECT 1.975000 0.635000 2.145000 0.860000 ;
-      RECT 1.975000 0.860000 2.855000 1.030000 ;
-      RECT 2.465000 1.030000 2.855000 1.530000 ;
-      RECT 2.465000 1.530000 2.760000 2.050000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.170000  0.085000 0.470000 0.635000 ;
+      RECT 0.200000  2.455000 1.635000 2.785000 ;
+      RECT 0.535000  1.230000 0.900000 1.400000 ;
+      RECT 0.535000  1.400000 0.705000 2.430000 ;
+      RECT 0.535000  2.430000 1.635000 2.455000 ;
+      RECT 0.640000  0.305000 0.900000 1.230000 ;
+      RECT 1.080000  0.085000 1.665000 0.635000 ;
+      RECT 1.465000  2.050000 2.760000 2.220000 ;
+      RECT 1.465000  2.220000 1.635000 2.430000 ;
+      RECT 1.835000  0.305000 2.145000 0.635000 ;
+      RECT 1.920000  2.390000 2.605000 3.245000 ;
+      RECT 1.975000  0.635000 2.145000 0.860000 ;
+      RECT 1.975000  0.860000 2.855000 1.030000 ;
+      RECT 2.315000  0.085000 2.590000 0.635000 ;
+      RECT 2.465000  1.030000 2.855000 1.530000 ;
+      RECT 2.465000  1.530000 2.760000 2.050000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__or4_0
diff --git a/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef
index 5ace079..3795a97 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_1.magic.lef
@@ -80,19 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.130000  0.085000 0.430000 0.610000 ;
-        RECT 0.990000  0.085000 1.660000 0.475000 ;
-        RECT 2.285000  0.085000 2.530000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,33 +88,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 1.670000 2.445000 2.835000 3.245000 ;
-        RECT 2.505000 2.320000 2.835000 2.445000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 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.160000 2.000000 2.815000 2.150000 ;
-      RECT 0.160000 2.150000 2.335000 2.260000 ;
-      RECT 0.160000 2.260000 0.490000 2.775000 ;
-      RECT 0.600000 0.280000 0.820000 0.645000 ;
-      RECT 0.600000 0.645000 2.115000 0.815000 ;
-      RECT 1.830000 0.280000 2.115000 0.645000 ;
-      RECT 1.945000 0.815000 2.115000 1.075000 ;
-      RECT 1.945000 1.075000 2.815000 1.245000 ;
-      RECT 2.165000 1.930000 2.815000 2.000000 ;
-      RECT 2.565000 1.245000 2.815000 1.930000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.130000  0.085000 0.430000 0.610000 ;
+      RECT 0.160000  2.000000 2.815000 2.150000 ;
+      RECT 0.160000  2.150000 2.335000 2.260000 ;
+      RECT 0.160000  2.260000 0.490000 2.775000 ;
+      RECT 0.600000  0.280000 0.820000 0.645000 ;
+      RECT 0.600000  0.645000 2.115000 0.815000 ;
+      RECT 0.990000  0.085000 1.660000 0.475000 ;
+      RECT 1.670000  2.445000 2.835000 3.245000 ;
+      RECT 1.830000  0.280000 2.115000 0.645000 ;
+      RECT 1.945000  0.815000 2.115000 1.075000 ;
+      RECT 1.945000  1.075000 2.815000 1.245000 ;
+      RECT 2.165000  1.930000 2.815000 2.000000 ;
+      RECT 2.285000  0.085000 2.530000 0.905000 ;
+      RECT 2.505000  2.320000 2.835000 2.445000 ;
+      RECT 2.565000  1.245000 2.815000 1.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 ;
   END
 END sky130_fd_sc_lp__or4_1
diff --git a/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef
index ae2b2a2..bf0e2d9 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_2.magic.lef
@@ -82,22 +82,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.565000 ;
-        RECT 1.260000  0.085000 1.590000 0.485000 ;
-        RECT 2.190000  0.085000 2.860000 0.485000 ;
-        RECT 2.455000  0.485000 2.860000 0.845000 ;
-        RECT 3.430000  0.085000 3.720000 1.105000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,36 +90,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 2.415000 1.845000 2.855000 2.175000 ;
-        RECT 2.525000 2.175000 2.855000 3.245000 ;
-        RECT 3.430000 1.815000 3.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 ;
-        RECT 2.555000 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.320000 1.920000 0.705000 2.210000 ;
-      RECT 0.535000 0.735000 2.285000 0.825000 ;
-      RECT 0.535000 0.825000 0.980000 0.905000 ;
-      RECT 0.535000 0.905000 0.705000 1.920000 ;
-      RECT 0.800000 0.255000 1.090000 0.655000 ;
-      RECT 0.800000 0.655000 2.285000 0.735000 ;
-      RECT 1.760000 0.255000 2.020000 0.655000 ;
-      RECT 2.005000 0.825000 2.285000 1.015000 ;
-      RECT 2.005000 1.015000 2.745000 1.185000 ;
-      RECT 2.575000 1.185000 2.745000 1.285000 ;
-      RECT 2.575000 1.285000 2.855000 1.615000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.300000  0.085000 0.630000 0.565000 ;
+      RECT 0.320000  1.920000 0.705000 2.210000 ;
+      RECT 0.535000  0.735000 2.285000 0.825000 ;
+      RECT 0.535000  0.825000 0.980000 0.905000 ;
+      RECT 0.535000  0.905000 0.705000 1.920000 ;
+      RECT 0.800000  0.255000 1.090000 0.655000 ;
+      RECT 0.800000  0.655000 2.285000 0.735000 ;
+      RECT 1.260000  0.085000 1.590000 0.485000 ;
+      RECT 1.760000  0.255000 2.020000 0.655000 ;
+      RECT 2.005000  0.825000 2.285000 1.015000 ;
+      RECT 2.005000  1.015000 2.745000 1.185000 ;
+      RECT 2.190000  0.085000 2.860000 0.485000 ;
+      RECT 2.415000  1.845000 2.855000 2.175000 ;
+      RECT 2.455000  0.485000 2.860000 0.845000 ;
+      RECT 2.525000  2.175000 2.855000 3.245000 ;
+      RECT 2.575000  1.185000 2.745000 1.285000 ;
+      RECT 2.575000  1.285000 2.855000 1.615000 ;
+      RECT 3.430000  0.085000 3.720000 1.105000 ;
+      RECT 3.430000  1.815000 3.720000 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_lp__or4_2
diff --git a/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef
index 266ba7d..97866b6 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_4.magic.lef
@@ -86,24 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.250000  0.085000 0.580000 1.040000 ;
-        RECT 1.190000  0.085000 1.520000 0.825000 ;
-        RECT 2.190000  0.085000 2.520000 0.825000 ;
-        RECT 3.125000  0.085000 3.455000 0.915000 ;
-        RECT 4.020000  0.085000 4.285000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 4.800000 0.245000 ;
     END
@@ -112,35 +94,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 2.185000 2.270000 2.515000 3.245000 ;
-        RECT 3.125000 2.105000 3.455000 3.245000 ;
-        RECT 3.985000 2.105000 4.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 ;
-        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 1.930000 2.595000 2.100000 ;
-      RECT 0.250000 2.100000 0.580000 3.075000 ;
-      RECT 0.750000 0.255000 1.010000 0.995000 ;
-      RECT 0.750000 0.995000 2.595000 1.165000 ;
-      RECT 1.690000 0.255000 2.020000 0.995000 ;
-      RECT 2.425000 1.165000 2.595000 1.425000 ;
-      RECT 2.425000 1.425000 4.260000 1.595000 ;
-      RECT 2.425000 1.595000 2.595000 1.930000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.250000  0.085000 0.580000 1.040000 ;
+      RECT 0.250000  1.930000 2.595000 2.100000 ;
+      RECT 0.250000  2.100000 0.580000 3.075000 ;
+      RECT 0.750000  0.255000 1.010000 0.995000 ;
+      RECT 0.750000  0.995000 2.595000 1.165000 ;
+      RECT 1.190000  0.085000 1.520000 0.825000 ;
+      RECT 1.690000  0.255000 2.020000 0.995000 ;
+      RECT 2.185000  2.270000 2.515000 3.245000 ;
+      RECT 2.190000  0.085000 2.520000 0.825000 ;
+      RECT 2.425000  1.165000 2.595000 1.425000 ;
+      RECT 2.425000  1.425000 4.260000 1.595000 ;
+      RECT 2.425000  1.595000 2.595000 1.930000 ;
+      RECT 3.125000  0.085000 3.455000 0.915000 ;
+      RECT 3.125000  2.105000 3.455000 3.245000 ;
+      RECT 3.985000  2.105000 4.315000 3.245000 ;
+      RECT 4.020000  0.085000 4.285000 0.915000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4_4
diff --git a/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef
index f08eb45..eb1a63c 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_lp.magic.lef
@@ -81,23 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.800000 0.085000 ;
-        RECT 0.905000  0.085000 1.235000 0.675000 ;
-        RECT 1.870000  0.895000 2.455000 1.145000 ;
-        RECT 2.285000  0.085000 2.455000 0.895000 ;
-        RECT 3.565000  0.085000 3.895000 1.145000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,36 +89,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 3.550000 2.075000 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.090000 0.265000 0.445000 0.675000 ;
-      RECT 0.090000 0.675000 0.260000 0.855000 ;
-      RECT 0.090000 0.855000 1.690000 1.025000 ;
-      RECT 0.090000 1.025000 0.260000 2.075000 ;
-      RECT 0.090000 2.075000 0.545000 3.065000 ;
-      RECT 1.520000 0.265000 2.105000 0.675000 ;
-      RECT 1.520000 0.675000 1.690000 0.855000 ;
-      RECT 1.520000 1.025000 1.690000 1.325000 ;
-      RECT 1.520000 1.325000 4.175000 1.495000 ;
-      RECT 2.775000 0.815000 3.105000 1.325000 ;
-      RECT 3.845000 1.495000 4.175000 1.695000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.090000  0.265000 0.445000 0.675000 ;
+      RECT 0.090000  0.675000 0.260000 0.855000 ;
+      RECT 0.090000  0.855000 1.690000 1.025000 ;
+      RECT 0.090000  1.025000 0.260000 2.075000 ;
+      RECT 0.090000  2.075000 0.545000 3.065000 ;
+      RECT 0.905000  0.085000 1.235000 0.675000 ;
+      RECT 1.520000  0.265000 2.105000 0.675000 ;
+      RECT 1.520000  0.675000 1.690000 0.855000 ;
+      RECT 1.520000  1.025000 1.690000 1.325000 ;
+      RECT 1.520000  1.325000 4.175000 1.495000 ;
+      RECT 1.870000  0.895000 2.455000 1.145000 ;
+      RECT 2.285000  0.085000 2.455000 0.895000 ;
+      RECT 2.775000  0.815000 3.105000 1.325000 ;
+      RECT 3.550000  2.075000 3.880000 3.245000 ;
+      RECT 3.565000  0.085000 3.895000 1.145000 ;
+      RECT 3.845000  1.495000 4.175000 1.695000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4_lp
diff --git a/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef b/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef
index 8253ae3..c209995 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef
+++ b/cells/or4/sky130_fd_sc_lp__or4_m.magic.lef
@@ -81,19 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.225000  0.085000 0.555000 0.485000 ;
-        RECT 1.465000  0.085000 1.795000 0.485000 ;
-        RECT 2.425000  0.085000 2.755000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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.285000 2.155000 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.600000 1.965000 0.905000 2.295000 ;
-      RECT 0.735000 0.345000 0.925000 1.795000 ;
-      RECT 0.735000 1.795000 2.810000 1.965000 ;
-      RECT 1.775000 1.965000 2.105000 3.025000 ;
-      RECT 1.975000 0.330000 2.245000 0.650000 ;
-      RECT 1.975000 0.650000 2.810000 0.660000 ;
-      RECT 2.075000 0.660000 2.810000 0.820000 ;
-      RECT 2.640000 0.820000 2.810000 1.795000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.225000  0.085000 0.555000 0.485000 ;
+      RECT 0.600000  1.965000 0.905000 2.295000 ;
+      RECT 0.735000  0.345000 0.925000 1.795000 ;
+      RECT 0.735000  1.795000 2.810000 1.965000 ;
+      RECT 1.465000  0.085000 1.795000 0.485000 ;
+      RECT 1.775000  1.965000 2.105000 3.025000 ;
+      RECT 1.975000  0.330000 2.245000 0.650000 ;
+      RECT 1.975000  0.650000 2.810000 0.660000 ;
+      RECT 2.075000  0.660000 2.810000 0.820000 ;
+      RECT 2.285000  2.155000 2.615000 3.245000 ;
+      RECT 2.425000  0.085000 2.755000 0.465000 ;
+      RECT 2.640000  0.820000 2.810000 1.795000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__or4_m
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef
index 4bd33b9..d27402f 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_1.magic.lef
@@ -81,20 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.780000  0.085000 1.010000 1.030000 ;
-        RECT 1.705000  0.085000 1.905000 1.030000 ;
-        RECT 2.895000  0.085000 3.235000 1.070000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,37 +89,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.745000 2.745000 1.040000 3.245000 ;
-        RECT 2.905000 1.815000 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 ;
-        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.280000 0.700000 0.610000 1.215000 ;
-      RECT 0.280000 1.215000 1.195000 1.385000 ;
-      RECT 0.280000 2.405000 0.890000 2.575000 ;
-      RECT 0.280000 2.575000 0.575000 3.030000 ;
-      RECT 0.650000 1.385000 1.195000 1.545000 ;
-      RECT 0.650000 1.545000 0.890000 2.405000 ;
-      RECT 1.060000 1.880000 1.545000 2.210000 ;
-      RECT 1.180000 0.700000 1.535000 1.030000 ;
-      RECT 1.365000 1.030000 1.535000 1.240000 ;
-      RECT 1.365000 1.240000 3.315000 1.410000 ;
-      RECT 1.365000 1.410000 1.545000 1.880000 ;
-      RECT 2.320000 0.825000 2.650000 1.240000 ;
-      RECT 2.960000 1.410000 3.315000 1.625000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.280000  0.700000 0.610000 1.215000 ;
+      RECT 0.280000  1.215000 1.195000 1.385000 ;
+      RECT 0.280000  2.405000 0.890000 2.575000 ;
+      RECT 0.280000  2.575000 0.575000 3.030000 ;
+      RECT 0.650000  1.385000 1.195000 1.545000 ;
+      RECT 0.650000  1.545000 0.890000 2.405000 ;
+      RECT 0.745000  2.745000 1.040000 3.245000 ;
+      RECT 0.780000  0.085000 1.010000 1.030000 ;
+      RECT 1.060000  1.880000 1.545000 2.210000 ;
+      RECT 1.180000  0.700000 1.535000 1.030000 ;
+      RECT 1.365000  1.030000 1.535000 1.240000 ;
+      RECT 1.365000  1.240000 3.315000 1.410000 ;
+      RECT 1.365000  1.410000 1.545000 1.880000 ;
+      RECT 1.705000  0.085000 1.905000 1.030000 ;
+      RECT 2.320000  0.825000 2.650000 1.240000 ;
+      RECT 2.895000  0.085000 3.235000 1.070000 ;
+      RECT 2.905000  1.815000 3.165000 3.245000 ;
+      RECT 2.960000  1.410000 3.315000 1.625000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4b_1
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef
index ec5df7d..f114e48 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_2.magic.lef
@@ -82,21 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.640000  0.085000 0.970000 0.815000 ;
-        RECT 1.500000  0.085000 1.890000 0.835000 ;
-        RECT 2.455000  0.085000 2.815000 0.610000 ;
-        RECT 3.485000  0.085000 3.745000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,40 +90,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.640000 2.695000 0.970000 3.245000 ;
-        RECT 1.500000 2.695000 1.830000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 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.700000 0.445000 0.985000 ;
-      RECT 0.115000 0.985000 0.830000 1.155000 ;
-      RECT 0.115000 1.920000 0.830000 2.260000 ;
-      RECT 0.650000 1.155000 0.830000 1.920000 ;
-      RECT 0.660000 2.260000 0.830000 2.355000 ;
-      RECT 0.660000 2.355000 3.440000 2.525000 ;
-      RECT 1.350000 1.335000 1.670000 1.665000 ;
-      RECT 1.500000 1.005000 2.275000 1.175000 ;
-      RECT 1.500000 1.175000 1.670000 1.335000 ;
-      RECT 1.500000 1.665000 1.670000 2.005000 ;
-      RECT 1.500000 2.005000 3.745000 2.185000 ;
-      RECT 2.060000 0.280000 2.275000 1.005000 ;
-      RECT 2.985000 0.255000 3.315000 0.725000 ;
-      RECT 2.985000 0.725000 3.745000 0.895000 ;
-      RECT 3.100000 2.525000 3.440000 3.045000 ;
-      RECT 3.415000 0.895000 3.745000 2.005000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.115000  0.700000 0.445000 0.985000 ;
+      RECT 0.115000  0.985000 0.830000 1.155000 ;
+      RECT 0.115000  1.920000 0.830000 2.260000 ;
+      RECT 0.640000  0.085000 0.970000 0.815000 ;
+      RECT 0.640000  2.695000 0.970000 3.245000 ;
+      RECT 0.650000  1.155000 0.830000 1.920000 ;
+      RECT 0.660000  2.260000 0.830000 2.355000 ;
+      RECT 0.660000  2.355000 3.440000 2.525000 ;
+      RECT 1.350000  1.335000 1.670000 1.665000 ;
+      RECT 1.500000  0.085000 1.890000 0.835000 ;
+      RECT 1.500000  1.005000 2.275000 1.175000 ;
+      RECT 1.500000  1.175000 1.670000 1.335000 ;
+      RECT 1.500000  1.665000 1.670000 2.005000 ;
+      RECT 1.500000  2.005000 3.745000 2.185000 ;
+      RECT 1.500000  2.695000 1.830000 3.245000 ;
+      RECT 2.060000  0.280000 2.275000 1.005000 ;
+      RECT 2.455000  0.085000 2.815000 0.610000 ;
+      RECT 2.985000  0.255000 3.315000 0.725000 ;
+      RECT 2.985000  0.725000 3.745000 0.895000 ;
+      RECT 3.100000  2.525000 3.440000 3.045000 ;
+      RECT 3.415000  0.895000 3.745000 2.005000 ;
+      RECT 3.485000  0.085000 3.745000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4b_2
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef
index 0c7e78d..5cf237a 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_4.magic.lef
@@ -88,26 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 0.835000 ;
-        RECT 0.970000  0.085000 1.300000 0.485000 ;
-        RECT 1.850000  0.085000 2.180000 0.825000 ;
-        RECT 2.730000  0.085000 3.400000 0.825000 ;
-        RECT 3.930000  0.085000 4.700000 0.835000 ;
-        RECT 4.205000  0.835000 4.700000 1.015000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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 +96,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.110000 2.035000 0.440000 3.245000 ;
-        RECT 0.970000 2.035000 1.300000 3.245000 ;
-        RECT 1.885000 1.920000 2.215000 3.245000 ;
-        RECT 4.425000 2.715000 4.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 ;
-        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.505000 1.355000 1.905000 1.525000 ;
-      RECT 1.735000 0.995000 3.760000 1.005000 ;
-      RECT 1.735000 1.005000 4.035000 1.175000 ;
-      RECT 1.735000 1.175000 1.905000 1.355000 ;
-      RECT 2.350000 0.255000 2.560000 0.995000 ;
-      RECT 3.570000 0.255000 3.760000 0.995000 ;
-      RECT 3.855000 1.175000 4.035000 1.815000 ;
-      RECT 3.855000 1.815000 4.090000 3.075000 ;
-      RECT 4.215000 1.185000 5.130000 1.355000 ;
-      RECT 4.215000 1.355000 4.560000 1.515000 ;
-      RECT 4.260000 1.515000 4.560000 2.375000 ;
-      RECT 4.260000 2.375000 5.185000 2.545000 ;
-      RECT 4.870000 0.700000 5.130000 1.185000 ;
-      RECT 4.925000 2.545000 5.185000 3.075000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.110000  0.085000 0.440000 0.835000 ;
+      RECT 0.110000  2.035000 0.440000 3.245000 ;
+      RECT 0.505000  1.355000 1.905000 1.525000 ;
+      RECT 0.970000  0.085000 1.300000 0.485000 ;
+      RECT 0.970000  2.035000 1.300000 3.245000 ;
+      RECT 1.735000  0.995000 3.760000 1.005000 ;
+      RECT 1.735000  1.005000 4.035000 1.175000 ;
+      RECT 1.735000  1.175000 1.905000 1.355000 ;
+      RECT 1.850000  0.085000 2.180000 0.825000 ;
+      RECT 1.885000  1.920000 2.215000 3.245000 ;
+      RECT 2.350000  0.255000 2.560000 0.995000 ;
+      RECT 2.730000  0.085000 3.400000 0.825000 ;
+      RECT 3.570000  0.255000 3.760000 0.995000 ;
+      RECT 3.855000  1.175000 4.035000 1.815000 ;
+      RECT 3.855000  1.815000 4.090000 3.075000 ;
+      RECT 3.930000  0.085000 4.700000 0.835000 ;
+      RECT 4.205000  0.835000 4.700000 1.015000 ;
+      RECT 4.215000  1.185000 5.130000 1.355000 ;
+      RECT 4.215000  1.355000 4.560000 1.515000 ;
+      RECT 4.260000  1.515000 4.560000 2.375000 ;
+      RECT 4.260000  2.375000 5.185000 2.545000 ;
+      RECT 4.425000  2.715000 4.755000 3.245000 ;
+      RECT 4.870000  0.700000 5.130000 1.185000 ;
+      RECT 4.925000  2.545000 5.185000 3.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4b_4
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef
index 983684c..afc2c91 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_lp.magic.lef
@@ -81,23 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.280000 0.085000 ;
-        RECT 0.895000  0.085000 1.225000 0.645000 ;
-        RECT 2.475000  0.085000 2.805000 0.725000 ;
-        RECT 4.055000  0.085000 4.385000 0.725000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,38 +89,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 5.280000 3.415000 ;
-        RECT 0.645000 2.025000 0.975000 3.245000 ;
-        RECT 3.755000 2.105000 4.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 5.280000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.265000 0.435000 0.825000 ;
-      RECT 0.105000 0.825000 1.505000 0.995000 ;
-      RECT 0.105000 0.995000 0.275000 2.025000 ;
-      RECT 0.105000 2.025000 0.445000 3.065000 ;
-      RECT 1.175000 0.995000 1.505000 1.495000 ;
-      RECT 1.535000 2.065000 1.865000 3.065000 ;
-      RECT 1.685000 0.265000 2.015000 0.905000 ;
-      RECT 1.685000 0.905000 4.705000 1.075000 ;
-      RECT 1.685000 1.075000 1.865000 2.065000 ;
-      RECT 3.265000 0.265000 3.595000 0.905000 ;
-      RECT 4.375000 1.075000 4.705000 1.840000 ;
+      RECT 0.000000 -0.085000 5.280000 0.085000 ;
+      RECT 0.000000  3.245000 5.280000 3.415000 ;
+      RECT 0.105000  0.265000 0.435000 0.825000 ;
+      RECT 0.105000  0.825000 1.505000 0.995000 ;
+      RECT 0.105000  0.995000 0.275000 2.025000 ;
+      RECT 0.105000  2.025000 0.445000 3.065000 ;
+      RECT 0.645000  2.025000 0.975000 3.245000 ;
+      RECT 0.895000  0.085000 1.225000 0.645000 ;
+      RECT 1.175000  0.995000 1.505000 1.495000 ;
+      RECT 1.535000  2.065000 1.865000 3.065000 ;
+      RECT 1.685000  0.265000 2.015000 0.905000 ;
+      RECT 1.685000  0.905000 4.705000 1.075000 ;
+      RECT 1.685000  1.075000 1.865000 2.065000 ;
+      RECT 2.475000  0.085000 2.805000 0.725000 ;
+      RECT 3.265000  0.265000 3.595000 0.905000 ;
+      RECT 3.755000  2.105000 4.085000 3.245000 ;
+      RECT 4.055000  0.085000 4.385000 0.725000 ;
+      RECT 4.375000  1.075000 4.705000 1.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 ;
   END
 END sky130_fd_sc_lp__or4b_lp
diff --git a/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef b/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef
index 146507d..ed13f34 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_m.magic.lef
@@ -80,20 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.840000 0.085000 ;
-        RECT 0.660000  0.085000 0.870000 0.935000 ;
-        RECT 1.595000  0.085000 1.805000 0.935000 ;
-        RECT 2.905000  0.085000 3.115000 0.935000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -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,39 +88,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 0.580000 2.690000 0.910000 3.245000 ;
-        RECT 2.835000 2.155000 3.165000 2.365000 ;
-        RECT 2.995000 2.365000 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 ;
-        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.150000 0.795000 0.480000 1.140000 ;
-      RECT 0.150000 1.140000 1.065000 1.310000 ;
-      RECT 0.210000 2.340000 0.820000 2.510000 ;
-      RECT 0.210000 2.510000 0.400000 2.830000 ;
-      RECT 0.650000 1.310000 1.065000 1.825000 ;
-      RECT 0.650000 1.825000 0.820000 2.340000 ;
-      RECT 1.050000 0.750000 1.415000 0.960000 ;
-      RECT 1.245000 0.960000 1.415000 1.225000 ;
-      RECT 1.245000 1.225000 2.715000 1.395000 ;
-      RECT 1.245000 1.395000 1.415000 2.005000 ;
-      RECT 1.245000 2.005000 2.655000 2.335000 ;
-      RECT 2.385000 0.835000 2.715000 1.225000 ;
-      RECT 2.485000 2.335000 2.655000 2.855000 ;
-      RECT 2.485000 2.855000 2.815000 3.025000 ;
+      RECT 0.000000 -0.085000 3.840000 0.085000 ;
+      RECT 0.000000  3.245000 3.840000 3.415000 ;
+      RECT 0.150000  0.795000 0.480000 1.140000 ;
+      RECT 0.150000  1.140000 1.065000 1.310000 ;
+      RECT 0.210000  2.340000 0.820000 2.510000 ;
+      RECT 0.210000  2.510000 0.400000 2.830000 ;
+      RECT 0.580000  2.690000 0.910000 3.245000 ;
+      RECT 0.650000  1.310000 1.065000 1.825000 ;
+      RECT 0.650000  1.825000 0.820000 2.340000 ;
+      RECT 0.660000  0.085000 0.870000 0.935000 ;
+      RECT 1.050000  0.750000 1.415000 0.960000 ;
+      RECT 1.245000  0.960000 1.415000 1.225000 ;
+      RECT 1.245000  1.225000 2.715000 1.395000 ;
+      RECT 1.245000  1.395000 1.415000 2.005000 ;
+      RECT 1.245000  2.005000 2.655000 2.335000 ;
+      RECT 1.595000  0.085000 1.805000 0.935000 ;
+      RECT 2.385000  0.835000 2.715000 1.225000 ;
+      RECT 2.485000  2.335000 2.655000 2.855000 ;
+      RECT 2.485000  2.855000 2.815000 3.025000 ;
+      RECT 2.835000  2.155000 3.165000 2.365000 ;
+      RECT 2.905000  0.085000 3.115000 0.935000 ;
+      RECT 2.995000  2.365000 3.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 ;
   END
 END sky130_fd_sc_lp__or4b_m
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef
index 9a1a7c8..f8c396d 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.magic.lef
@@ -80,22 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.670000  0.085000 0.920000 0.595000 ;
-        RECT 1.550000  0.085000 1.860000 0.605000 ;
-        RECT 2.430000  0.085000 2.760000 0.610000 ;
-        RECT 3.495000  0.085000 3.795000 1.025000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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 +88,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.560000 2.720000 0.820000 3.245000 ;
-        RECT 3.375000 1.815000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 4.320000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.500000 0.595000 ;
-      RECT 0.085000 0.595000 0.265000 1.615000 ;
-      RECT 0.085000 1.615000 2.615000 1.795000 ;
-      RECT 0.085000 1.795000 0.390000 3.050000 ;
-      RECT 0.990000 2.720000 1.785000 3.050000 ;
-      RECT 1.090000 0.280000 1.360000 0.775000 ;
-      RECT 1.090000 0.775000 1.860000 0.945000 ;
-      RECT 1.530000 0.945000 1.860000 1.435000 ;
-      RECT 1.620000 1.965000 2.965000 2.135000 ;
-      RECT 1.620000 2.135000 1.890000 2.330000 ;
-      RECT 2.030000 0.280000 2.260000 1.195000 ;
-      RECT 2.030000 1.195000 3.795000 1.365000 ;
-      RECT 2.285000 1.535000 2.615000 1.615000 ;
-      RECT 2.795000 1.365000 3.795000 1.525000 ;
-      RECT 2.795000 1.525000 2.965000 1.965000 ;
-      RECT 2.940000 0.280000 3.325000 0.610000 ;
-      RECT 3.155000 0.610000 3.325000 1.195000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.085000  0.280000 0.500000 0.595000 ;
+      RECT 0.085000  0.595000 0.265000 1.615000 ;
+      RECT 0.085000  1.615000 2.615000 1.795000 ;
+      RECT 0.085000  1.795000 0.390000 3.050000 ;
+      RECT 0.560000  2.720000 0.820000 3.245000 ;
+      RECT 0.670000  0.085000 0.920000 0.595000 ;
+      RECT 0.990000  2.720000 1.785000 3.050000 ;
+      RECT 1.090000  0.280000 1.360000 0.775000 ;
+      RECT 1.090000  0.775000 1.860000 0.945000 ;
+      RECT 1.530000  0.945000 1.860000 1.435000 ;
+      RECT 1.550000  0.085000 1.860000 0.605000 ;
+      RECT 1.620000  1.965000 2.965000 2.135000 ;
+      RECT 1.620000  2.135000 1.890000 2.330000 ;
+      RECT 2.030000  0.280000 2.260000 1.195000 ;
+      RECT 2.030000  1.195000 3.795000 1.365000 ;
+      RECT 2.285000  1.535000 2.615000 1.615000 ;
+      RECT 2.430000  0.085000 2.760000 0.610000 ;
+      RECT 2.795000  1.365000 3.795000 1.525000 ;
+      RECT 2.795000  1.525000 2.965000 1.965000 ;
+      RECT 2.940000  0.280000 3.325000 0.610000 ;
+      RECT 3.155000  0.610000 3.325000 1.195000 ;
+      RECT 3.375000  1.815000 3.675000 3.245000 ;
+      RECT 3.495000  0.085000 3.795000 1.025000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4bb_1
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.magic.lef
index 524a64a..2190373 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_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.985000  0.085000 1.245000 0.605000 ;
-        RECT 1.865000  0.085000 2.195000 0.415000 ;
-        RECT 2.980000  0.085000 3.280000 1.015000 ;
-        RECT 3.865000  0.085000 4.140000 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 ;
-        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,46 +87,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.800000 3.415000 ;
-        RECT 0.960000 2.045000 1.255000 3.245000 ;
-        RECT 2.985000 2.785000 3.315000 3.245000 ;
-        RECT 3.845000 2.785000 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.160000 0.280000 0.410000 1.625000 ;
-      RECT 0.160000 1.625000 2.460000 1.795000 ;
-      RECT 0.495000 1.795000 0.790000 2.390000 ;
-      RECT 1.415000 0.265000 1.650000 0.585000 ;
-      RECT 1.415000 0.585000 2.810000 0.595000 ;
-      RECT 1.480000 0.595000 2.810000 0.755000 ;
-      RECT 2.130000 0.925000 2.460000 1.625000 ;
-      RECT 2.435000 0.280000 2.810000 0.585000 ;
-      RECT 2.435000 1.995000 2.810000 2.275000 ;
-      RECT 2.475000 2.445000 4.205000 2.615000 ;
-      RECT 2.475000 2.615000 2.805000 3.075000 ;
-      RECT 2.640000 0.755000 2.810000 1.185000 ;
-      RECT 2.640000 1.185000 3.280000 1.515000 ;
-      RECT 2.640000 1.515000 2.810000 1.995000 ;
-      RECT 3.865000 1.065000 4.665000 1.235000 ;
-      RECT 3.865000 1.235000 4.035000 1.930000 ;
-      RECT 3.865000 1.930000 4.700000 2.260000 ;
-      RECT 3.865000 2.260000 4.205000 2.445000 ;
-      RECT 4.335000 0.700000 4.665000 1.065000 ;
+      RECT 0.000000 -0.085000 4.800000 0.085000 ;
+      RECT 0.000000  3.245000 4.800000 3.415000 ;
+      RECT 0.160000  0.280000 0.410000 1.625000 ;
+      RECT 0.160000  1.625000 2.460000 1.795000 ;
+      RECT 0.495000  1.795000 0.790000 2.390000 ;
+      RECT 0.960000  2.045000 1.255000 3.245000 ;
+      RECT 0.985000  0.085000 1.245000 0.605000 ;
+      RECT 1.415000  0.265000 1.650000 0.585000 ;
+      RECT 1.415000  0.585000 2.810000 0.595000 ;
+      RECT 1.480000  0.595000 2.810000 0.755000 ;
+      RECT 1.865000  0.085000 2.195000 0.415000 ;
+      RECT 2.130000  0.925000 2.460000 1.625000 ;
+      RECT 2.435000  0.280000 2.810000 0.585000 ;
+      RECT 2.435000  1.995000 2.810000 2.275000 ;
+      RECT 2.475000  2.445000 4.205000 2.615000 ;
+      RECT 2.475000  2.615000 2.805000 3.075000 ;
+      RECT 2.640000  0.755000 2.810000 1.185000 ;
+      RECT 2.640000  1.185000 3.280000 1.515000 ;
+      RECT 2.640000  1.515000 2.810000 1.995000 ;
+      RECT 2.980000  0.085000 3.280000 1.015000 ;
+      RECT 2.985000  2.785000 3.315000 3.245000 ;
+      RECT 3.845000  2.785000 4.175000 3.245000 ;
+      RECT 3.865000  0.085000 4.140000 0.895000 ;
+      RECT 3.865000  1.065000 4.665000 1.235000 ;
+      RECT 3.865000  1.235000 4.035000 1.930000 ;
+      RECT 3.865000  1.930000 4.700000 2.260000 ;
+      RECT 3.865000  2.260000 4.205000 2.445000 ;
+      RECT 4.335000  0.700000 4.665000 1.065000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4bb_2
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef
index 6b492e3..16fe835 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.magic.lef
@@ -83,27 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.875000  0.085000 1.195000 1.040000 ;
-        RECT 1.865000  0.085000 2.195000 0.815000 ;
-        RECT 2.880000  0.085000 3.210000 0.385000 ;
-        RECT 3.955000  0.085000 4.285000 0.385000 ;
-        RECT 4.990000  0.085000 5.320000 0.385000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -112,52 +91,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.895000 2.265000 1.225000 3.245000 ;
-        RECT 3.290000 2.095000 3.620000 3.245000 ;
-        RECT 4.150000 2.085000 4.480000 3.245000 ;
-        RECT 5.010000 2.085000 5.340000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.355000 0.730000 0.705000 1.040000 ;
-      RECT 0.355000 1.920000 0.705000 1.925000 ;
-      RECT 0.355000 1.925000 2.350000 2.095000 ;
-      RECT 0.355000 2.095000 0.685000 2.210000 ;
-      RECT 0.535000 1.040000 0.705000 1.920000 ;
-      RECT 1.365000 0.255000 1.695000 0.995000 ;
-      RECT 1.365000 0.995000 2.700000 1.040000 ;
-      RECT 1.525000 1.040000 2.700000 1.165000 ;
-      RECT 2.100000 1.345000 2.350000 1.925000 ;
-      RECT 2.365000 0.255000 2.700000 0.995000 ;
-      RECT 2.530000 1.165000 2.700000 1.755000 ;
-      RECT 2.530000 1.755000 3.540000 1.925000 ;
-      RECT 2.765000 1.925000 3.095000 3.075000 ;
-      RECT 2.870000 0.555000 5.865000 0.715000 ;
-      RECT 2.870000 0.715000 5.705000 0.725000 ;
-      RECT 2.870000 0.725000 3.130000 1.545000 ;
-      RECT 3.300000 1.325000 4.720000 1.575000 ;
-      RECT 3.300000 1.575000 3.540000 1.755000 ;
-      RECT 5.510000 0.725000 5.705000 1.920000 ;
-      RECT 5.510000 1.920000 5.865000 2.210000 ;
-      RECT 5.535000 0.310000 5.865000 0.555000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.355000  0.730000 0.705000 1.040000 ;
+      RECT 0.355000  1.920000 0.705000 1.925000 ;
+      RECT 0.355000  1.925000 2.350000 2.095000 ;
+      RECT 0.355000  2.095000 0.685000 2.210000 ;
+      RECT 0.535000  1.040000 0.705000 1.920000 ;
+      RECT 0.875000  0.085000 1.195000 1.040000 ;
+      RECT 0.895000  2.265000 1.225000 3.245000 ;
+      RECT 1.365000  0.255000 1.695000 0.995000 ;
+      RECT 1.365000  0.995000 2.700000 1.040000 ;
+      RECT 1.525000  1.040000 2.700000 1.165000 ;
+      RECT 1.865000  0.085000 2.195000 0.815000 ;
+      RECT 2.100000  1.345000 2.350000 1.925000 ;
+      RECT 2.365000  0.255000 2.700000 0.995000 ;
+      RECT 2.530000  1.165000 2.700000 1.755000 ;
+      RECT 2.530000  1.755000 3.540000 1.925000 ;
+      RECT 2.765000  1.925000 3.095000 3.075000 ;
+      RECT 2.870000  0.555000 5.865000 0.715000 ;
+      RECT 2.870000  0.715000 5.705000 0.725000 ;
+      RECT 2.870000  0.725000 3.130000 1.545000 ;
+      RECT 2.880000  0.085000 3.210000 0.385000 ;
+      RECT 3.290000  2.095000 3.620000 3.245000 ;
+      RECT 3.300000  1.325000 4.720000 1.575000 ;
+      RECT 3.300000  1.575000 3.540000 1.755000 ;
+      RECT 3.955000  0.085000 4.285000 0.385000 ;
+      RECT 4.150000  2.085000 4.480000 3.245000 ;
+      RECT 4.990000  0.085000 5.320000 0.385000 ;
+      RECT 5.010000  2.085000 5.340000 3.245000 ;
+      RECT 5.510000  0.725000 5.705000 1.920000 ;
+      RECT 5.510000  1.920000 5.865000 2.210000 ;
+      RECT 5.535000  0.310000 5.865000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4bb_4
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef
index 0b9154c..3276a58 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.magic.lef
@@ -81,28 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.200000 0.085000 ;
-        RECT 0.915000  0.085000 1.245000 0.595000 ;
-        RECT 3.660000  0.085000 3.990000 0.935000 ;
-        RECT 5.320000  0.085000 5.650000 1.365000 ;
-        RECT 5.965000  0.085000 6.295000 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 ;
-        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,72 +89,91 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.200000 3.415000 ;
-        RECT 1.035000 2.335000 1.365000 3.245000 ;
-        RECT 5.845000 2.755000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 7.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.505000 0.775000 1.595000 0.945000 ;
-      RECT 0.505000 0.945000 0.675000 1.975000 ;
-      RECT 0.505000 1.975000 1.220000 1.985000 ;
-      RECT 0.505000 1.985000 2.365000 2.145000 ;
-      RECT 0.855000 1.125000 1.945000 1.295000 ;
-      RECT 0.855000 1.295000 1.130000 1.795000 ;
-      RECT 1.050000 2.145000 2.365000 2.155000 ;
-      RECT 1.425000 0.265000 2.035000 0.595000 ;
-      RECT 1.425000 0.595000 1.595000 0.775000 ;
-      RECT 1.565000 2.155000 2.365000 2.485000 ;
-      RECT 1.565000 2.485000 1.895000 3.065000 ;
-      RECT 1.775000 0.775000 3.200000 0.945000 ;
-      RECT 1.775000 0.945000 1.945000 1.125000 ;
-      RECT 2.035000 1.815000 2.365000 1.985000 ;
-      RECT 2.360000 1.125000 2.690000 1.465000 ;
-      RECT 2.360000 1.465000 2.715000 1.635000 ;
-      RECT 2.505000 2.760000 2.835000 2.865000 ;
-      RECT 2.505000 2.865000 5.155000 3.035000 ;
-      RECT 2.545000 1.635000 2.715000 2.410000 ;
-      RECT 2.545000 2.410000 4.175000 2.580000 ;
-      RECT 2.870000 0.605000 3.200000 0.775000 ;
-      RECT 2.870000 0.945000 3.200000 1.115000 ;
-      RECT 2.870000 1.115000 4.340000 1.285000 ;
-      RECT 3.495000 1.285000 3.825000 2.230000 ;
-      RECT 4.005000 1.465000 5.035000 1.635000 ;
-      RECT 4.005000 1.635000 4.175000 2.410000 ;
-      RECT 4.170000 0.895000 4.780000 1.065000 ;
-      RECT 4.170000 1.065000 4.340000 1.115000 ;
-      RECT 4.355000 2.355000 4.685000 2.405000 ;
-      RECT 4.355000 2.405000 6.725000 2.575000 ;
-      RECT 4.355000 2.575000 4.685000 2.685000 ;
-      RECT 4.450000 0.605000 4.780000 0.895000 ;
-      RECT 4.865000 1.635000 5.035000 2.055000 ;
-      RECT 4.865000 2.055000 6.215000 2.225000 ;
-      RECT 5.830000 0.905000 6.215000 1.365000 ;
-      RECT 6.045000 1.365000 6.215000 2.055000 ;
-      RECT 6.395000 2.075000 7.085000 2.245000 ;
-      RECT 6.395000 2.245000 6.725000 2.405000 ;
-      RECT 6.395000 2.575000 6.725000 3.065000 ;
-      RECT 6.755000 0.265000 7.085000 0.675000 ;
-      RECT 6.915000 0.675000 7.085000 2.075000 ;
+      RECT 0.000000 -0.085000 7.200000 0.085000 ;
+      RECT 0.000000  3.245000 7.200000 3.415000 ;
+      RECT 0.505000  0.775000 1.595000 0.945000 ;
+      RECT 0.505000  0.945000 0.675000 1.975000 ;
+      RECT 0.505000  1.975000 1.220000 1.985000 ;
+      RECT 0.505000  1.985000 2.365000 2.145000 ;
+      RECT 0.855000  1.125000 1.945000 1.295000 ;
+      RECT 0.855000  1.295000 1.130000 1.795000 ;
+      RECT 0.915000  0.085000 1.245000 0.595000 ;
+      RECT 1.035000  2.335000 1.365000 3.245000 ;
+      RECT 1.050000  2.145000 2.365000 2.155000 ;
+      RECT 1.425000  0.265000 2.035000 0.595000 ;
+      RECT 1.425000  0.595000 1.595000 0.775000 ;
+      RECT 1.565000  2.155000 2.365000 2.485000 ;
+      RECT 1.565000  2.485000 1.895000 3.065000 ;
+      RECT 1.775000  0.775000 3.200000 0.945000 ;
+      RECT 1.775000  0.945000 1.945000 1.125000 ;
+      RECT 2.035000  1.815000 2.365000 1.985000 ;
+      RECT 2.360000  1.125000 2.690000 1.465000 ;
+      RECT 2.360000  1.465000 2.715000 1.635000 ;
+      RECT 2.505000  2.760000 2.835000 2.865000 ;
+      RECT 2.505000  2.865000 5.155000 3.035000 ;
+      RECT 2.545000  1.635000 2.715000 2.410000 ;
+      RECT 2.545000  2.410000 4.175000 2.580000 ;
+      RECT 2.870000  0.605000 3.200000 0.775000 ;
+      RECT 2.870000  0.945000 3.200000 1.115000 ;
+      RECT 2.870000  1.115000 4.340000 1.285000 ;
+      RECT 3.495000  1.285000 3.825000 2.230000 ;
+      RECT 3.660000  0.085000 3.990000 0.935000 ;
+      RECT 4.005000  1.465000 5.035000 1.635000 ;
+      RECT 4.005000  1.635000 4.175000 2.410000 ;
+      RECT 4.170000  0.895000 4.780000 1.065000 ;
+      RECT 4.170000  1.065000 4.340000 1.115000 ;
+      RECT 4.355000  2.355000 4.685000 2.405000 ;
+      RECT 4.355000  2.405000 6.725000 2.575000 ;
+      RECT 4.355000  2.575000 4.685000 2.685000 ;
+      RECT 4.450000  0.605000 4.780000 0.895000 ;
+      RECT 4.865000  1.635000 5.035000 2.055000 ;
+      RECT 4.865000  2.055000 6.215000 2.225000 ;
+      RECT 5.320000  0.085000 5.650000 1.365000 ;
+      RECT 5.830000  0.905000 6.215000 1.365000 ;
+      RECT 5.845000  2.755000 6.175000 3.245000 ;
+      RECT 5.965000  0.085000 6.295000 0.675000 ;
+      RECT 6.045000  1.365000 6.215000 2.055000 ;
+      RECT 6.395000  2.075000 7.085000 2.245000 ;
+      RECT 6.395000  2.245000 6.725000 2.405000 ;
+      RECT 6.395000  2.575000 6.725000 3.065000 ;
+      RECT 6.755000  0.265000 7.085000 0.675000 ;
+      RECT 6.915000  0.675000 7.085000 2.075000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4bb_lp
diff --git a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef
index 6468e4e..5aec12c 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.magic.lef
@@ -82,22 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.320000 0.085000 ;
-        RECT 0.700000  0.085000 0.910000 0.555000 ;
-        RECT 1.650000  0.085000 1.860000 0.545000 ;
-        RECT 2.470000  0.085000 2.800000 0.445000 ;
-        RECT 3.545000  0.085000 3.735000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -106,42 +90,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 4.320000 3.415000 ;
-        RECT 0.585000 2.760000 0.775000 3.245000 ;
-        RECT 3.385000 2.595000 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 ;
-        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 0.265000 0.480000 0.595000 ;
-      RECT 0.105000 0.595000 0.275000 1.625000 ;
-      RECT 0.105000 1.625000 2.375000 1.795000 ;
-      RECT 0.105000 1.795000 0.365000 2.960000 ;
-      RECT 1.015000 2.695000 1.735000 3.025000 ;
-      RECT 1.130000 0.355000 1.340000 0.735000 ;
-      RECT 1.130000 0.735000 1.705000 0.905000 ;
-      RECT 1.535000 0.905000 1.705000 1.445000 ;
-      RECT 1.700000 2.175000 2.855000 2.505000 ;
-      RECT 2.080000 0.365000 2.290000 0.625000 ;
-      RECT 2.080000 0.625000 3.365000 0.795000 ;
-      RECT 2.205000 1.365000 2.375000 1.625000 ;
-      RECT 2.685000 1.665000 3.875000 1.835000 ;
-      RECT 2.685000 1.835000 2.855000 2.175000 ;
-      RECT 3.020000 0.345000 3.365000 0.625000 ;
-      RECT 3.195000 0.795000 3.365000 1.665000 ;
-      RECT 3.705000 1.025000 3.875000 1.665000 ;
+      RECT 0.000000 -0.085000 4.320000 0.085000 ;
+      RECT 0.000000  3.245000 4.320000 3.415000 ;
+      RECT 0.105000  0.265000 0.480000 0.595000 ;
+      RECT 0.105000  0.595000 0.275000 1.625000 ;
+      RECT 0.105000  1.625000 2.375000 1.795000 ;
+      RECT 0.105000  1.795000 0.365000 2.960000 ;
+      RECT 0.585000  2.760000 0.775000 3.245000 ;
+      RECT 0.700000  0.085000 0.910000 0.555000 ;
+      RECT 1.015000  2.695000 1.735000 3.025000 ;
+      RECT 1.130000  0.355000 1.340000 0.735000 ;
+      RECT 1.130000  0.735000 1.705000 0.905000 ;
+      RECT 1.535000  0.905000 1.705000 1.445000 ;
+      RECT 1.650000  0.085000 1.860000 0.545000 ;
+      RECT 1.700000  2.175000 2.855000 2.505000 ;
+      RECT 2.080000  0.365000 2.290000 0.625000 ;
+      RECT 2.080000  0.625000 3.365000 0.795000 ;
+      RECT 2.205000  1.365000 2.375000 1.625000 ;
+      RECT 2.470000  0.085000 2.800000 0.445000 ;
+      RECT 2.685000  1.665000 3.875000 1.835000 ;
+      RECT 2.685000  1.835000 2.855000 2.175000 ;
+      RECT 3.020000  0.345000 3.365000 0.625000 ;
+      RECT 3.195000  0.795000 3.365000 1.665000 ;
+      RECT 3.385000  2.595000 3.715000 3.245000 ;
+      RECT 3.545000  0.085000 3.735000 0.545000 ;
+      RECT 3.705000  1.025000 3.875000 1.665000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__or4bb_m
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef
index 5ca1696..03ce451 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.magic.lef
@@ -93,12 +93,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  8.570000 1.080000  8.995000 1.410000 ;
-        RECT 13.000000 1.180000 13.330000 1.780000 ;
-      LAYER mcon ;
-        RECT  8.795000 1.210000  8.965000 1.380000 ;
-        RECT 13.115000 1.210000 13.285000 1.380000 ;
       LAYER met1 ;
         RECT  8.735000 1.180000  9.025000 1.225000 ;
         RECT  8.735000 1.225000 13.345000 1.365000 ;
@@ -120,55 +114,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 17.760000 0.085000 ;
-        RECT  0.155000  0.085000  0.485000 1.035000 ;
-        RECT  2.350000  0.085000  2.680000 0.995000 ;
-        RECT  3.655000  0.085000  3.985000 0.690000 ;
-        RECT  5.465000  0.085000  5.795000 0.770000 ;
-        RECT  7.875000  0.085000  8.205000 0.525000 ;
-        RECT 10.615000  0.085000 10.865000 0.905000 ;
-        RECT 12.645000  0.085000 12.975000 0.650000 ;
-        RECT 15.420000  0.085000 15.670000 1.145000 ;
-        RECT 16.840000  0.085000 17.090000 0.725000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -177,153 +122,203 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 17.760000 3.415000 ;
-        RECT  0.545000 2.415000  0.795000 3.245000 ;
-        RECT  2.395000 2.035000  2.565000 3.245000 ;
-        RECT  3.795000 2.070000  3.965000 3.245000 ;
-        RECT  5.470000 2.675000  5.800000 3.245000 ;
-        RECT  8.300000 2.290000  8.630000 3.245000 ;
-        RECT 10.345000 1.905000 10.675000 3.245000 ;
-        RECT 13.105000 2.470000 13.355000 3.245000 ;
-        RECT 14.325000 2.820000 14.655000 3.245000 ;
-        RECT 15.390000 2.820000 15.720000 3.245000 ;
-        RECT 16.885000 1.815000 17.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 ;
-        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.115000 2.065000  1.145000 2.235000 ;
-      RECT  0.115000 2.235000  0.365000 3.030000 ;
-      RECT  0.975000 2.235000  1.145000 2.895000 ;
-      RECT  0.975000 2.895000  2.095000 3.065000 ;
-      RECT  0.980000 0.460000  2.170000 0.630000 ;
-      RECT  0.980000 0.630000  1.310000 1.035000 ;
-      RECT  1.335000 2.000000  2.170000 2.170000 ;
-      RECT  1.335000 2.170000  1.585000 2.715000 ;
-      RECT  1.765000 2.350000  2.095000 2.895000 ;
-      RECT  2.000000 0.630000  2.170000 1.685000 ;
-      RECT  2.000000 1.685000  2.915000 1.855000 ;
-      RECT  2.000000 1.855000  2.170000 2.000000 ;
-      RECT  2.350000 1.175000  3.265000 1.505000 ;
-      RECT  2.745000 1.855000  2.915000 2.895000 ;
-      RECT  2.745000 2.895000  3.615000 3.065000 ;
-      RECT  3.095000 0.575000  3.425000 1.035000 ;
-      RECT  3.095000 1.035000  3.265000 1.175000 ;
-      RECT  3.095000 1.505000  3.265000 2.715000 ;
-      RECT  3.445000 1.720000  4.315000 1.890000 ;
-      RECT  3.445000 1.890000  3.615000 2.895000 ;
-      RECT  4.145000 1.890000  4.315000 2.895000 ;
-      RECT  4.145000 2.895000  5.290000 3.065000 ;
-      RECT  4.165000 0.265000  4.545000 0.690000 ;
-      RECT  4.375000 0.690000  4.545000 0.870000 ;
-      RECT  4.375000 0.870000  4.760000 1.540000 ;
-      RECT  4.495000 1.540000  4.760000 2.715000 ;
-      RECT  4.955000 0.310000  5.285000 1.345000 ;
-      RECT  4.955000 1.345000  6.000000 1.675000 ;
-      RECT  4.955000 1.675000  5.295000 2.145000 ;
-      RECT  5.120000 2.325000  6.350000 2.495000 ;
-      RECT  5.120000 2.495000  5.290000 2.895000 ;
-      RECT  6.020000 1.875000  6.350000 2.325000 ;
-      RECT  6.025000 0.605000  6.355000 1.065000 ;
-      RECT  6.180000 1.065000  6.350000 1.875000 ;
-      RECT  6.530000 1.875000  7.660000 2.045000 ;
-      RECT  6.530000 2.045000  6.865000 2.335000 ;
-      RECT  6.535000 0.500000  6.865000 1.875000 ;
-      RECT  7.045000 0.705000  8.555000 0.875000 ;
-      RECT  7.045000 0.875000  7.310000 1.380000 ;
-      RECT  7.490000 1.055000  8.390000 1.225000 ;
-      RECT  7.490000 1.225000  7.660000 1.875000 ;
-      RECT  7.840000 1.405000  8.040000 1.940000 ;
-      RECT  7.840000 1.940000  9.855000 2.110000 ;
-      RECT  8.220000 1.225000  8.390000 1.590000 ;
-      RECT  8.220000 1.590000  9.505000 1.735000 ;
-      RECT  8.220000 1.735000  9.345000 1.760000 ;
-      RECT  8.385000 0.265000 10.435000 0.435000 ;
-      RECT  8.385000 0.435000  8.555000 0.705000 ;
-      RECT  8.735000 0.615000 10.085000 0.785000 ;
-      RECT  8.735000 0.785000  9.065000 0.900000 ;
-      RECT  9.175000 1.405000  9.505000 1.590000 ;
-      RECT  9.245000 0.965000  9.575000 1.055000 ;
-      RECT  9.245000 1.055000  9.855000 1.225000 ;
-      RECT  9.525000 1.915000  9.855000 1.940000 ;
-      RECT  9.525000 2.110000  9.855000 2.755000 ;
-      RECT  9.685000 1.225000  9.855000 1.435000 ;
-      RECT  9.685000 1.435000 10.940000 1.725000 ;
-      RECT  9.685000 1.725000  9.855000 1.915000 ;
-      RECT  9.755000 0.785000 10.085000 0.875000 ;
-      RECT 10.265000 0.435000 10.435000 1.085000 ;
-      RECT 10.265000 1.085000 11.290000 1.255000 ;
-      RECT 11.120000 1.255000 11.290000 1.345000 ;
-      RECT 11.120000 1.345000 11.530000 1.675000 ;
-      RECT 11.120000 1.675000 11.290000 2.895000 ;
-      RECT 11.120000 2.895000 12.430000 3.065000 ;
-      RECT 11.470000 0.575000 11.880000 0.830000 ;
-      RECT 11.470000 0.830000 13.710000 1.000000 ;
-      RECT 11.470000 1.000000 11.880000 1.165000 ;
-      RECT 11.470000 2.120000 11.880000 2.715000 ;
-      RECT 11.710000 1.165000 11.880000 2.120000 ;
-      RECT 12.100000 1.700000 12.430000 2.895000 ;
-      RECT 12.640000 1.960000 13.865000 2.290000 ;
-      RECT 13.235000 0.265000 14.665000 0.435000 ;
-      RECT 13.235000 0.435000 13.565000 0.650000 ;
-      RECT 13.535000 2.290000 13.865000 2.470000 ;
-      RECT 13.535000 2.470000 15.720000 2.640000 ;
-      RECT 13.535000 2.640000 13.865000 3.065000 ;
-      RECT 13.540000 1.000000 13.710000 1.435000 ;
-      RECT 13.540000 1.435000 13.870000 1.765000 ;
-      RECT 13.905000 0.615000 14.155000 1.085000 ;
-      RECT 13.905000 1.085000 14.220000 1.255000 ;
-      RECT 14.050000 1.255000 14.220000 2.470000 ;
-      RECT 14.335000 0.435000 14.665000 0.815000 ;
-      RECT 14.400000 0.995000 15.240000 1.165000 ;
-      RECT 14.400000 1.165000 14.730000 1.960000 ;
-      RECT 14.400000 1.960000 15.210000 2.290000 ;
-      RECT 14.910000 0.265000 15.240000 0.995000 ;
-      RECT 15.550000 1.325000 15.905000 1.655000 ;
-      RECT 15.550000 1.655000 15.720000 2.470000 ;
-      RECT 16.455000 0.265000 16.660000 1.305000 ;
-      RECT 16.455000 1.305000 17.320000 1.635000 ;
-      RECT 16.455000 1.635000 16.705000 2.495000 ;
+      RECT  0.000000 -0.085000 17.760000 0.085000 ;
+      RECT  0.000000  3.245000 17.760000 3.415000 ;
+      RECT  0.115000  2.065000  1.145000 2.235000 ;
+      RECT  0.115000  2.235000  0.365000 3.030000 ;
+      RECT  0.155000  0.085000  0.485000 1.035000 ;
+      RECT  0.545000  2.415000  0.795000 3.245000 ;
+      RECT  0.975000  2.235000  1.145000 2.895000 ;
+      RECT  0.975000  2.895000  2.095000 3.065000 ;
+      RECT  0.980000  0.460000  2.170000 0.630000 ;
+      RECT  0.980000  0.630000  1.310000 1.035000 ;
+      RECT  1.335000  2.000000  2.170000 2.170000 ;
+      RECT  1.335000  2.170000  1.585000 2.715000 ;
+      RECT  1.765000  2.350000  2.095000 2.895000 ;
+      RECT  2.000000  0.630000  2.170000 1.685000 ;
+      RECT  2.000000  1.685000  2.915000 1.855000 ;
+      RECT  2.000000  1.855000  2.170000 2.000000 ;
+      RECT  2.350000  0.085000  2.680000 0.995000 ;
+      RECT  2.350000  1.175000  3.265000 1.505000 ;
+      RECT  2.395000  2.035000  2.565000 3.245000 ;
+      RECT  2.745000  1.855000  2.915000 2.895000 ;
+      RECT  2.745000  2.895000  3.615000 3.065000 ;
+      RECT  3.095000  0.575000  3.425000 1.035000 ;
+      RECT  3.095000  1.035000  3.265000 1.175000 ;
+      RECT  3.095000  1.505000  3.265000 2.715000 ;
+      RECT  3.445000  1.720000  4.315000 1.890000 ;
+      RECT  3.445000  1.890000  3.615000 2.895000 ;
+      RECT  3.655000  0.085000  3.985000 0.690000 ;
+      RECT  3.795000  2.070000  3.965000 3.245000 ;
+      RECT  4.145000  1.890000  4.315000 2.895000 ;
+      RECT  4.145000  2.895000  5.290000 3.065000 ;
+      RECT  4.165000  0.265000  4.545000 0.690000 ;
+      RECT  4.375000  0.690000  4.545000 0.870000 ;
+      RECT  4.375000  0.870000  4.760000 1.540000 ;
+      RECT  4.495000  1.540000  4.760000 2.715000 ;
+      RECT  4.955000  0.310000  5.285000 1.345000 ;
+      RECT  4.955000  1.345000  6.000000 1.675000 ;
+      RECT  4.955000  1.675000  5.295000 2.145000 ;
+      RECT  5.120000  2.325000  6.350000 2.495000 ;
+      RECT  5.120000  2.495000  5.290000 2.895000 ;
+      RECT  5.465000  0.085000  5.795000 0.770000 ;
+      RECT  5.470000  2.675000  5.800000 3.245000 ;
+      RECT  6.020000  1.875000  6.350000 2.325000 ;
+      RECT  6.025000  0.605000  6.355000 1.065000 ;
+      RECT  6.180000  1.065000  6.350000 1.875000 ;
+      RECT  6.530000  1.875000  7.660000 2.045000 ;
+      RECT  6.530000  2.045000  6.865000 2.335000 ;
+      RECT  6.535000  0.500000  6.865000 1.875000 ;
+      RECT  7.045000  0.705000  8.555000 0.875000 ;
+      RECT  7.045000  0.875000  7.310000 1.380000 ;
+      RECT  7.490000  1.055000  8.390000 1.225000 ;
+      RECT  7.490000  1.225000  7.660000 1.875000 ;
+      RECT  7.840000  1.405000  8.040000 1.940000 ;
+      RECT  7.840000  1.940000  9.855000 2.110000 ;
+      RECT  7.875000  0.085000  8.205000 0.525000 ;
+      RECT  8.220000  1.225000  8.390000 1.590000 ;
+      RECT  8.220000  1.590000  9.505000 1.735000 ;
+      RECT  8.220000  1.735000  9.345000 1.760000 ;
+      RECT  8.300000  2.290000  8.630000 3.245000 ;
+      RECT  8.385000  0.265000 10.435000 0.435000 ;
+      RECT  8.385000  0.435000  8.555000 0.705000 ;
+      RECT  8.570000  1.080000  8.995000 1.410000 ;
+      RECT  8.735000  0.615000 10.085000 0.785000 ;
+      RECT  8.735000  0.785000  9.065000 0.900000 ;
+      RECT  9.175000  1.405000  9.505000 1.590000 ;
+      RECT  9.245000  0.965000  9.575000 1.055000 ;
+      RECT  9.245000  1.055000  9.855000 1.225000 ;
+      RECT  9.525000  1.915000  9.855000 1.940000 ;
+      RECT  9.525000  2.110000  9.855000 2.755000 ;
+      RECT  9.685000  1.225000  9.855000 1.435000 ;
+      RECT  9.685000  1.435000 10.940000 1.725000 ;
+      RECT  9.685000  1.725000  9.855000 1.915000 ;
+      RECT  9.755000  0.785000 10.085000 0.875000 ;
+      RECT 10.265000  0.435000 10.435000 1.085000 ;
+      RECT 10.265000  1.085000 11.290000 1.255000 ;
+      RECT 10.345000  1.905000 10.675000 3.245000 ;
+      RECT 10.615000  0.085000 10.865000 0.905000 ;
+      RECT 11.120000  1.255000 11.290000 1.345000 ;
+      RECT 11.120000  1.345000 11.530000 1.675000 ;
+      RECT 11.120000  1.675000 11.290000 2.895000 ;
+      RECT 11.120000  2.895000 12.430000 3.065000 ;
+      RECT 11.470000  0.575000 11.880000 0.830000 ;
+      RECT 11.470000  0.830000 13.710000 1.000000 ;
+      RECT 11.470000  1.000000 11.880000 1.165000 ;
+      RECT 11.470000  2.120000 11.880000 2.715000 ;
+      RECT 11.710000  1.165000 11.880000 2.120000 ;
+      RECT 12.100000  1.700000 12.430000 2.895000 ;
+      RECT 12.640000  1.960000 13.865000 2.290000 ;
+      RECT 12.645000  0.085000 12.975000 0.650000 ;
+      RECT 13.000000  1.180000 13.330000 1.780000 ;
+      RECT 13.105000  2.470000 13.355000 3.245000 ;
+      RECT 13.235000  0.265000 14.665000 0.435000 ;
+      RECT 13.235000  0.435000 13.565000 0.650000 ;
+      RECT 13.535000  2.290000 13.865000 2.470000 ;
+      RECT 13.535000  2.470000 15.720000 2.640000 ;
+      RECT 13.535000  2.640000 13.865000 3.065000 ;
+      RECT 13.540000  1.000000 13.710000 1.435000 ;
+      RECT 13.540000  1.435000 13.870000 1.765000 ;
+      RECT 13.905000  0.615000 14.155000 1.085000 ;
+      RECT 13.905000  1.085000 14.220000 1.255000 ;
+      RECT 14.050000  1.255000 14.220000 2.470000 ;
+      RECT 14.325000  2.820000 14.655000 3.245000 ;
+      RECT 14.335000  0.435000 14.665000 0.815000 ;
+      RECT 14.400000  0.995000 15.240000 1.165000 ;
+      RECT 14.400000  1.165000 14.730000 1.960000 ;
+      RECT 14.400000  1.960000 15.210000 2.290000 ;
+      RECT 14.910000  0.265000 15.240000 0.995000 ;
+      RECT 15.390000  2.820000 15.720000 3.245000 ;
+      RECT 15.420000  0.085000 15.670000 1.145000 ;
+      RECT 15.550000  1.325000 15.905000 1.655000 ;
+      RECT 15.550000  1.655000 15.720000 2.470000 ;
+      RECT 16.455000  0.265000 16.660000 1.305000 ;
+      RECT 16.455000  1.305000 17.320000 1.635000 ;
+      RECT 16.455000  1.635000 16.705000 2.495000 ;
+      RECT 16.840000  0.085000 17.090000 0.725000 ;
+      RECT 16.885000  1.815000 17.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 ;
+      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.210000  8.965000 1.380000 ;
+      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.210000 13.285000 1.380000 ;
+      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_lp__sdfbbn_1
diff --git a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef
index cc8d8b8..982ef66 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.magic.lef
@@ -91,12 +91,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  8.185000 1.180000  8.515000 1.545000 ;
-        RECT 12.605000 1.180000 12.950000 1.780000 ;
-      LAYER mcon ;
-        RECT  8.315000 1.210000  8.485000 1.380000 ;
-        RECT 12.635000 1.210000 12.805000 1.380000 ;
       LAYER met1 ;
         RECT  8.255000 1.180000  8.545000 1.225000 ;
         RECT  8.255000 1.225000 12.865000 1.365000 ;
@@ -118,58 +112,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 18.240000 0.085000 ;
-        RECT  0.165000  0.085000  0.495000 1.035000 ;
-        RECT  2.325000  0.085000  2.655000 1.005000 ;
-        RECT  3.665000  0.085000  3.995000 0.915000 ;
-        RECT  5.380000  0.085000  5.710000 0.775000 ;
-        RECT  7.465000  0.085000  7.795000 0.650000 ;
-        RECT 10.205000  0.085000 10.455000 0.915000 ;
-        RECT 12.335000  0.085000 12.665000 0.650000 ;
-        RECT 14.980000  0.085000 15.230000 1.125000 ;
-        RECT 15.945000  0.085000 16.195000 1.125000 ;
-        RECT 16.935000  0.085000 17.185000 1.005000 ;
-        RECT 17.875000  0.085000 18.125000 1.095000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -178,150 +120,203 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 18.240000 3.415000 ;
-        RECT  0.770000 2.415000  1.100000 3.245000 ;
-        RECT  2.720000 2.425000  3.050000 3.245000 ;
-        RECT  3.645000 2.385000  3.895000 3.245000 ;
-        RECT  5.360000 2.675000  5.690000 3.245000 ;
-        RECT  7.955000 2.425000  8.285000 3.245000 ;
-        RECT  9.510000 1.875000  9.840000 3.245000 ;
-        RECT 12.685000 2.470000 12.935000 3.245000 ;
-        RECT 13.935000 2.740000 14.265000 3.245000 ;
-        RECT 14.975000 2.740000 15.305000 3.245000 ;
-        RECT 15.945000 1.815000 16.195000 3.245000 ;
-        RECT 16.935000 1.815000 17.185000 3.245000 ;
-        RECT 17.875000 1.815000 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.260000 2.065000  1.470000 2.235000 ;
-      RECT  0.260000 2.235000  0.590000 3.065000 ;
-      RECT  0.985000 0.460000  2.145000 0.630000 ;
-      RECT  0.985000 0.630000  1.315000 1.035000 ;
-      RECT  1.300000 2.235000  1.470000 2.895000 ;
-      RECT  1.300000 2.895000  2.490000 3.065000 ;
-      RECT  1.650000 2.035000  4.245000 2.205000 ;
-      RECT  1.650000 2.205000  1.980000 2.715000 ;
-      RECT  1.975000 0.630000  2.145000 2.035000 ;
-      RECT  2.160000 2.385000  2.490000 2.895000 ;
-      RECT  2.325000 1.185000  2.580000 1.515000 ;
-      RECT  2.325000 1.515000  3.445000 1.855000 ;
-      RECT  2.945000 0.575000  3.445000 1.515000 ;
-      RECT  4.075000 2.205000  4.245000 2.895000 ;
-      RECT  4.075000 2.895000  5.180000 3.065000 ;
-      RECT  4.175000 0.455000  4.595000 0.915000 ;
-      RECT  4.425000 0.915000  4.595000 1.005000 ;
-      RECT  4.425000 1.005000  4.770000 2.715000 ;
-      RECT  4.870000 0.315000  5.200000 0.775000 ;
-      RECT  4.950000 0.775000  5.200000 1.815000 ;
-      RECT  4.950000 1.815000  5.890000 1.985000 ;
-      RECT  4.950000 1.985000  5.200000 2.145000 ;
-      RECT  5.010000 2.325000  6.240000 2.495000 ;
-      RECT  5.010000 2.495000  5.180000 2.895000 ;
-      RECT  5.615000 1.315000  5.890000 1.815000 ;
-      RECT  5.910000 0.665000  6.240000 1.125000 ;
-      RECT  5.910000 2.295000  6.240000 2.325000 ;
-      RECT  5.910000 2.495000  6.240000 2.755000 ;
-      RECT  6.070000 1.125000  6.240000 2.295000 ;
-      RECT  6.420000 0.665000  6.590000 2.075000 ;
-      RECT  6.420000 2.075000  7.295000 2.245000 ;
-      RECT  6.420000 2.245000  6.750000 2.755000 ;
-      RECT  6.770000 0.830000  8.145000 1.000000 ;
-      RECT  6.770000 1.000000  6.945000 1.545000 ;
-      RECT  7.125000 1.475000  8.005000 1.645000 ;
-      RECT  7.125000 1.645000  7.295000 2.075000 ;
-      RECT  7.475000 1.825000  7.655000 2.075000 ;
-      RECT  7.475000 2.075000  9.330000 2.245000 ;
-      RECT  7.835000 1.645000  8.005000 1.725000 ;
-      RECT  7.835000 1.725000  8.980000 1.895000 ;
-      RECT  7.975000 0.265000 10.025000 0.435000 ;
-      RECT  7.975000 0.435000  8.145000 0.830000 ;
-      RECT  8.325000 0.615000  9.675000 0.785000 ;
-      RECT  8.325000 0.785000  8.655000 1.000000 ;
-      RECT  8.525000 2.245000  9.330000 2.755000 ;
-      RECT  8.705000 1.405000  8.980000 1.725000 ;
-      RECT  8.835000 0.965000  9.165000 1.055000 ;
-      RECT  8.835000 1.055000  9.330000 1.225000 ;
-      RECT  9.160000 1.225000  9.330000 1.445000 ;
-      RECT  9.160000 1.445000 10.500000 1.615000 ;
-      RECT  9.160000 1.615000  9.330000 2.075000 ;
-      RECT  9.345000 0.785000  9.675000 0.875000 ;
-      RECT  9.855000 0.435000 10.025000 1.095000 ;
-      RECT  9.855000 1.095000 11.120000 1.265000 ;
-      RECT 10.170000 1.615000 10.500000 1.705000 ;
-      RECT 10.680000 1.265000 11.120000 1.675000 ;
-      RECT 10.680000 1.675000 10.850000 2.895000 ;
-      RECT 10.680000 2.895000 12.020000 3.065000 ;
-      RECT 11.030000 2.120000 11.470000 2.715000 ;
-      RECT 11.300000 0.575000 11.630000 0.830000 ;
-      RECT 11.300000 0.830000 13.300000 1.000000 ;
-      RECT 11.300000 1.000000 11.630000 1.255000 ;
-      RECT 11.300000 1.255000 11.470000 2.120000 ;
-      RECT 11.690000 1.700000 12.020000 2.895000 ;
-      RECT 12.230000 1.960000 12.560000 2.120000 ;
-      RECT 12.230000 2.120000 13.445000 2.290000 ;
-      RECT 12.925000 0.265000 14.240000 0.435000 ;
-      RECT 12.925000 0.435000 13.255000 0.650000 ;
-      RECT 13.115000 2.290000 13.445000 2.390000 ;
-      RECT 13.115000 2.390000 15.305000 2.560000 ;
-      RECT 13.115000 2.560000 13.445000 3.065000 ;
-      RECT 13.130000 1.000000 13.300000 1.460000 ;
-      RECT 13.130000 1.460000 13.485000 1.790000 ;
-      RECT 13.480000 0.615000 13.810000 0.995000 ;
-      RECT 13.480000 0.995000 13.835000 1.165000 ;
-      RECT 13.665000 1.165000 13.835000 2.390000 ;
-      RECT 13.990000 0.435000 14.240000 0.815000 ;
-      RECT 14.015000 0.995000 14.800000 1.165000 ;
-      RECT 14.015000 1.165000 14.340000 1.960000 ;
-      RECT 14.015000 1.960000 14.795000 2.210000 ;
-      RECT 14.470000 0.665000 14.800000 0.995000 ;
-      RECT 15.135000 1.305000 15.415000 1.635000 ;
-      RECT 15.135000 1.635000 15.305000 2.390000 ;
-      RECT 16.425000 0.295000 16.755000 1.185000 ;
-      RECT 16.425000 1.185000 17.185000 1.515000 ;
-      RECT 16.425000 1.515000 16.755000 2.640000 ;
+      RECT  0.000000 -0.085000 18.240000 0.085000 ;
+      RECT  0.000000  3.245000 18.240000 3.415000 ;
+      RECT  0.165000  0.085000  0.495000 1.035000 ;
+      RECT  0.260000  2.065000  1.470000 2.235000 ;
+      RECT  0.260000  2.235000  0.590000 3.065000 ;
+      RECT  0.770000  2.415000  1.100000 3.245000 ;
+      RECT  0.985000  0.460000  2.145000 0.630000 ;
+      RECT  0.985000  0.630000  1.315000 1.035000 ;
+      RECT  1.300000  2.235000  1.470000 2.895000 ;
+      RECT  1.300000  2.895000  2.490000 3.065000 ;
+      RECT  1.650000  2.035000  4.245000 2.205000 ;
+      RECT  1.650000  2.205000  1.980000 2.715000 ;
+      RECT  1.975000  0.630000  2.145000 2.035000 ;
+      RECT  2.160000  2.385000  2.490000 2.895000 ;
+      RECT  2.325000  0.085000  2.655000 1.005000 ;
+      RECT  2.325000  1.185000  2.580000 1.515000 ;
+      RECT  2.325000  1.515000  3.445000 1.855000 ;
+      RECT  2.720000  2.425000  3.050000 3.245000 ;
+      RECT  2.945000  0.575000  3.445000 1.515000 ;
+      RECT  3.645000  2.385000  3.895000 3.245000 ;
+      RECT  3.665000  0.085000  3.995000 0.915000 ;
+      RECT  4.075000  2.205000  4.245000 2.895000 ;
+      RECT  4.075000  2.895000  5.180000 3.065000 ;
+      RECT  4.175000  0.455000  4.595000 0.915000 ;
+      RECT  4.425000  0.915000  4.595000 1.005000 ;
+      RECT  4.425000  1.005000  4.770000 2.715000 ;
+      RECT  4.870000  0.315000  5.200000 0.775000 ;
+      RECT  4.950000  0.775000  5.200000 1.815000 ;
+      RECT  4.950000  1.815000  5.890000 1.985000 ;
+      RECT  4.950000  1.985000  5.200000 2.145000 ;
+      RECT  5.010000  2.325000  6.240000 2.495000 ;
+      RECT  5.010000  2.495000  5.180000 2.895000 ;
+      RECT  5.360000  2.675000  5.690000 3.245000 ;
+      RECT  5.380000  0.085000  5.710000 0.775000 ;
+      RECT  5.615000  1.315000  5.890000 1.815000 ;
+      RECT  5.910000  0.665000  6.240000 1.125000 ;
+      RECT  5.910000  2.295000  6.240000 2.325000 ;
+      RECT  5.910000  2.495000  6.240000 2.755000 ;
+      RECT  6.070000  1.125000  6.240000 2.295000 ;
+      RECT  6.420000  0.665000  6.590000 2.075000 ;
+      RECT  6.420000  2.075000  7.295000 2.245000 ;
+      RECT  6.420000  2.245000  6.750000 2.755000 ;
+      RECT  6.770000  0.830000  8.145000 1.000000 ;
+      RECT  6.770000  1.000000  6.945000 1.545000 ;
+      RECT  7.125000  1.475000  8.005000 1.645000 ;
+      RECT  7.125000  1.645000  7.295000 2.075000 ;
+      RECT  7.465000  0.085000  7.795000 0.650000 ;
+      RECT  7.475000  1.825000  7.655000 2.075000 ;
+      RECT  7.475000  2.075000  9.330000 2.245000 ;
+      RECT  7.835000  1.645000  8.005000 1.725000 ;
+      RECT  7.835000  1.725000  8.980000 1.895000 ;
+      RECT  7.955000  2.425000  8.285000 3.245000 ;
+      RECT  7.975000  0.265000 10.025000 0.435000 ;
+      RECT  7.975000  0.435000  8.145000 0.830000 ;
+      RECT  8.185000  1.180000  8.515000 1.545000 ;
+      RECT  8.325000  0.615000  9.675000 0.785000 ;
+      RECT  8.325000  0.785000  8.655000 1.000000 ;
+      RECT  8.525000  2.245000  9.330000 2.755000 ;
+      RECT  8.705000  1.405000  8.980000 1.725000 ;
+      RECT  8.835000  0.965000  9.165000 1.055000 ;
+      RECT  8.835000  1.055000  9.330000 1.225000 ;
+      RECT  9.160000  1.225000  9.330000 1.445000 ;
+      RECT  9.160000  1.445000 10.500000 1.615000 ;
+      RECT  9.160000  1.615000  9.330000 2.075000 ;
+      RECT  9.345000  0.785000  9.675000 0.875000 ;
+      RECT  9.510000  1.875000  9.840000 3.245000 ;
+      RECT  9.855000  0.435000 10.025000 1.095000 ;
+      RECT  9.855000  1.095000 11.120000 1.265000 ;
+      RECT 10.170000  1.615000 10.500000 1.705000 ;
+      RECT 10.205000  0.085000 10.455000 0.915000 ;
+      RECT 10.680000  1.265000 11.120000 1.675000 ;
+      RECT 10.680000  1.675000 10.850000 2.895000 ;
+      RECT 10.680000  2.895000 12.020000 3.065000 ;
+      RECT 11.030000  2.120000 11.470000 2.715000 ;
+      RECT 11.300000  0.575000 11.630000 0.830000 ;
+      RECT 11.300000  0.830000 13.300000 1.000000 ;
+      RECT 11.300000  1.000000 11.630000 1.255000 ;
+      RECT 11.300000  1.255000 11.470000 2.120000 ;
+      RECT 11.690000  1.700000 12.020000 2.895000 ;
+      RECT 12.230000  1.960000 12.560000 2.120000 ;
+      RECT 12.230000  2.120000 13.445000 2.290000 ;
+      RECT 12.335000  0.085000 12.665000 0.650000 ;
+      RECT 12.605000  1.180000 12.950000 1.780000 ;
+      RECT 12.685000  2.470000 12.935000 3.245000 ;
+      RECT 12.925000  0.265000 14.240000 0.435000 ;
+      RECT 12.925000  0.435000 13.255000 0.650000 ;
+      RECT 13.115000  2.290000 13.445000 2.390000 ;
+      RECT 13.115000  2.390000 15.305000 2.560000 ;
+      RECT 13.115000  2.560000 13.445000 3.065000 ;
+      RECT 13.130000  1.000000 13.300000 1.460000 ;
+      RECT 13.130000  1.460000 13.485000 1.790000 ;
+      RECT 13.480000  0.615000 13.810000 0.995000 ;
+      RECT 13.480000  0.995000 13.835000 1.165000 ;
+      RECT 13.665000  1.165000 13.835000 2.390000 ;
+      RECT 13.935000  2.740000 14.265000 3.245000 ;
+      RECT 13.990000  0.435000 14.240000 0.815000 ;
+      RECT 14.015000  0.995000 14.800000 1.165000 ;
+      RECT 14.015000  1.165000 14.340000 1.960000 ;
+      RECT 14.015000  1.960000 14.795000 2.210000 ;
+      RECT 14.470000  0.665000 14.800000 0.995000 ;
+      RECT 14.975000  2.740000 15.305000 3.245000 ;
+      RECT 14.980000  0.085000 15.230000 1.125000 ;
+      RECT 15.135000  1.305000 15.415000 1.635000 ;
+      RECT 15.135000  1.635000 15.305000 2.390000 ;
+      RECT 15.945000  0.085000 16.195000 1.125000 ;
+      RECT 15.945000  1.815000 16.195000 3.245000 ;
+      RECT 16.425000  0.295000 16.755000 1.185000 ;
+      RECT 16.425000  1.185000 17.185000 1.515000 ;
+      RECT 16.425000  1.515000 16.755000 2.640000 ;
+      RECT 16.935000  0.085000 17.185000 1.005000 ;
+      RECT 16.935000  1.815000 17.185000 3.245000 ;
+      RECT 17.875000  0.085000 18.125000 1.095000 ;
+      RECT 17.875000  1.815000 18.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 ;
+      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 ;
+      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 ;
   END
 END sky130_fd_sc_lp__sdfbbn_2
diff --git a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
index cb7b326..fc37a1a 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.magic.lef
@@ -93,14 +93,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  6.845000 1.950000  7.165000 2.150000 ;
-        RECT  6.995000 1.375000  7.525000 1.780000 ;
-        RECT  6.995000 1.780000  7.165000 1.950000 ;
-        RECT 11.080000 1.765000 11.410000 2.150000 ;
-      LAYER mcon ;
-        RECT  6.875000 1.950000  7.045000 2.120000 ;
-        RECT 11.195000 1.950000 11.365000 2.120000 ;
       LAYER met1 ;
         RECT  6.815000 1.920000  7.105000 1.965000 ;
         RECT  6.815000 1.965000 11.425000 2.105000 ;
@@ -118,7 +110,7 @@
         RECT 3.445000 1.500000 3.775000 2.170000 ;
     END
   END CLK
-  PIN VNB
+  PIN VGND
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
@@ -167,6 +159,12 @@
         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 ;
+    END
+  END VGND
+  PIN VNB
+    DIRECTION INOUT ;
+    USE GROUND ;
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.245000 15.840000 0.245000 ;
         RECT 0.000000  0.245000  0.500000 0.500000 ;
@@ -176,6 +174,15 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
+      LAYER met1 ;
+        RECT 0.000000 2.800000  0.500000 3.085000 ;
+        RECT 0.000000 3.085000 15.840000 3.575000 ;
+    END
+  END VPB
+  PIN VPWR
+    DIRECTION INOUT ;
+    USE POWER ;
+    PORT
       LAYER li1 ;
         RECT  0.000000 3.245000 15.840000 3.415000 ;
         RECT  0.625000 2.415000  0.955000 3.245000 ;
@@ -222,11 +229,8 @@
         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 2.800000  0.500000 3.085000 ;
-        RECT 0.000000 3.085000 15.840000 3.575000 ;
     END
-  END VPB
+  END VPWR
   OBS
     LAYER li1 ;
       RECT  0.115000 2.065000  1.305000 2.235000 ;
@@ -269,6 +273,9 @@
       RECT  6.485000 1.450000  6.815000 1.770000 ;
       RECT  6.485000 1.770000  6.655000 2.330000 ;
       RECT  6.485000 2.330000  7.795000 2.500000 ;
+      RECT  6.845000 1.950000  7.165000 2.150000 ;
+      RECT  6.995000 1.375000  7.525000 1.780000 ;
+      RECT  6.995000 1.780000  7.165000 1.950000 ;
       RECT  7.435000 0.265000  8.705000 0.465000 ;
       RECT  7.435000 0.465000  7.765000 0.845000 ;
       RECT  7.465000 1.960000  9.360000 2.130000 ;
@@ -294,6 +301,7 @@
       RECT 10.485000 1.000000 11.760000 1.170000 ;
       RECT 10.575000 1.745000 10.870000 2.330000 ;
       RECT 10.575000 2.330000 13.780000 2.500000 ;
+      RECT 11.080000 1.765000 11.410000 2.150000 ;
       RECT 11.370000 0.265000 12.650000 0.435000 ;
       RECT 11.370000 0.435000 11.700000 0.650000 ;
       RECT 11.520000 2.500000 11.850000 3.065000 ;
@@ -313,8 +321,10 @@
       RECT 14.520000 1.305000 15.400000 1.635000 ;
       RECT 14.520000 1.635000 14.770000 2.495000 ;
     LAYER mcon ;
-      RECT 4.955000 1.210000 5.125000 1.380000 ;
-      RECT 9.755000 1.210000 9.925000 1.380000 ;
+      RECT  4.955000 1.210000  5.125000 1.380000 ;
+      RECT  6.875000 1.950000  7.045000 2.120000 ;
+      RECT  9.755000 1.210000  9.925000 1.380000 ;
+      RECT 11.195000 1.950000 11.365000 2.120000 ;
     LAYER met1 ;
       RECT 4.895000 1.180000 5.185000 1.225000 ;
       RECT 4.895000 1.225000 9.985000 1.365000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef
index c213c13..429f2e4 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.magic.lef
@@ -64,14 +64,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.380000 1.950000  3.750000 2.280000 ;
-        RECT  7.775000 1.820000  8.080000 2.165000 ;
-        RECT 10.230000 1.870000 10.795000 2.200000 ;
-      LAYER mcon ;
-        RECT  3.515000 1.950000  3.685000 2.120000 ;
-        RECT  7.835000 1.950000  8.005000 2.120000 ;
-        RECT 10.235000 1.950000 10.405000 2.120000 ;
       LAYER met1 ;
         RECT  3.455000 1.920000  3.745000 1.965000 ;
         RECT  3.455000 1.965000 10.465000 2.105000 ;
@@ -115,46 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.585000  0.085000  0.795000 0.685000 ;
-        RECT  3.275000  0.085000  3.605000 0.655000 ;
-        RECT  4.665000  0.085000  4.995000 0.690000 ;
-        RECT  5.655000  0.085000  5.835000 0.960000 ;
-        RECT  7.950000  0.085000  8.280000 0.550000 ;
-        RECT 10.135000  0.085000 10.465000 0.610000 ;
-        RECT 11.545000  0.085000 11.875000 0.555000 ;
-        RECT 12.990000  0.085000 13.225000 1.175000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -163,132 +115,175 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  1.090000 2.435000  1.350000 3.245000 ;
-        RECT  2.775000 2.790000  3.105000 3.245000 ;
-        RECT  4.665000 2.790000  4.995000 3.245000 ;
-        RECT  7.075000 2.695000  7.405000 3.245000 ;
-        RECT  8.250000 1.875000  8.480000 3.245000 ;
-        RECT 10.350000 2.545000 10.610000 3.245000 ;
-        RECT 11.305000 2.025000 11.635000 3.245000 ;
-        RECT 12.900000 2.795000 13.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 ;
-        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.155000 0.485000  0.365000 0.905000 ;
-      RECT  0.155000 0.905000  1.235000 1.235000 ;
-      RECT  0.155000 1.235000  0.325000 2.035000 ;
-      RECT  0.155000 2.035000  2.375000 2.215000 ;
-      RECT  0.590000 2.215000  0.920000 3.075000 ;
-      RECT  1.045000 0.255000  3.105000 0.425000 ;
-      RECT  1.045000 0.425000  1.305000 0.735000 ;
-      RECT  1.810000 2.385000  3.210000 2.415000 ;
-      RECT  1.810000 2.415000  3.275000 2.450000 ;
-      RECT  1.810000 2.450000  6.035000 2.620000 ;
-      RECT  1.810000 2.620000  2.140000 3.075000 ;
-      RECT  1.985000 0.595000  2.315000 0.815000 ;
-      RECT  1.985000 0.815000  3.210000 0.985000 ;
-      RECT  2.775000 0.425000  3.105000 0.645000 ;
-      RECT  3.040000 0.985000  3.210000 2.385000 ;
-      RECT  3.275000 2.620000  3.605000 3.075000 ;
-      RECT  4.235000 1.950000  4.995000 2.215000 ;
-      RECT  4.255000 0.670000  4.425000 0.860000 ;
-      RECT  4.255000 0.860000  4.995000 1.030000 ;
-      RECT  4.825000 1.030000  4.995000 1.345000 ;
-      RECT  4.825000 1.345000  5.150000 1.425000 ;
-      RECT  4.825000 1.425000  5.230000 1.595000 ;
-      RECT  4.825000 1.595000  5.150000 1.715000 ;
-      RECT  4.825000 1.715000  4.995000 1.950000 ;
-      RECT  5.165000 1.885000  6.175000 1.970000 ;
-      RECT  5.165000 1.970000  5.480000 2.215000 ;
-      RECT  5.185000 0.680000  5.485000 1.085000 ;
-      RECT  5.185000 1.085000  5.535000 1.130000 ;
-      RECT  5.185000 1.130000  6.175000 1.175000 ;
-      RECT  5.290000 1.175000  6.175000 1.235000 ;
-      RECT  5.320000 1.740000  6.175000 1.885000 ;
-      RECT  5.345000 1.235000  6.175000 1.295000 ;
-      RECT  5.400000 1.295000  6.175000 1.740000 ;
-      RECT  5.775000 2.155000  6.515000 2.325000 ;
-      RECT  5.775000 2.325000  6.035000 2.450000 ;
-      RECT  5.775000 2.620000  6.035000 2.685000 ;
-      RECT  6.005000 0.255000  7.780000 0.425000 ;
-      RECT  6.005000 0.425000  6.175000 1.130000 ;
-      RECT  6.205000 2.495000  7.990000 2.525000 ;
-      RECT  6.205000 2.525000  6.905000 2.775000 ;
-      RECT  6.345000 0.700000  6.515000 2.155000 ;
-      RECT  6.725000 0.650000  6.945000 0.980000 ;
-      RECT  6.725000 0.980000  6.895000 2.335000 ;
-      RECT  6.725000 2.335000  7.990000 2.495000 ;
-      RECT  7.065000 1.110000  8.915000 1.295000 ;
-      RECT  7.065000 1.295000  7.245000 2.155000 ;
-      RECT  7.105000 1.060000  8.915000 1.110000 ;
-      RECT  7.425000 1.465000  8.575000 1.650000 ;
-      RECT  7.425000 1.650000  7.605000 2.335000 ;
-      RECT  7.585000 2.525000  7.990000 2.685000 ;
-      RECT  7.610000 0.425000  7.780000 0.720000 ;
-      RECT  7.610000 0.720000  9.255000 0.890000 ;
-      RECT  8.660000 1.875000  8.915000 2.920000 ;
-      RECT  8.745000 1.295000  8.915000 1.875000 ;
-      RECT  9.085000 0.890000  9.255000 1.090000 ;
-      RECT  9.085000 1.090000  9.350000 1.950000 ;
-      RECT  9.085000 1.950000  9.720000 2.260000 ;
-      RECT  9.190000 2.495000 10.060000 2.920000 ;
-      RECT  9.425000 0.330000  9.830000 0.935000 ;
-      RECT  9.540000 2.260000  9.720000 2.320000 ;
-      RECT  9.550000 0.935000  9.830000 1.515000 ;
-      RECT  9.550000 1.515000 10.680000 1.685000 ;
-      RECT  9.550000 1.685000 10.060000 1.725000 ;
-      RECT  9.890000 1.725000 10.060000 2.495000 ;
-      RECT 10.000000 0.995000 10.805000 1.165000 ;
-      RECT 10.000000 1.165000 10.340000 1.345000 ;
-      RECT 10.510000 1.345000 11.190000 1.515000 ;
-      RECT 10.635000 0.725000 11.590000 0.975000 ;
-      RECT 10.635000 0.975000 10.805000 0.995000 ;
-      RECT 10.790000 2.370000 11.135000 2.920000 ;
-      RECT 10.965000 1.685000 11.590000 1.855000 ;
-      RECT 10.965000 1.855000 11.135000 2.370000 ;
-      RECT 10.975000 1.145000 11.190000 1.345000 ;
-      RECT 11.025000 0.510000 11.355000 0.725000 ;
-      RECT 11.360000 0.975000 11.590000 1.685000 ;
-      RECT 11.805000 1.615000 12.305000 2.285000 ;
-      RECT 11.970000 2.455000 13.230000 2.625000 ;
-      RECT 11.970000 2.625000 12.300000 3.075000 ;
-      RECT 12.045000 0.280000 12.305000 1.615000 ;
-      RECT 13.040000 1.345000 13.415000 1.675000 ;
-      RECT 13.040000 1.675000 13.230000 2.455000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.155000  0.485000  0.365000 0.905000 ;
+      RECT  0.155000  0.905000  1.235000 1.235000 ;
+      RECT  0.155000  1.235000  0.325000 2.035000 ;
+      RECT  0.155000  2.035000  2.375000 2.215000 ;
+      RECT  0.585000  0.085000  0.795000 0.685000 ;
+      RECT  0.590000  2.215000  0.920000 3.075000 ;
+      RECT  1.045000  0.255000  3.105000 0.425000 ;
+      RECT  1.045000  0.425000  1.305000 0.735000 ;
+      RECT  1.090000  2.435000  1.350000 3.245000 ;
+      RECT  1.810000  2.385000  3.210000 2.415000 ;
+      RECT  1.810000  2.415000  3.275000 2.450000 ;
+      RECT  1.810000  2.450000  6.035000 2.620000 ;
+      RECT  1.810000  2.620000  2.140000 3.075000 ;
+      RECT  1.985000  0.595000  2.315000 0.815000 ;
+      RECT  1.985000  0.815000  3.210000 0.985000 ;
+      RECT  2.775000  0.425000  3.105000 0.645000 ;
+      RECT  2.775000  2.790000  3.105000 3.245000 ;
+      RECT  3.040000  0.985000  3.210000 2.385000 ;
+      RECT  3.275000  0.085000  3.605000 0.655000 ;
+      RECT  3.275000  2.620000  3.605000 3.075000 ;
+      RECT  3.380000  1.950000  3.750000 2.280000 ;
+      RECT  4.235000  1.950000  4.995000 2.215000 ;
+      RECT  4.255000  0.670000  4.425000 0.860000 ;
+      RECT  4.255000  0.860000  4.995000 1.030000 ;
+      RECT  4.665000  0.085000  4.995000 0.690000 ;
+      RECT  4.665000  2.790000  4.995000 3.245000 ;
+      RECT  4.825000  1.030000  4.995000 1.345000 ;
+      RECT  4.825000  1.345000  5.150000 1.425000 ;
+      RECT  4.825000  1.425000  5.230000 1.595000 ;
+      RECT  4.825000  1.595000  5.150000 1.715000 ;
+      RECT  4.825000  1.715000  4.995000 1.950000 ;
+      RECT  5.165000  1.885000  6.175000 1.970000 ;
+      RECT  5.165000  1.970000  5.480000 2.215000 ;
+      RECT  5.185000  0.680000  5.485000 1.085000 ;
+      RECT  5.185000  1.085000  5.535000 1.130000 ;
+      RECT  5.185000  1.130000  6.175000 1.175000 ;
+      RECT  5.290000  1.175000  6.175000 1.235000 ;
+      RECT  5.320000  1.740000  6.175000 1.885000 ;
+      RECT  5.345000  1.235000  6.175000 1.295000 ;
+      RECT  5.400000  1.295000  6.175000 1.740000 ;
+      RECT  5.655000  0.085000  5.835000 0.960000 ;
+      RECT  5.775000  2.155000  6.515000 2.325000 ;
+      RECT  5.775000  2.325000  6.035000 2.450000 ;
+      RECT  5.775000  2.620000  6.035000 2.685000 ;
+      RECT  6.005000  0.255000  7.780000 0.425000 ;
+      RECT  6.005000  0.425000  6.175000 1.130000 ;
+      RECT  6.205000  2.495000  7.990000 2.525000 ;
+      RECT  6.205000  2.525000  6.905000 2.775000 ;
+      RECT  6.345000  0.700000  6.515000 2.155000 ;
+      RECT  6.725000  0.650000  6.945000 0.980000 ;
+      RECT  6.725000  0.980000  6.895000 2.335000 ;
+      RECT  6.725000  2.335000  7.990000 2.495000 ;
+      RECT  7.065000  1.110000  8.915000 1.295000 ;
+      RECT  7.065000  1.295000  7.245000 2.155000 ;
+      RECT  7.075000  2.695000  7.405000 3.245000 ;
+      RECT  7.105000  1.060000  8.915000 1.110000 ;
+      RECT  7.425000  1.465000  8.575000 1.650000 ;
+      RECT  7.425000  1.650000  7.605000 2.335000 ;
+      RECT  7.585000  2.525000  7.990000 2.685000 ;
+      RECT  7.610000  0.425000  7.780000 0.720000 ;
+      RECT  7.610000  0.720000  9.255000 0.890000 ;
+      RECT  7.775000  1.820000  8.080000 2.165000 ;
+      RECT  7.950000  0.085000  8.280000 0.550000 ;
+      RECT  8.250000  1.875000  8.480000 3.245000 ;
+      RECT  8.660000  1.875000  8.915000 2.920000 ;
+      RECT  8.745000  1.295000  8.915000 1.875000 ;
+      RECT  9.085000  0.890000  9.255000 1.090000 ;
+      RECT  9.085000  1.090000  9.350000 1.950000 ;
+      RECT  9.085000  1.950000  9.720000 2.260000 ;
+      RECT  9.190000  2.495000 10.060000 2.920000 ;
+      RECT  9.425000  0.330000  9.830000 0.935000 ;
+      RECT  9.540000  2.260000  9.720000 2.320000 ;
+      RECT  9.550000  0.935000  9.830000 1.515000 ;
+      RECT  9.550000  1.515000 10.680000 1.685000 ;
+      RECT  9.550000  1.685000 10.060000 1.725000 ;
+      RECT  9.890000  1.725000 10.060000 2.495000 ;
+      RECT 10.000000  0.995000 10.805000 1.165000 ;
+      RECT 10.000000  1.165000 10.340000 1.345000 ;
+      RECT 10.135000  0.085000 10.465000 0.610000 ;
+      RECT 10.230000  1.870000 10.795000 2.200000 ;
+      RECT 10.350000  2.545000 10.610000 3.245000 ;
+      RECT 10.510000  1.345000 11.190000 1.515000 ;
+      RECT 10.635000  0.725000 11.590000 0.975000 ;
+      RECT 10.635000  0.975000 10.805000 0.995000 ;
+      RECT 10.790000  2.370000 11.135000 2.920000 ;
+      RECT 10.965000  1.685000 11.590000 1.855000 ;
+      RECT 10.965000  1.855000 11.135000 2.370000 ;
+      RECT 10.975000  1.145000 11.190000 1.345000 ;
+      RECT 11.025000  0.510000 11.355000 0.725000 ;
+      RECT 11.305000  2.025000 11.635000 3.245000 ;
+      RECT 11.360000  0.975000 11.590000 1.685000 ;
+      RECT 11.545000  0.085000 11.875000 0.555000 ;
+      RECT 11.805000  1.615000 12.305000 2.285000 ;
+      RECT 11.970000  2.455000 13.230000 2.625000 ;
+      RECT 11.970000  2.625000 12.300000 3.075000 ;
+      RECT 12.045000  0.280000 12.305000 1.615000 ;
+      RECT 12.900000  2.795000 13.230000 3.245000 ;
+      RECT 12.990000  0.085000 13.225000 1.175000 ;
+      RECT 13.040000  1.345000 13.415000 1.675000 ;
+      RECT 13.040000  1.675000 13.230000 2.455000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.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.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  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  1.950000 10.405000 2.120000 ;
+      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_lp__sdfrbp_1
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef
index 7fdd0df..280db3d 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.magic.lef
@@ -62,14 +62,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.325000 1.920000  3.695000 2.200000 ;
-        RECT  7.300000 1.825000  7.605000 2.155000 ;
-        RECT 10.125000 1.940000 10.505000 2.300000 ;
-      LAYER mcon ;
-        RECT  3.515000 1.950000  3.685000 2.120000 ;
-        RECT  7.355000 1.950000  7.525000 2.120000 ;
-        RECT 10.205000 1.950000 10.375000 2.120000 ;
       LAYER met1 ;
         RECT  3.455000 1.920000  3.745000 1.965000 ;
         RECT  3.455000 1.965000 10.435000 2.105000 ;
@@ -114,49 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.525000  0.085000  0.855000 0.765000 ;
-        RECT  3.350000  0.085000  3.610000 0.780000 ;
-        RECT  4.260000  0.085000  4.590000 0.690000 ;
-        RECT  5.260000  0.085000  5.430000 0.905000 ;
-        RECT  7.595000  0.085000  7.925000 0.550000 ;
-        RECT  9.880000  0.085000 10.210000 0.670000 ;
-        RECT 11.190000  0.085000 11.480000 0.900000 ;
-        RECT 12.085000  0.085000 12.405000 1.095000 ;
-        RECT 13.095000  0.085000 13.405000 1.060000 ;
-        RECT 13.980000  0.085000 14.285000 1.140000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -165,136 +114,182 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  1.050000 2.435000  1.310000 3.245000 ;
-        RECT  2.670000 2.835000  3.000000 3.245000 ;
-        RECT  4.215000 2.825000  4.545000 3.245000 ;
-        RECT  6.690000 2.675000  7.020000 3.245000 ;
-        RECT  7.775000 2.085000  8.025000 3.245000 ;
-        RECT  9.710000 2.850000 10.455000 3.245000 ;
-        RECT 10.105000 2.525000 10.455000 2.850000 ;
-        RECT 11.150000 2.280000 11.480000 3.245000 ;
-        RECT 12.085000 1.795000 12.405000 3.245000 ;
-        RECT 13.095000 1.815000 13.405000 3.245000 ;
-        RECT 13.980000 1.815000 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.095000 0.465000  0.355000 0.935000 ;
-      RECT  0.095000 0.935000  1.255000 1.265000 ;
-      RECT  0.095000 1.265000  0.365000 2.015000 ;
-      RECT  0.095000 2.015000  2.335000 2.195000 ;
-      RECT  0.530000 2.195000  2.335000 2.265000 ;
-      RECT  0.530000 2.265000  0.880000 3.075000 ;
-      RECT  1.115000 0.265000  3.180000 0.435000 ;
-      RECT  1.115000 0.435000  1.490000 0.685000 ;
-      RECT  1.115000 0.685000  1.415000 0.765000 ;
-      RECT  1.770000 2.445000  3.145000 2.485000 ;
-      RECT  1.770000 2.485000  5.625000 2.655000 ;
-      RECT  1.770000 2.655000  2.100000 3.075000 ;
-      RECT  1.975000 0.605000  2.305000 0.795000 ;
-      RECT  1.975000 0.795000  3.145000 0.965000 ;
-      RECT  2.850000 0.435000  3.180000 0.625000 ;
-      RECT  2.975000 0.965000  3.145000 2.445000 ;
-      RECT  3.210000 2.655000  3.540000 3.075000 ;
-      RECT  3.800000 0.595000  4.060000 0.860000 ;
-      RECT  3.800000 0.860000  4.515000 1.040000 ;
-      RECT  3.865000 1.930000  4.515000 2.100000 ;
-      RECT  3.865000 2.100000  4.115000 2.315000 ;
-      RECT  4.345000 1.040000  4.515000 1.280000 ;
-      RECT  4.345000 1.280000  4.780000 1.610000 ;
-      RECT  4.345000 1.610000  4.515000 1.930000 ;
-      RECT  4.685000 1.815000  5.120000 2.145000 ;
-      RECT  4.685000 2.145000  5.085000 2.315000 ;
-      RECT  4.770000 0.595000  5.090000 1.050000 ;
-      RECT  4.770000 1.050000  5.120000 1.075000 ;
-      RECT  4.770000 1.075000  5.770000 1.110000 ;
-      RECT  4.905000 1.110000  5.770000 1.155000 ;
-      RECT  4.950000 1.155000  5.770000 1.780000 ;
-      RECT  4.950000 1.780000  5.120000 1.815000 ;
-      RECT  5.355000 2.325000  5.625000 2.485000 ;
-      RECT  5.390000 1.950000  6.110000 2.120000 ;
-      RECT  5.390000 2.120000  5.625000 2.325000 ;
-      RECT  5.600000 0.310000  7.425000 0.480000 ;
-      RECT  5.600000 0.480000  5.770000 1.075000 ;
-      RECT  5.795000 2.290000  6.450000 2.335000 ;
-      RECT  5.795000 2.335000  7.565000 2.505000 ;
-      RECT  5.795000 2.505000  6.520000 2.695000 ;
-      RECT  5.940000 0.650000  6.110000 1.950000 ;
-      RECT  6.280000 0.650000  6.620000 0.890000 ;
-      RECT  6.280000 0.890000  6.450000 2.290000 ;
-      RECT  6.620000 1.060000  8.560000 1.235000 ;
-      RECT  6.620000 1.235000  6.790000 2.155000 ;
-      RECT  6.960000 1.405000  8.140000 1.645000 ;
-      RECT  6.960000 1.645000  7.130000 2.335000 ;
-      RECT  7.190000 2.505000  7.565000 2.695000 ;
-      RECT  7.245000 0.480000  7.425000 0.720000 ;
-      RECT  7.245000 0.720000  8.850000 0.775000 ;
-      RECT  7.245000 0.775000  8.900000 0.820000 ;
-      RECT  7.245000 0.820000  9.070000 0.890000 ;
-      RECT  7.965000 1.645000  8.140000 1.735000 ;
-      RECT  8.310000 1.235000  8.560000 2.080000 ;
-      RECT  8.310000 2.080000  8.630000 2.910000 ;
-      RECT  8.670000 0.890000  9.070000 0.930000 ;
-      RECT  8.705000 0.930000  9.070000 0.965000 ;
-      RECT  8.730000 0.965000  9.070000 1.700000 ;
-      RECT  8.730000 1.700000  9.515000 1.900000 ;
-      RECT  8.825000 2.080000  9.105000 2.490000 ;
-      RECT  8.825000 2.490000  9.935000 2.670000 ;
-      RECT  8.825000 2.670000  9.155000 2.910000 ;
-      RECT  9.020000 0.255000  9.445000 0.650000 ;
-      RECT  9.240000 0.650000  9.445000 1.360000 ;
-      RECT  9.240000 1.360000  9.955000 1.430000 ;
-      RECT  9.240000 1.430000 10.875000 1.530000 ;
-      RECT  9.275000 1.900000  9.515000 1.990000 ;
-      RECT  9.275000 1.990000  9.595000 2.320000 ;
-      RECT  9.615000 0.860000 11.000000 1.070000 ;
-      RECT  9.615000 1.070000 11.235000 1.190000 ;
-      RECT  9.765000 1.530000 10.875000 1.760000 ;
-      RECT  9.765000 1.760000  9.935000 2.490000 ;
-      RECT 10.125000 1.190000 11.235000 1.260000 ;
-      RECT 10.625000 2.470000 10.895000 2.855000 ;
-      RECT 10.670000 0.330000 11.000000 0.860000 ;
-      RECT 10.675000 1.940000 11.235000 2.110000 ;
-      RECT 10.675000 2.110000 10.895000 2.470000 ;
-      RECT 11.065000 1.260000 11.235000 1.940000 ;
-      RECT 12.575000 0.285000 12.905000 1.230000 ;
-      RECT 12.575000 1.230000 13.405000 1.560000 ;
-      RECT 12.575000 1.560000 12.885000 2.495000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.095000  0.465000  0.355000 0.935000 ;
+      RECT  0.095000  0.935000  1.255000 1.265000 ;
+      RECT  0.095000  1.265000  0.365000 2.015000 ;
+      RECT  0.095000  2.015000  2.335000 2.195000 ;
+      RECT  0.525000  0.085000  0.855000 0.765000 ;
+      RECT  0.530000  2.195000  2.335000 2.265000 ;
+      RECT  0.530000  2.265000  0.880000 3.075000 ;
+      RECT  1.050000  2.435000  1.310000 3.245000 ;
+      RECT  1.115000  0.265000  3.180000 0.435000 ;
+      RECT  1.115000  0.435000  1.490000 0.685000 ;
+      RECT  1.115000  0.685000  1.415000 0.765000 ;
+      RECT  1.770000  2.445000  3.145000 2.485000 ;
+      RECT  1.770000  2.485000  5.625000 2.655000 ;
+      RECT  1.770000  2.655000  2.100000 3.075000 ;
+      RECT  1.975000  0.605000  2.305000 0.795000 ;
+      RECT  1.975000  0.795000  3.145000 0.965000 ;
+      RECT  2.670000  2.835000  3.000000 3.245000 ;
+      RECT  2.850000  0.435000  3.180000 0.625000 ;
+      RECT  2.975000  0.965000  3.145000 2.445000 ;
+      RECT  3.210000  2.655000  3.540000 3.075000 ;
+      RECT  3.325000  1.920000  3.695000 2.200000 ;
+      RECT  3.350000  0.085000  3.610000 0.780000 ;
+      RECT  3.800000  0.595000  4.060000 0.860000 ;
+      RECT  3.800000  0.860000  4.515000 1.040000 ;
+      RECT  3.865000  1.930000  4.515000 2.100000 ;
+      RECT  3.865000  2.100000  4.115000 2.315000 ;
+      RECT  4.215000  2.825000  4.545000 3.245000 ;
+      RECT  4.260000  0.085000  4.590000 0.690000 ;
+      RECT  4.345000  1.040000  4.515000 1.280000 ;
+      RECT  4.345000  1.280000  4.780000 1.610000 ;
+      RECT  4.345000  1.610000  4.515000 1.930000 ;
+      RECT  4.685000  1.815000  5.120000 2.145000 ;
+      RECT  4.685000  2.145000  5.085000 2.315000 ;
+      RECT  4.770000  0.595000  5.090000 1.050000 ;
+      RECT  4.770000  1.050000  5.120000 1.075000 ;
+      RECT  4.770000  1.075000  5.770000 1.110000 ;
+      RECT  4.905000  1.110000  5.770000 1.155000 ;
+      RECT  4.950000  1.155000  5.770000 1.780000 ;
+      RECT  4.950000  1.780000  5.120000 1.815000 ;
+      RECT  5.260000  0.085000  5.430000 0.905000 ;
+      RECT  5.355000  2.325000  5.625000 2.485000 ;
+      RECT  5.390000  1.950000  6.110000 2.120000 ;
+      RECT  5.390000  2.120000  5.625000 2.325000 ;
+      RECT  5.600000  0.310000  7.425000 0.480000 ;
+      RECT  5.600000  0.480000  5.770000 1.075000 ;
+      RECT  5.795000  2.290000  6.450000 2.335000 ;
+      RECT  5.795000  2.335000  7.565000 2.505000 ;
+      RECT  5.795000  2.505000  6.520000 2.695000 ;
+      RECT  5.940000  0.650000  6.110000 1.950000 ;
+      RECT  6.280000  0.650000  6.620000 0.890000 ;
+      RECT  6.280000  0.890000  6.450000 2.290000 ;
+      RECT  6.620000  1.060000  8.560000 1.235000 ;
+      RECT  6.620000  1.235000  6.790000 2.155000 ;
+      RECT  6.690000  2.675000  7.020000 3.245000 ;
+      RECT  6.960000  1.405000  8.140000 1.645000 ;
+      RECT  6.960000  1.645000  7.130000 2.335000 ;
+      RECT  7.190000  2.505000  7.565000 2.695000 ;
+      RECT  7.245000  0.480000  7.425000 0.720000 ;
+      RECT  7.245000  0.720000  8.850000 0.775000 ;
+      RECT  7.245000  0.775000  8.900000 0.820000 ;
+      RECT  7.245000  0.820000  9.070000 0.890000 ;
+      RECT  7.300000  1.825000  7.605000 2.155000 ;
+      RECT  7.595000  0.085000  7.925000 0.550000 ;
+      RECT  7.775000  2.085000  8.025000 3.245000 ;
+      RECT  7.965000  1.645000  8.140000 1.735000 ;
+      RECT  8.310000  1.235000  8.560000 2.080000 ;
+      RECT  8.310000  2.080000  8.630000 2.910000 ;
+      RECT  8.670000  0.890000  9.070000 0.930000 ;
+      RECT  8.705000  0.930000  9.070000 0.965000 ;
+      RECT  8.730000  0.965000  9.070000 1.700000 ;
+      RECT  8.730000  1.700000  9.515000 1.900000 ;
+      RECT  8.825000  2.080000  9.105000 2.490000 ;
+      RECT  8.825000  2.490000  9.935000 2.670000 ;
+      RECT  8.825000  2.670000  9.155000 2.910000 ;
+      RECT  9.020000  0.255000  9.445000 0.650000 ;
+      RECT  9.240000  0.650000  9.445000 1.360000 ;
+      RECT  9.240000  1.360000  9.955000 1.430000 ;
+      RECT  9.240000  1.430000 10.875000 1.530000 ;
+      RECT  9.275000  1.900000  9.515000 1.990000 ;
+      RECT  9.275000  1.990000  9.595000 2.320000 ;
+      RECT  9.615000  0.860000 11.000000 1.070000 ;
+      RECT  9.615000  1.070000 11.235000 1.190000 ;
+      RECT  9.710000  2.850000 10.455000 3.245000 ;
+      RECT  9.765000  1.530000 10.875000 1.760000 ;
+      RECT  9.765000  1.760000  9.935000 2.490000 ;
+      RECT  9.880000  0.085000 10.210000 0.670000 ;
+      RECT 10.105000  2.525000 10.455000 2.850000 ;
+      RECT 10.125000  1.190000 11.235000 1.260000 ;
+      RECT 10.125000  1.940000 10.505000 2.300000 ;
+      RECT 10.625000  2.470000 10.895000 2.855000 ;
+      RECT 10.670000  0.330000 11.000000 0.860000 ;
+      RECT 10.675000  1.940000 11.235000 2.110000 ;
+      RECT 10.675000  2.110000 10.895000 2.470000 ;
+      RECT 11.065000  1.260000 11.235000 1.940000 ;
+      RECT 11.150000  2.280000 11.480000 3.245000 ;
+      RECT 11.190000  0.085000 11.480000 0.900000 ;
+      RECT 12.085000  0.085000 12.405000 1.095000 ;
+      RECT 12.085000  1.795000 12.405000 3.245000 ;
+      RECT 12.575000  0.285000 12.905000 1.230000 ;
+      RECT 12.575000  1.230000 13.405000 1.560000 ;
+      RECT 12.575000  1.560000 12.885000 2.495000 ;
+      RECT 13.095000  0.085000 13.405000 1.060000 ;
+      RECT 13.095000  1.815000 13.405000 3.245000 ;
+      RECT 13.980000  0.085000 14.285000 1.140000 ;
+      RECT 13.980000  1.815000 14.285000 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.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  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.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.205000  1.950000 10.375000 2.120000 ;
+      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_lp__sdfrbp_2
diff --git a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef
index 6efb576..5f99ac1 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.magic.lef
@@ -66,14 +66,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  3.865000 1.625000  4.195000 2.520000 ;
-        RECT  6.755000 2.225000  7.085000 2.520000 ;
-        RECT 13.665000 2.100000 14.275000 2.520000 ;
-      LAYER mcon ;
-        RECT  3.995000 2.320000  4.165000 2.490000 ;
-        RECT  6.875000 2.320000  7.045000 2.490000 ;
-        RECT 14.075000 2.320000 14.245000 2.490000 ;
       LAYER met1 ;
         RECT  3.935000 2.290000  4.225000 2.335000 ;
         RECT  3.935000 2.335000 14.305000 2.475000 ;
@@ -115,56 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 19.200000 0.085000 ;
-        RECT  0.945000  0.085000  1.275000 0.535000 ;
-        RECT  3.480000  0.085000  3.650000 0.555000 ;
-        RECT  6.995000  0.085000  7.245000 0.535000 ;
-        RECT  8.865000  0.085000  9.195000 0.465000 ;
-        RECT 12.180000  0.085000 12.510000 0.870000 ;
-        RECT 15.710000  0.085000 16.040000 0.710000 ;
-        RECT 17.965000  0.085000 18.295000 1.125000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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 ;
-        RECT 18.395000 -0.085000 18.565000 0.085000 ;
-        RECT 18.875000 -0.085000 19.045000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 19.200000 0.245000 ;
     END
@@ -173,171 +115,224 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 19.200000 3.415000 ;
-        RECT  0.960000 2.495000  1.290000 3.245000 ;
-        RECT  2.895000 2.495000  3.225000 3.245000 ;
-        RECT  5.860000 2.735000  6.190000 3.245000 ;
-        RECT  8.895000 1.855000  9.225000 3.245000 ;
-        RECT 12.495000 2.795000 12.825000 3.245000 ;
-        RECT 13.930000 2.700000 14.180000 3.245000 ;
-        RECT 15.710000 1.960000 16.040000 3.245000 ;
-        RECT 17.965000 1.815000 18.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 ;
-        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 ;
-        RECT 18.395000 3.245000 18.565000 3.415000 ;
-        RECT 18.875000 3.245000 19.045000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 19.200000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.125000 0.265000  0.455000 0.715000 ;
-      RECT  0.125000 0.715000  2.680000 0.885000 ;
-      RECT  0.125000 0.885000  0.295000 2.435000 ;
-      RECT  0.125000 2.435000  0.500000 3.065000 ;
-      RECT  0.985000 1.065000  2.015000 1.235000 ;
-      RECT  0.985000 1.235000  1.155000 2.145000 ;
-      RECT  0.985000 2.145000  3.575000 2.315000 ;
-      RECT  1.335000 1.415000  1.505000 1.795000 ;
-      RECT  1.335000 1.795000  3.155000 1.965000 ;
-      RECT  1.685000 1.235000  2.015000 1.615000 ;
-      RECT  2.075000 2.315000  2.405000 3.065000 ;
-      RECT  2.295000 0.615000  2.680000 0.715000 ;
-      RECT  2.475000 1.065000  3.585000 1.235000 ;
-      RECT  2.475000 1.235000  2.725000 1.615000 ;
-      RECT  2.905000 1.415000  3.155000 1.795000 ;
-      RECT  3.405000 2.315000  3.575000 2.700000 ;
-      RECT  3.405000 2.700000  4.545000 2.975000 ;
-      RECT  3.415000 0.725000  4.000000 0.895000 ;
-      RECT  3.415000 0.895000  3.585000 1.065000 ;
-      RECT  3.830000 0.265000  4.210000 0.715000 ;
-      RECT  3.830000 0.715000  4.000000 0.725000 ;
-      RECT  4.100000 1.075000  4.350000 1.445000 ;
-      RECT  4.180000 0.885000  5.770000 1.055000 ;
-      RECT  4.180000 1.055000  4.350000 1.075000 ;
-      RECT  4.375000 2.025000  5.325000 2.195000 ;
-      RECT  4.375000 2.195000  4.545000 2.700000 ;
-      RECT  4.380000 0.265000  6.740000 0.435000 ;
-      RECT  4.380000 0.435000  4.710000 0.715000 ;
-      RECT  4.530000 1.235000  5.675000 1.405000 ;
-      RECT  4.530000 1.405000  4.860000 1.535000 ;
-      RECT  4.715000 2.385000  6.540000 2.555000 ;
-      RECT  4.715000 2.555000  4.905000 2.895000 ;
-      RECT  5.075000 1.585000  5.325000 2.025000 ;
-      RECT  5.470000 0.715000  6.390000 0.885000 ;
-      RECT  5.505000 1.405000  5.675000 1.545000 ;
-      RECT  5.505000 1.545000  7.810000 1.715000 ;
-      RECT  5.505000 1.715000  5.675000 2.385000 ;
-      RECT  5.855000 1.885000  7.810000 2.055000 ;
-      RECT  5.855000 2.055000  6.155000 2.215000 ;
-      RECT  6.185000 1.065000  9.585000 1.165000 ;
-      RECT  6.185000 1.165000  8.240000 1.235000 ;
-      RECT  6.185000 1.235000  6.515000 1.375000 ;
-      RECT  6.370000 2.555000  6.540000 2.700000 ;
-      RECT  6.370000 2.700000  7.460000 2.870000 ;
-      RECT  6.570000 0.435000  6.740000 0.715000 ;
-      RECT  6.570000 0.715000  7.670000 0.885000 ;
-      RECT  7.210000 2.870000  7.460000 3.065000 ;
-      RECT  7.480000 1.415000  7.810000 1.545000 ;
-      RECT  7.500000 0.265000  8.590000 0.435000 ;
-      RECT  7.500000 0.435000  7.670000 0.715000 ;
-      RECT  7.640000 2.055000  7.810000 2.895000 ;
-      RECT  7.640000 2.895000  8.590000 3.065000 ;
-      RECT  7.850000 0.615000  8.240000 0.995000 ;
-      RECT  7.850000 0.995000  9.585000 1.065000 ;
-      RECT  7.990000 1.235000  8.240000 2.715000 ;
-      RECT  8.420000 0.435000  8.590000 0.645000 ;
-      RECT  8.420000 0.645000 10.095000 0.815000 ;
-      RECT  8.420000 1.345000  9.235000 1.675000 ;
-      RECT  8.420000 1.675000  8.590000 2.895000 ;
-      RECT  9.415000 1.165000  9.585000 2.895000 ;
-      RECT  9.415000 2.895000 10.285000 3.065000 ;
-      RECT  9.765000 0.265000 10.095000 0.645000 ;
-      RECT  9.765000 0.815000 10.095000 1.435000 ;
-      RECT  9.765000 1.435000 10.900000 1.765000 ;
-      RECT  9.765000 1.765000  9.935000 2.715000 ;
-      RECT 10.115000 1.945000 11.610000 2.115000 ;
-      RECT 10.115000 2.115000 10.285000 2.895000 ;
-      RECT 10.465000 2.295000 10.715000 2.895000 ;
-      RECT 10.465000 2.895000 12.315000 3.065000 ;
-      RECT 10.620000 0.575000 10.950000 1.085000 ;
-      RECT 10.620000 1.085000 11.250000 1.255000 ;
-      RECT 10.930000 2.425000 11.960000 2.595000 ;
-      RECT 10.930000 2.595000 11.260000 2.715000 ;
-      RECT 11.080000 1.255000 11.250000 1.915000 ;
-      RECT 11.080000 1.915000 11.610000 1.945000 ;
-      RECT 11.130000 0.575000 11.960000 0.905000 ;
-      RECT 11.360000 2.115000 11.610000 2.245000 ;
-      RECT 11.790000 0.905000 11.960000 1.745000 ;
-      RECT 11.790000 1.745000 13.050000 1.915000 ;
-      RECT 11.790000 1.915000 11.960000 2.425000 ;
-      RECT 11.985000 2.795000 12.315000 2.895000 ;
-      RECT 12.140000 1.050000 14.140000 1.060000 ;
-      RECT 12.140000 1.060000 12.860000 1.220000 ;
-      RECT 12.140000 1.220000 12.470000 1.565000 ;
-      RECT 12.140000 2.185000 12.415000 2.445000 ;
-      RECT 12.140000 2.445000 13.470000 2.615000 ;
-      RECT 12.595000 2.095000 13.400000 2.265000 ;
-      RECT 12.690000 0.265000 15.250000 0.435000 ;
-      RECT 12.690000 0.435000 13.020000 0.595000 ;
-      RECT 12.690000 0.890000 14.140000 1.050000 ;
-      RECT 12.720000 1.400000 14.490000 1.570000 ;
-      RECT 12.720000 1.570000 13.050000 1.745000 ;
-      RECT 13.140000 2.615000 13.470000 3.030000 ;
-      RECT 13.230000 1.750000 14.690000 1.920000 ;
-      RECT 13.230000 1.920000 13.400000 2.095000 ;
-      RECT 13.890000 0.685000 14.140000 0.890000 ;
-      RECT 14.055000 1.240000 14.490000 1.400000 ;
-      RECT 14.320000 0.890000 16.185000 1.060000 ;
-      RECT 14.320000 1.060000 14.490000 1.240000 ;
-      RECT 14.360000 2.700000 14.690000 3.030000 ;
-      RECT 14.500000 0.435000 15.250000 0.710000 ;
-      RECT 14.520000 1.920000 14.690000 2.700000 ;
-      RECT 14.685000 1.240000 15.250000 1.570000 ;
-      RECT 14.920000 1.570000 15.250000 3.065000 ;
-      RECT 16.015000 1.060000 16.185000 1.255000 ;
-      RECT 16.015000 1.255000 16.345000 1.585000 ;
-      RECT 17.060000 0.665000 17.390000 1.305000 ;
-      RECT 17.060000 1.305000 18.575000 1.635000 ;
-      RECT 17.060000 1.635000 17.390000 2.495000 ;
+      RECT  0.000000 -0.085000 19.200000 0.085000 ;
+      RECT  0.000000  3.245000 19.200000 3.415000 ;
+      RECT  0.125000  0.265000  0.455000 0.715000 ;
+      RECT  0.125000  0.715000  2.680000 0.885000 ;
+      RECT  0.125000  0.885000  0.295000 2.435000 ;
+      RECT  0.125000  2.435000  0.500000 3.065000 ;
+      RECT  0.945000  0.085000  1.275000 0.535000 ;
+      RECT  0.960000  2.495000  1.290000 3.245000 ;
+      RECT  0.985000  1.065000  2.015000 1.235000 ;
+      RECT  0.985000  1.235000  1.155000 2.145000 ;
+      RECT  0.985000  2.145000  3.575000 2.315000 ;
+      RECT  1.335000  1.415000  1.505000 1.795000 ;
+      RECT  1.335000  1.795000  3.155000 1.965000 ;
+      RECT  1.685000  1.235000  2.015000 1.615000 ;
+      RECT  2.075000  2.315000  2.405000 3.065000 ;
+      RECT  2.295000  0.615000  2.680000 0.715000 ;
+      RECT  2.475000  1.065000  3.585000 1.235000 ;
+      RECT  2.475000  1.235000  2.725000 1.615000 ;
+      RECT  2.895000  2.495000  3.225000 3.245000 ;
+      RECT  2.905000  1.415000  3.155000 1.795000 ;
+      RECT  3.405000  2.315000  3.575000 2.700000 ;
+      RECT  3.405000  2.700000  4.545000 2.975000 ;
+      RECT  3.415000  0.725000  4.000000 0.895000 ;
+      RECT  3.415000  0.895000  3.585000 1.065000 ;
+      RECT  3.480000  0.085000  3.650000 0.555000 ;
+      RECT  3.830000  0.265000  4.210000 0.715000 ;
+      RECT  3.830000  0.715000  4.000000 0.725000 ;
+      RECT  3.865000  1.625000  4.195000 2.520000 ;
+      RECT  4.100000  1.075000  4.350000 1.445000 ;
+      RECT  4.180000  0.885000  5.770000 1.055000 ;
+      RECT  4.180000  1.055000  4.350000 1.075000 ;
+      RECT  4.375000  2.025000  5.325000 2.195000 ;
+      RECT  4.375000  2.195000  4.545000 2.700000 ;
+      RECT  4.380000  0.265000  6.740000 0.435000 ;
+      RECT  4.380000  0.435000  4.710000 0.715000 ;
+      RECT  4.530000  1.235000  5.675000 1.405000 ;
+      RECT  4.530000  1.405000  4.860000 1.535000 ;
+      RECT  4.715000  2.385000  6.540000 2.555000 ;
+      RECT  4.715000  2.555000  4.905000 2.895000 ;
+      RECT  5.075000  1.585000  5.325000 2.025000 ;
+      RECT  5.470000  0.715000  6.390000 0.885000 ;
+      RECT  5.505000  1.405000  5.675000 1.545000 ;
+      RECT  5.505000  1.545000  7.810000 1.715000 ;
+      RECT  5.505000  1.715000  5.675000 2.385000 ;
+      RECT  5.855000  1.885000  7.810000 2.055000 ;
+      RECT  5.855000  2.055000  6.155000 2.215000 ;
+      RECT  5.860000  2.735000  6.190000 3.245000 ;
+      RECT  6.185000  1.065000  9.585000 1.165000 ;
+      RECT  6.185000  1.165000  8.240000 1.235000 ;
+      RECT  6.185000  1.235000  6.515000 1.375000 ;
+      RECT  6.370000  2.555000  6.540000 2.700000 ;
+      RECT  6.370000  2.700000  7.460000 2.870000 ;
+      RECT  6.570000  0.435000  6.740000 0.715000 ;
+      RECT  6.570000  0.715000  7.670000 0.885000 ;
+      RECT  6.755000  2.225000  7.085000 2.520000 ;
+      RECT  6.995000  0.085000  7.245000 0.535000 ;
+      RECT  7.210000  2.870000  7.460000 3.065000 ;
+      RECT  7.480000  1.415000  7.810000 1.545000 ;
+      RECT  7.500000  0.265000  8.590000 0.435000 ;
+      RECT  7.500000  0.435000  7.670000 0.715000 ;
+      RECT  7.640000  2.055000  7.810000 2.895000 ;
+      RECT  7.640000  2.895000  8.590000 3.065000 ;
+      RECT  7.850000  0.615000  8.240000 0.995000 ;
+      RECT  7.850000  0.995000  9.585000 1.065000 ;
+      RECT  7.990000  1.235000  8.240000 2.715000 ;
+      RECT  8.420000  0.435000  8.590000 0.645000 ;
+      RECT  8.420000  0.645000 10.095000 0.815000 ;
+      RECT  8.420000  1.345000  9.235000 1.675000 ;
+      RECT  8.420000  1.675000  8.590000 2.895000 ;
+      RECT  8.865000  0.085000  9.195000 0.465000 ;
+      RECT  8.895000  1.855000  9.225000 3.245000 ;
+      RECT  9.415000  1.165000  9.585000 2.895000 ;
+      RECT  9.415000  2.895000 10.285000 3.065000 ;
+      RECT  9.765000  0.265000 10.095000 0.645000 ;
+      RECT  9.765000  0.815000 10.095000 1.435000 ;
+      RECT  9.765000  1.435000 10.900000 1.765000 ;
+      RECT  9.765000  1.765000  9.935000 2.715000 ;
+      RECT 10.115000  1.945000 11.610000 2.115000 ;
+      RECT 10.115000  2.115000 10.285000 2.895000 ;
+      RECT 10.465000  2.295000 10.715000 2.895000 ;
+      RECT 10.465000  2.895000 12.315000 3.065000 ;
+      RECT 10.620000  0.575000 10.950000 1.085000 ;
+      RECT 10.620000  1.085000 11.250000 1.255000 ;
+      RECT 10.930000  2.425000 11.960000 2.595000 ;
+      RECT 10.930000  2.595000 11.260000 2.715000 ;
+      RECT 11.080000  1.255000 11.250000 1.915000 ;
+      RECT 11.080000  1.915000 11.610000 1.945000 ;
+      RECT 11.130000  0.575000 11.960000 0.905000 ;
+      RECT 11.360000  2.115000 11.610000 2.245000 ;
+      RECT 11.790000  0.905000 11.960000 1.745000 ;
+      RECT 11.790000  1.745000 13.050000 1.915000 ;
+      RECT 11.790000  1.915000 11.960000 2.425000 ;
+      RECT 11.985000  2.795000 12.315000 2.895000 ;
+      RECT 12.140000  1.050000 14.140000 1.060000 ;
+      RECT 12.140000  1.060000 12.860000 1.220000 ;
+      RECT 12.140000  1.220000 12.470000 1.565000 ;
+      RECT 12.140000  2.185000 12.415000 2.445000 ;
+      RECT 12.140000  2.445000 13.470000 2.615000 ;
+      RECT 12.180000  0.085000 12.510000 0.870000 ;
+      RECT 12.495000  2.795000 12.825000 3.245000 ;
+      RECT 12.595000  2.095000 13.400000 2.265000 ;
+      RECT 12.690000  0.265000 15.250000 0.435000 ;
+      RECT 12.690000  0.435000 13.020000 0.595000 ;
+      RECT 12.690000  0.890000 14.140000 1.050000 ;
+      RECT 12.720000  1.400000 14.490000 1.570000 ;
+      RECT 12.720000  1.570000 13.050000 1.745000 ;
+      RECT 13.140000  2.615000 13.470000 3.030000 ;
+      RECT 13.230000  1.750000 14.690000 1.920000 ;
+      RECT 13.230000  1.920000 13.400000 2.095000 ;
+      RECT 13.665000  2.100000 14.275000 2.520000 ;
+      RECT 13.890000  0.685000 14.140000 0.890000 ;
+      RECT 13.930000  2.700000 14.180000 3.245000 ;
+      RECT 14.055000  1.240000 14.490000 1.400000 ;
+      RECT 14.320000  0.890000 16.185000 1.060000 ;
+      RECT 14.320000  1.060000 14.490000 1.240000 ;
+      RECT 14.360000  2.700000 14.690000 3.030000 ;
+      RECT 14.500000  0.435000 15.250000 0.710000 ;
+      RECT 14.520000  1.920000 14.690000 2.700000 ;
+      RECT 14.685000  1.240000 15.250000 1.570000 ;
+      RECT 14.920000  1.570000 15.250000 3.065000 ;
+      RECT 15.710000  0.085000 16.040000 0.710000 ;
+      RECT 15.710000  1.960000 16.040000 3.245000 ;
+      RECT 16.015000  1.060000 16.185000 1.255000 ;
+      RECT 16.015000  1.255000 16.345000 1.585000 ;
+      RECT 17.060000  0.665000 17.390000 1.305000 ;
+      RECT 17.060000  1.305000 18.575000 1.635000 ;
+      RECT 17.060000  1.635000 17.390000 2.495000 ;
+      RECT 17.965000  0.085000 18.295000 1.125000 ;
+      RECT 17.965000  1.815000 18.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 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.320000  4.165000 2.490000 ;
+      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  2.320000  7.045000 2.490000 ;
+      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  2.320000 14.245000 2.490000 ;
+      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 ;
+      RECT 18.395000 -0.085000 18.565000 0.085000 ;
+      RECT 18.395000  3.245000 18.565000 3.415000 ;
+      RECT 18.875000 -0.085000 19.045000 0.085000 ;
+      RECT 18.875000  3.245000 19.045000 3.415000 ;
   END
 END sky130_fd_sc_lp__sdfrbp_lp
diff --git a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef
index 78fa6e5..fdac676 100644
--- a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.magic.lef
@@ -55,7 +55,6 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT  3.460000 1.525000  3.695000 2.195000 ;
         RECT  7.755000 1.430000  8.715000 1.745000 ;
         RECT  7.755000 1.745000  8.025000 2.180000 ;
         RECT  8.545000 1.745000  8.715000 2.635000 ;
@@ -65,8 +64,9 @@
         RECT 10.145000 1.375000 11.040000 1.965000 ;
         RECT 10.145000 1.965000 10.315000 2.905000 ;
       LAYER mcon ;
-        RECT 3.515000 1.950000 3.685000 2.120000 ;
         RECT 7.835000 1.950000 8.005000 2.120000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 3.455000 1.920000 3.745000 1.965000 ;
         RECT 3.455000 1.965000 8.065000 2.105000 ;
@@ -109,43 +109,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  0.110000  0.085000  0.405000 0.690000 ;
-        RECT  3.875000  0.085000  4.205000 0.455000 ;
-        RECT  4.945000  0.085000  5.275000 0.455000 ;
-        RECT  8.120000  0.085000  8.450000 0.550000 ;
-        RECT 10.560000  0.085000 10.890000 0.855000 ;
-        RECT 12.525000  0.085000 12.915000 1.095000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -154,120 +117,156 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  0.110000 1.815000  0.405000 3.245000 ;
-        RECT  1.955000 2.955000  2.625000 3.245000 ;
-        RECT  3.755000 2.770000  4.085000 3.245000 ;
-        RECT  4.945000 2.770000  5.275000 3.245000 ;
-        RECT  7.155000 2.690000  7.455000 3.245000 ;
-        RECT  8.585000 2.985000  8.915000 3.245000 ;
-        RECT 10.540000 2.710000 10.870000 3.245000 ;
-        RECT 11.550000 2.710000 11.840000 3.245000 ;
-        RECT 12.370000 2.585000 12.710000 3.245000 ;
-        RECT 12.450000 1.765000 12.710000 2.585000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.575000 0.295000  0.870000 0.565000 ;
-      RECT  0.575000 0.565000  0.770000 1.815000 ;
-      RECT  0.575000 1.815000  0.810000 1.965000 ;
-      RECT  0.575000 1.965000  1.425000 2.275000 ;
-      RECT  0.575000 2.275000  2.960000 2.445000 ;
-      RECT  0.575000 2.445000  0.810000 2.495000 ;
-      RECT  1.105000 2.615000  3.525000 2.785000 ;
-      RECT  1.105000 2.785000  1.435000 2.965000 ;
-      RECT  1.350000 0.265000  3.550000 0.435000 ;
-      RECT  1.350000 0.435000  1.680000 0.545000 ;
-      RECT  2.255000 0.605000  2.585000 0.685000 ;
-      RECT  2.255000 0.685000  6.290000 0.795000 ;
-      RECT  2.255000 0.795000  4.035000 0.855000 ;
-      RECT  2.790000 2.020000  3.265000 2.195000 ;
-      RECT  2.790000 2.195000  2.960000 2.275000 ;
-      RECT  3.095000 1.035000  3.425000 1.205000 ;
-      RECT  3.095000 1.205000  3.265000 2.020000 ;
-      RECT  3.195000 2.365000  4.035000 2.430000 ;
-      RECT  3.195000 2.430000  6.235000 2.600000 ;
-      RECT  3.195000 2.600000  3.525000 2.615000 ;
-      RECT  3.195000 2.785000  3.525000 3.065000 ;
-      RECT  3.220000 0.435000  3.550000 0.515000 ;
-      RECT  3.865000 0.625000  6.290000 0.685000 ;
-      RECT  3.865000 0.855000  4.035000 2.365000 ;
-      RECT  4.320000 1.930000  5.215000 2.260000 ;
-      RECT  4.385000 0.965000  5.215000 1.165000 ;
-      RECT  5.045000 1.165000  5.215000 1.930000 ;
-      RECT  5.395000 0.965000  5.820000 1.125000 ;
-      RECT  5.395000 1.125000  6.630000 1.295000 ;
-      RECT  5.395000 1.295000  5.820000 1.815000 ;
-      RECT  5.395000 1.815000  6.630000 2.150000 ;
-      RECT  5.395000 2.150000  6.160000 2.260000 ;
-      RECT  5.915000 2.600000  6.235000 3.020000 ;
-      RECT  6.040000 0.795000  6.290000 0.955000 ;
-      RECT  6.405000 2.320000  7.000000 2.350000 ;
-      RECT  6.405000 2.350000  8.375000 2.520000 ;
-      RECT  6.405000 2.520000  6.695000 3.020000 ;
-      RECT  6.460000 0.255000  7.350000 0.510000 ;
-      RECT  6.460000 0.510000  6.630000 1.125000 ;
-      RECT  6.800000 0.680000  7.000000 2.320000 ;
-      RECT  7.180000 0.510000  7.350000 0.720000 ;
-      RECT  7.180000 0.720000  9.450000 0.890000 ;
-      RECT  7.215000 1.060000  9.110000 1.260000 ;
-      RECT  7.215000 1.260000  7.545000 2.145000 ;
-      RECT  7.625000 2.520000  8.375000 3.020000 ;
-      RECT  8.195000 1.985000  8.375000 2.350000 ;
-      RECT  8.940000 1.260000  9.110000 2.265000 ;
-      RECT  8.940000 2.265000  9.460000 2.465000 ;
-      RECT  9.195000 0.255000 10.110000 0.455000 ;
-      RECT  9.195000 0.455000  9.450000 0.720000 ;
-      RECT  9.280000 0.890000  9.450000 1.755000 ;
-      RECT  9.280000 1.755000  9.625000 2.085000 ;
-      RECT  9.620000 0.625000  9.965000 1.025000 ;
-      RECT  9.620000 1.025000 11.600000 1.205000 ;
-      RECT  9.620000 1.205000  9.965000 1.295000 ;
-      RECT  9.630000 2.405000  9.965000 2.735000 ;
-      RECT  9.795000 1.295000  9.965000 2.405000 ;
-      RECT 10.495000 2.175000 11.390000 2.505000 ;
-      RECT 11.080000 2.505000 11.380000 3.075000 ;
-      RECT 11.220000 1.795000 11.940000 1.965000 ;
-      RECT 11.220000 1.965000 11.390000 2.175000 ;
-      RECT 11.340000 1.205000 11.600000 1.495000 ;
-      RECT 11.465000 0.595000 11.940000 0.855000 ;
-      RECT 11.770000 0.855000 11.940000 1.795000 ;
-      RECT 11.810000 2.135000 12.280000 2.415000 ;
-      RECT 12.110000 0.350000 12.355000 1.265000 ;
-      RECT 12.110000 1.265000 12.915000 1.595000 ;
-      RECT 12.110000 1.595000 12.280000 2.135000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.110000  0.085000  0.405000 0.690000 ;
+      RECT  0.110000  1.815000  0.405000 3.245000 ;
+      RECT  0.575000  0.295000  0.870000 0.565000 ;
+      RECT  0.575000  0.565000  0.770000 1.815000 ;
+      RECT  0.575000  1.815000  0.810000 1.965000 ;
+      RECT  0.575000  1.965000  1.425000 2.275000 ;
+      RECT  0.575000  2.275000  2.960000 2.445000 ;
+      RECT  0.575000  2.445000  0.810000 2.495000 ;
+      RECT  1.105000  2.615000  3.525000 2.785000 ;
+      RECT  1.105000  2.785000  1.435000 2.965000 ;
+      RECT  1.350000  0.265000  3.550000 0.435000 ;
+      RECT  1.350000  0.435000  1.680000 0.545000 ;
+      RECT  1.955000  2.955000  2.625000 3.245000 ;
+      RECT  2.255000  0.605000  2.585000 0.685000 ;
+      RECT  2.255000  0.685000  6.290000 0.795000 ;
+      RECT  2.255000  0.795000  4.035000 0.855000 ;
+      RECT  2.790000  2.020000  3.265000 2.195000 ;
+      RECT  2.790000  2.195000  2.960000 2.275000 ;
+      RECT  3.095000  1.035000  3.425000 1.205000 ;
+      RECT  3.095000  1.205000  3.265000 2.020000 ;
+      RECT  3.195000  2.365000  4.035000 2.430000 ;
+      RECT  3.195000  2.430000  6.235000 2.600000 ;
+      RECT  3.195000  2.600000  3.525000 2.615000 ;
+      RECT  3.195000  2.785000  3.525000 3.065000 ;
+      RECT  3.220000  0.435000  3.550000 0.515000 ;
+      RECT  3.460000  1.525000  3.695000 2.195000 ;
+      RECT  3.755000  2.770000  4.085000 3.245000 ;
+      RECT  3.865000  0.625000  6.290000 0.685000 ;
+      RECT  3.865000  0.855000  4.035000 2.365000 ;
+      RECT  3.875000  0.085000  4.205000 0.455000 ;
+      RECT  4.320000  1.930000  5.215000 2.260000 ;
+      RECT  4.385000  0.965000  5.215000 1.165000 ;
+      RECT  4.945000  0.085000  5.275000 0.455000 ;
+      RECT  4.945000  2.770000  5.275000 3.245000 ;
+      RECT  5.045000  1.165000  5.215000 1.930000 ;
+      RECT  5.395000  0.965000  5.820000 1.125000 ;
+      RECT  5.395000  1.125000  6.630000 1.295000 ;
+      RECT  5.395000  1.295000  5.820000 1.815000 ;
+      RECT  5.395000  1.815000  6.630000 2.150000 ;
+      RECT  5.395000  2.150000  6.160000 2.260000 ;
+      RECT  5.915000  2.600000  6.235000 3.020000 ;
+      RECT  6.040000  0.795000  6.290000 0.955000 ;
+      RECT  6.405000  2.320000  7.000000 2.350000 ;
+      RECT  6.405000  2.350000  8.375000 2.520000 ;
+      RECT  6.405000  2.520000  6.695000 3.020000 ;
+      RECT  6.460000  0.255000  7.350000 0.510000 ;
+      RECT  6.460000  0.510000  6.630000 1.125000 ;
+      RECT  6.800000  0.680000  7.000000 2.320000 ;
+      RECT  7.155000  2.690000  7.455000 3.245000 ;
+      RECT  7.180000  0.510000  7.350000 0.720000 ;
+      RECT  7.180000  0.720000  9.450000 0.890000 ;
+      RECT  7.215000  1.060000  9.110000 1.260000 ;
+      RECT  7.215000  1.260000  7.545000 2.145000 ;
+      RECT  7.625000  2.520000  8.375000 3.020000 ;
+      RECT  8.120000  0.085000  8.450000 0.550000 ;
+      RECT  8.195000  1.985000  8.375000 2.350000 ;
+      RECT  8.585000  2.985000  8.915000 3.245000 ;
+      RECT  8.940000  1.260000  9.110000 2.265000 ;
+      RECT  8.940000  2.265000  9.460000 2.465000 ;
+      RECT  9.195000  0.255000 10.110000 0.455000 ;
+      RECT  9.195000  0.455000  9.450000 0.720000 ;
+      RECT  9.280000  0.890000  9.450000 1.755000 ;
+      RECT  9.280000  1.755000  9.625000 2.085000 ;
+      RECT  9.620000  0.625000  9.965000 1.025000 ;
+      RECT  9.620000  1.025000 11.600000 1.205000 ;
+      RECT  9.620000  1.205000  9.965000 1.295000 ;
+      RECT  9.630000  2.405000  9.965000 2.735000 ;
+      RECT  9.795000  1.295000  9.965000 2.405000 ;
+      RECT 10.495000  2.175000 11.390000 2.505000 ;
+      RECT 10.540000  2.710000 10.870000 3.245000 ;
+      RECT 10.560000  0.085000 10.890000 0.855000 ;
+      RECT 11.080000  2.505000 11.380000 3.075000 ;
+      RECT 11.220000  1.795000 11.940000 1.965000 ;
+      RECT 11.220000  1.965000 11.390000 2.175000 ;
+      RECT 11.340000  1.205000 11.600000 1.495000 ;
+      RECT 11.465000  0.595000 11.940000 0.855000 ;
+      RECT 11.550000  2.710000 11.840000 3.245000 ;
+      RECT 11.770000  0.855000 11.940000 1.795000 ;
+      RECT 11.810000  2.135000 12.280000 2.415000 ;
+      RECT 12.110000  0.350000 12.355000 1.265000 ;
+      RECT 12.110000  1.265000 12.915000 1.595000 ;
+      RECT 12.110000  1.595000 12.280000 2.135000 ;
+      RECT 12.370000  2.585000 12.710000 3.245000 ;
+      RECT 12.450000  1.765000 12.710000 2.585000 ;
+      RECT 12.525000  0.085000 12.915000 1.095000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.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.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  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_lp__sdfrtn_1
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef
index 824951e..42998be 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.magic.lef
@@ -96,43 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  0.600000  0.085000  0.895000 0.690000 ;
-        RECT  3.405000  0.085000  3.735000 0.635000 ;
-        RECT  6.145000  0.085000  6.475000 0.615000 ;
-        RECT  8.490000  0.085000  8.820000 0.965000 ;
-        RECT 10.755000  0.085000 11.085000 0.475000 ;
-        RECT 12.575000  0.085000 12.915000 0.475000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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,128 +104,161 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  1.320000 2.315000  1.650000 3.245000 ;
-        RECT  3.040000 2.655000  3.370000 3.245000 ;
-        RECT  4.865000 2.505000  5.195000 3.245000 ;
-        RECT  6.270000 2.660000  6.600000 3.245000 ;
-        RECT  8.455000 2.855000  9.190000 3.245000 ;
-        RECT  9.790000 2.710000 10.050000 3.245000 ;
-        RECT 10.715000 2.710000 11.040000 3.245000 ;
-        RECT 12.430000 2.015000 12.915000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.090000 0.415000  0.430000 0.860000 ;
-      RECT  0.090000 0.860000  1.510000 1.030000 ;
-      RECT  0.090000 1.030000  0.370000 1.975000 ;
-      RECT  0.090000 1.975000  2.675000 2.145000 ;
-      RECT  0.090000 2.145000  1.150000 2.965000 ;
-      RECT  1.145000 0.265000  3.225000 0.435000 ;
-      RECT  1.145000 0.435000  1.355000 0.595000 ;
-      RECT  1.990000 0.615000  2.320000 0.815000 ;
-      RECT  1.990000 0.815000  4.215000 0.985000 ;
-      RECT  2.110000 2.315000  3.825000 2.485000 ;
-      RECT  2.110000 2.485000  2.440000 2.995000 ;
-      RECT  2.425000 1.815000  2.675000 1.975000 ;
-      RECT  2.895000 0.435000  3.225000 0.635000 ;
-      RECT  3.480000 0.985000  3.685000 2.295000 ;
-      RECT  3.480000 2.295000  3.825000 2.315000 ;
-      RECT  3.540000 2.485000  3.825000 2.965000 ;
-      RECT  3.855000 1.155000  4.215000 1.915000 ;
-      RECT  4.015000 0.655000  4.215000 0.815000 ;
-      RECT  4.020000 2.085000  4.555000 2.165000 ;
-      RECT  4.020000 2.165000  5.630000 2.335000 ;
-      RECT  4.020000 2.335000  4.385000 2.690000 ;
-      RECT  4.385000 0.785000  6.475000 0.995000 ;
-      RECT  4.385000 0.995000  4.555000 2.085000 ;
-      RECT  4.725000 1.600000  6.835000 1.770000 ;
-      RECT  4.725000 1.770000  5.015000 1.995000 ;
-      RECT  4.735000 1.165000  5.125000 1.430000 ;
-      RECT  5.365000 2.335000  5.630000 2.690000 ;
-      RECT  6.145000 0.995000  6.475000 1.430000 ;
-      RECT  6.645000 0.355000  7.100000 0.575000 ;
-      RECT  6.645000 0.575000  6.835000 1.600000 ;
-      RECT  6.655000 1.770000  6.835000 1.960000 ;
-      RECT  6.655000 1.960000  7.145000 2.150000 ;
-      RECT  7.005000 0.745000  8.320000 0.915000 ;
-      RECT  7.005000 0.915000  7.175000 1.620000 ;
-      RECT  7.005000 1.620000  7.575000 1.790000 ;
-      RECT  7.270000 0.325000  7.530000 0.745000 ;
-      RECT  7.315000 1.790000  7.575000 2.735000 ;
-      RECT  7.345000 1.095000  7.940000 1.425000 ;
-      RECT  7.770000 1.425000  7.940000 2.055000 ;
-      RECT  7.770000 2.055000  8.120000 2.305000 ;
-      RECT  8.110000 0.915000  8.320000 1.135000 ;
-      RECT  8.110000 1.135000 10.045000 1.305000 ;
-      RECT  8.110000 1.485000  8.370000 1.555000 ;
-      RECT  8.110000 1.555000 10.045000 1.725000 ;
-      RECT  8.110000 1.725000  8.370000 1.815000 ;
-      RECT  8.400000 2.055000  9.620000 2.075000 ;
-      RECT  8.400000 2.075000  8.730000 2.305000 ;
-      RECT  8.560000 1.905000  9.620000 2.055000 ;
-      RECT  9.360000 2.745000  9.620000 3.075000 ;
-      RECT  9.425000 0.255000 10.155000 0.475000 ;
-      RECT  9.425000 0.475000  9.705000 0.965000 ;
-      RECT  9.450000 2.075000  9.620000 2.745000 ;
-      RECT  9.480000 1.305000 10.045000 1.385000 ;
-      RECT  9.800000 1.725000 10.045000 2.370000 ;
-      RECT  9.800000 2.370000 11.380000 2.540000 ;
-      RECT  9.875000 0.645000 11.980000 0.815000 ;
-      RECT  9.875000 0.815000 10.045000 1.135000 ;
-      RECT 10.215000 0.985000 10.575000 1.165000 ;
-      RECT 10.215000 1.165000 10.545000 2.200000 ;
-      RECT 10.715000 1.345000 11.380000 2.370000 ;
-      RECT 11.200000 0.985000 11.630000 1.185000 ;
-      RECT 11.200000 1.185000 11.380000 1.345000 ;
-      RECT 11.210000 2.540000 11.380000 2.670000 ;
-      RECT 11.210000 2.670000 11.630000 2.940000 ;
-      RECT 11.810000 0.815000 11.980000 0.985000 ;
-      RECT 11.810000 0.985000 12.455000 1.165000 ;
-      RECT 12.050000 1.675000 12.915000 1.845000 ;
-      RECT 12.050000 1.845000 12.260000 2.495000 ;
-      RECT 12.125000 1.165000 12.455000 1.505000 ;
-      RECT 12.150000 0.275000 12.405000 0.645000 ;
-      RECT 12.150000 0.645000 12.915000 0.815000 ;
-      RECT 12.665000 0.815000 12.915000 1.675000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.090000  0.415000  0.430000 0.860000 ;
+      RECT  0.090000  0.860000  1.510000 1.030000 ;
+      RECT  0.090000  1.030000  0.370000 1.975000 ;
+      RECT  0.090000  1.975000  2.675000 2.145000 ;
+      RECT  0.090000  2.145000  1.150000 2.965000 ;
+      RECT  0.600000  0.085000  0.895000 0.690000 ;
+      RECT  1.145000  0.265000  3.225000 0.435000 ;
+      RECT  1.145000  0.435000  1.355000 0.595000 ;
+      RECT  1.320000  2.315000  1.650000 3.245000 ;
+      RECT  1.990000  0.615000  2.320000 0.815000 ;
+      RECT  1.990000  0.815000  4.215000 0.985000 ;
+      RECT  2.110000  2.315000  3.825000 2.485000 ;
+      RECT  2.110000  2.485000  2.440000 2.995000 ;
+      RECT  2.425000  1.815000  2.675000 1.975000 ;
+      RECT  2.895000  0.435000  3.225000 0.635000 ;
+      RECT  3.040000  2.655000  3.370000 3.245000 ;
+      RECT  3.405000  0.085000  3.735000 0.635000 ;
+      RECT  3.480000  0.985000  3.685000 2.295000 ;
+      RECT  3.480000  2.295000  3.825000 2.315000 ;
+      RECT  3.540000  2.485000  3.825000 2.965000 ;
+      RECT  3.855000  1.155000  4.215000 1.915000 ;
+      RECT  4.015000  0.655000  4.215000 0.815000 ;
+      RECT  4.020000  2.085000  4.555000 2.165000 ;
+      RECT  4.020000  2.165000  5.630000 2.335000 ;
+      RECT  4.020000  2.335000  4.385000 2.690000 ;
+      RECT  4.385000  0.785000  6.475000 0.995000 ;
+      RECT  4.385000  0.995000  4.555000 2.085000 ;
+      RECT  4.725000  1.600000  6.835000 1.770000 ;
+      RECT  4.725000  1.770000  5.015000 1.995000 ;
+      RECT  4.735000  1.165000  5.125000 1.430000 ;
+      RECT  4.865000  2.505000  5.195000 3.245000 ;
+      RECT  5.365000  2.335000  5.630000 2.690000 ;
+      RECT  6.145000  0.085000  6.475000 0.615000 ;
+      RECT  6.145000  0.995000  6.475000 1.430000 ;
+      RECT  6.270000  2.660000  6.600000 3.245000 ;
+      RECT  6.645000  0.355000  7.100000 0.575000 ;
+      RECT  6.645000  0.575000  6.835000 1.600000 ;
+      RECT  6.655000  1.770000  6.835000 1.960000 ;
+      RECT  6.655000  1.960000  7.145000 2.150000 ;
+      RECT  7.005000  0.745000  8.320000 0.915000 ;
+      RECT  7.005000  0.915000  7.175000 1.620000 ;
+      RECT  7.005000  1.620000  7.575000 1.790000 ;
+      RECT  7.270000  0.325000  7.530000 0.745000 ;
+      RECT  7.315000  1.790000  7.575000 2.735000 ;
+      RECT  7.345000  1.095000  7.940000 1.425000 ;
+      RECT  7.770000  1.425000  7.940000 2.055000 ;
+      RECT  7.770000  2.055000  8.120000 2.305000 ;
+      RECT  8.110000  0.915000  8.320000 1.135000 ;
+      RECT  8.110000  1.135000 10.045000 1.305000 ;
+      RECT  8.110000  1.485000  8.370000 1.555000 ;
+      RECT  8.110000  1.555000 10.045000 1.725000 ;
+      RECT  8.110000  1.725000  8.370000 1.815000 ;
+      RECT  8.400000  2.055000  9.620000 2.075000 ;
+      RECT  8.400000  2.075000  8.730000 2.305000 ;
+      RECT  8.455000  2.855000  9.190000 3.245000 ;
+      RECT  8.490000  0.085000  8.820000 0.965000 ;
+      RECT  8.560000  1.905000  9.620000 2.055000 ;
+      RECT  9.360000  2.745000  9.620000 3.075000 ;
+      RECT  9.425000  0.255000 10.155000 0.475000 ;
+      RECT  9.425000  0.475000  9.705000 0.965000 ;
+      RECT  9.450000  2.075000  9.620000 2.745000 ;
+      RECT  9.480000  1.305000 10.045000 1.385000 ;
+      RECT  9.790000  2.710000 10.050000 3.245000 ;
+      RECT  9.800000  1.725000 10.045000 2.370000 ;
+      RECT  9.800000  2.370000 11.380000 2.540000 ;
+      RECT  9.875000  0.645000 11.980000 0.815000 ;
+      RECT  9.875000  0.815000 10.045000 1.135000 ;
+      RECT 10.215000  0.985000 10.575000 1.165000 ;
+      RECT 10.215000  1.165000 10.545000 2.200000 ;
+      RECT 10.715000  1.345000 11.380000 2.370000 ;
+      RECT 10.715000  2.710000 11.040000 3.245000 ;
+      RECT 10.755000  0.085000 11.085000 0.475000 ;
+      RECT 11.200000  0.985000 11.630000 1.185000 ;
+      RECT 11.200000  1.185000 11.380000 1.345000 ;
+      RECT 11.210000  2.540000 11.380000 2.670000 ;
+      RECT 11.210000  2.670000 11.630000 2.940000 ;
+      RECT 11.810000  0.815000 11.980000 0.985000 ;
+      RECT 11.810000  0.985000 12.455000 1.165000 ;
+      RECT 12.050000  1.675000 12.915000 1.845000 ;
+      RECT 12.050000  1.845000 12.260000 2.495000 ;
+      RECT 12.125000  1.165000 12.455000 1.505000 ;
+      RECT 12.150000  0.275000 12.405000 0.645000 ;
+      RECT 12.150000  0.645000 12.915000 0.815000 ;
+      RECT 12.430000  2.015000 12.915000 3.245000 ;
+      RECT 12.575000  0.085000 12.915000 0.475000 ;
+      RECT 12.665000  0.815000 12.915000 1.675000 ;
     LAYER mcon ;
-      RECT  3.995000 1.210000  4.165000 1.380000 ;
-      RECT  4.955000 1.210000  5.125000 1.380000 ;
-      RECT  7.355000 1.210000  7.525000 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  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  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  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  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  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  3.935000 1.180000  4.225000 1.225000 ;
       RECT  3.935000 1.225000 10.465000 1.365000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef
index e1ab032..dcba2aa 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.magic.lef
@@ -94,45 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.565000  0.085000  0.895000 0.690000 ;
-        RECT  3.405000  0.085000  3.735000 0.665000 ;
-        RECT  6.145000  0.085000  6.475000 0.615000 ;
-        RECT  8.470000  0.085000  8.800000 0.955000 ;
-        RECT 10.880000  0.085000 11.210000 0.475000 ;
-        RECT 12.615000  0.085000 12.945000 0.475000 ;
-        RECT 13.545000  0.085000 13.815000 1.095000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -141,128 +102,163 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  1.205000 2.320000  1.475000 3.245000 ;
-        RECT  2.970000 2.640000  3.300000 3.245000 ;
-        RECT  4.855000 2.515000  5.185000 3.245000 ;
-        RECT  6.245000 2.645000  6.575000 3.245000 ;
-        RECT  8.410000 2.865000  9.140000 3.245000 ;
-        RECT  9.925000 2.705000 10.175000 3.245000 ;
-        RECT 10.805000 2.665000 11.120000 3.245000 ;
-        RECT 12.545000 2.015000 12.945000 3.245000 ;
-        RECT 13.545000 1.815000 13.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 ;
-        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.135000 0.415000  0.395000 0.860000 ;
-      RECT  0.135000 0.860000  1.510000 1.030000 ;
-      RECT  0.135000 1.030000  0.405000 1.930000 ;
-      RECT  0.135000 1.930000  2.560000 2.130000 ;
-      RECT  0.135000 2.130000  1.035000 3.000000 ;
-      RECT  1.085000 0.265000  3.225000 0.435000 ;
-      RECT  1.085000 0.435000  1.415000 0.625000 ;
-      RECT  1.990000 0.605000  2.320000 0.835000 ;
-      RECT  1.990000 0.835000  4.215000 1.005000 ;
-      RECT  1.995000 2.300000  3.885000 2.470000 ;
-      RECT  1.995000 2.470000  2.325000 3.000000 ;
-      RECT  2.895000 0.435000  3.225000 0.665000 ;
-      RECT  3.455000 1.005000  3.680000 2.300000 ;
-      RECT  3.510000 2.470000  3.885000 2.970000 ;
-      RECT  3.850000 1.175000  4.215000 1.995000 ;
-      RECT  3.955000 0.640000  4.215000 0.835000 ;
-      RECT  4.055000 2.175000  5.625000 2.345000 ;
-      RECT  4.055000 2.345000  4.385000 2.695000 ;
-      RECT  4.385000 0.640000  4.800000 0.785000 ;
-      RECT  4.385000 0.785000  6.475000 0.995000 ;
-      RECT  4.385000 0.995000  4.555000 2.175000 ;
-      RECT  4.725000 1.600000  6.835000 1.770000 ;
-      RECT  4.725000 1.770000  5.010000 1.995000 ;
-      RECT  4.735000 1.165000  5.200000 1.430000 ;
-      RECT  5.355000 2.345000  5.625000 2.695000 ;
-      RECT  6.145000 0.995000  6.475000 1.430000 ;
-      RECT  6.645000 0.325000  6.835000 1.600000 ;
-      RECT  6.655000 1.770000  6.835000 1.945000 ;
-      RECT  6.655000 1.945000  7.100000 2.135000 ;
-      RECT  7.005000 0.325000  8.235000 0.925000 ;
-      RECT  7.005000 0.925000  7.175000 1.605000 ;
-      RECT  7.005000 1.605000  7.555000 1.775000 ;
-      RECT  7.270000 1.775000  7.555000 2.355000 ;
-      RECT  7.345000 1.095000  7.895000 1.425000 ;
-      RECT  7.725000 1.425000  7.895000 2.095000 ;
-      RECT  7.725000 2.095000  8.075000 2.355000 ;
-      RECT  8.065000 0.925000  8.235000 1.205000 ;
-      RECT  8.065000 1.205000 10.000000 1.375000 ;
-      RECT  8.065000 1.555000  8.245000 1.560000 ;
-      RECT  8.065000 1.560000 10.105000 1.730000 ;
-      RECT  8.065000 1.730000  8.325000 1.885000 ;
-      RECT  8.535000 1.910000  9.755000 2.080000 ;
-      RECT  8.535000 2.080000  8.865000 2.275000 ;
-      RECT  9.310000 2.865000  9.755000 3.075000 ;
-      RECT  9.380000 0.255000 10.110000 0.475000 ;
-      RECT  9.380000 0.475000  9.660000 0.970000 ;
-      RECT  9.585000 2.080000  9.755000 2.865000 ;
-      RECT  9.830000 0.645000 12.070000 0.815000 ;
-      RECT  9.830000 0.815000 10.000000 1.205000 ;
-      RECT  9.935000 1.730000 10.105000 2.325000 ;
-      RECT  9.935000 2.325000 11.460000 2.495000 ;
-      RECT 10.210000 0.985000 10.700000 1.165000 ;
-      RECT 10.210000 1.165000 10.635000 1.425000 ;
-      RECT 10.375000 1.425000 10.635000 2.155000 ;
-      RECT 10.805000 1.345000 11.460000 2.325000 ;
-      RECT 11.290000 0.985000 11.720000 1.245000 ;
-      RECT 11.290000 1.245000 11.460000 1.345000 ;
-      RECT 11.290000 2.495000 11.460000 2.660000 ;
-      RECT 11.290000 2.660000 11.720000 2.940000 ;
-      RECT 11.900000 0.815000 12.070000 0.995000 ;
-      RECT 11.900000 0.995000 12.540000 1.245000 ;
-      RECT 12.115000 0.275000 12.445000 0.465000 ;
-      RECT 12.175000 1.675000 12.890000 1.845000 ;
-      RECT 12.175000 1.845000 12.375000 2.495000 ;
-      RECT 12.210000 1.245000 12.540000 1.505000 ;
-      RECT 12.275000 0.465000 12.445000 0.645000 ;
-      RECT 12.275000 0.645000 12.945000 0.815000 ;
-      RECT 12.720000 0.815000 12.945000 1.245000 ;
-      RECT 12.720000 1.245000 13.030000 1.575000 ;
-      RECT 12.720000 1.575000 12.890000 1.675000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.135000  0.415000  0.395000 0.860000 ;
+      RECT  0.135000  0.860000  1.510000 1.030000 ;
+      RECT  0.135000  1.030000  0.405000 1.930000 ;
+      RECT  0.135000  1.930000  2.560000 2.130000 ;
+      RECT  0.135000  2.130000  1.035000 3.000000 ;
+      RECT  0.565000  0.085000  0.895000 0.690000 ;
+      RECT  1.085000  0.265000  3.225000 0.435000 ;
+      RECT  1.085000  0.435000  1.415000 0.625000 ;
+      RECT  1.205000  2.320000  1.475000 3.245000 ;
+      RECT  1.990000  0.605000  2.320000 0.835000 ;
+      RECT  1.990000  0.835000  4.215000 1.005000 ;
+      RECT  1.995000  2.300000  3.885000 2.470000 ;
+      RECT  1.995000  2.470000  2.325000 3.000000 ;
+      RECT  2.895000  0.435000  3.225000 0.665000 ;
+      RECT  2.970000  2.640000  3.300000 3.245000 ;
+      RECT  3.405000  0.085000  3.735000 0.665000 ;
+      RECT  3.455000  1.005000  3.680000 2.300000 ;
+      RECT  3.510000  2.470000  3.885000 2.970000 ;
+      RECT  3.850000  1.175000  4.215000 1.995000 ;
+      RECT  3.955000  0.640000  4.215000 0.835000 ;
+      RECT  4.055000  2.175000  5.625000 2.345000 ;
+      RECT  4.055000  2.345000  4.385000 2.695000 ;
+      RECT  4.385000  0.640000  4.800000 0.785000 ;
+      RECT  4.385000  0.785000  6.475000 0.995000 ;
+      RECT  4.385000  0.995000  4.555000 2.175000 ;
+      RECT  4.725000  1.600000  6.835000 1.770000 ;
+      RECT  4.725000  1.770000  5.010000 1.995000 ;
+      RECT  4.735000  1.165000  5.200000 1.430000 ;
+      RECT  4.855000  2.515000  5.185000 3.245000 ;
+      RECT  5.355000  2.345000  5.625000 2.695000 ;
+      RECT  6.145000  0.085000  6.475000 0.615000 ;
+      RECT  6.145000  0.995000  6.475000 1.430000 ;
+      RECT  6.245000  2.645000  6.575000 3.245000 ;
+      RECT  6.645000  0.325000  6.835000 1.600000 ;
+      RECT  6.655000  1.770000  6.835000 1.945000 ;
+      RECT  6.655000  1.945000  7.100000 2.135000 ;
+      RECT  7.005000  0.325000  8.235000 0.925000 ;
+      RECT  7.005000  0.925000  7.175000 1.605000 ;
+      RECT  7.005000  1.605000  7.555000 1.775000 ;
+      RECT  7.270000  1.775000  7.555000 2.355000 ;
+      RECT  7.345000  1.095000  7.895000 1.425000 ;
+      RECT  7.725000  1.425000  7.895000 2.095000 ;
+      RECT  7.725000  2.095000  8.075000 2.355000 ;
+      RECT  8.065000  0.925000  8.235000 1.205000 ;
+      RECT  8.065000  1.205000 10.000000 1.375000 ;
+      RECT  8.065000  1.555000  8.245000 1.560000 ;
+      RECT  8.065000  1.560000 10.105000 1.730000 ;
+      RECT  8.065000  1.730000  8.325000 1.885000 ;
+      RECT  8.410000  2.865000  9.140000 3.245000 ;
+      RECT  8.470000  0.085000  8.800000 0.955000 ;
+      RECT  8.535000  1.910000  9.755000 2.080000 ;
+      RECT  8.535000  2.080000  8.865000 2.275000 ;
+      RECT  9.310000  2.865000  9.755000 3.075000 ;
+      RECT  9.380000  0.255000 10.110000 0.475000 ;
+      RECT  9.380000  0.475000  9.660000 0.970000 ;
+      RECT  9.585000  2.080000  9.755000 2.865000 ;
+      RECT  9.830000  0.645000 12.070000 0.815000 ;
+      RECT  9.830000  0.815000 10.000000 1.205000 ;
+      RECT  9.925000  2.705000 10.175000 3.245000 ;
+      RECT  9.935000  1.730000 10.105000 2.325000 ;
+      RECT  9.935000  2.325000 11.460000 2.495000 ;
+      RECT 10.210000  0.985000 10.700000 1.165000 ;
+      RECT 10.210000  1.165000 10.635000 1.425000 ;
+      RECT 10.375000  1.425000 10.635000 2.155000 ;
+      RECT 10.805000  1.345000 11.460000 2.325000 ;
+      RECT 10.805000  2.665000 11.120000 3.245000 ;
+      RECT 10.880000  0.085000 11.210000 0.475000 ;
+      RECT 11.290000  0.985000 11.720000 1.245000 ;
+      RECT 11.290000  1.245000 11.460000 1.345000 ;
+      RECT 11.290000  2.495000 11.460000 2.660000 ;
+      RECT 11.290000  2.660000 11.720000 2.940000 ;
+      RECT 11.900000  0.815000 12.070000 0.995000 ;
+      RECT 11.900000  0.995000 12.540000 1.245000 ;
+      RECT 12.115000  0.275000 12.445000 0.465000 ;
+      RECT 12.175000  1.675000 12.890000 1.845000 ;
+      RECT 12.175000  1.845000 12.375000 2.495000 ;
+      RECT 12.210000  1.245000 12.540000 1.505000 ;
+      RECT 12.275000  0.465000 12.445000 0.645000 ;
+      RECT 12.275000  0.645000 12.945000 0.815000 ;
+      RECT 12.545000  2.015000 12.945000 3.245000 ;
+      RECT 12.615000  0.085000 12.945000 0.475000 ;
+      RECT 12.720000  0.815000 12.945000 1.245000 ;
+      RECT 12.720000  1.245000 13.030000 1.575000 ;
+      RECT 12.720000  1.575000 12.890000 1.675000 ;
+      RECT 13.545000  0.085000 13.815000 1.095000 ;
+      RECT 13.545000  1.815000 13.815000 3.245000 ;
     LAYER mcon ;
-      RECT  3.995000 1.210000  4.165000 1.380000 ;
-      RECT  4.955000 1.210000  5.125000 1.380000 ;
-      RECT  7.355000 1.210000  7.525000 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  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  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  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  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  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 ;
     LAYER met1 ;
       RECT  3.935000 1.180000  4.225000 1.225000 ;
       RECT  3.935000 1.225000 10.465000 1.365000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef
index 06deaec..6dadee7 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.magic.lef
@@ -103,49 +103,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.360000 0.085000 ;
-        RECT  0.525000  0.085000  0.855000 0.625000 ;
-        RECT  3.355000  0.085000  3.615000 0.725000 ;
-        RECT  6.435000  0.085000  6.765000 0.995000 ;
-        RECT  8.955000  0.085000  9.285000 0.965000 ;
-        RECT 11.175000  0.085000 11.505000 0.455000 ;
-        RECT 13.165000  0.085000 13.495000 0.665000 ;
-        RECT 14.025000  0.085000 14.355000 0.875000 ;
-        RECT 14.960000  0.085000 15.255000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -154,143 +111,182 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.360000 3.415000 ;
-        RECT  1.620000 2.295000  1.910000 3.245000 ;
-        RECT  3.355000 2.645000  3.685000 3.245000 ;
-        RECT  5.360000 2.475000  5.700000 3.245000 ;
-        RECT  6.690000 2.625000  7.020000 3.245000 ;
-        RECT  9.005000 2.825000  9.335000 3.245000 ;
-        RECT 10.210000 2.665000 10.410000 3.245000 ;
-        RECT 11.095000 2.665000 11.610000 3.245000 ;
-        RECT 11.430000 2.105000 11.610000 2.665000 ;
-        RECT 13.165000 2.095000 13.495000 3.245000 ;
-        RECT 14.045000 2.155000 14.375000 3.245000 ;
-        RECT 14.925000 2.155000 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.155000 0.415000  0.355000 0.795000 ;
-      RECT  0.155000 0.795000  1.500000 1.030000 ;
-      RECT  0.155000 1.030000  0.380000 1.930000 ;
-      RECT  0.155000 1.930000  2.855000 2.125000 ;
-      RECT  0.155000 2.125000  1.450000 2.275000 ;
-      RECT  1.045000 0.255000  3.185000 0.425000 ;
-      RECT  1.045000 0.425000  1.375000 0.625000 ;
-      RECT  1.150000 2.275000  1.450000 2.975000 ;
-      RECT  1.950000 0.595000  2.280000 0.815000 ;
-      RECT  1.950000 0.815000  3.075000 0.895000 ;
-      RECT  1.950000 0.895000  4.875000 0.970000 ;
-      RECT  1.950000 0.970000  4.235000 0.985000 ;
-      RECT  2.370000 2.295000  4.235000 2.475000 ;
-      RECT  2.370000 2.475000  2.700000 2.975000 ;
-      RECT  2.605000 1.770000  2.855000 1.930000 ;
-      RECT  2.855000 0.425000  3.185000 0.645000 ;
-      RECT  2.905000 0.985000  4.235000 1.065000 ;
-      RECT  3.780000 1.065000  4.235000 2.295000 ;
-      RECT  3.785000 0.640000  4.875000 0.895000 ;
-      RECT  3.855000 2.475000  4.235000 2.905000 ;
-      RECT  4.405000 1.140000  4.645000 1.880000 ;
-      RECT  4.405000 2.135000  6.040000 2.305000 ;
-      RECT  4.405000 2.305000  4.825000 2.775000 ;
-      RECT  4.815000 1.210000  5.215000 1.380000 ;
-      RECT  4.815000 1.380000  4.995000 2.135000 ;
-      RECT  5.045000 0.640000  5.955000 0.955000 ;
-      RECT  5.045000 0.955000  5.215000 1.210000 ;
-      RECT  5.265000 1.665000  7.315000 1.725000 ;
-      RECT  5.265000 1.725000  6.040000 1.965000 ;
-      RECT  5.385000 1.125000  5.615000 1.455000 ;
-      RECT  5.785000 0.955000  5.955000 1.165000 ;
-      RECT  5.785000 1.165000  6.935000 1.385000 ;
-      RECT  5.870000 1.555000  7.315000 1.665000 ;
-      RECT  5.870000 2.305000  6.040000 2.360000 ;
-      RECT  5.870000 2.360000  6.240000 2.690000 ;
-      RECT  7.105000 0.335000  7.315000 1.555000 ;
-      RECT  7.115000 1.725000  7.315000 1.900000 ;
-      RECT  7.115000 1.900000  7.565000 2.115000 ;
-      RECT  7.485000 0.395000  8.710000 0.945000 ;
-      RECT  7.485000 0.945000  7.655000 1.560000 ;
-      RECT  7.485000 1.560000  8.020000 1.730000 ;
-      RECT  7.735000 1.730000  8.020000 2.545000 ;
-      RECT  7.835000 1.175000  8.360000 1.380000 ;
-      RECT  8.190000 1.380000  8.360000 2.055000 ;
-      RECT  8.190000 2.055000  8.540000 2.315000 ;
-      RECT  8.530000 1.485000  8.790000 1.555000 ;
-      RECT  8.530000 1.555000 10.390000 1.725000 ;
-      RECT  8.530000 1.725000  8.790000 1.815000 ;
-      RECT  8.540000 0.945000  8.710000 1.135000 ;
-      RECT  8.540000 1.135000 10.485000 1.305000 ;
-      RECT  8.820000 2.055000 10.040000 2.075000 ;
-      RECT  8.820000 2.075000  9.150000 2.315000 ;
-      RECT  8.980000 1.905000 10.040000 2.055000 ;
-      RECT  9.595000 2.825000 10.040000 3.045000 ;
-      RECT  9.720000 1.305000 10.485000 1.375000 ;
-      RECT  9.845000 0.255000 10.575000 0.455000 ;
-      RECT  9.845000 0.455000 10.145000 0.965000 ;
-      RECT  9.870000 2.075000 10.040000 2.825000 ;
-      RECT 10.220000 1.725000 10.390000 2.325000 ;
-      RECT 10.220000 2.325000 11.260000 2.495000 ;
-      RECT 10.315000 0.625000 12.470000 0.795000 ;
-      RECT 10.315000 0.795000 10.485000 1.135000 ;
-      RECT 10.665000 0.965000 10.995000 1.165000 ;
-      RECT 10.665000 1.165000 10.920000 2.145000 ;
-      RECT 11.090000 1.345000 11.985000 1.675000 ;
-      RECT 11.090000 1.675000 11.260000 2.325000 ;
-      RECT 11.790000 0.975000 12.120000 1.165000 ;
-      RECT 11.790000 1.165000 11.985000 1.345000 ;
-      RECT 11.805000 1.675000 11.985000 2.670000 ;
-      RECT 11.805000 2.670000 12.060000 3.000000 ;
-      RECT 12.300000 0.795000 12.470000 1.185000 ;
-      RECT 12.300000 1.185000 13.135000 1.355000 ;
-      RECT 12.735000 0.255000 12.995000 0.835000 ;
-      RECT 12.735000 0.835000 13.475000 1.015000 ;
-      RECT 12.740000 1.755000 13.475000 1.925000 ;
-      RECT 12.740000 1.925000 12.995000 3.075000 ;
-      RECT 12.860000 1.355000 13.135000 1.515000 ;
-      RECT 13.305000 1.015000 13.475000 1.395000 ;
-      RECT 13.305000 1.395000 14.820000 1.565000 ;
-      RECT 13.305000 1.565000 13.475000 1.755000 ;
+      RECT  0.000000 -0.085000 15.360000 0.085000 ;
+      RECT  0.000000  3.245000 15.360000 3.415000 ;
+      RECT  0.155000  0.415000  0.355000 0.795000 ;
+      RECT  0.155000  0.795000  1.500000 1.030000 ;
+      RECT  0.155000  1.030000  0.380000 1.930000 ;
+      RECT  0.155000  1.930000  2.855000 2.125000 ;
+      RECT  0.155000  2.125000  1.450000 2.275000 ;
+      RECT  0.525000  0.085000  0.855000 0.625000 ;
+      RECT  1.045000  0.255000  3.185000 0.425000 ;
+      RECT  1.045000  0.425000  1.375000 0.625000 ;
+      RECT  1.150000  2.275000  1.450000 2.975000 ;
+      RECT  1.620000  2.295000  1.910000 3.245000 ;
+      RECT  1.950000  0.595000  2.280000 0.815000 ;
+      RECT  1.950000  0.815000  3.075000 0.895000 ;
+      RECT  1.950000  0.895000  4.875000 0.970000 ;
+      RECT  1.950000  0.970000  4.235000 0.985000 ;
+      RECT  2.370000  2.295000  4.235000 2.475000 ;
+      RECT  2.370000  2.475000  2.700000 2.975000 ;
+      RECT  2.605000  1.770000  2.855000 1.930000 ;
+      RECT  2.855000  0.425000  3.185000 0.645000 ;
+      RECT  2.905000  0.985000  4.235000 1.065000 ;
+      RECT  3.355000  0.085000  3.615000 0.725000 ;
+      RECT  3.355000  2.645000  3.685000 3.245000 ;
+      RECT  3.780000  1.065000  4.235000 2.295000 ;
+      RECT  3.785000  0.640000  4.875000 0.895000 ;
+      RECT  3.855000  2.475000  4.235000 2.905000 ;
+      RECT  4.405000  1.140000  4.645000 1.880000 ;
+      RECT  4.405000  2.135000  6.040000 2.305000 ;
+      RECT  4.405000  2.305000  4.825000 2.775000 ;
+      RECT  4.815000  1.210000  5.215000 1.380000 ;
+      RECT  4.815000  1.380000  4.995000 2.135000 ;
+      RECT  5.045000  0.640000  5.955000 0.955000 ;
+      RECT  5.045000  0.955000  5.215000 1.210000 ;
+      RECT  5.265000  1.665000  7.315000 1.725000 ;
+      RECT  5.265000  1.725000  6.040000 1.965000 ;
+      RECT  5.360000  2.475000  5.700000 3.245000 ;
+      RECT  5.385000  1.125000  5.615000 1.455000 ;
+      RECT  5.785000  0.955000  5.955000 1.165000 ;
+      RECT  5.785000  1.165000  6.935000 1.385000 ;
+      RECT  5.870000  1.555000  7.315000 1.665000 ;
+      RECT  5.870000  2.305000  6.040000 2.360000 ;
+      RECT  5.870000  2.360000  6.240000 2.690000 ;
+      RECT  6.435000  0.085000  6.765000 0.995000 ;
+      RECT  6.690000  2.625000  7.020000 3.245000 ;
+      RECT  7.105000  0.335000  7.315000 1.555000 ;
+      RECT  7.115000  1.725000  7.315000 1.900000 ;
+      RECT  7.115000  1.900000  7.565000 2.115000 ;
+      RECT  7.485000  0.395000  8.710000 0.945000 ;
+      RECT  7.485000  0.945000  7.655000 1.560000 ;
+      RECT  7.485000  1.560000  8.020000 1.730000 ;
+      RECT  7.735000  1.730000  8.020000 2.545000 ;
+      RECT  7.835000  1.175000  8.360000 1.380000 ;
+      RECT  8.190000  1.380000  8.360000 2.055000 ;
+      RECT  8.190000  2.055000  8.540000 2.315000 ;
+      RECT  8.530000  1.485000  8.790000 1.555000 ;
+      RECT  8.530000  1.555000 10.390000 1.725000 ;
+      RECT  8.530000  1.725000  8.790000 1.815000 ;
+      RECT  8.540000  0.945000  8.710000 1.135000 ;
+      RECT  8.540000  1.135000 10.485000 1.305000 ;
+      RECT  8.820000  2.055000 10.040000 2.075000 ;
+      RECT  8.820000  2.075000  9.150000 2.315000 ;
+      RECT  8.955000  0.085000  9.285000 0.965000 ;
+      RECT  8.980000  1.905000 10.040000 2.055000 ;
+      RECT  9.005000  2.825000  9.335000 3.245000 ;
+      RECT  9.595000  2.825000 10.040000 3.045000 ;
+      RECT  9.720000  1.305000 10.485000 1.375000 ;
+      RECT  9.845000  0.255000 10.575000 0.455000 ;
+      RECT  9.845000  0.455000 10.145000 0.965000 ;
+      RECT  9.870000  2.075000 10.040000 2.825000 ;
+      RECT 10.210000  2.665000 10.410000 3.245000 ;
+      RECT 10.220000  1.725000 10.390000 2.325000 ;
+      RECT 10.220000  2.325000 11.260000 2.495000 ;
+      RECT 10.315000  0.625000 12.470000 0.795000 ;
+      RECT 10.315000  0.795000 10.485000 1.135000 ;
+      RECT 10.665000  0.965000 10.995000 1.165000 ;
+      RECT 10.665000  1.165000 10.920000 2.145000 ;
+      RECT 11.090000  1.345000 11.985000 1.675000 ;
+      RECT 11.090000  1.675000 11.260000 2.325000 ;
+      RECT 11.095000  2.665000 11.610000 3.245000 ;
+      RECT 11.175000  0.085000 11.505000 0.455000 ;
+      RECT 11.430000  2.105000 11.610000 2.665000 ;
+      RECT 11.790000  0.975000 12.120000 1.165000 ;
+      RECT 11.790000  1.165000 11.985000 1.345000 ;
+      RECT 11.805000  1.675000 11.985000 2.670000 ;
+      RECT 11.805000  2.670000 12.060000 3.000000 ;
+      RECT 12.300000  0.795000 12.470000 1.185000 ;
+      RECT 12.300000  1.185000 13.135000 1.355000 ;
+      RECT 12.735000  0.255000 12.995000 0.835000 ;
+      RECT 12.735000  0.835000 13.475000 1.015000 ;
+      RECT 12.740000  1.755000 13.475000 1.925000 ;
+      RECT 12.740000  1.925000 12.995000 3.075000 ;
+      RECT 12.860000  1.355000 13.135000 1.515000 ;
+      RECT 13.165000  0.085000 13.495000 0.665000 ;
+      RECT 13.165000  2.095000 13.495000 3.245000 ;
+      RECT 13.305000  1.015000 13.475000 1.395000 ;
+      RECT 13.305000  1.395000 14.820000 1.565000 ;
+      RECT 13.305000  1.565000 13.475000 1.755000 ;
+      RECT 14.025000  0.085000 14.355000 0.875000 ;
+      RECT 14.045000  2.155000 14.375000 3.245000 ;
+      RECT 14.925000  2.155000 15.255000 3.245000 ;
+      RECT 14.960000  0.085000 15.255000 0.885000 ;
     LAYER mcon ;
-      RECT  4.475000 1.210000  4.645000 1.380000 ;
-      RECT  5.435000 1.210000  5.605000 1.380000 ;
-      RECT  7.835000 1.210000  8.005000 1.380000 ;
-      RECT 10.715000 1.210000 10.885000 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  1.210000  4.645000 1.380000 ;
+      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  1.210000  8.005000 1.380000 ;
+      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.210000 10.885000 1.380000 ;
+      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  4.415000 1.180000  4.705000 1.225000 ;
       RECT  4.415000 1.225000 10.945000 1.365000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef
index 137db8f..c06c641 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.magic.lef
@@ -54,18 +54,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  2.975000 1.450000  3.305000 1.780000 ;
-        RECT  8.765000 1.325000  9.200000 1.645000 ;
-        RECT  8.765000 1.645000  9.185000 1.780000 ;
-        RECT 12.635000 1.550000 12.835000 1.615000 ;
-        RECT 12.635000 1.615000 13.485000 1.785000 ;
-        RECT 13.085000 1.785000 13.485000 1.935000 ;
-        RECT 13.085000 1.935000 13.315000 2.890000 ;
-      LAYER mcon ;
-        RECT  3.035000 1.580000  3.205000 1.750000 ;
-        RECT  8.795000 1.580000  8.965000 1.750000 ;
-        RECT 12.635000 1.580000 12.805000 1.750000 ;
       LAYER met1 ;
         RECT  2.975000 1.550000  3.265000 1.595000 ;
         RECT  2.975000 1.595000 12.865000 1.735000 ;
@@ -110,48 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.320000 0.085000 ;
-        RECT  2.560000  0.085000  2.890000 0.880000 ;
-        RECT  5.210000  0.085000  5.540000 0.725000 ;
-        RECT  8.850000  0.085000  9.180000 0.445000 ;
-        RECT 12.635000  0.085000 12.965000 0.510000 ;
-        RECT 15.085000  0.085000 15.415000 0.890000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -160,131 +106,180 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 16.320000 3.415000 ;
-        RECT  1.580000 2.660000  1.910000 3.245000 ;
-        RECT  3.220000 2.855000  3.550000 3.245000 ;
-        RECT  5.180000 2.810000  5.510000 3.245000 ;
-        RECT  8.585000 2.310000  8.915000 3.245000 ;
-        RECT 10.080000 1.685000 10.410000 3.245000 ;
-        RECT 12.400000 2.075000 12.650000 3.245000 ;
-        RECT 14.025000 2.075000 14.355000 3.245000 ;
-        RECT 15.115000 1.920000 15.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 ;
-        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.090000 0.620000  1.480000 0.790000 ;
-      RECT  0.090000 0.790000  0.260000 2.075000 ;
-      RECT  0.090000 2.075000  0.890000 2.310000 ;
-      RECT  0.090000 2.310000  3.020000 2.480000 ;
-      RECT  0.090000 2.480000  0.890000 3.065000 ;
-      RECT  0.170000 0.265000  2.380000 0.435000 ;
-      RECT  0.170000 0.435000  0.500000 0.440000 ;
-      RECT  0.440000 0.970000  0.735000 1.100000 ;
-      RECT  0.440000 1.100000  4.225000 1.270000 ;
-      RECT  0.440000 1.270000  0.735000 1.300000 ;
-      RECT  1.150000 0.615000  1.480000 0.620000 ;
-      RECT  1.150000 0.790000  1.480000 0.865000 ;
-      RECT  2.050000 0.435000  2.380000 0.880000 ;
-      RECT  2.435000 1.270000  2.765000 1.780000 ;
-      RECT  2.690000 2.480000  3.020000 2.505000 ;
-      RECT  2.690000 2.505000  3.900000 2.675000 ;
-      RECT  2.690000 2.675000  3.020000 3.065000 ;
-      RECT  3.730000 2.675000  3.900000 2.895000 ;
-      RECT  3.730000 2.895000  5.010000 3.065000 ;
-      RECT  3.820000 0.595000  4.225000 1.100000 ;
-      RECT  3.835000 2.075000  4.225000 2.325000 ;
-      RECT  4.055000 1.270000  4.225000 2.075000 ;
-      RECT  4.420000 0.635000  4.590000 1.680000 ;
-      RECT  4.420000 1.680000  5.805000 1.850000 ;
-      RECT  4.420000 1.850000  4.670000 2.715000 ;
-      RECT  4.840000 2.460000  7.035000 2.630000 ;
-      RECT  4.840000 2.630000  5.010000 2.895000 ;
-      RECT  5.475000 1.180000  5.805000 1.680000 ;
-      RECT  5.710000 2.030000  6.290000 2.280000 ;
-      RECT  5.975000 1.450000  6.685000 1.780000 ;
-      RECT  5.975000 1.780000  6.290000 2.030000 ;
-      RECT  6.070000 0.595000  6.455000 1.450000 ;
-      RECT  6.705000 0.595000  7.035000 1.145000 ;
-      RECT  6.865000 1.145000  7.035000 2.460000 ;
-      RECT  6.865000 2.630000  7.035000 2.755000 ;
-      RECT  7.215000 0.625000  7.385000 1.790000 ;
-      RECT  7.215000 1.790000  7.790000 1.960000 ;
-      RECT  7.215000 1.960000  9.700000 2.130000 ;
-      RECT  7.215000 2.130000  7.790000 2.755000 ;
-      RECT  7.555000 0.625000 10.425000 0.795000 ;
-      RECT  7.555000 0.795000  7.725000 1.525000 ;
-      RECT  8.225000 0.975000 10.040000 1.145000 ;
-      RECT  8.225000 1.145000  8.555000 1.525000 ;
-      RECT  9.275000 2.130000  9.700000 2.755000 ;
-      RECT  9.355000 1.715000  9.700000 1.960000 ;
-      RECT  9.370000 1.325000  9.700000 1.715000 ;
-      RECT  9.870000 1.145000 10.040000 1.275000 ;
-      RECT  9.870000 1.275000 10.775000 1.445000 ;
-      RECT 10.005000 0.275000 10.775000 0.445000 ;
-      RECT 10.210000 0.795000 10.425000 1.095000 ;
-      RECT 10.605000 0.445000 10.775000 1.275000 ;
-      RECT 10.605000 1.445000 10.775000 1.685000 ;
-      RECT 10.605000 1.685000 11.020000 2.725000 ;
-      RECT 10.955000 1.120000 12.105000 1.450000 ;
-      RECT 11.300000 1.685000 12.455000 1.855000 ;
-      RECT 11.300000 1.855000 11.630000 3.065000 ;
-      RECT 11.510000 0.265000 11.840000 0.505000 ;
-      RECT 11.510000 0.505000 12.455000 0.675000 ;
-      RECT 11.815000 0.910000 12.105000 1.120000 ;
-      RECT 12.285000 0.675000 12.455000 0.690000 ;
-      RECT 12.285000 0.690000 13.845000 0.860000 ;
-      RECT 12.285000 0.860000 12.455000 1.685000 ;
-      RECT 12.635000 1.040000 13.185000 1.265000 ;
-      RECT 12.635000 1.265000 14.195000 1.370000 ;
-      RECT 13.015000 1.370000 14.195000 1.435000 ;
-      RECT 13.495000 2.115000 13.835000 3.065000 ;
-      RECT 13.515000 0.860000 13.845000 1.085000 ;
-      RECT 13.665000 1.435000 13.835000 2.115000 ;
-      RECT 13.670000 0.295000 14.195000 0.510000 ;
-      RECT 14.025000 0.510000 14.195000 1.265000 ;
-      RECT 14.375000 0.430000 14.705000 0.890000 ;
-      RECT 14.535000 0.890000 14.705000 1.570000 ;
-      RECT 14.535000 1.570000 15.680000 1.740000 ;
-      RECT 14.535000 1.740000 14.915000 2.960000 ;
-      RECT 15.350000 1.070000 15.680000 1.570000 ;
+      RECT  0.000000 -0.085000 16.320000 0.085000 ;
+      RECT  0.000000  3.245000 16.320000 3.415000 ;
+      RECT  0.090000  0.620000  1.480000 0.790000 ;
+      RECT  0.090000  0.790000  0.260000 2.075000 ;
+      RECT  0.090000  2.075000  0.890000 2.310000 ;
+      RECT  0.090000  2.310000  3.020000 2.480000 ;
+      RECT  0.090000  2.480000  0.890000 3.065000 ;
+      RECT  0.170000  0.265000  2.380000 0.435000 ;
+      RECT  0.170000  0.435000  0.500000 0.440000 ;
+      RECT  0.440000  0.970000  0.735000 1.100000 ;
+      RECT  0.440000  1.100000  4.225000 1.270000 ;
+      RECT  0.440000  1.270000  0.735000 1.300000 ;
+      RECT  1.150000  0.615000  1.480000 0.620000 ;
+      RECT  1.150000  0.790000  1.480000 0.865000 ;
+      RECT  1.580000  2.660000  1.910000 3.245000 ;
+      RECT  2.050000  0.435000  2.380000 0.880000 ;
+      RECT  2.435000  1.270000  2.765000 1.780000 ;
+      RECT  2.560000  0.085000  2.890000 0.880000 ;
+      RECT  2.690000  2.480000  3.020000 2.505000 ;
+      RECT  2.690000  2.505000  3.900000 2.675000 ;
+      RECT  2.690000  2.675000  3.020000 3.065000 ;
+      RECT  2.975000  1.450000  3.305000 1.780000 ;
+      RECT  3.220000  2.855000  3.550000 3.245000 ;
+      RECT  3.730000  2.675000  3.900000 2.895000 ;
+      RECT  3.730000  2.895000  5.010000 3.065000 ;
+      RECT  3.820000  0.595000  4.225000 1.100000 ;
+      RECT  3.835000  2.075000  4.225000 2.325000 ;
+      RECT  4.055000  1.270000  4.225000 2.075000 ;
+      RECT  4.420000  0.635000  4.590000 1.680000 ;
+      RECT  4.420000  1.680000  5.805000 1.850000 ;
+      RECT  4.420000  1.850000  4.670000 2.715000 ;
+      RECT  4.840000  2.460000  7.035000 2.630000 ;
+      RECT  4.840000  2.630000  5.010000 2.895000 ;
+      RECT  5.180000  2.810000  5.510000 3.245000 ;
+      RECT  5.210000  0.085000  5.540000 0.725000 ;
+      RECT  5.475000  1.180000  5.805000 1.680000 ;
+      RECT  5.710000  2.030000  6.290000 2.280000 ;
+      RECT  5.975000  1.450000  6.685000 1.780000 ;
+      RECT  5.975000  1.780000  6.290000 2.030000 ;
+      RECT  6.070000  0.595000  6.455000 1.450000 ;
+      RECT  6.705000  0.595000  7.035000 1.145000 ;
+      RECT  6.865000  1.145000  7.035000 2.460000 ;
+      RECT  6.865000  2.630000  7.035000 2.755000 ;
+      RECT  7.215000  0.625000  7.385000 1.790000 ;
+      RECT  7.215000  1.790000  7.790000 1.960000 ;
+      RECT  7.215000  1.960000  9.700000 2.130000 ;
+      RECT  7.215000  2.130000  7.790000 2.755000 ;
+      RECT  7.555000  0.625000 10.425000 0.795000 ;
+      RECT  7.555000  0.795000  7.725000 1.525000 ;
+      RECT  8.225000  0.975000 10.040000 1.145000 ;
+      RECT  8.225000  1.145000  8.555000 1.525000 ;
+      RECT  8.585000  2.310000  8.915000 3.245000 ;
+      RECT  8.765000  1.325000  9.200000 1.645000 ;
+      RECT  8.765000  1.645000  9.185000 1.780000 ;
+      RECT  8.850000  0.085000  9.180000 0.445000 ;
+      RECT  9.275000  2.130000  9.700000 2.755000 ;
+      RECT  9.355000  1.715000  9.700000 1.960000 ;
+      RECT  9.370000  1.325000  9.700000 1.715000 ;
+      RECT  9.870000  1.145000 10.040000 1.275000 ;
+      RECT  9.870000  1.275000 10.775000 1.445000 ;
+      RECT 10.005000  0.275000 10.775000 0.445000 ;
+      RECT 10.080000  1.685000 10.410000 3.245000 ;
+      RECT 10.210000  0.795000 10.425000 1.095000 ;
+      RECT 10.605000  0.445000 10.775000 1.275000 ;
+      RECT 10.605000  1.445000 10.775000 1.685000 ;
+      RECT 10.605000  1.685000 11.020000 2.725000 ;
+      RECT 10.955000  1.120000 12.105000 1.450000 ;
+      RECT 11.300000  1.685000 12.455000 1.855000 ;
+      RECT 11.300000  1.855000 11.630000 3.065000 ;
+      RECT 11.510000  0.265000 11.840000 0.505000 ;
+      RECT 11.510000  0.505000 12.455000 0.675000 ;
+      RECT 11.815000  0.910000 12.105000 1.120000 ;
+      RECT 12.285000  0.675000 12.455000 0.690000 ;
+      RECT 12.285000  0.690000 13.845000 0.860000 ;
+      RECT 12.285000  0.860000 12.455000 1.685000 ;
+      RECT 12.400000  2.075000 12.650000 3.245000 ;
+      RECT 12.635000  0.085000 12.965000 0.510000 ;
+      RECT 12.635000  1.040000 13.185000 1.265000 ;
+      RECT 12.635000  1.265000 14.195000 1.370000 ;
+      RECT 12.635000  1.550000 12.835000 1.615000 ;
+      RECT 12.635000  1.615000 13.485000 1.785000 ;
+      RECT 13.015000  1.370000 14.195000 1.435000 ;
+      RECT 13.085000  1.785000 13.485000 1.935000 ;
+      RECT 13.085000  1.935000 13.315000 2.890000 ;
+      RECT 13.495000  2.115000 13.835000 3.065000 ;
+      RECT 13.515000  0.860000 13.845000 1.085000 ;
+      RECT 13.665000  1.435000 13.835000 2.115000 ;
+      RECT 13.670000  0.295000 14.195000 0.510000 ;
+      RECT 14.025000  0.510000 14.195000 1.265000 ;
+      RECT 14.025000  2.075000 14.355000 3.245000 ;
+      RECT 14.375000  0.430000 14.705000 0.890000 ;
+      RECT 14.535000  0.890000 14.705000 1.570000 ;
+      RECT 14.535000  1.570000 15.680000 1.740000 ;
+      RECT 14.535000  1.740000 14.915000 2.960000 ;
+      RECT 15.085000  0.085000 15.415000 0.890000 ;
+      RECT 15.115000  1.920000 15.445000 3.245000 ;
+      RECT 15.350000  1.070000 15.680000 1.570000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.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  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  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.580000 12.805000 1.750000 ;
+      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 ;
   END
 END sky130_fd_sc_lp__sdfrtp_lp2
diff --git a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef
index 674fa8c..39e3fa2 100644
--- a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef
+++ b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.magic.lef
@@ -96,43 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.440000 0.085000 ;
-        RECT  0.600000  0.085000  0.895000 0.690000 ;
-        RECT  3.405000  0.085000  3.735000 0.635000 ;
-        RECT  6.145000  0.085000  6.475000 0.940000 ;
-        RECT  8.490000  0.085000  8.820000 0.965000 ;
-        RECT 10.755000  0.085000 11.085000 0.475000 ;
-        RECT 12.575000  0.085000 12.915000 0.475000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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,128 +104,161 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.440000 3.415000 ;
-        RECT  1.320000 2.390000  1.650000 3.245000 ;
-        RECT  3.070000 2.655000  3.400000 3.245000 ;
-        RECT  4.865000 2.505000  5.195000 3.245000 ;
-        RECT  6.270000 2.660000  6.600000 3.245000 ;
-        RECT  8.455000 2.855000  9.190000 3.245000 ;
-        RECT  9.790000 2.710000 10.050000 3.245000 ;
-        RECT 10.755000 2.710000 11.040000 3.245000 ;
-        RECT 12.430000 2.015000 12.915000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.090000 0.415000  0.430000 0.860000 ;
-      RECT  0.090000 0.860000  1.510000 1.030000 ;
-      RECT  0.090000 1.030000  0.370000 1.975000 ;
-      RECT  0.090000 1.975000  2.675000 2.145000 ;
-      RECT  0.090000 2.145000  1.140000 2.965000 ;
-      RECT  1.145000 0.265000  3.225000 0.435000 ;
-      RECT  1.145000 0.435000  1.355000 0.595000 ;
-      RECT  1.990000 0.615000  2.320000 0.815000 ;
-      RECT  1.990000 0.815000  4.215000 0.985000 ;
-      RECT  2.110000 2.315000  3.885000 2.485000 ;
-      RECT  2.110000 2.485000  2.440000 2.680000 ;
-      RECT  2.425000 1.815000  2.675000 1.975000 ;
-      RECT  2.895000 0.435000  3.225000 0.635000 ;
-      RECT  3.480000 0.985000  3.685000 2.295000 ;
-      RECT  3.480000 2.295000  3.885000 2.315000 ;
-      RECT  3.590000 2.485000  3.885000 2.625000 ;
-      RECT  3.855000 1.155000  4.215000 1.915000 ;
-      RECT  4.015000 0.655000  4.215000 0.815000 ;
-      RECT  4.065000 2.085000  4.555000 2.165000 ;
-      RECT  4.065000 2.165000  5.630000 2.335000 ;
-      RECT  4.065000 2.335000  4.385000 2.690000 ;
-      RECT  4.385000 0.785000  5.670000 0.995000 ;
-      RECT  4.385000 0.995000  4.555000 2.085000 ;
-      RECT  4.725000 1.600000  6.835000 1.770000 ;
-      RECT  4.725000 1.770000  5.015000 1.995000 ;
-      RECT  4.735000 1.165000  5.125000 1.430000 ;
-      RECT  5.365000 2.335000  5.630000 2.690000 ;
-      RECT  5.465000 0.995000  5.670000 1.170000 ;
-      RECT  5.465000 1.170000  6.475000 1.430000 ;
-      RECT  6.645000 0.630000  6.835000 1.600000 ;
-      RECT  6.655000 1.770000  6.835000 1.960000 ;
-      RECT  6.655000 1.960000  7.145000 2.150000 ;
-      RECT  7.005000 0.745000  8.320000 0.915000 ;
-      RECT  7.005000 0.915000  7.175000 1.620000 ;
-      RECT  7.005000 1.620000  7.575000 1.790000 ;
-      RECT  7.200000 0.625000  7.870000 0.745000 ;
-      RECT  7.315000 1.790000  7.575000 2.735000 ;
-      RECT  7.345000 1.095000  7.940000 1.425000 ;
-      RECT  7.770000 1.425000  7.940000 2.055000 ;
-      RECT  7.770000 2.055000  8.120000 2.305000 ;
-      RECT  8.110000 0.915000  8.320000 1.135000 ;
-      RECT  8.110000 1.135000 10.045000 1.305000 ;
-      RECT  8.110000 1.485000  8.370000 1.555000 ;
-      RECT  8.110000 1.555000 10.045000 1.725000 ;
-      RECT  8.110000 1.725000  8.370000 1.815000 ;
-      RECT  8.400000 2.055000  9.620000 2.075000 ;
-      RECT  8.400000 2.075000  8.730000 2.305000 ;
-      RECT  8.560000 1.905000  9.620000 2.055000 ;
-      RECT  9.360000 2.745000  9.620000 3.075000 ;
-      RECT  9.425000 0.255000 10.155000 0.475000 ;
-      RECT  9.425000 0.475000  9.705000 0.965000 ;
-      RECT  9.450000 2.075000  9.620000 2.745000 ;
-      RECT  9.480000 1.305000 10.045000 1.385000 ;
-      RECT  9.800000 1.725000 10.045000 2.370000 ;
-      RECT  9.800000 2.370000 11.380000 2.540000 ;
-      RECT  9.875000 0.645000 11.980000 0.815000 ;
-      RECT  9.875000 0.815000 10.045000 1.135000 ;
-      RECT 10.215000 0.985000 10.575000 1.165000 ;
-      RECT 10.215000 1.165000 10.545000 2.200000 ;
-      RECT 10.715000 1.345000 11.380000 2.370000 ;
-      RECT 11.200000 0.985000 11.630000 1.185000 ;
-      RECT 11.200000 1.185000 11.380000 1.345000 ;
-      RECT 11.210000 2.540000 11.380000 2.715000 ;
-      RECT 11.210000 2.715000 11.630000 3.045000 ;
-      RECT 11.810000 0.815000 11.980000 0.985000 ;
-      RECT 11.810000 0.985000 12.455000 1.165000 ;
-      RECT 12.050000 1.675000 12.915000 1.845000 ;
-      RECT 12.050000 1.845000 12.260000 2.495000 ;
-      RECT 12.125000 1.165000 12.455000 1.505000 ;
-      RECT 12.150000 0.275000 12.405000 0.645000 ;
-      RECT 12.150000 0.645000 12.915000 0.815000 ;
-      RECT 12.665000 0.815000 12.915000 1.675000 ;
+      RECT  0.000000 -0.085000 13.440000 0.085000 ;
+      RECT  0.000000  3.245000 13.440000 3.415000 ;
+      RECT  0.090000  0.415000  0.430000 0.860000 ;
+      RECT  0.090000  0.860000  1.510000 1.030000 ;
+      RECT  0.090000  1.030000  0.370000 1.975000 ;
+      RECT  0.090000  1.975000  2.675000 2.145000 ;
+      RECT  0.090000  2.145000  1.140000 2.965000 ;
+      RECT  0.600000  0.085000  0.895000 0.690000 ;
+      RECT  1.145000  0.265000  3.225000 0.435000 ;
+      RECT  1.145000  0.435000  1.355000 0.595000 ;
+      RECT  1.320000  2.390000  1.650000 3.245000 ;
+      RECT  1.990000  0.615000  2.320000 0.815000 ;
+      RECT  1.990000  0.815000  4.215000 0.985000 ;
+      RECT  2.110000  2.315000  3.885000 2.485000 ;
+      RECT  2.110000  2.485000  2.440000 2.680000 ;
+      RECT  2.425000  1.815000  2.675000 1.975000 ;
+      RECT  2.895000  0.435000  3.225000 0.635000 ;
+      RECT  3.070000  2.655000  3.400000 3.245000 ;
+      RECT  3.405000  0.085000  3.735000 0.635000 ;
+      RECT  3.480000  0.985000  3.685000 2.295000 ;
+      RECT  3.480000  2.295000  3.885000 2.315000 ;
+      RECT  3.590000  2.485000  3.885000 2.625000 ;
+      RECT  3.855000  1.155000  4.215000 1.915000 ;
+      RECT  4.015000  0.655000  4.215000 0.815000 ;
+      RECT  4.065000  2.085000  4.555000 2.165000 ;
+      RECT  4.065000  2.165000  5.630000 2.335000 ;
+      RECT  4.065000  2.335000  4.385000 2.690000 ;
+      RECT  4.385000  0.785000  5.670000 0.995000 ;
+      RECT  4.385000  0.995000  4.555000 2.085000 ;
+      RECT  4.725000  1.600000  6.835000 1.770000 ;
+      RECT  4.725000  1.770000  5.015000 1.995000 ;
+      RECT  4.735000  1.165000  5.125000 1.430000 ;
+      RECT  4.865000  2.505000  5.195000 3.245000 ;
+      RECT  5.365000  2.335000  5.630000 2.690000 ;
+      RECT  5.465000  0.995000  5.670000 1.170000 ;
+      RECT  5.465000  1.170000  6.475000 1.430000 ;
+      RECT  6.145000  0.085000  6.475000 0.940000 ;
+      RECT  6.270000  2.660000  6.600000 3.245000 ;
+      RECT  6.645000  0.630000  6.835000 1.600000 ;
+      RECT  6.655000  1.770000  6.835000 1.960000 ;
+      RECT  6.655000  1.960000  7.145000 2.150000 ;
+      RECT  7.005000  0.745000  8.320000 0.915000 ;
+      RECT  7.005000  0.915000  7.175000 1.620000 ;
+      RECT  7.005000  1.620000  7.575000 1.790000 ;
+      RECT  7.200000  0.625000  7.870000 0.745000 ;
+      RECT  7.315000  1.790000  7.575000 2.735000 ;
+      RECT  7.345000  1.095000  7.940000 1.425000 ;
+      RECT  7.770000  1.425000  7.940000 2.055000 ;
+      RECT  7.770000  2.055000  8.120000 2.305000 ;
+      RECT  8.110000  0.915000  8.320000 1.135000 ;
+      RECT  8.110000  1.135000 10.045000 1.305000 ;
+      RECT  8.110000  1.485000  8.370000 1.555000 ;
+      RECT  8.110000  1.555000 10.045000 1.725000 ;
+      RECT  8.110000  1.725000  8.370000 1.815000 ;
+      RECT  8.400000  2.055000  9.620000 2.075000 ;
+      RECT  8.400000  2.075000  8.730000 2.305000 ;
+      RECT  8.455000  2.855000  9.190000 3.245000 ;
+      RECT  8.490000  0.085000  8.820000 0.965000 ;
+      RECT  8.560000  1.905000  9.620000 2.055000 ;
+      RECT  9.360000  2.745000  9.620000 3.075000 ;
+      RECT  9.425000  0.255000 10.155000 0.475000 ;
+      RECT  9.425000  0.475000  9.705000 0.965000 ;
+      RECT  9.450000  2.075000  9.620000 2.745000 ;
+      RECT  9.480000  1.305000 10.045000 1.385000 ;
+      RECT  9.790000  2.710000 10.050000 3.245000 ;
+      RECT  9.800000  1.725000 10.045000 2.370000 ;
+      RECT  9.800000  2.370000 11.380000 2.540000 ;
+      RECT  9.875000  0.645000 11.980000 0.815000 ;
+      RECT  9.875000  0.815000 10.045000 1.135000 ;
+      RECT 10.215000  0.985000 10.575000 1.165000 ;
+      RECT 10.215000  1.165000 10.545000 2.200000 ;
+      RECT 10.715000  1.345000 11.380000 2.370000 ;
+      RECT 10.755000  0.085000 11.085000 0.475000 ;
+      RECT 10.755000  2.710000 11.040000 3.245000 ;
+      RECT 11.200000  0.985000 11.630000 1.185000 ;
+      RECT 11.200000  1.185000 11.380000 1.345000 ;
+      RECT 11.210000  2.540000 11.380000 2.715000 ;
+      RECT 11.210000  2.715000 11.630000 3.045000 ;
+      RECT 11.810000  0.815000 11.980000 0.985000 ;
+      RECT 11.810000  0.985000 12.455000 1.165000 ;
+      RECT 12.050000  1.675000 12.915000 1.845000 ;
+      RECT 12.050000  1.845000 12.260000 2.495000 ;
+      RECT 12.125000  1.165000 12.455000 1.505000 ;
+      RECT 12.150000  0.275000 12.405000 0.645000 ;
+      RECT 12.150000  0.645000 12.915000 0.815000 ;
+      RECT 12.430000  2.015000 12.915000 3.245000 ;
+      RECT 12.575000  0.085000 12.915000 0.475000 ;
+      RECT 12.665000  0.815000 12.915000 1.675000 ;
     LAYER mcon ;
-      RECT  3.995000 1.210000  4.165000 1.380000 ;
-      RECT  4.955000 1.210000  5.125000 1.380000 ;
-      RECT  7.355000 1.210000  7.525000 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  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  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  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  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  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  3.935000 1.180000  4.225000 1.225000 ;
       RECT  3.935000 1.225000 10.465000 1.365000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef
index 3d7d91b..8d8e369 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.magic.lef
@@ -84,12 +84,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.345000 1.790000  7.645000 2.130000 ;
-        RECT 10.650000 1.920000 11.530000 2.130000 ;
-      LAYER mcon ;
-        RECT  7.355000 1.950000  7.525000 2.120000 ;
-        RECT 10.715000 1.950000 10.885000 2.120000 ;
       LAYER met1 ;
         RECT  7.295000 1.920000  7.585000 1.965000 ;
         RECT  7.295000 1.965000 10.945000 2.105000 ;
@@ -111,49 +105,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.360000 0.085000 ;
-        RECT  0.805000  0.085000  1.135000 0.595000 ;
-        RECT  2.790000  0.085000  3.120000 0.485000 ;
-        RECT  4.295000  0.085000  4.535000 0.730000 ;
-        RECT  6.560000  0.085000  6.890000 0.855000 ;
-        RECT  8.855000  0.085000  9.055000 0.910000 ;
-        RECT 10.820000  0.085000 11.150000 0.960000 ;
-        RECT 11.900000  0.085000 12.455000 1.080000 ;
-        RECT 14.425000  0.085000 14.755000 0.510000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -162,127 +113,171 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.360000 3.415000 ;
-        RECT  0.560000 2.465000  0.890000 3.245000 ;
-        RECT  2.405000 2.815000  2.735000 3.245000 ;
-        RECT  3.955000 2.955000  4.285000 3.245000 ;
-        RECT  6.505000 2.360000  6.835000 3.245000 ;
-        RECT  7.650000 2.640000  8.885000 3.245000 ;
-        RECT 10.460000 2.640000 11.225000 3.245000 ;
-        RECT 12.855000 2.180000 13.115000 3.245000 ;
-        RECT 14.425000 1.840000 14.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 ;
-        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.130000 0.280000  0.635000 0.610000 ;
-      RECT  0.130000 0.610000  0.380000 1.125000 ;
-      RECT  0.130000 1.125000  0.935000 1.455000 ;
-      RECT  0.130000 1.455000  0.390000 3.065000 ;
-      RECT  1.460000 2.475000  3.075000 2.645000 ;
-      RECT  1.460000 2.645000  1.790000 3.025000 ;
-      RECT  1.595000 0.280000  2.540000 0.595000 ;
-      RECT  2.370000 0.595000  2.540000 0.655000 ;
-      RECT  2.370000 0.655000  3.075000 0.825000 ;
-      RECT  2.905000 0.825000  3.075000 2.475000 ;
-      RECT  2.905000 2.645000  3.075000 2.895000 ;
-      RECT  2.905000 2.895000  3.775000 3.065000 ;
-      RECT  3.245000 2.230000  4.125000 2.435000 ;
-      RECT  3.245000 2.435000  3.435000 2.725000 ;
-      RECT  3.290000 0.330000  4.125000 0.660000 ;
-      RECT  3.605000 2.615000  5.575000 2.785000 ;
-      RECT  3.605000 2.785000  3.775000 2.895000 ;
-      RECT  3.925000 0.660000  4.125000 2.230000 ;
-      RECT  4.480000 1.375000  5.105000 2.435000 ;
-      RECT  4.705000 0.400000  5.005000 1.375000 ;
-      RECT  5.255000 0.585000  5.670000 0.865000 ;
-      RECT  5.255000 0.865000  5.455000 1.035000 ;
-      RECT  5.275000 1.035000  5.455000 2.360000 ;
-      RECT  5.275000 2.360000  5.575000 2.615000 ;
-      RECT  5.625000 1.035000  8.335000 1.205000 ;
-      RECT  5.625000 1.205000  5.795000 1.885000 ;
-      RECT  5.625000 1.885000  6.035000 2.055000 ;
-      RECT  5.745000 2.055000  6.035000 2.690000 ;
-      RECT  5.840000 0.640000  6.100000 1.025000 ;
-      RECT  5.840000 1.025000  8.335000 1.035000 ;
-      RECT  5.965000 1.375000  7.985000 1.545000 ;
-      RECT  5.965000 1.545000  6.225000 1.705000 ;
-      RECT  6.455000 1.905000  7.175000 2.190000 ;
-      RECT  7.005000 2.190000  7.175000 2.300000 ;
-      RECT  7.005000 2.300000  9.475000 2.470000 ;
-      RECT  7.005000 2.470000  7.480000 2.690000 ;
-      RECT  7.060000 0.525000  7.250000 1.025000 ;
-      RECT  7.420000 0.635000  8.685000 0.855000 ;
-      RECT  7.815000 1.545000  7.985000 1.780000 ;
-      RECT  7.815000 1.780000  9.125000 1.950000 ;
-      RECT  8.165000 1.205000  8.335000 1.420000 ;
-      RECT  8.165000 1.420000  8.775000 1.610000 ;
-      RECT  8.515000 0.855000  8.685000 1.080000 ;
-      RECT  8.515000 1.080000 10.130000 1.250000 ;
-      RECT  8.955000 1.420000  9.790000 1.610000 ;
-      RECT  8.955000 1.610000  9.125000 1.780000 ;
-      RECT  9.305000 1.780000 10.130000 1.950000 ;
-      RECT  9.305000 1.950000  9.475000 2.300000 ;
-      RECT  9.575000 0.640000 10.480000 0.910000 ;
-      RECT  9.645000 2.120000 10.480000 2.300000 ;
-      RECT  9.645000 2.300000 11.655000 2.470000 ;
-      RECT  9.645000 2.470000 10.150000 2.880000 ;
-      RECT  9.960000 1.250000 10.130000 1.780000 ;
-      RECT 10.310000 0.910000 10.480000 2.120000 ;
-      RECT 10.660000 1.495000 12.150000 1.750000 ;
-      RECT 11.375000 0.795000 11.730000 1.495000 ;
-      RECT 11.395000 2.470000 11.655000 2.905000 ;
-      RECT 11.395000 2.905000 12.685000 3.075000 ;
-      RECT 11.975000 1.750000 12.150000 2.465000 ;
-      RECT 11.975000 2.465000 12.345000 2.735000 ;
-      RECT 12.320000 1.590000 12.795000 2.010000 ;
-      RECT 12.320000 2.010000 12.685000 2.260000 ;
-      RECT 12.515000 2.260000 12.685000 2.905000 ;
-      RECT 12.625000 0.450000 13.735000 0.620000 ;
-      RECT 12.625000 0.620000 12.795000 1.590000 ;
-      RECT 12.965000 0.790000 13.235000 1.160000 ;
-      RECT 12.965000 1.160000 13.665000 1.330000 ;
-      RECT 13.285000 1.330000 13.665000 1.830000 ;
-      RECT 13.285000 1.830000 13.545000 2.860000 ;
-      RECT 13.405000 0.330000 13.735000 0.450000 ;
-      RECT 13.405000 0.620000 13.735000 0.680000 ;
-      RECT 13.405000 0.680000 14.835000 0.850000 ;
-      RECT 14.665000 0.850000 14.835000 1.670000 ;
+      RECT  0.000000 -0.085000 15.360000 0.085000 ;
+      RECT  0.000000  3.245000 15.360000 3.415000 ;
+      RECT  0.130000  0.280000  0.635000 0.610000 ;
+      RECT  0.130000  0.610000  0.380000 1.125000 ;
+      RECT  0.130000  1.125000  0.935000 1.455000 ;
+      RECT  0.130000  1.455000  0.390000 3.065000 ;
+      RECT  0.560000  2.465000  0.890000 3.245000 ;
+      RECT  0.805000  0.085000  1.135000 0.595000 ;
+      RECT  1.460000  2.475000  3.075000 2.645000 ;
+      RECT  1.460000  2.645000  1.790000 3.025000 ;
+      RECT  1.595000  0.280000  2.540000 0.595000 ;
+      RECT  2.370000  0.595000  2.540000 0.655000 ;
+      RECT  2.370000  0.655000  3.075000 0.825000 ;
+      RECT  2.405000  2.815000  2.735000 3.245000 ;
+      RECT  2.790000  0.085000  3.120000 0.485000 ;
+      RECT  2.905000  0.825000  3.075000 2.475000 ;
+      RECT  2.905000  2.645000  3.075000 2.895000 ;
+      RECT  2.905000  2.895000  3.775000 3.065000 ;
+      RECT  3.245000  2.230000  4.125000 2.435000 ;
+      RECT  3.245000  2.435000  3.435000 2.725000 ;
+      RECT  3.290000  0.330000  4.125000 0.660000 ;
+      RECT  3.605000  2.615000  5.575000 2.785000 ;
+      RECT  3.605000  2.785000  3.775000 2.895000 ;
+      RECT  3.925000  0.660000  4.125000 2.230000 ;
+      RECT  3.955000  2.955000  4.285000 3.245000 ;
+      RECT  4.295000  0.085000  4.535000 0.730000 ;
+      RECT  4.480000  1.375000  5.105000 2.435000 ;
+      RECT  4.705000  0.400000  5.005000 1.375000 ;
+      RECT  5.255000  0.585000  5.670000 0.865000 ;
+      RECT  5.255000  0.865000  5.455000 1.035000 ;
+      RECT  5.275000  1.035000  5.455000 2.360000 ;
+      RECT  5.275000  2.360000  5.575000 2.615000 ;
+      RECT  5.625000  1.035000  8.335000 1.205000 ;
+      RECT  5.625000  1.205000  5.795000 1.885000 ;
+      RECT  5.625000  1.885000  6.035000 2.055000 ;
+      RECT  5.745000  2.055000  6.035000 2.690000 ;
+      RECT  5.840000  0.640000  6.100000 1.025000 ;
+      RECT  5.840000  1.025000  8.335000 1.035000 ;
+      RECT  5.965000  1.375000  7.985000 1.545000 ;
+      RECT  5.965000  1.545000  6.225000 1.705000 ;
+      RECT  6.455000  1.905000  7.175000 2.190000 ;
+      RECT  6.505000  2.360000  6.835000 3.245000 ;
+      RECT  6.560000  0.085000  6.890000 0.855000 ;
+      RECT  7.005000  2.190000  7.175000 2.300000 ;
+      RECT  7.005000  2.300000  9.475000 2.470000 ;
+      RECT  7.005000  2.470000  7.480000 2.690000 ;
+      RECT  7.060000  0.525000  7.250000 1.025000 ;
+      RECT  7.345000  1.790000  7.645000 2.130000 ;
+      RECT  7.420000  0.635000  8.685000 0.855000 ;
+      RECT  7.650000  2.640000  8.885000 3.245000 ;
+      RECT  7.815000  1.545000  7.985000 1.780000 ;
+      RECT  7.815000  1.780000  9.125000 1.950000 ;
+      RECT  8.165000  1.205000  8.335000 1.420000 ;
+      RECT  8.165000  1.420000  8.775000 1.610000 ;
+      RECT  8.515000  0.855000  8.685000 1.080000 ;
+      RECT  8.515000  1.080000 10.130000 1.250000 ;
+      RECT  8.855000  0.085000  9.055000 0.910000 ;
+      RECT  8.955000  1.420000  9.790000 1.610000 ;
+      RECT  8.955000  1.610000  9.125000 1.780000 ;
+      RECT  9.305000  1.780000 10.130000 1.950000 ;
+      RECT  9.305000  1.950000  9.475000 2.300000 ;
+      RECT  9.575000  0.640000 10.480000 0.910000 ;
+      RECT  9.645000  2.120000 10.480000 2.300000 ;
+      RECT  9.645000  2.300000 11.655000 2.470000 ;
+      RECT  9.645000  2.470000 10.150000 2.880000 ;
+      RECT  9.960000  1.250000 10.130000 1.780000 ;
+      RECT 10.310000  0.910000 10.480000 2.120000 ;
+      RECT 10.460000  2.640000 11.225000 3.245000 ;
+      RECT 10.650000  1.920000 11.530000 2.130000 ;
+      RECT 10.660000  1.495000 12.150000 1.750000 ;
+      RECT 10.820000  0.085000 11.150000 0.960000 ;
+      RECT 11.375000  0.795000 11.730000 1.495000 ;
+      RECT 11.395000  2.470000 11.655000 2.905000 ;
+      RECT 11.395000  2.905000 12.685000 3.075000 ;
+      RECT 11.900000  0.085000 12.455000 1.080000 ;
+      RECT 11.975000  1.750000 12.150000 2.465000 ;
+      RECT 11.975000  2.465000 12.345000 2.735000 ;
+      RECT 12.320000  1.590000 12.795000 2.010000 ;
+      RECT 12.320000  2.010000 12.685000 2.260000 ;
+      RECT 12.515000  2.260000 12.685000 2.905000 ;
+      RECT 12.625000  0.450000 13.735000 0.620000 ;
+      RECT 12.625000  0.620000 12.795000 1.590000 ;
+      RECT 12.855000  2.180000 13.115000 3.245000 ;
+      RECT 12.965000  0.790000 13.235000 1.160000 ;
+      RECT 12.965000  1.160000 13.665000 1.330000 ;
+      RECT 13.285000  1.330000 13.665000 1.830000 ;
+      RECT 13.285000  1.830000 13.545000 2.860000 ;
+      RECT 13.405000  0.330000 13.735000 0.450000 ;
+      RECT 13.405000  0.620000 13.735000 0.680000 ;
+      RECT 13.405000  0.680000 14.835000 0.850000 ;
+      RECT 14.425000  0.085000 14.755000 0.510000 ;
+      RECT 14.425000  1.840000 14.615000 3.245000 ;
+      RECT 14.665000  0.850000 14.835000 1.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  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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.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 ;
+      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 ;
   END
 END sky130_fd_sc_lp__sdfsbp_1
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef
index d463ffe..61fce37 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.magic.lef
@@ -87,12 +87,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.265000 1.895000  7.865000 2.130000 ;
-        RECT 10.705000 1.630000 10.895000 2.300000 ;
-      LAYER mcon ;
-        RECT  7.355000 1.950000  7.525000 2.120000 ;
-        RECT 10.715000 1.950000 10.885000 2.120000 ;
       LAYER met1 ;
         RECT  7.295000 1.920000  7.585000 1.965000 ;
         RECT  7.295000 1.965000 10.945000 2.105000 ;
@@ -114,51 +108,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.360000 0.085000 ;
-        RECT  0.830000  0.085000  1.160000 0.605000 ;
-        RECT  2.690000  0.085000  3.020000 0.535000 ;
-        RECT  4.145000  0.085000  4.405000 0.725000 ;
-        RECT  6.580000  0.085000  6.910000 0.970000 ;
-        RECT  8.140000  0.085000  8.470000 0.695000 ;
-        RECT 10.340000  0.085000 10.670000 0.915000 ;
-        RECT 11.550000  0.085000 11.985000 0.915000 ;
-        RECT 12.630000  0.085000 12.965000 1.105000 ;
-        RECT 13.655000  0.085000 13.940000 1.095000 ;
-        RECT 14.945000  0.085000 15.215000 1.095000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -167,123 +116,169 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.360000 3.415000 ;
-        RECT  0.525000 2.660000  0.855000 3.245000 ;
-        RECT  2.445000 2.975000  2.775000 3.245000 ;
-        RECT  4.100000 2.675000  4.360000 3.245000 ;
-        RECT  6.790000 2.640000  7.120000 3.245000 ;
-        RECT  7.950000 2.640000  8.280000 3.245000 ;
-        RECT 10.005000 2.505000 10.195000 3.245000 ;
-        RECT 11.860000 2.315000 12.120000 3.245000 ;
-        RECT 12.755000 1.815000 13.095000 3.245000 ;
-        RECT 14.025000 1.820000 14.355000 3.245000 ;
-        RECT 14.945000 1.820000 15.215000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.095000 0.275000  0.660000 0.815000 ;
-      RECT  0.095000 0.815000  1.345000 0.985000 ;
-      RECT  0.095000 0.985000  0.355000 2.985000 ;
-      RECT  1.055000 0.985000  1.345000 1.485000 ;
-      RECT  1.425000 2.585000  3.230000 2.805000 ;
-      RECT  1.970000 0.280000  2.220000 0.705000 ;
-      RECT  1.970000 0.705000  2.690000 0.875000 ;
-      RECT  2.520000 0.875000  2.690000 1.195000 ;
-      RECT  2.520000 1.195000  3.230000 1.365000 ;
-      RECT  3.060000 1.365000  3.230000 2.585000 ;
-      RECT  3.060000 2.805000  3.930000 2.995000 ;
-      RECT  3.190000 0.275000  3.940000 0.605000 ;
-      RECT  3.400000 1.195000  4.405000 1.565000 ;
-      RECT  3.400000 1.565000  3.590000 2.635000 ;
-      RECT  3.550000 0.605000  3.940000 0.895000 ;
-      RECT  3.550000 0.895000  4.405000 1.195000 ;
-      RECT  3.760000 2.335000  5.655000 2.360000 ;
-      RECT  3.760000 2.360000  5.780000 2.505000 ;
-      RECT  3.760000 2.505000  3.930000 2.805000 ;
-      RECT  4.575000 0.410000  4.905000 1.485000 ;
-      RECT  4.575000 1.485000  5.295000 2.165000 ;
-      RECT  5.360000 0.640000  5.655000 1.235000 ;
-      RECT  5.475000 1.235000  5.655000 2.335000 ;
-      RECT  5.475000 2.505000  5.780000 2.705000 ;
-      RECT  5.825000 0.640000  6.120000 1.140000 ;
-      RECT  5.825000 1.140000  7.505000 1.205000 ;
-      RECT  5.825000 1.205000  8.575000 1.345000 ;
-      RECT  5.825000 1.345000  5.995000 2.020000 ;
-      RECT  5.825000 2.020000  6.250000 2.190000 ;
-      RECT  5.950000 2.190000  6.250000 2.690000 ;
-      RECT  6.165000 1.515000  6.430000 1.545000 ;
-      RECT  6.165000 1.545000  8.215000 1.725000 ;
-      RECT  6.165000 1.725000  6.425000 1.845000 ;
-      RECT  6.635000 1.905000  6.965000 2.300000 ;
-      RECT  6.635000 2.300000  9.485000 2.375000 ;
-      RECT  6.635000 2.375000  8.215000 2.470000 ;
-      RECT  7.175000 1.345000  8.575000 1.375000 ;
-      RECT  7.255000 0.640000  7.960000 0.865000 ;
-      RECT  7.255000 0.865000  8.915000 0.970000 ;
-      RECT  7.300000 2.470000  7.630000 2.690000 ;
-      RECT  7.790000 0.970000  8.915000 1.030000 ;
-      RECT  7.790000 1.030000  9.485000 1.035000 ;
-      RECT  8.045000 1.725000  8.215000 1.855000 ;
-      RECT  8.045000 1.855000  9.145000 2.025000 ;
-      RECT  8.045000 2.205000  9.485000 2.300000 ;
-      RECT  8.385000 1.375000  8.575000 1.675000 ;
-      RECT  8.745000 1.035000  9.485000 1.200000 ;
-      RECT  8.885000 1.370000  9.145000 1.855000 ;
-      RECT  8.970000 2.555000  9.835000 2.885000 ;
-      RECT  9.135000 0.590000  9.835000 0.860000 ;
-      RECT  9.315000 1.200000  9.485000 2.205000 ;
-      RECT  9.665000 0.860000  9.835000 2.155000 ;
-      RECT  9.665000 2.155000 10.535000 2.335000 ;
-      RECT  9.665000 2.335000  9.835000 2.555000 ;
-      RECT 10.015000 1.085000 11.925000 1.255000 ;
-      RECT 10.015000 1.255000 10.345000 1.845000 ;
-      RECT 10.365000 2.335000 10.535000 2.505000 ;
-      RECT 10.365000 2.505000 11.235000 2.835000 ;
-      RECT 11.065000 1.425000 11.575000 1.645000 ;
-      RECT 11.065000 1.645000 11.235000 2.505000 ;
-      RECT 11.120000 0.710000 11.380000 1.085000 ;
-      RECT 11.415000 1.815000 11.925000 2.145000 ;
-      RECT 11.755000 1.255000 11.925000 1.815000 ;
-      RECT 13.135000 0.290000 13.475000 0.620000 ;
-      RECT 13.265000 0.620000 13.475000 1.275000 ;
-      RECT 13.265000 1.275000 14.355000 1.605000 ;
-      RECT 13.265000 1.605000 13.575000 2.495000 ;
+      RECT  0.000000 -0.085000 15.360000 0.085000 ;
+      RECT  0.000000  3.245000 15.360000 3.415000 ;
+      RECT  0.095000  0.275000  0.660000 0.815000 ;
+      RECT  0.095000  0.815000  1.345000 0.985000 ;
+      RECT  0.095000  0.985000  0.355000 2.985000 ;
+      RECT  0.525000  2.660000  0.855000 3.245000 ;
+      RECT  0.830000  0.085000  1.160000 0.605000 ;
+      RECT  1.055000  0.985000  1.345000 1.485000 ;
+      RECT  1.425000  2.585000  3.230000 2.805000 ;
+      RECT  1.970000  0.280000  2.220000 0.705000 ;
+      RECT  1.970000  0.705000  2.690000 0.875000 ;
+      RECT  2.445000  2.975000  2.775000 3.245000 ;
+      RECT  2.520000  0.875000  2.690000 1.195000 ;
+      RECT  2.520000  1.195000  3.230000 1.365000 ;
+      RECT  2.690000  0.085000  3.020000 0.535000 ;
+      RECT  3.060000  1.365000  3.230000 2.585000 ;
+      RECT  3.060000  2.805000  3.930000 2.995000 ;
+      RECT  3.190000  0.275000  3.940000 0.605000 ;
+      RECT  3.400000  1.195000  4.405000 1.565000 ;
+      RECT  3.400000  1.565000  3.590000 2.635000 ;
+      RECT  3.550000  0.605000  3.940000 0.895000 ;
+      RECT  3.550000  0.895000  4.405000 1.195000 ;
+      RECT  3.760000  2.335000  5.655000 2.360000 ;
+      RECT  3.760000  2.360000  5.780000 2.505000 ;
+      RECT  3.760000  2.505000  3.930000 2.805000 ;
+      RECT  4.100000  2.675000  4.360000 3.245000 ;
+      RECT  4.145000  0.085000  4.405000 0.725000 ;
+      RECT  4.575000  0.410000  4.905000 1.485000 ;
+      RECT  4.575000  1.485000  5.295000 2.165000 ;
+      RECT  5.360000  0.640000  5.655000 1.235000 ;
+      RECT  5.475000  1.235000  5.655000 2.335000 ;
+      RECT  5.475000  2.505000  5.780000 2.705000 ;
+      RECT  5.825000  0.640000  6.120000 1.140000 ;
+      RECT  5.825000  1.140000  7.505000 1.205000 ;
+      RECT  5.825000  1.205000  8.575000 1.345000 ;
+      RECT  5.825000  1.345000  5.995000 2.020000 ;
+      RECT  5.825000  2.020000  6.250000 2.190000 ;
+      RECT  5.950000  2.190000  6.250000 2.690000 ;
+      RECT  6.165000  1.515000  6.430000 1.545000 ;
+      RECT  6.165000  1.545000  8.215000 1.725000 ;
+      RECT  6.165000  1.725000  6.425000 1.845000 ;
+      RECT  6.580000  0.085000  6.910000 0.970000 ;
+      RECT  6.635000  1.905000  6.965000 2.300000 ;
+      RECT  6.635000  2.300000  9.485000 2.375000 ;
+      RECT  6.635000  2.375000  8.215000 2.470000 ;
+      RECT  6.790000  2.640000  7.120000 3.245000 ;
+      RECT  7.175000  1.345000  8.575000 1.375000 ;
+      RECT  7.255000  0.640000  7.960000 0.865000 ;
+      RECT  7.255000  0.865000  8.915000 0.970000 ;
+      RECT  7.265000  1.895000  7.865000 2.130000 ;
+      RECT  7.300000  2.470000  7.630000 2.690000 ;
+      RECT  7.790000  0.970000  8.915000 1.030000 ;
+      RECT  7.790000  1.030000  9.485000 1.035000 ;
+      RECT  7.950000  2.640000  8.280000 3.245000 ;
+      RECT  8.045000  1.725000  8.215000 1.855000 ;
+      RECT  8.045000  1.855000  9.145000 2.025000 ;
+      RECT  8.045000  2.205000  9.485000 2.300000 ;
+      RECT  8.140000  0.085000  8.470000 0.695000 ;
+      RECT  8.385000  1.375000  8.575000 1.675000 ;
+      RECT  8.745000  1.035000  9.485000 1.200000 ;
+      RECT  8.885000  1.370000  9.145000 1.855000 ;
+      RECT  8.970000  2.555000  9.835000 2.885000 ;
+      RECT  9.135000  0.590000  9.835000 0.860000 ;
+      RECT  9.315000  1.200000  9.485000 2.205000 ;
+      RECT  9.665000  0.860000  9.835000 2.155000 ;
+      RECT  9.665000  2.155000 10.535000 2.335000 ;
+      RECT  9.665000  2.335000  9.835000 2.555000 ;
+      RECT 10.005000  2.505000 10.195000 3.245000 ;
+      RECT 10.015000  1.085000 11.925000 1.255000 ;
+      RECT 10.015000  1.255000 10.345000 1.845000 ;
+      RECT 10.340000  0.085000 10.670000 0.915000 ;
+      RECT 10.365000  2.335000 10.535000 2.505000 ;
+      RECT 10.365000  2.505000 11.235000 2.835000 ;
+      RECT 10.705000  1.630000 10.895000 2.300000 ;
+      RECT 11.065000  1.425000 11.575000 1.645000 ;
+      RECT 11.065000  1.645000 11.235000 2.505000 ;
+      RECT 11.120000  0.710000 11.380000 1.085000 ;
+      RECT 11.415000  1.815000 11.925000 2.145000 ;
+      RECT 11.550000  0.085000 11.985000 0.915000 ;
+      RECT 11.755000  1.255000 11.925000 1.815000 ;
+      RECT 11.860000  2.315000 12.120000 3.245000 ;
+      RECT 12.630000  0.085000 12.965000 1.105000 ;
+      RECT 12.755000  1.815000 13.095000 3.245000 ;
+      RECT 13.135000  0.290000 13.475000 0.620000 ;
+      RECT 13.265000  0.620000 13.475000 1.275000 ;
+      RECT 13.265000  1.275000 14.355000 1.605000 ;
+      RECT 13.265000  1.605000 13.575000 2.495000 ;
+      RECT 13.655000  0.085000 13.940000 1.095000 ;
+      RECT 14.025000  1.820000 14.355000 3.245000 ;
+      RECT 14.945000  0.085000 15.215000 1.095000 ;
+      RECT 14.945000  1.820000 15.215000 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.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 ;
+      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 ;
   END
 END sky130_fd_sc_lp__sdfsbp_2
diff --git a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef
index d4007d8..2822cee 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.magic.lef
@@ -89,12 +89,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  8.795000 1.550000  9.065000 1.880000 ;
-        RECT 11.985000 1.550000 12.355000 1.890000 ;
-      LAYER mcon ;
-        RECT  8.795000 1.580000  8.965000 1.750000 ;
-        RECT 12.155000 1.580000 12.325000 1.750000 ;
       LAYER met1 ;
         RECT  8.735000 1.550000  9.025000 1.595000 ;
         RECT  8.735000 1.595000 12.385000 1.735000 ;
@@ -116,51 +110,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.675000 ;
-        RECT  2.995000  0.085000  3.325000 0.580000 ;
-        RECT  4.655000  0.085000  4.825000 0.920000 ;
-        RECT  7.315000  0.085000  7.565000 0.695000 ;
-        RECT  9.050000  0.085000  9.380000 1.020000 ;
-        RECT 11.590000  0.085000 11.920000 0.770000 ;
-        RECT 12.955000  0.085000 13.285000 0.725000 ;
-        RECT 15.090000  0.085000 15.420000 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 ;
-        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
@@ -169,139 +118,185 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 16.320000 3.415000 ;
-        RECT  0.645000 2.025000  0.975000 3.245000 ;
-        RECT  2.755000 2.670000  3.085000 3.245000 ;
-        RECT  4.380000 2.310000  4.710000 3.245000 ;
-        RECT  7.740000 2.865000  8.070000 3.245000 ;
-        RECT  8.800000 2.865000  9.130000 3.245000 ;
-        RECT 11.510000 2.465000 11.840000 3.245000 ;
-        RECT 13.545000 1.980000 13.795000 3.245000 ;
-        RECT 15.085000 1.850000 15.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 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.265000  0.565000 1.425000 ;
-      RECT  0.115000 1.425000  1.385000 1.755000 ;
-      RECT  0.115000 1.755000  0.445000 3.065000 ;
-      RECT  1.205000 2.025000  1.535000 2.895000 ;
-      RECT  1.205000 2.895000  2.575000 3.065000 ;
-      RECT  1.735000 1.970000  3.185000 2.140000 ;
-      RECT  1.735000 2.140000  2.065000 2.715000 ;
-      RECT  2.175000 0.265000  2.625000 0.630000 ;
-      RECT  2.405000 2.320000  3.615000 2.490000 ;
-      RECT  2.405000 2.490000  2.575000 2.895000 ;
-      RECT  2.455000 0.630000  2.625000 0.760000 ;
-      RECT  2.455000 0.760000  3.675000 0.930000 ;
-      RECT  3.015000 0.930000  3.185000 1.970000 ;
-      RECT  3.285000 2.490000  3.615000 3.065000 ;
-      RECT  3.505000 0.265000  4.465000 0.435000 ;
-      RECT  3.505000 0.435000  3.675000 0.760000 ;
-      RECT  3.850000 1.960000  5.140000 2.130000 ;
-      RECT  3.850000 2.130000  4.180000 3.065000 ;
-      RECT  3.865000 0.615000  4.115000 1.005000 ;
-      RECT  3.865000 1.005000  4.035000 1.960000 ;
-      RECT  4.295000 0.435000  4.465000 1.100000 ;
-      RECT  4.295000 1.100000  5.185000 1.185000 ;
-      RECT  4.295000 1.185000  5.490000 1.270000 ;
-      RECT  4.825000 1.555000  5.140000 1.960000 ;
-      RECT  4.910000 2.310000  5.240000 2.895000 ;
-      RECT  4.910000 2.895000  7.560000 3.065000 ;
-      RECT  5.015000 0.265000  6.270000 0.435000 ;
-      RECT  5.015000 0.435000  5.185000 1.100000 ;
-      RECT  5.015000 1.270000  5.490000 1.355000 ;
-      RECT  5.320000 1.355000  5.490000 1.960000 ;
-      RECT  5.320000 1.960000  5.780000 2.130000 ;
-      RECT  5.365000 0.615000  5.840000 1.005000 ;
-      RECT  5.450000 2.130000  5.780000 2.715000 ;
-      RECT  5.670000 1.005000  5.840000 1.300000 ;
-      RECT  5.670000 1.300000  6.905000 1.630000 ;
-      RECT  5.670000 1.630000  6.130000 1.780000 ;
-      RECT  5.960000 1.780000  6.130000 2.895000 ;
-      RECT  6.020000 0.435000  6.270000 0.855000 ;
-      RECT  6.310000 2.075000  7.255000 2.245000 ;
-      RECT  6.310000 2.245000  6.640000 2.715000 ;
-      RECT  6.450000 0.605000  6.780000 0.875000 ;
-      RECT  6.450000 0.875000  7.915000 1.045000 ;
-      RECT  6.450000 1.045000  6.780000 1.065000 ;
-      RECT  7.085000 1.045000  7.255000 2.075000 ;
-      RECT  7.390000 2.515000  9.985000 2.685000 ;
-      RECT  7.390000 2.685000  7.560000 2.895000 ;
-      RECT  7.435000 1.225000  8.265000 1.395000 ;
-      RECT  7.435000 1.395000  7.765000 2.085000 ;
-      RECT  7.435000 2.085000  8.600000 2.335000 ;
-      RECT  7.745000 0.265000  8.870000 0.435000 ;
-      RECT  7.745000 0.435000  7.915000 0.875000 ;
-      RECT  8.005000 1.575000  8.615000 1.905000 ;
-      RECT  8.095000 0.615000  8.520000 1.020000 ;
-      RECT  8.095000 1.020000  8.265000 1.225000 ;
-      RECT  8.445000 1.200000  9.605000 1.370000 ;
-      RECT  8.445000 1.370000  8.615000 1.575000 ;
-      RECT  8.700000 0.435000  8.870000 1.200000 ;
-      RECT  9.275000 1.370000  9.605000 1.870000 ;
-      RECT  9.815000 1.155000 10.145000 1.605000 ;
-      RECT  9.815000 1.605000 10.980000 1.775000 ;
-      RECT  9.815000 1.775000  9.985000 2.515000 ;
-      RECT 10.205000 2.075000 10.535000 2.115000 ;
-      RECT 10.205000 2.115000 12.460000 2.285000 ;
-      RECT 10.205000 2.285000 10.535000 3.065000 ;
-      RECT 10.325000 0.310000 10.655000 0.950000 ;
-      RECT 10.325000 0.950000 11.330000 1.120000 ;
-      RECT 10.715000 1.775000 10.980000 1.935000 ;
-      RECT 11.160000 1.120000 11.330000 2.115000 ;
-      RECT 11.510000 1.200000 12.810000 1.370000 ;
-      RECT 11.510000 1.370000 11.775000 1.885000 ;
-      RECT 12.165000 0.265000 12.495000 1.200000 ;
-      RECT 12.210000 2.075000 12.460000 2.115000 ;
-      RECT 12.210000 2.285000 12.460000 2.895000 ;
-      RECT 12.210000 2.895000 13.365000 3.065000 ;
-      RECT 12.640000 1.370000 12.810000 2.020000 ;
-      RECT 12.640000 2.020000 13.015000 2.715000 ;
-      RECT 12.990000 1.170000 13.365000 1.840000 ;
-      RECT 13.195000 1.840000 13.365000 2.895000 ;
-      RECT 14.300000 0.350000 14.630000 0.810000 ;
-      RECT 14.460000 0.810000 14.630000 1.490000 ;
-      RECT 14.460000 1.490000 15.725000 1.660000 ;
-      RECT 14.460000 1.660000 14.885000 2.890000 ;
-      RECT 15.395000 0.990000 15.725000 1.490000 ;
+      RECT  0.000000 -0.085000 16.320000 0.085000 ;
+      RECT  0.000000  3.245000 16.320000 3.415000 ;
+      RECT  0.115000  0.265000  0.565000 1.425000 ;
+      RECT  0.115000  1.425000  1.385000 1.755000 ;
+      RECT  0.115000  1.755000  0.445000 3.065000 ;
+      RECT  0.645000  2.025000  0.975000 3.245000 ;
+      RECT  1.055000  0.085000  1.385000 0.675000 ;
+      RECT  1.205000  2.025000  1.535000 2.895000 ;
+      RECT  1.205000  2.895000  2.575000 3.065000 ;
+      RECT  1.735000  1.970000  3.185000 2.140000 ;
+      RECT  1.735000  2.140000  2.065000 2.715000 ;
+      RECT  2.175000  0.265000  2.625000 0.630000 ;
+      RECT  2.405000  2.320000  3.615000 2.490000 ;
+      RECT  2.405000  2.490000  2.575000 2.895000 ;
+      RECT  2.455000  0.630000  2.625000 0.760000 ;
+      RECT  2.455000  0.760000  3.675000 0.930000 ;
+      RECT  2.755000  2.670000  3.085000 3.245000 ;
+      RECT  2.995000  0.085000  3.325000 0.580000 ;
+      RECT  3.015000  0.930000  3.185000 1.970000 ;
+      RECT  3.285000  2.490000  3.615000 3.065000 ;
+      RECT  3.505000  0.265000  4.465000 0.435000 ;
+      RECT  3.505000  0.435000  3.675000 0.760000 ;
+      RECT  3.850000  1.960000  5.140000 2.130000 ;
+      RECT  3.850000  2.130000  4.180000 3.065000 ;
+      RECT  3.865000  0.615000  4.115000 1.005000 ;
+      RECT  3.865000  1.005000  4.035000 1.960000 ;
+      RECT  4.295000  0.435000  4.465000 1.100000 ;
+      RECT  4.295000  1.100000  5.185000 1.185000 ;
+      RECT  4.295000  1.185000  5.490000 1.270000 ;
+      RECT  4.380000  2.310000  4.710000 3.245000 ;
+      RECT  4.655000  0.085000  4.825000 0.920000 ;
+      RECT  4.825000  1.555000  5.140000 1.960000 ;
+      RECT  4.910000  2.310000  5.240000 2.895000 ;
+      RECT  4.910000  2.895000  7.560000 3.065000 ;
+      RECT  5.015000  0.265000  6.270000 0.435000 ;
+      RECT  5.015000  0.435000  5.185000 1.100000 ;
+      RECT  5.015000  1.270000  5.490000 1.355000 ;
+      RECT  5.320000  1.355000  5.490000 1.960000 ;
+      RECT  5.320000  1.960000  5.780000 2.130000 ;
+      RECT  5.365000  0.615000  5.840000 1.005000 ;
+      RECT  5.450000  2.130000  5.780000 2.715000 ;
+      RECT  5.670000  1.005000  5.840000 1.300000 ;
+      RECT  5.670000  1.300000  6.905000 1.630000 ;
+      RECT  5.670000  1.630000  6.130000 1.780000 ;
+      RECT  5.960000  1.780000  6.130000 2.895000 ;
+      RECT  6.020000  0.435000  6.270000 0.855000 ;
+      RECT  6.310000  2.075000  7.255000 2.245000 ;
+      RECT  6.310000  2.245000  6.640000 2.715000 ;
+      RECT  6.450000  0.605000  6.780000 0.875000 ;
+      RECT  6.450000  0.875000  7.915000 1.045000 ;
+      RECT  6.450000  1.045000  6.780000 1.065000 ;
+      RECT  7.085000  1.045000  7.255000 2.075000 ;
+      RECT  7.315000  0.085000  7.565000 0.695000 ;
+      RECT  7.390000  2.515000  9.985000 2.685000 ;
+      RECT  7.390000  2.685000  7.560000 2.895000 ;
+      RECT  7.435000  1.225000  8.265000 1.395000 ;
+      RECT  7.435000  1.395000  7.765000 2.085000 ;
+      RECT  7.435000  2.085000  8.600000 2.335000 ;
+      RECT  7.740000  2.865000  8.070000 3.245000 ;
+      RECT  7.745000  0.265000  8.870000 0.435000 ;
+      RECT  7.745000  0.435000  7.915000 0.875000 ;
+      RECT  8.005000  1.575000  8.615000 1.905000 ;
+      RECT  8.095000  0.615000  8.520000 1.020000 ;
+      RECT  8.095000  1.020000  8.265000 1.225000 ;
+      RECT  8.445000  1.200000  9.605000 1.370000 ;
+      RECT  8.445000  1.370000  8.615000 1.575000 ;
+      RECT  8.700000  0.435000  8.870000 1.200000 ;
+      RECT  8.795000  1.550000  9.065000 1.880000 ;
+      RECT  8.800000  2.865000  9.130000 3.245000 ;
+      RECT  9.050000  0.085000  9.380000 1.020000 ;
+      RECT  9.275000  1.370000  9.605000 1.870000 ;
+      RECT  9.815000  1.155000 10.145000 1.605000 ;
+      RECT  9.815000  1.605000 10.980000 1.775000 ;
+      RECT  9.815000  1.775000  9.985000 2.515000 ;
+      RECT 10.205000  2.075000 10.535000 2.115000 ;
+      RECT 10.205000  2.115000 12.460000 2.285000 ;
+      RECT 10.205000  2.285000 10.535000 3.065000 ;
+      RECT 10.325000  0.310000 10.655000 0.950000 ;
+      RECT 10.325000  0.950000 11.330000 1.120000 ;
+      RECT 10.715000  1.775000 10.980000 1.935000 ;
+      RECT 11.160000  1.120000 11.330000 2.115000 ;
+      RECT 11.510000  1.200000 12.810000 1.370000 ;
+      RECT 11.510000  1.370000 11.775000 1.885000 ;
+      RECT 11.510000  2.465000 11.840000 3.245000 ;
+      RECT 11.590000  0.085000 11.920000 0.770000 ;
+      RECT 11.985000  1.550000 12.355000 1.890000 ;
+      RECT 12.165000  0.265000 12.495000 1.200000 ;
+      RECT 12.210000  2.075000 12.460000 2.115000 ;
+      RECT 12.210000  2.285000 12.460000 2.895000 ;
+      RECT 12.210000  2.895000 13.365000 3.065000 ;
+      RECT 12.640000  1.370000 12.810000 2.020000 ;
+      RECT 12.640000  2.020000 13.015000 2.715000 ;
+      RECT 12.955000  0.085000 13.285000 0.725000 ;
+      RECT 12.990000  1.170000 13.365000 1.840000 ;
+      RECT 13.195000  1.840000 13.365000 2.895000 ;
+      RECT 13.545000  1.980000 13.795000 3.245000 ;
+      RECT 14.300000  0.350000 14.630000 0.810000 ;
+      RECT 14.460000  0.810000 14.630000 1.490000 ;
+      RECT 14.460000  1.490000 15.725000 1.660000 ;
+      RECT 14.460000  1.660000 14.885000 2.890000 ;
+      RECT 15.085000  1.850000 15.415000 3.245000 ;
+      RECT 15.090000  0.085000 15.420000 0.810000 ;
+      RECT 15.395000  0.990000 15.725000 1.490000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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.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  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 ;
+      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 ;
   END
 END sky130_fd_sc_lp__sdfsbp_lp
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef
index 4cdf5a2..17b172b 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.magic.lef
@@ -92,47 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.165000  0.085000  0.495000 1.000000 ;
-        RECT  1.745000  0.085000  2.015000 1.015000 ;
-        RECT  3.950000  0.085000  4.200000 0.610000 ;
-        RECT  6.440000  0.085000  6.770000 0.665000 ;
-        RECT  7.485000  0.085000  7.655000 0.820000 ;
-        RECT  7.485000  0.820000  8.855000 1.010000 ;
-        RECT 11.495000  0.085000 11.825000 0.995000 ;
-        RECT 13.400000  0.085000 13.755000 1.125000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -141,118 +100,156 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.560000 2.350000  0.855000 3.245000 ;
-        RECT  2.375000 2.810000  2.705000 3.245000 ;
-        RECT  4.240000 2.845000  4.570000 3.245000 ;
-        RECT  6.440000 2.370000  6.720000 3.245000 ;
-        RECT  7.970000 2.155000  8.310000 3.245000 ;
-        RECT 11.090000 2.465000 11.350000 3.245000 ;
-        RECT 12.010000 2.465000 12.340000 3.245000 ;
-        RECT 13.425000 1.815000 13.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 ;
-        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.095000 2.010000  2.185000 2.180000 ;
-      RECT  0.095000 2.180000  0.390000 2.700000 ;
-      RECT  0.955000 0.685000  1.285000 1.190000 ;
-      RECT  0.955000 1.190000  2.595000 1.360000 ;
-      RECT  1.370000 2.350000  1.700000 2.450000 ;
-      RECT  1.370000 2.450000  3.055000 2.640000 ;
-      RECT  1.855000 2.180000  2.185000 2.280000 ;
-      RECT  2.215000 0.810000  3.025000 1.020000 ;
-      RECT  2.425000 1.360000  2.595000 2.450000 ;
-      RECT  2.765000 1.020000  3.025000 1.620000 ;
-      RECT  2.765000 1.620000  3.440000 1.790000 ;
-      RECT  2.885000 2.640000  3.055000 2.895000 ;
-      RECT  2.885000 2.895000  4.060000 3.065000 ;
-      RECT  3.225000 1.790000  3.440000 2.725000 ;
-      RECT  3.470000 0.280000  3.780000 0.610000 ;
-      RECT  3.610000 0.610000  3.780000 1.995000 ;
-      RECT  3.610000 1.995000  4.835000 2.185000 ;
-      RECT  3.610000 2.185000  4.025000 2.315000 ;
-      RECT  3.890000 2.495000  5.550000 2.525000 ;
-      RECT  3.890000 2.525000  4.570000 2.665000 ;
-      RECT  3.890000 2.665000  4.060000 2.895000 ;
-      RECT  4.370000 0.265000  5.550000 0.435000 ;
-      RECT  4.370000 0.435000  4.660000 0.610000 ;
-      RECT  4.400000 2.355000  5.550000 2.495000 ;
-      RECT  4.740000 2.695000  5.000000 2.865000 ;
-      RECT  4.740000 2.865000  6.250000 3.035000 ;
-      RECT  4.870000 0.605000  5.200000 0.805000 ;
-      RECT  5.030000 0.805000  5.200000 2.295000 ;
-      RECT  5.030000 2.295000  5.550000 2.355000 ;
-      RECT  5.200000 2.525000  5.550000 2.690000 ;
-      RECT  5.370000 0.435000  5.550000 1.845000 ;
-      RECT  5.720000 0.325000  5.920000 0.725000 ;
-      RECT  5.720000 0.725000  5.900000 1.245000 ;
-      RECT  5.720000 1.245000  8.695000 1.425000 ;
-      RECT  5.720000 1.425000  5.900000 2.690000 ;
-      RECT  6.080000 1.595000  6.410000 1.945000 ;
-      RECT  6.080000 1.945000  7.060000 2.115000 ;
-      RECT  6.080000 2.115000  6.250000 2.865000 ;
-      RECT  6.470000 0.835000  7.315000 1.075000 ;
-      RECT  6.620000 1.595000  7.460000 1.775000 ;
-      RECT  6.890000 2.115000  7.060000 2.840000 ;
-      RECT  6.890000 2.840000  7.800000 3.010000 ;
-      RECT  7.055000 0.660000  7.315000 0.835000 ;
-      RECT  7.230000 1.775000  7.460000 2.670000 ;
-      RECT  7.630000 1.815000  9.470000 1.985000 ;
-      RECT  7.630000 1.985000  7.800000 2.840000 ;
-      RECT  8.365000 1.425000  8.695000 1.645000 ;
-      RECT  8.490000 2.155000  8.820000 2.285000 ;
-      RECT  8.490000 2.285000 10.410000 2.455000 ;
-      RECT  8.490000 2.455000  8.820000 2.755000 ;
-      RECT  9.010000 2.625000  9.340000 2.795000 ;
-      RECT  9.010000 2.795000 10.920000 2.965000 ;
-      RECT  9.140000 1.985000  9.470000 2.105000 ;
-      RECT  9.640000 0.810000 10.280000 1.935000 ;
-      RECT  9.640000 1.935000 12.340000 2.115000 ;
-      RECT 10.080000 2.455000 10.410000 2.625000 ;
-      RECT 10.630000 2.465000 10.920000 2.795000 ;
-      RECT 10.790000 1.235000 12.770000 1.415000 ;
-      RECT 11.520000 2.115000 12.340000 2.255000 ;
-      RECT 11.520000 2.255000 11.760000 2.795000 ;
-      RECT 11.995000 0.665000 12.325000 1.235000 ;
-      RECT 12.090000 1.585000 12.340000 1.935000 ;
-      RECT 12.510000 1.415000 12.770000 2.795000 ;
-      RECT 12.950000 0.810000 13.230000 1.295000 ;
-      RECT 12.950000 1.295000 13.895000 1.625000 ;
-      RECT 12.950000 1.625000 13.255000 2.495000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.095000  2.010000  2.185000 2.180000 ;
+      RECT  0.095000  2.180000  0.390000 2.700000 ;
+      RECT  0.165000  0.085000  0.495000 1.000000 ;
+      RECT  0.560000  2.350000  0.855000 3.245000 ;
+      RECT  0.955000  0.685000  1.285000 1.190000 ;
+      RECT  0.955000  1.190000  2.595000 1.360000 ;
+      RECT  1.370000  2.350000  1.700000 2.450000 ;
+      RECT  1.370000  2.450000  3.055000 2.640000 ;
+      RECT  1.745000  0.085000  2.015000 1.015000 ;
+      RECT  1.855000  2.180000  2.185000 2.280000 ;
+      RECT  2.215000  0.810000  3.025000 1.020000 ;
+      RECT  2.375000  2.810000  2.705000 3.245000 ;
+      RECT  2.425000  1.360000  2.595000 2.450000 ;
+      RECT  2.765000  1.020000  3.025000 1.620000 ;
+      RECT  2.765000  1.620000  3.440000 1.790000 ;
+      RECT  2.885000  2.640000  3.055000 2.895000 ;
+      RECT  2.885000  2.895000  4.060000 3.065000 ;
+      RECT  3.225000  1.790000  3.440000 2.725000 ;
+      RECT  3.470000  0.280000  3.780000 0.610000 ;
+      RECT  3.610000  0.610000  3.780000 1.995000 ;
+      RECT  3.610000  1.995000  4.835000 2.185000 ;
+      RECT  3.610000  2.185000  4.025000 2.315000 ;
+      RECT  3.890000  2.495000  5.550000 2.525000 ;
+      RECT  3.890000  2.525000  4.570000 2.665000 ;
+      RECT  3.890000  2.665000  4.060000 2.895000 ;
+      RECT  3.950000  0.085000  4.200000 0.610000 ;
+      RECT  4.240000  2.845000  4.570000 3.245000 ;
+      RECT  4.370000  0.265000  5.550000 0.435000 ;
+      RECT  4.370000  0.435000  4.660000 0.610000 ;
+      RECT  4.400000  2.355000  5.550000 2.495000 ;
+      RECT  4.740000  2.695000  5.000000 2.865000 ;
+      RECT  4.740000  2.865000  6.250000 3.035000 ;
+      RECT  4.870000  0.605000  5.200000 0.805000 ;
+      RECT  5.030000  0.805000  5.200000 2.295000 ;
+      RECT  5.030000  2.295000  5.550000 2.355000 ;
+      RECT  5.200000  2.525000  5.550000 2.690000 ;
+      RECT  5.370000  0.435000  5.550000 1.845000 ;
+      RECT  5.720000  0.325000  5.920000 0.725000 ;
+      RECT  5.720000  0.725000  5.900000 1.245000 ;
+      RECT  5.720000  1.245000  8.695000 1.425000 ;
+      RECT  5.720000  1.425000  5.900000 2.690000 ;
+      RECT  6.080000  1.595000  6.410000 1.945000 ;
+      RECT  6.080000  1.945000  7.060000 2.115000 ;
+      RECT  6.080000  2.115000  6.250000 2.865000 ;
+      RECT  6.440000  0.085000  6.770000 0.665000 ;
+      RECT  6.440000  2.370000  6.720000 3.245000 ;
+      RECT  6.470000  0.835000  7.315000 1.075000 ;
+      RECT  6.620000  1.595000  7.460000 1.775000 ;
+      RECT  6.890000  2.115000  7.060000 2.840000 ;
+      RECT  6.890000  2.840000  7.800000 3.010000 ;
+      RECT  7.055000  0.660000  7.315000 0.835000 ;
+      RECT  7.230000  1.775000  7.460000 2.670000 ;
+      RECT  7.485000  0.085000  7.655000 0.820000 ;
+      RECT  7.485000  0.820000  8.855000 1.010000 ;
+      RECT  7.630000  1.815000  9.470000 1.985000 ;
+      RECT  7.630000  1.985000  7.800000 2.840000 ;
+      RECT  7.970000  2.155000  8.310000 3.245000 ;
+      RECT  8.365000  1.425000  8.695000 1.645000 ;
+      RECT  8.490000  2.155000  8.820000 2.285000 ;
+      RECT  8.490000  2.285000 10.410000 2.455000 ;
+      RECT  8.490000  2.455000  8.820000 2.755000 ;
+      RECT  9.010000  2.625000  9.340000 2.795000 ;
+      RECT  9.010000  2.795000 10.920000 2.965000 ;
+      RECT  9.140000  1.985000  9.470000 2.105000 ;
+      RECT  9.640000  0.810000 10.280000 1.935000 ;
+      RECT  9.640000  1.935000 12.340000 2.115000 ;
+      RECT 10.080000  2.455000 10.410000 2.625000 ;
+      RECT 10.630000  2.465000 10.920000 2.795000 ;
+      RECT 10.790000  1.235000 12.770000 1.415000 ;
+      RECT 11.090000  2.465000 11.350000 3.245000 ;
+      RECT 11.495000  0.085000 11.825000 0.995000 ;
+      RECT 11.520000  2.115000 12.340000 2.255000 ;
+      RECT 11.520000  2.255000 11.760000 2.795000 ;
+      RECT 11.995000  0.665000 12.325000 1.235000 ;
+      RECT 12.010000  2.465000 12.340000 3.245000 ;
+      RECT 12.090000  1.585000 12.340000 1.935000 ;
+      RECT 12.510000  1.415000 12.770000 2.795000 ;
+      RECT 12.950000  0.810000 13.230000 1.295000 ;
+      RECT 12.950000  1.295000 13.895000 1.625000 ;
+      RECT 12.950000  1.625000 13.255000 2.495000 ;
+      RECT 13.400000  0.085000 13.755000 1.125000 ;
+      RECT 13.425000  1.815000 13.865000 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 ;
+      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_lp__sdfstp_1
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef
index 51c71de..e944767 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.magic.lef
@@ -95,50 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.360000 0.085000 ;
-        RECT  0.405000  0.085000  0.735000 0.980000 ;
-        RECT  1.985000  0.085000  2.620000 0.980000 ;
-        RECT  4.400000  0.085000  4.655000 0.610000 ;
-        RECT  6.950000  0.085000  7.280000 0.555000 ;
-        RECT  7.965000  0.085000  8.135000 0.810000 ;
-        RECT  7.965000  0.810000  9.540000 1.010000 ;
-        RECT 11.885000  0.085000 12.215000 0.995000 ;
-        RECT 13.840000  0.085000 14.170000 1.095000 ;
-        RECT 14.760000  0.085000 15.090000 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 ;
-        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
@@ -147,118 +103,159 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.360000 3.415000 ;
-        RECT  0.585000 2.815000  0.915000 3.245000 ;
-        RECT  2.765000 2.300000  3.025000 3.245000 ;
-        RECT  4.500000 2.835000  4.830000 3.245000 ;
-        RECT  6.980000 2.275000  7.310000 3.245000 ;
-        RECT  8.520000 2.075000  8.745000 3.245000 ;
-        RECT 11.530000 2.275000 11.785000 3.245000 ;
-        RECT 12.440000 2.460000 12.760000 3.245000 ;
-        RECT 13.855000 1.825000 14.220000 3.245000 ;
-        RECT 14.760000 2.165000 15.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 ;
-        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.155000 2.395000  2.245000 2.645000 ;
-      RECT  0.155000 2.645000  0.415000 3.065000 ;
-      RECT  1.195000 0.650000  1.525000 1.150000 ;
-      RECT  1.195000 1.150000  2.595000 1.405000 ;
-      RECT  1.430000 2.815000  2.595000 3.075000 ;
-      RECT  2.425000 1.405000  2.595000 1.950000 ;
-      RECT  2.425000 1.950000  3.365000 2.120000 ;
-      RECT  2.425000 2.120000  2.595000 2.815000 ;
-      RECT  2.790000 0.650000  3.085000 1.550000 ;
-      RECT  2.790000 1.550000  3.785000 1.780000 ;
-      RECT  3.195000 2.120000  3.365000 2.800000 ;
-      RECT  3.195000 2.800000  4.320000 2.970000 ;
-      RECT  3.535000 1.780000  3.785000 2.630000 ;
-      RECT  3.965000 0.280000  4.230000 0.610000 ;
-      RECT  3.965000 0.610000  4.135000 1.995000 ;
-      RECT  3.965000 1.995000  5.135000 2.185000 ;
-      RECT  3.965000 2.185000  4.305000 2.325000 ;
-      RECT  4.150000 2.495000  5.740000 2.525000 ;
-      RECT  4.150000 2.525000  4.830000 2.665000 ;
-      RECT  4.150000 2.665000  4.320000 2.800000 ;
-      RECT  4.660000 2.355000  5.740000 2.495000 ;
-      RECT  4.825000 0.255000  6.070000 0.425000 ;
-      RECT  4.825000 0.425000  5.120000 0.610000 ;
-      RECT  4.855000 1.245000  5.135000 1.995000 ;
-      RECT  5.000000 2.705000  6.790000 3.035000 ;
-      RECT  5.380000 0.595000  5.710000 2.185000 ;
-      RECT  5.380000 2.185000  5.740000 2.355000 ;
-      RECT  5.880000 0.425000  6.070000 1.375000 ;
-      RECT  5.880000 1.375000  6.090000 1.705000 ;
-      RECT  5.910000 1.705000  6.090000 2.705000 ;
-      RECT  6.240000 0.325000  6.430000 0.715000 ;
-      RECT  6.260000 0.715000  6.430000 1.225000 ;
-      RECT  6.260000 1.225000  9.085000 1.415000 ;
-      RECT  6.260000 1.415000  6.450000 2.385000 ;
-      RECT  6.620000 1.935000  7.650000 2.105000 ;
-      RECT  6.620000 2.105000  6.790000 2.705000 ;
-      RECT  6.825000 0.725000  7.795000 1.055000 ;
-      RECT  6.845000 1.585000  8.010000 1.765000 ;
-      RECT  7.480000 2.105000  7.650000 2.565000 ;
-      RECT  7.480000 2.565000  8.350000 2.735000 ;
-      RECT  7.820000 1.765000  8.010000 2.385000 ;
-      RECT  8.180000 1.735000  9.910000 1.905000 ;
-      RECT  8.180000 1.905000  8.350000 2.565000 ;
-      RECT  8.915000 2.075000  9.210000 2.275000 ;
-      RECT  8.915000 2.275000 10.840000 2.445000 ;
-      RECT  8.915000 2.445000  9.210000 2.755000 ;
-      RECT  9.420000 2.615000  9.750000 2.795000 ;
-      RECT  9.420000 2.795000 11.360000 2.965000 ;
-      RECT  9.610000 1.905000  9.910000 2.095000 ;
-      RECT 10.080000 1.915000 10.700000 1.935000 ;
-      RECT 10.080000 1.935000 12.760000 2.105000 ;
-      RECT 10.095000 0.670000 10.700000 1.915000 ;
-      RECT 10.510000 2.445000 10.840000 2.615000 ;
-      RECT 11.060000 2.275000 11.360000 2.795000 ;
-      RECT 11.220000 1.235000 13.200000 1.415000 ;
-      RECT 11.955000 2.105000 12.760000 2.255000 ;
-      RECT 11.955000 2.255000 12.250000 2.550000 ;
-      RECT 12.425000 0.665000 12.755000 1.235000 ;
-      RECT 12.500000 1.585000 12.760000 1.935000 ;
-      RECT 12.930000 1.415000 13.200000 2.790000 ;
-      RECT 13.390000 0.700000 13.670000 1.315000 ;
-      RECT 13.390000 1.315000 14.335000 1.645000 ;
-      RECT 13.390000 1.645000 13.685000 2.485000 ;
+      RECT  0.000000 -0.085000 15.360000 0.085000 ;
+      RECT  0.000000  3.245000 15.360000 3.415000 ;
+      RECT  0.155000  2.395000  2.245000 2.645000 ;
+      RECT  0.155000  2.645000  0.415000 3.065000 ;
+      RECT  0.405000  0.085000  0.735000 0.980000 ;
+      RECT  0.585000  2.815000  0.915000 3.245000 ;
+      RECT  1.195000  0.650000  1.525000 1.150000 ;
+      RECT  1.195000  1.150000  2.595000 1.405000 ;
+      RECT  1.430000  2.815000  2.595000 3.075000 ;
+      RECT  1.985000  0.085000  2.620000 0.980000 ;
+      RECT  2.425000  1.405000  2.595000 1.950000 ;
+      RECT  2.425000  1.950000  3.365000 2.120000 ;
+      RECT  2.425000  2.120000  2.595000 2.815000 ;
+      RECT  2.765000  2.300000  3.025000 3.245000 ;
+      RECT  2.790000  0.650000  3.085000 1.550000 ;
+      RECT  2.790000  1.550000  3.785000 1.780000 ;
+      RECT  3.195000  2.120000  3.365000 2.800000 ;
+      RECT  3.195000  2.800000  4.320000 2.970000 ;
+      RECT  3.535000  1.780000  3.785000 2.630000 ;
+      RECT  3.965000  0.280000  4.230000 0.610000 ;
+      RECT  3.965000  0.610000  4.135000 1.995000 ;
+      RECT  3.965000  1.995000  5.135000 2.185000 ;
+      RECT  3.965000  2.185000  4.305000 2.325000 ;
+      RECT  4.150000  2.495000  5.740000 2.525000 ;
+      RECT  4.150000  2.525000  4.830000 2.665000 ;
+      RECT  4.150000  2.665000  4.320000 2.800000 ;
+      RECT  4.400000  0.085000  4.655000 0.610000 ;
+      RECT  4.500000  2.835000  4.830000 3.245000 ;
+      RECT  4.660000  2.355000  5.740000 2.495000 ;
+      RECT  4.825000  0.255000  6.070000 0.425000 ;
+      RECT  4.825000  0.425000  5.120000 0.610000 ;
+      RECT  4.855000  1.245000  5.135000 1.995000 ;
+      RECT  5.000000  2.705000  6.790000 3.035000 ;
+      RECT  5.380000  0.595000  5.710000 2.185000 ;
+      RECT  5.380000  2.185000  5.740000 2.355000 ;
+      RECT  5.880000  0.425000  6.070000 1.375000 ;
+      RECT  5.880000  1.375000  6.090000 1.705000 ;
+      RECT  5.910000  1.705000  6.090000 2.705000 ;
+      RECT  6.240000  0.325000  6.430000 0.715000 ;
+      RECT  6.260000  0.715000  6.430000 1.225000 ;
+      RECT  6.260000  1.225000  9.085000 1.415000 ;
+      RECT  6.260000  1.415000  6.450000 2.385000 ;
+      RECT  6.620000  1.935000  7.650000 2.105000 ;
+      RECT  6.620000  2.105000  6.790000 2.705000 ;
+      RECT  6.825000  0.725000  7.795000 1.055000 ;
+      RECT  6.845000  1.585000  8.010000 1.765000 ;
+      RECT  6.950000  0.085000  7.280000 0.555000 ;
+      RECT  6.980000  2.275000  7.310000 3.245000 ;
+      RECT  7.480000  2.105000  7.650000 2.565000 ;
+      RECT  7.480000  2.565000  8.350000 2.735000 ;
+      RECT  7.820000  1.765000  8.010000 2.385000 ;
+      RECT  7.965000  0.085000  8.135000 0.810000 ;
+      RECT  7.965000  0.810000  9.540000 1.010000 ;
+      RECT  8.180000  1.735000  9.910000 1.905000 ;
+      RECT  8.180000  1.905000  8.350000 2.565000 ;
+      RECT  8.520000  2.075000  8.745000 3.245000 ;
+      RECT  8.915000  2.075000  9.210000 2.275000 ;
+      RECT  8.915000  2.275000 10.840000 2.445000 ;
+      RECT  8.915000  2.445000  9.210000 2.755000 ;
+      RECT  9.420000  2.615000  9.750000 2.795000 ;
+      RECT  9.420000  2.795000 11.360000 2.965000 ;
+      RECT  9.610000  1.905000  9.910000 2.095000 ;
+      RECT 10.080000  1.915000 10.700000 1.935000 ;
+      RECT 10.080000  1.935000 12.760000 2.105000 ;
+      RECT 10.095000  0.670000 10.700000 1.915000 ;
+      RECT 10.510000  2.445000 10.840000 2.615000 ;
+      RECT 11.060000  2.275000 11.360000 2.795000 ;
+      RECT 11.220000  1.235000 13.200000 1.415000 ;
+      RECT 11.530000  2.275000 11.785000 3.245000 ;
+      RECT 11.885000  0.085000 12.215000 0.995000 ;
+      RECT 11.955000  2.105000 12.760000 2.255000 ;
+      RECT 11.955000  2.255000 12.250000 2.550000 ;
+      RECT 12.425000  0.665000 12.755000 1.235000 ;
+      RECT 12.440000  2.460000 12.760000 3.245000 ;
+      RECT 12.500000  1.585000 12.760000 1.935000 ;
+      RECT 12.930000  1.415000 13.200000 2.790000 ;
+      RECT 13.390000  0.700000 13.670000 1.315000 ;
+      RECT 13.390000  1.315000 14.335000 1.645000 ;
+      RECT 13.390000  1.645000 13.685000 2.485000 ;
+      RECT 13.840000  0.085000 14.170000 1.095000 ;
+      RECT 13.855000  1.825000 14.220000 3.245000 ;
+      RECT 14.760000  0.085000 15.090000 0.795000 ;
+      RECT 14.760000  2.165000 15.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  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  3.245000 15.205000 3.415000 ;
   END
 END sky130_fd_sc_lp__sdfstp_2
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef
index 5f32b0a..41aa885 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.magic.lef
@@ -97,52 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.840000 0.085000 ;
-        RECT  0.275000  0.085000  0.605000 0.970000 ;
-        RECT  1.855000  0.085000  2.185000 0.970000 ;
-        RECT  4.410000  0.085000  4.660000 0.660000 ;
-        RECT  6.910000  0.085000  7.240000 0.780000 ;
-        RECT  7.965000  0.085000  8.135000 0.835000 ;
-        RECT  7.965000  0.835000  9.315000 1.185000 ;
-        RECT 11.745000  0.085000 12.075000 1.005000 ;
-        RECT 13.580000  0.085000 13.910000 1.130000 ;
-        RECT 14.440000  0.085000 14.770000 0.905000 ;
-        RECT 15.300000  0.085000 15.630000 0.905000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -151,122 +105,165 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.840000 3.415000 ;
-        RECT  0.525000 2.665000  0.855000 3.245000 ;
-        RECT  2.645000 2.725000  2.855000 3.245000 ;
-        RECT  4.350000 2.795000  4.610000 3.245000 ;
-        RECT  6.890000 2.435000  7.080000 3.245000 ;
-        RECT  8.300000 2.135000  8.630000 3.245000 ;
-        RECT 11.340000 2.630000 11.550000 3.245000 ;
-        RECT 12.230000 2.460000 12.525000 3.245000 ;
-        RECT 13.650000 1.815000 13.900000 3.245000 ;
-        RECT 14.470000 2.105000 14.800000 3.245000 ;
-        RECT 15.330000 2.105000 15.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 ;
-        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.095000 2.325000  2.135000 2.495000 ;
-      RECT  0.095000 2.495000  0.355000 3.045000 ;
-      RECT  1.065000 0.640000  1.395000 1.215000 ;
-      RECT  1.065000 1.215000  2.595000 1.540000 ;
-      RECT  1.370000 2.665000  1.700000 2.905000 ;
-      RECT  1.370000 2.905000  2.475000 3.075000 ;
-      RECT  1.870000 2.495000  2.135000 2.735000 ;
-      RECT  2.305000 2.385000  3.195000 2.555000 ;
-      RECT  2.305000 2.555000  2.475000 2.905000 ;
-      RECT  2.355000 0.640000  3.025000 0.970000 ;
-      RECT  2.425000 1.540000  2.595000 2.385000 ;
-      RECT  2.765000 0.970000  3.025000 1.930000 ;
-      RECT  2.765000 1.930000  3.625000 2.100000 ;
-      RECT  3.025000 2.555000  3.195000 2.905000 ;
-      RECT  3.025000 2.905000  4.180000 3.075000 ;
-      RECT  3.365000 2.100000  3.625000 2.735000 ;
-      RECT  3.825000 2.025000  4.985000 2.285000 ;
-      RECT  3.865000 0.330000  4.240000 0.660000 ;
-      RECT  3.865000 0.660000  4.035000 1.945000 ;
-      RECT  3.865000 1.945000  4.985000 2.025000 ;
-      RECT  3.955000 2.455000  5.590000 2.625000 ;
-      RECT  3.955000 2.625000  4.180000 2.905000 ;
-      RECT  4.780000 2.795000  5.930000 2.805000 ;
-      RECT  4.780000 2.805000  6.720000 3.075000 ;
-      RECT  4.830000 0.255000  6.020000 0.425000 ;
-      RECT  4.830000 0.425000  5.070000 0.660000 ;
-      RECT  5.340000 0.595000  5.680000 0.805000 ;
-      RECT  5.340000 0.805000  5.590000 2.455000 ;
-      RECT  5.760000 1.295000  6.020000 1.965000 ;
-      RECT  5.760000 1.965000  5.930000 2.795000 ;
-      RECT  5.850000 0.425000  6.020000 1.295000 ;
-      RECT  6.100000 2.305000  6.370000 2.635000 ;
-      RECT  6.190000 0.535000  6.450000 0.865000 ;
-      RECT  6.190000 0.865000  6.370000 1.355000 ;
-      RECT  6.190000 1.355000  8.935000 1.545000 ;
-      RECT  6.190000 1.545000  6.370000 2.305000 ;
-      RECT  6.540000 2.095000  7.420000 2.265000 ;
-      RECT  6.540000 2.265000  6.720000 2.805000 ;
-      RECT  6.695000 1.715000  7.780000 1.925000 ;
-      RECT  6.785000 0.950000  7.785000 1.185000 ;
-      RECT  7.250000 2.265000  7.420000 2.785000 ;
-      RECT  7.250000 2.785000  8.120000 2.955000 ;
-      RECT  7.590000 1.925000  7.780000 2.615000 ;
-      RECT  7.595000 0.735000  7.785000 0.950000 ;
-      RECT  7.950000 1.795000  9.690000 1.965000 ;
-      RECT  7.950000 1.965000  8.120000 2.785000 ;
-      RECT  8.605000 1.545000  8.935000 1.625000 ;
-      RECT  8.800000 2.295000 10.630000 2.475000 ;
-      RECT  8.800000 2.475000  9.000000 2.635000 ;
-      RECT  9.250000 2.645000  9.580000 2.695000 ;
-      RECT  9.250000 2.695000 11.120000 3.025000 ;
-      RECT  9.360000 1.965000  9.690000 2.015000 ;
-      RECT  9.870000 0.835000 10.515000 1.935000 ;
-      RECT  9.870000 1.935000 12.465000 2.125000 ;
-      RECT 10.300000 2.475000 10.630000 2.525000 ;
-      RECT 11.025000 1.175000 12.560000 1.235000 ;
-      RECT 11.025000 1.235000 12.990000 1.415000 ;
-      RECT 11.770000 2.125000 12.465000 2.255000 ;
-      RECT 11.770000 2.255000 12.060000 2.960000 ;
-      RECT 12.110000 1.585000 12.465000 1.935000 ;
-      RECT 12.265000 0.675000 12.560000 1.175000 ;
-      RECT 12.695000 1.415000 12.990000 2.790000 ;
-      RECT 13.160000 0.255000 13.410000 1.425000 ;
-      RECT 13.160000 1.425000 14.855000 1.595000 ;
-      RECT 13.160000 1.595000 13.480000 3.075000 ;
+      RECT  0.000000 -0.085000 15.840000 0.085000 ;
+      RECT  0.000000  3.245000 15.840000 3.415000 ;
+      RECT  0.095000  2.325000  2.135000 2.495000 ;
+      RECT  0.095000  2.495000  0.355000 3.045000 ;
+      RECT  0.275000  0.085000  0.605000 0.970000 ;
+      RECT  0.525000  2.665000  0.855000 3.245000 ;
+      RECT  1.065000  0.640000  1.395000 1.215000 ;
+      RECT  1.065000  1.215000  2.595000 1.540000 ;
+      RECT  1.370000  2.665000  1.700000 2.905000 ;
+      RECT  1.370000  2.905000  2.475000 3.075000 ;
+      RECT  1.855000  0.085000  2.185000 0.970000 ;
+      RECT  1.870000  2.495000  2.135000 2.735000 ;
+      RECT  2.305000  2.385000  3.195000 2.555000 ;
+      RECT  2.305000  2.555000  2.475000 2.905000 ;
+      RECT  2.355000  0.640000  3.025000 0.970000 ;
+      RECT  2.425000  1.540000  2.595000 2.385000 ;
+      RECT  2.645000  2.725000  2.855000 3.245000 ;
+      RECT  2.765000  0.970000  3.025000 1.930000 ;
+      RECT  2.765000  1.930000  3.625000 2.100000 ;
+      RECT  3.025000  2.555000  3.195000 2.905000 ;
+      RECT  3.025000  2.905000  4.180000 3.075000 ;
+      RECT  3.365000  2.100000  3.625000 2.735000 ;
+      RECT  3.825000  2.025000  4.985000 2.285000 ;
+      RECT  3.865000  0.330000  4.240000 0.660000 ;
+      RECT  3.865000  0.660000  4.035000 1.945000 ;
+      RECT  3.865000  1.945000  4.985000 2.025000 ;
+      RECT  3.955000  2.455000  5.590000 2.625000 ;
+      RECT  3.955000  2.625000  4.180000 2.905000 ;
+      RECT  4.350000  2.795000  4.610000 3.245000 ;
+      RECT  4.410000  0.085000  4.660000 0.660000 ;
+      RECT  4.780000  2.795000  5.930000 2.805000 ;
+      RECT  4.780000  2.805000  6.720000 3.075000 ;
+      RECT  4.830000  0.255000  6.020000 0.425000 ;
+      RECT  4.830000  0.425000  5.070000 0.660000 ;
+      RECT  5.340000  0.595000  5.680000 0.805000 ;
+      RECT  5.340000  0.805000  5.590000 2.455000 ;
+      RECT  5.760000  1.295000  6.020000 1.965000 ;
+      RECT  5.760000  1.965000  5.930000 2.795000 ;
+      RECT  5.850000  0.425000  6.020000 1.295000 ;
+      RECT  6.100000  2.305000  6.370000 2.635000 ;
+      RECT  6.190000  0.535000  6.450000 0.865000 ;
+      RECT  6.190000  0.865000  6.370000 1.355000 ;
+      RECT  6.190000  1.355000  8.935000 1.545000 ;
+      RECT  6.190000  1.545000  6.370000 2.305000 ;
+      RECT  6.540000  2.095000  7.420000 2.265000 ;
+      RECT  6.540000  2.265000  6.720000 2.805000 ;
+      RECT  6.695000  1.715000  7.780000 1.925000 ;
+      RECT  6.785000  0.950000  7.785000 1.185000 ;
+      RECT  6.890000  2.435000  7.080000 3.245000 ;
+      RECT  6.910000  0.085000  7.240000 0.780000 ;
+      RECT  7.250000  2.265000  7.420000 2.785000 ;
+      RECT  7.250000  2.785000  8.120000 2.955000 ;
+      RECT  7.590000  1.925000  7.780000 2.615000 ;
+      RECT  7.595000  0.735000  7.785000 0.950000 ;
+      RECT  7.950000  1.795000  9.690000 1.965000 ;
+      RECT  7.950000  1.965000  8.120000 2.785000 ;
+      RECT  7.965000  0.085000  8.135000 0.835000 ;
+      RECT  7.965000  0.835000  9.315000 1.185000 ;
+      RECT  8.300000  2.135000  8.630000 3.245000 ;
+      RECT  8.605000  1.545000  8.935000 1.625000 ;
+      RECT  8.800000  2.295000 10.630000 2.475000 ;
+      RECT  8.800000  2.475000  9.000000 2.635000 ;
+      RECT  9.250000  2.645000  9.580000 2.695000 ;
+      RECT  9.250000  2.695000 11.120000 3.025000 ;
+      RECT  9.360000  1.965000  9.690000 2.015000 ;
+      RECT  9.870000  0.835000 10.515000 1.935000 ;
+      RECT  9.870000  1.935000 12.465000 2.125000 ;
+      RECT 10.300000  2.475000 10.630000 2.525000 ;
+      RECT 11.025000  1.175000 12.560000 1.235000 ;
+      RECT 11.025000  1.235000 12.990000 1.415000 ;
+      RECT 11.340000  2.630000 11.550000 3.245000 ;
+      RECT 11.745000  0.085000 12.075000 1.005000 ;
+      RECT 11.770000  2.125000 12.465000 2.255000 ;
+      RECT 11.770000  2.255000 12.060000 2.960000 ;
+      RECT 12.110000  1.585000 12.465000 1.935000 ;
+      RECT 12.230000  2.460000 12.525000 3.245000 ;
+      RECT 12.265000  0.675000 12.560000 1.175000 ;
+      RECT 12.695000  1.415000 12.990000 2.790000 ;
+      RECT 13.160000  0.255000 13.410000 1.425000 ;
+      RECT 13.160000  1.425000 14.855000 1.595000 ;
+      RECT 13.160000  1.595000 13.480000 3.075000 ;
+      RECT 13.580000  0.085000 13.910000 1.130000 ;
+      RECT 13.650000  1.815000 13.900000 3.245000 ;
+      RECT 14.440000  0.085000 14.770000 0.905000 ;
+      RECT 14.470000  2.105000 14.800000 3.245000 ;
+      RECT 15.300000  0.085000 15.630000 0.905000 ;
+      RECT 15.330000  2.105000 15.660000 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 ;
+      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_lp__sdfstp_4
diff --git a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef
index 9f7d98c..c510cc6 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.magic.lef
@@ -77,12 +77,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  8.795000 1.605000  9.100000 2.150000 ;
-        RECT 12.100000 1.265000 12.430000 2.150000 ;
-      LAYER mcon ;
-        RECT  8.795000 1.950000  8.965000 2.120000 ;
-        RECT 12.155000 1.950000 12.325000 2.120000 ;
       LAYER met1 ;
         RECT  8.735000 1.920000  9.025000 1.965000 ;
         RECT  8.735000 1.965000 12.385000 2.105000 ;
@@ -104,50 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.840000 0.085000 ;
-        RECT  1.055000  0.085000  1.385000 0.675000 ;
-        RECT  3.025000  0.085000  3.275000 0.580000 ;
-        RECT  4.630000  0.085000  4.800000 0.980000 ;
-        RECT  7.315000  0.085000  7.565000 0.685000 ;
-        RECT  9.085000  0.085000  9.415000 1.065000 ;
-        RECT 11.375000  0.085000 11.705000 0.735000 ;
-        RECT 13.255000  0.085000 13.585000 0.725000 ;
-        RECT 14.605000  0.085000 14.935000 0.725000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -156,136 +106,181 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.840000 3.415000 ;
-        RECT  0.645000 2.025000  0.975000 3.245000 ;
-        RECT  2.755000 2.670000  3.085000 3.245000 ;
-        RECT  4.375000 2.370000  4.705000 3.245000 ;
-        RECT  7.440000 2.855000  7.770000 3.245000 ;
-        RECT  8.790000 2.855000  9.120000 3.245000 ;
-        RECT 11.545000 2.680000 11.875000 3.245000 ;
-        RECT 13.665000 1.755000 13.915000 3.245000 ;
-        RECT 14.675000 1.850000 15.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 ;
-        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 0.265000  0.595000 0.675000 ;
-      RECT  0.115000 0.675000  0.445000 1.460000 ;
-      RECT  0.115000 1.460000  1.385000 1.790000 ;
-      RECT  0.115000 1.790000  0.445000 3.065000 ;
-      RECT  1.205000 2.010000  1.535000 2.895000 ;
-      RECT  1.205000 2.895000  2.415000 3.065000 ;
-      RECT  1.735000 1.970000  3.185000 2.140000 ;
-      RECT  1.735000 2.140000  2.065000 2.715000 ;
-      RECT  2.205000 0.265000  2.625000 0.630000 ;
-      RECT  2.245000 2.320000  3.615000 2.490000 ;
-      RECT  2.245000 2.490000  2.415000 2.895000 ;
-      RECT  2.455000 0.630000  2.625000 0.760000 ;
-      RECT  2.455000 0.760000  3.625000 0.930000 ;
-      RECT  3.015000 0.930000  3.185000 1.970000 ;
-      RECT  3.365000 2.010000  3.615000 2.320000 ;
-      RECT  3.365000 2.490000  3.615000 3.050000 ;
-      RECT  3.455000 0.265000  4.410000 0.435000 ;
-      RECT  3.455000 0.435000  3.625000 0.760000 ;
-      RECT  3.810000 0.615000  4.060000 0.980000 ;
-      RECT  3.845000 2.020000  5.100000 2.190000 ;
-      RECT  3.845000 2.190000  4.175000 3.065000 ;
-      RECT  3.865000 0.980000  4.035000 2.020000 ;
-      RECT  4.240000 0.435000  4.410000 1.160000 ;
-      RECT  4.240000 1.160000  5.450000 1.330000 ;
-      RECT  4.825000 1.555000  5.100000 2.020000 ;
-      RECT  4.905000 2.370000  5.235000 2.895000 ;
-      RECT  4.905000 2.895000  6.980000 3.065000 ;
-      RECT  4.990000 0.265000  6.150000 0.435000 ;
-      RECT  4.990000 0.435000  5.160000 1.160000 ;
-      RECT  5.280000 1.330000  5.450000 2.020000 ;
-      RECT  5.280000 2.020000  5.770000 2.190000 ;
-      RECT  5.340000 0.615000  5.800000 0.980000 ;
-      RECT  5.440000 2.190000  5.770000 2.715000 ;
-      RECT  5.630000 0.980000  5.800000 1.300000 ;
-      RECT  5.630000 1.300000  6.895000 1.630000 ;
-      RECT  5.630000 1.630000  6.120000 1.840000 ;
-      RECT  5.950000 1.840000  6.120000 2.895000 ;
-      RECT  5.980000 0.435000  6.150000 1.065000 ;
-      RECT  6.300000 2.075000  7.245000 2.245000 ;
-      RECT  6.300000 2.245000  6.630000 2.715000 ;
-      RECT  6.395000 0.605000  6.725000 0.865000 ;
-      RECT  6.395000 0.865000  7.915000 1.035000 ;
-      RECT  6.395000 1.035000  7.245000 1.065000 ;
-      RECT  6.810000 2.505000 10.020000 2.675000 ;
-      RECT  6.810000 2.675000  6.980000 2.895000 ;
-      RECT  7.075000 1.065000  7.245000 2.075000 ;
-      RECT  7.425000 1.215000  8.265000 1.385000 ;
-      RECT  7.425000 1.385000  7.755000 2.075000 ;
-      RECT  7.425000 2.075000  8.590000 2.325000 ;
-      RECT  7.745000 0.265000  8.905000 0.435000 ;
-      RECT  7.745000 0.435000  7.915000 0.865000 ;
-      RECT  7.995000 1.565000  8.615000 1.895000 ;
-      RECT  8.095000 0.615000  8.555000 1.065000 ;
-      RECT  8.095000 1.065000  8.265000 1.215000 ;
-      RECT  8.445000 1.245000  9.640000 1.415000 ;
-      RECT  8.445000 1.415000  8.615000 1.565000 ;
-      RECT  8.735000 0.435000  8.905000 1.245000 ;
-      RECT  9.310000 1.415000  9.640000 1.915000 ;
-      RECT  9.850000 1.300000 10.180000 1.460000 ;
-      RECT  9.850000 1.460000 11.055000 1.630000 ;
-      RECT  9.850000 1.630000 10.020000 2.505000 ;
-      RECT 10.085000 0.310000 10.530000 0.915000 ;
-      RECT 10.085000 0.915000 11.405000 1.085000 ;
-      RECT 10.240000 2.075000 10.570000 2.330000 ;
-      RECT 10.240000 2.330000 12.655000 2.500000 ;
-      RECT 10.240000 2.500000 10.570000 3.065000 ;
-      RECT 10.750000 1.630000 11.055000 1.935000 ;
-      RECT 11.235000 1.085000 11.405000 2.330000 ;
-      RECT 11.585000 0.915000 13.135000 1.085000 ;
-      RECT 11.585000 1.085000 11.890000 1.885000 ;
-      RECT 12.325000 2.500000 12.655000 2.895000 ;
-      RECT 12.325000 2.895000 13.485000 3.065000 ;
-      RECT 12.465000 0.265000 12.795000 0.915000 ;
-      RECT 12.885000 1.085000 13.135000 2.715000 ;
-      RECT 13.315000 0.905000 13.645000 1.575000 ;
-      RECT 13.315000 1.575000 13.485000 2.895000 ;
-      RECT 13.815000 0.265000 14.265000 0.725000 ;
-      RECT 14.095000 0.725000 14.265000 0.990000 ;
-      RECT 14.095000 0.990000 15.240000 1.160000 ;
-      RECT 14.095000 1.160000 14.475000 2.890000 ;
-      RECT 14.910000 1.160000 15.240000 1.660000 ;
+      RECT  0.000000 -0.085000 15.840000 0.085000 ;
+      RECT  0.000000  3.245000 15.840000 3.415000 ;
+      RECT  0.115000  0.265000  0.595000 0.675000 ;
+      RECT  0.115000  0.675000  0.445000 1.460000 ;
+      RECT  0.115000  1.460000  1.385000 1.790000 ;
+      RECT  0.115000  1.790000  0.445000 3.065000 ;
+      RECT  0.645000  2.025000  0.975000 3.245000 ;
+      RECT  1.055000  0.085000  1.385000 0.675000 ;
+      RECT  1.205000  2.010000  1.535000 2.895000 ;
+      RECT  1.205000  2.895000  2.415000 3.065000 ;
+      RECT  1.735000  1.970000  3.185000 2.140000 ;
+      RECT  1.735000  2.140000  2.065000 2.715000 ;
+      RECT  2.205000  0.265000  2.625000 0.630000 ;
+      RECT  2.245000  2.320000  3.615000 2.490000 ;
+      RECT  2.245000  2.490000  2.415000 2.895000 ;
+      RECT  2.455000  0.630000  2.625000 0.760000 ;
+      RECT  2.455000  0.760000  3.625000 0.930000 ;
+      RECT  2.755000  2.670000  3.085000 3.245000 ;
+      RECT  3.015000  0.930000  3.185000 1.970000 ;
+      RECT  3.025000  0.085000  3.275000 0.580000 ;
+      RECT  3.365000  2.010000  3.615000 2.320000 ;
+      RECT  3.365000  2.490000  3.615000 3.050000 ;
+      RECT  3.455000  0.265000  4.410000 0.435000 ;
+      RECT  3.455000  0.435000  3.625000 0.760000 ;
+      RECT  3.810000  0.615000  4.060000 0.980000 ;
+      RECT  3.845000  2.020000  5.100000 2.190000 ;
+      RECT  3.845000  2.190000  4.175000 3.065000 ;
+      RECT  3.865000  0.980000  4.035000 2.020000 ;
+      RECT  4.240000  0.435000  4.410000 1.160000 ;
+      RECT  4.240000  1.160000  5.450000 1.330000 ;
+      RECT  4.375000  2.370000  4.705000 3.245000 ;
+      RECT  4.630000  0.085000  4.800000 0.980000 ;
+      RECT  4.825000  1.555000  5.100000 2.020000 ;
+      RECT  4.905000  2.370000  5.235000 2.895000 ;
+      RECT  4.905000  2.895000  6.980000 3.065000 ;
+      RECT  4.990000  0.265000  6.150000 0.435000 ;
+      RECT  4.990000  0.435000  5.160000 1.160000 ;
+      RECT  5.280000  1.330000  5.450000 2.020000 ;
+      RECT  5.280000  2.020000  5.770000 2.190000 ;
+      RECT  5.340000  0.615000  5.800000 0.980000 ;
+      RECT  5.440000  2.190000  5.770000 2.715000 ;
+      RECT  5.630000  0.980000  5.800000 1.300000 ;
+      RECT  5.630000  1.300000  6.895000 1.630000 ;
+      RECT  5.630000  1.630000  6.120000 1.840000 ;
+      RECT  5.950000  1.840000  6.120000 2.895000 ;
+      RECT  5.980000  0.435000  6.150000 1.065000 ;
+      RECT  6.300000  2.075000  7.245000 2.245000 ;
+      RECT  6.300000  2.245000  6.630000 2.715000 ;
+      RECT  6.395000  0.605000  6.725000 0.865000 ;
+      RECT  6.395000  0.865000  7.915000 1.035000 ;
+      RECT  6.395000  1.035000  7.245000 1.065000 ;
+      RECT  6.810000  2.505000 10.020000 2.675000 ;
+      RECT  6.810000  2.675000  6.980000 2.895000 ;
+      RECT  7.075000  1.065000  7.245000 2.075000 ;
+      RECT  7.315000  0.085000  7.565000 0.685000 ;
+      RECT  7.425000  1.215000  8.265000 1.385000 ;
+      RECT  7.425000  1.385000  7.755000 2.075000 ;
+      RECT  7.425000  2.075000  8.590000 2.325000 ;
+      RECT  7.440000  2.855000  7.770000 3.245000 ;
+      RECT  7.745000  0.265000  8.905000 0.435000 ;
+      RECT  7.745000  0.435000  7.915000 0.865000 ;
+      RECT  7.995000  1.565000  8.615000 1.895000 ;
+      RECT  8.095000  0.615000  8.555000 1.065000 ;
+      RECT  8.095000  1.065000  8.265000 1.215000 ;
+      RECT  8.445000  1.245000  9.640000 1.415000 ;
+      RECT  8.445000  1.415000  8.615000 1.565000 ;
+      RECT  8.735000  0.435000  8.905000 1.245000 ;
+      RECT  8.790000  2.855000  9.120000 3.245000 ;
+      RECT  8.795000  1.605000  9.100000 2.150000 ;
+      RECT  9.085000  0.085000  9.415000 1.065000 ;
+      RECT  9.310000  1.415000  9.640000 1.915000 ;
+      RECT  9.850000  1.300000 10.180000 1.460000 ;
+      RECT  9.850000  1.460000 11.055000 1.630000 ;
+      RECT  9.850000  1.630000 10.020000 2.505000 ;
+      RECT 10.085000  0.310000 10.530000 0.915000 ;
+      RECT 10.085000  0.915000 11.405000 1.085000 ;
+      RECT 10.240000  2.075000 10.570000 2.330000 ;
+      RECT 10.240000  2.330000 12.655000 2.500000 ;
+      RECT 10.240000  2.500000 10.570000 3.065000 ;
+      RECT 10.750000  1.630000 11.055000 1.935000 ;
+      RECT 11.235000  1.085000 11.405000 2.330000 ;
+      RECT 11.375000  0.085000 11.705000 0.735000 ;
+      RECT 11.545000  2.680000 11.875000 3.245000 ;
+      RECT 11.585000  0.915000 13.135000 1.085000 ;
+      RECT 11.585000  1.085000 11.890000 1.885000 ;
+      RECT 12.100000  1.265000 12.430000 2.150000 ;
+      RECT 12.325000  2.500000 12.655000 2.895000 ;
+      RECT 12.325000  2.895000 13.485000 3.065000 ;
+      RECT 12.465000  0.265000 12.795000 0.915000 ;
+      RECT 12.885000  1.085000 13.135000 2.715000 ;
+      RECT 13.255000  0.085000 13.585000 0.725000 ;
+      RECT 13.315000  0.905000 13.645000 1.575000 ;
+      RECT 13.315000  1.575000 13.485000 2.895000 ;
+      RECT 13.665000  1.755000 13.915000 3.245000 ;
+      RECT 13.815000  0.265000 14.265000 0.725000 ;
+      RECT 14.095000  0.725000 14.265000 0.990000 ;
+      RECT 14.095000  0.990000 15.240000 1.160000 ;
+      RECT 14.095000  1.160000 14.475000 2.890000 ;
+      RECT 14.605000  0.085000 14.935000 0.725000 ;
+      RECT 14.675000  1.850000 15.005000 3.245000 ;
+      RECT 14.910000  1.160000 15.240000 1.660000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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.950000 12.325000 2.120000 ;
+      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_lp__sdfstp_lp
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef
index b056a9f..f18f0c2 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.magic.lef
@@ -90,46 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.165000  0.085000  0.495000 0.970000 ;
-        RECT  1.855000  0.085000  2.185000 0.835000 ;
-        RECT  4.575000  0.085000  4.905000 1.165000 ;
-        RECT  7.805000  0.085000  8.080000 0.950000 ;
-        RECT 10.680000  0.085000 11.010000 1.215000 ;
-        RECT 11.980000  0.085000 12.270000 0.805000 ;
-        RECT 13.455000  0.085000 13.675000 1.175000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -138,118 +98,155 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.525000 2.630000  0.855000 3.245000 ;
-        RECT  3.315000 2.725000  3.575000 3.245000 ;
-        RECT  4.320000 2.725000  4.650000 3.245000 ;
-        RECT  7.830000 2.685000  8.160000 3.245000 ;
-        RECT 10.980000 2.145000 11.335000 3.245000 ;
-        RECT 12.530000 2.665000 12.860000 3.245000 ;
-        RECT 13.545000 2.665000 13.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 ;
-        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.095000 2.290000  2.075000 2.460000 ;
-      RECT  0.095000 2.460000  0.355000 3.065000 ;
-      RECT  1.010000 0.640000  1.340000 1.005000 ;
-      RECT  1.010000 1.005000  1.870000 1.175000 ;
-      RECT  1.315000 2.835000  2.425000 2.895000 ;
-      RECT  1.315000 2.895000  3.145000 3.065000 ;
-      RECT  1.700000 1.175000  1.870000 1.205000 ;
-      RECT  1.700000 1.205000  2.425000 1.415000 ;
-      RECT  1.745000 2.460000  2.075000 2.665000 ;
-      RECT  2.255000 1.415000  2.425000 2.835000 ;
-      RECT  2.355000 0.640000  2.805000 0.970000 ;
-      RECT  2.595000 0.970000  2.805000 2.725000 ;
-      RECT  2.975000 1.560000  3.555000 1.730000 ;
-      RECT  2.975000 1.730000  3.145000 2.385000 ;
-      RECT  2.975000 2.385000  5.875000 2.555000 ;
-      RECT  2.975000 2.555000  3.145000 2.895000 ;
-      RECT  3.385000 0.265000  4.405000 0.435000 ;
-      RECT  3.385000 0.435000  3.555000 1.560000 ;
-      RECT  3.795000 0.615000  4.065000 1.685000 ;
-      RECT  3.795000 1.685000  6.735000 1.855000 ;
-      RECT  3.795000 1.855000  5.050000 2.215000 ;
-      RECT  4.235000 0.435000  4.405000 1.335000 ;
-      RECT  4.235000 1.335000  6.200000 1.505000 ;
-      RECT  4.940000 2.725000  5.270000 2.895000 ;
-      RECT  4.940000 2.895000  6.895000 3.065000 ;
-      RECT  5.390000 2.025000  6.385000 2.215000 ;
-      RECT  5.500000 0.255000  6.710000 0.435000 ;
-      RECT  5.500000 0.435000  5.795000 0.980000 ;
-      RECT  5.545000 2.555000  5.875000 2.725000 ;
-      RECT  5.965000 0.650000  6.200000 1.335000 ;
-      RECT  6.055000 2.215000  6.385000 2.725000 ;
-      RECT  6.380000 0.435000  6.710000 0.855000 ;
-      RECT  6.565000 1.855000  6.735000 2.345000 ;
-      RECT  6.565000 2.345000 10.240000 2.515000 ;
-      RECT  6.565000 2.685000  6.895000 2.895000 ;
-      RECT  6.905000 0.615000  7.635000 0.945000 ;
-      RECT  6.905000 0.945000  7.165000 1.975000 ;
-      RECT  6.905000 1.975000  7.635000 2.165000 ;
-      RECT  6.950000 0.255000  7.280000 0.615000 ;
-      RECT  7.405000 1.125000  7.655000 1.625000 ;
-      RECT  7.405000 1.625000  8.915000 1.795000 ;
-      RECT  8.250000 0.615000  8.915000 0.945000 ;
-      RECT  8.320000 1.795000  8.915000 2.175000 ;
-      RECT  8.690000 0.945000  8.915000 1.625000 ;
-      RECT  8.910000 2.685000  9.240000 2.725000 ;
-      RECT  8.910000 2.725000 10.810000 2.945000 ;
-      RECT  9.085000 0.670000  9.575000 1.000000 ;
-      RECT  9.085000 1.000000  9.255000 2.345000 ;
-      RECT  9.530000 1.445000 11.335000 1.615000 ;
-      RECT  9.530000 1.615000  9.860000 2.175000 ;
-      RECT  9.745000 0.795000 10.075000 1.445000 ;
-      RECT 10.020000 2.515000 10.240000 2.555000 ;
-      RECT 10.030000 1.875000 10.240000 2.345000 ;
-      RECT 10.410000 1.785000 10.740000 1.805000 ;
-      RECT 10.410000 1.805000 11.785000 1.975000 ;
-      RECT 10.480000 2.245000 10.810000 2.725000 ;
-      RECT 11.005000 1.615000 11.335000 1.635000 ;
-      RECT 11.180000 0.595000 11.685000 0.975000 ;
-      RECT 11.180000 0.975000 12.460000 1.265000 ;
-      RECT 11.505000 1.265000 12.460000 1.645000 ;
-      RECT 11.505000 1.645000 11.785000 1.805000 ;
-      RECT 11.505000 1.975000 11.785000 2.755000 ;
-      RECT 12.005000 1.815000 12.810000 2.325000 ;
-      RECT 12.005000 2.325000 13.875000 2.495000 ;
-      RECT 12.440000 0.475000 12.810000 0.805000 ;
-      RECT 12.640000 0.805000 12.810000 1.815000 ;
-      RECT 13.625000 1.345000 13.875000 2.325000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.095000  2.290000  2.075000 2.460000 ;
+      RECT  0.095000  2.460000  0.355000 3.065000 ;
+      RECT  0.165000  0.085000  0.495000 0.970000 ;
+      RECT  0.525000  2.630000  0.855000 3.245000 ;
+      RECT  1.010000  0.640000  1.340000 1.005000 ;
+      RECT  1.010000  1.005000  1.870000 1.175000 ;
+      RECT  1.315000  2.835000  2.425000 2.895000 ;
+      RECT  1.315000  2.895000  3.145000 3.065000 ;
+      RECT  1.700000  1.175000  1.870000 1.205000 ;
+      RECT  1.700000  1.205000  2.425000 1.415000 ;
+      RECT  1.745000  2.460000  2.075000 2.665000 ;
+      RECT  1.855000  0.085000  2.185000 0.835000 ;
+      RECT  2.255000  1.415000  2.425000 2.835000 ;
+      RECT  2.355000  0.640000  2.805000 0.970000 ;
+      RECT  2.595000  0.970000  2.805000 2.725000 ;
+      RECT  2.975000  1.560000  3.555000 1.730000 ;
+      RECT  2.975000  1.730000  3.145000 2.385000 ;
+      RECT  2.975000  2.385000  5.875000 2.555000 ;
+      RECT  2.975000  2.555000  3.145000 2.895000 ;
+      RECT  3.315000  2.725000  3.575000 3.245000 ;
+      RECT  3.385000  0.265000  4.405000 0.435000 ;
+      RECT  3.385000  0.435000  3.555000 1.560000 ;
+      RECT  3.795000  0.615000  4.065000 1.685000 ;
+      RECT  3.795000  1.685000  6.735000 1.855000 ;
+      RECT  3.795000  1.855000  5.050000 2.215000 ;
+      RECT  4.235000  0.435000  4.405000 1.335000 ;
+      RECT  4.235000  1.335000  6.200000 1.505000 ;
+      RECT  4.320000  2.725000  4.650000 3.245000 ;
+      RECT  4.575000  0.085000  4.905000 1.165000 ;
+      RECT  4.940000  2.725000  5.270000 2.895000 ;
+      RECT  4.940000  2.895000  6.895000 3.065000 ;
+      RECT  5.390000  2.025000  6.385000 2.215000 ;
+      RECT  5.500000  0.255000  6.710000 0.435000 ;
+      RECT  5.500000  0.435000  5.795000 0.980000 ;
+      RECT  5.545000  2.555000  5.875000 2.725000 ;
+      RECT  5.965000  0.650000  6.200000 1.335000 ;
+      RECT  6.055000  2.215000  6.385000 2.725000 ;
+      RECT  6.380000  0.435000  6.710000 0.855000 ;
+      RECT  6.565000  1.855000  6.735000 2.345000 ;
+      RECT  6.565000  2.345000 10.240000 2.515000 ;
+      RECT  6.565000  2.685000  6.895000 2.895000 ;
+      RECT  6.905000  0.615000  7.635000 0.945000 ;
+      RECT  6.905000  0.945000  7.165000 1.975000 ;
+      RECT  6.905000  1.975000  7.635000 2.165000 ;
+      RECT  6.950000  0.255000  7.280000 0.615000 ;
+      RECT  7.405000  1.125000  7.655000 1.625000 ;
+      RECT  7.405000  1.625000  8.915000 1.795000 ;
+      RECT  7.805000  0.085000  8.080000 0.950000 ;
+      RECT  7.830000  2.685000  8.160000 3.245000 ;
+      RECT  8.250000  0.615000  8.915000 0.945000 ;
+      RECT  8.320000  1.795000  8.915000 2.175000 ;
+      RECT  8.690000  0.945000  8.915000 1.625000 ;
+      RECT  8.910000  2.685000  9.240000 2.725000 ;
+      RECT  8.910000  2.725000 10.810000 2.945000 ;
+      RECT  9.085000  0.670000  9.575000 1.000000 ;
+      RECT  9.085000  1.000000  9.255000 2.345000 ;
+      RECT  9.530000  1.445000 11.335000 1.615000 ;
+      RECT  9.530000  1.615000  9.860000 2.175000 ;
+      RECT  9.745000  0.795000 10.075000 1.445000 ;
+      RECT 10.020000  2.515000 10.240000 2.555000 ;
+      RECT 10.030000  1.875000 10.240000 2.345000 ;
+      RECT 10.410000  1.785000 10.740000 1.805000 ;
+      RECT 10.410000  1.805000 11.785000 1.975000 ;
+      RECT 10.480000  2.245000 10.810000 2.725000 ;
+      RECT 10.680000  0.085000 11.010000 1.215000 ;
+      RECT 10.980000  2.145000 11.335000 3.245000 ;
+      RECT 11.005000  1.615000 11.335000 1.635000 ;
+      RECT 11.180000  0.595000 11.685000 0.975000 ;
+      RECT 11.180000  0.975000 12.460000 1.265000 ;
+      RECT 11.505000  1.265000 12.460000 1.645000 ;
+      RECT 11.505000  1.645000 11.785000 1.805000 ;
+      RECT 11.505000  1.975000 11.785000 2.755000 ;
+      RECT 11.980000  0.085000 12.270000 0.805000 ;
+      RECT 12.005000  1.815000 12.810000 2.325000 ;
+      RECT 12.005000  2.325000 13.875000 2.495000 ;
+      RECT 12.440000  0.475000 12.810000 0.805000 ;
+      RECT 12.530000  2.665000 12.860000 3.245000 ;
+      RECT 12.640000  0.805000 12.810000 1.815000 ;
+      RECT 13.455000  0.085000 13.675000 1.175000 ;
+      RECT 13.545000  2.665000 13.875000 3.245000 ;
+      RECT 13.625000  1.345000 13.875000 2.325000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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 ;
   END
 END sky130_fd_sc_lp__sdfxbp_1
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef
index 07795fe..3bc7528 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.magic.lef
@@ -92,50 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.360000 0.085000 ;
-        RECT  0.095000  0.085000  0.425000 0.975000 ;
-        RECT  1.785000  0.085000  2.115000 0.860000 ;
-        RECT  4.710000  0.085000  5.040000 1.165000 ;
-        RECT  7.930000  0.085000  8.180000 0.970000 ;
-        RECT 11.010000  0.085000 11.340000 1.210000 ;
-        RECT 12.140000  0.085000 12.470000 0.880000 ;
-        RECT 13.040000  0.085000 13.385000 1.140000 ;
-        RECT 14.045000  0.085000 14.375000 0.885000 ;
-        RECT 14.985000  0.085000 15.255000 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 ;
-        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
@@ -144,118 +100,159 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.360000 3.415000 ;
-        RECT  0.595000 2.630000  0.875000 3.245000 ;
-        RECT  3.360000 2.715000  3.610000 3.245000 ;
-        RECT  4.415000 2.715000  4.745000 3.245000 ;
-        RECT  7.810000 2.705000  8.140000 3.245000 ;
-        RECT 10.915000 2.145000 11.390000 3.245000 ;
-        RECT 12.160000 2.715000 12.490000 3.245000 ;
-        RECT 13.020000 2.715000 13.350000 3.245000 ;
-        RECT 14.125000 2.105000 14.335000 3.245000 ;
-        RECT 14.985000 1.815000 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.095000 2.290000  2.115000 2.460000 ;
-      RECT  0.095000 2.460000  0.425000 3.075000 ;
-      RECT  0.885000 0.645000  1.215000 1.030000 ;
-      RECT  0.975000 1.030000  2.465000 1.215000 ;
-      RECT  1.355000 2.630000  1.615000 2.905000 ;
-      RECT  1.355000 2.905000  3.190000 3.075000 ;
-      RECT  1.785000 2.460000  2.115000 2.735000 ;
-      RECT  2.295000 0.580000  2.850000 0.860000 ;
-      RECT  2.295000 1.215000  2.465000 2.905000 ;
-      RECT  2.635000 0.860000  2.850000 2.735000 ;
-      RECT  3.020000 2.035000  3.690000 2.375000 ;
-      RECT  3.020000 2.375000  5.935000 2.545000 ;
-      RECT  3.020000 2.545000  3.190000 2.905000 ;
-      RECT  3.520000 0.295000  4.540000 0.465000 ;
-      RECT  3.520000 0.465000  3.690000 2.035000 ;
-      RECT  3.870000 0.635000  4.200000 2.035000 ;
-      RECT  3.870000 2.035000  5.145000 2.205000 ;
-      RECT  4.370000 0.465000  4.540000 1.335000 ;
-      RECT  4.370000 1.335000  6.325000 1.505000 ;
-      RECT  4.815000 1.675000  6.795000 1.845000 ;
-      RECT  4.815000 1.845000  5.145000 2.035000 ;
-      RECT  5.035000 2.715000  5.365000 2.905000 ;
-      RECT  5.035000 2.905000  6.955000 3.075000 ;
-      RECT  5.400000 2.015000  6.445000 2.205000 ;
-      RECT  5.605000 2.545000  5.935000 2.735000 ;
-      RECT  5.635000 0.265000  6.825000 0.435000 ;
-      RECT  5.635000 0.435000  5.920000 0.965000 ;
-      RECT  6.090000 0.645000  6.325000 1.335000 ;
-      RECT  6.115000 2.205000  6.445000 2.735000 ;
-      RECT  6.495000 0.435000  6.825000 0.855000 ;
-      RECT  6.625000 1.845000  6.795000 2.365000 ;
-      RECT  6.625000 2.365000  9.875000 2.535000 ;
-      RECT  6.625000 2.705000  6.955000 2.905000 ;
-      RECT  6.995000 0.255000  7.395000 0.640000 ;
-      RECT  6.995000 0.640000  7.760000 0.970000 ;
-      RECT  6.995000 0.970000  7.175000 1.940000 ;
-      RECT  6.995000 1.940000  7.515000 2.195000 ;
-      RECT  7.590000 1.565000  9.050000 1.735000 ;
-      RECT  7.590000 1.735000  8.650000 1.770000 ;
-      RECT  8.320000 1.770000  8.650000 2.195000 ;
-      RECT  8.350000 0.640000  9.050000 0.970000 ;
-      RECT  8.720000 0.970000  9.050000 1.565000 ;
-      RECT  9.615000 0.660000  9.875000 2.365000 ;
-      RECT  9.615000 2.535000  9.875000 2.775000 ;
-      RECT 10.045000 0.660000 10.360000 1.380000 ;
-      RECT 10.045000 1.380000 11.510000 1.550000 ;
-      RECT 10.045000 1.550000 10.360000 2.775000 ;
-      RECT 10.610000 1.720000 10.940000 1.795000 ;
-      RECT 10.610000 1.795000 11.940000 1.975000 ;
-      RECT 11.180000 1.550000 11.510000 1.625000 ;
-      RECT 11.520000 0.590000 11.940000 1.210000 ;
-      RECT 11.560000 1.975000 11.940000 2.375000 ;
-      RECT 11.560000 2.375000 13.320000 2.545000 ;
-      RECT 11.560000 2.545000 11.940000 2.755000 ;
-      RECT 11.690000 1.210000 11.940000 1.795000 ;
-      RECT 12.505000 1.405000 13.855000 1.585000 ;
-      RECT 12.505000 1.585000 13.320000 1.655000 ;
-      RECT 13.150000 1.655000 13.320000 2.375000 ;
-      RECT 13.545000 1.755000 14.375000 1.925000 ;
-      RECT 13.545000 1.925000 13.875000 2.485000 ;
-      RECT 13.555000 0.325000 13.855000 1.055000 ;
-      RECT 13.555000 1.055000 14.375000 1.225000 ;
-      RECT 14.025000 1.225000 14.375000 1.755000 ;
+      RECT  0.000000 -0.085000 15.360000 0.085000 ;
+      RECT  0.000000  3.245000 15.360000 3.415000 ;
+      RECT  0.095000  0.085000  0.425000 0.975000 ;
+      RECT  0.095000  2.290000  2.115000 2.460000 ;
+      RECT  0.095000  2.460000  0.425000 3.075000 ;
+      RECT  0.595000  2.630000  0.875000 3.245000 ;
+      RECT  0.885000  0.645000  1.215000 1.030000 ;
+      RECT  0.975000  1.030000  2.465000 1.215000 ;
+      RECT  1.355000  2.630000  1.615000 2.905000 ;
+      RECT  1.355000  2.905000  3.190000 3.075000 ;
+      RECT  1.785000  0.085000  2.115000 0.860000 ;
+      RECT  1.785000  2.460000  2.115000 2.735000 ;
+      RECT  2.295000  0.580000  2.850000 0.860000 ;
+      RECT  2.295000  1.215000  2.465000 2.905000 ;
+      RECT  2.635000  0.860000  2.850000 2.735000 ;
+      RECT  3.020000  2.035000  3.690000 2.375000 ;
+      RECT  3.020000  2.375000  5.935000 2.545000 ;
+      RECT  3.020000  2.545000  3.190000 2.905000 ;
+      RECT  3.360000  2.715000  3.610000 3.245000 ;
+      RECT  3.520000  0.295000  4.540000 0.465000 ;
+      RECT  3.520000  0.465000  3.690000 2.035000 ;
+      RECT  3.870000  0.635000  4.200000 2.035000 ;
+      RECT  3.870000  2.035000  5.145000 2.205000 ;
+      RECT  4.370000  0.465000  4.540000 1.335000 ;
+      RECT  4.370000  1.335000  6.325000 1.505000 ;
+      RECT  4.415000  2.715000  4.745000 3.245000 ;
+      RECT  4.710000  0.085000  5.040000 1.165000 ;
+      RECT  4.815000  1.675000  6.795000 1.845000 ;
+      RECT  4.815000  1.845000  5.145000 2.035000 ;
+      RECT  5.035000  2.715000  5.365000 2.905000 ;
+      RECT  5.035000  2.905000  6.955000 3.075000 ;
+      RECT  5.400000  2.015000  6.445000 2.205000 ;
+      RECT  5.605000  2.545000  5.935000 2.735000 ;
+      RECT  5.635000  0.265000  6.825000 0.435000 ;
+      RECT  5.635000  0.435000  5.920000 0.965000 ;
+      RECT  6.090000  0.645000  6.325000 1.335000 ;
+      RECT  6.115000  2.205000  6.445000 2.735000 ;
+      RECT  6.495000  0.435000  6.825000 0.855000 ;
+      RECT  6.625000  1.845000  6.795000 2.365000 ;
+      RECT  6.625000  2.365000  9.875000 2.535000 ;
+      RECT  6.625000  2.705000  6.955000 2.905000 ;
+      RECT  6.995000  0.255000  7.395000 0.640000 ;
+      RECT  6.995000  0.640000  7.760000 0.970000 ;
+      RECT  6.995000  0.970000  7.175000 1.940000 ;
+      RECT  6.995000  1.940000  7.515000 2.195000 ;
+      RECT  7.590000  1.565000  9.050000 1.735000 ;
+      RECT  7.590000  1.735000  8.650000 1.770000 ;
+      RECT  7.810000  2.705000  8.140000 3.245000 ;
+      RECT  7.930000  0.085000  8.180000 0.970000 ;
+      RECT  8.320000  1.770000  8.650000 2.195000 ;
+      RECT  8.350000  0.640000  9.050000 0.970000 ;
+      RECT  8.720000  0.970000  9.050000 1.565000 ;
+      RECT  9.615000  0.660000  9.875000 2.365000 ;
+      RECT  9.615000  2.535000  9.875000 2.775000 ;
+      RECT 10.045000  0.660000 10.360000 1.380000 ;
+      RECT 10.045000  1.380000 11.510000 1.550000 ;
+      RECT 10.045000  1.550000 10.360000 2.775000 ;
+      RECT 10.610000  1.720000 10.940000 1.795000 ;
+      RECT 10.610000  1.795000 11.940000 1.975000 ;
+      RECT 10.915000  2.145000 11.390000 3.245000 ;
+      RECT 11.010000  0.085000 11.340000 1.210000 ;
+      RECT 11.180000  1.550000 11.510000 1.625000 ;
+      RECT 11.520000  0.590000 11.940000 1.210000 ;
+      RECT 11.560000  1.975000 11.940000 2.375000 ;
+      RECT 11.560000  2.375000 13.320000 2.545000 ;
+      RECT 11.560000  2.545000 11.940000 2.755000 ;
+      RECT 11.690000  1.210000 11.940000 1.795000 ;
+      RECT 12.140000  0.085000 12.470000 0.880000 ;
+      RECT 12.160000  2.715000 12.490000 3.245000 ;
+      RECT 12.505000  1.405000 13.855000 1.585000 ;
+      RECT 12.505000  1.585000 13.320000 1.655000 ;
+      RECT 13.020000  2.715000 13.350000 3.245000 ;
+      RECT 13.040000  0.085000 13.385000 1.140000 ;
+      RECT 13.150000  1.655000 13.320000 2.375000 ;
+      RECT 13.545000  1.755000 14.375000 1.925000 ;
+      RECT 13.545000  1.925000 13.875000 2.485000 ;
+      RECT 13.555000  0.325000 13.855000 1.055000 ;
+      RECT 13.555000  1.055000 14.375000 1.225000 ;
+      RECT 14.025000  1.225000 14.375000 1.755000 ;
+      RECT 14.045000  0.085000 14.375000 0.885000 ;
+      RECT 14.125000  2.105000 14.335000 3.245000 ;
+      RECT 14.985000  0.085000 15.255000 1.090000 ;
+      RECT 14.985000  1.815000 15.255000 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 ;
+      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 ;
   END
 END sky130_fd_sc_lp__sdfxbp_2
diff --git a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef
index efdd84c..e186fb6 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.magic.lef
@@ -92,49 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.840000 0.085000 ;
-        RECT  1.150000  0.085000  1.480000 0.985000 ;
-        RECT  2.950000  0.085000  3.280000 1.065000 ;
-        RECT  4.280000  0.085000  4.610000 0.650000 ;
-        RECT  7.850000  0.085000  8.180000 0.715000 ;
-        RECT 11.280000  0.085000 11.530000 0.595000 ;
-        RECT 13.300000  0.085000 13.630000 1.075000 ;
-        RECT 14.620000  0.085000 14.950000 0.725000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -143,120 +100,160 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 15.840000 3.415000 ;
-        RECT  0.630000 2.025000  0.960000 3.245000 ;
-        RECT  2.690000 2.855000  3.020000 3.245000 ;
-        RECT  4.320000 2.505000  4.650000 3.245000 ;
-        RECT  7.875000 2.015000  8.205000 3.245000 ;
-        RECT 10.750000 2.130000 11.080000 3.245000 ;
-        RECT 13.015000 1.985000 13.345000 3.245000 ;
-        RECT 14.185000 2.335000 14.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 ;
-        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.100000 0.605000  0.580000 1.165000 ;
-      RECT  0.100000 1.165000  1.685000 1.335000 ;
-      RECT  0.100000 1.335000  0.350000 3.065000 ;
-      RECT  1.160000 2.065000  1.490000 2.505000 ;
-      RECT  1.160000 2.505000  3.550000 2.675000 ;
-      RECT  1.160000 2.675000  1.490000 3.065000 ;
-      RECT  1.355000 1.335000  1.685000 1.835000 ;
-      RECT  1.690000 2.065000  2.625000 2.155000 ;
-      RECT  1.690000 2.155000  6.655000 2.325000 ;
-      RECT  2.160000 0.605000  2.625000 1.035000 ;
-      RECT  2.455000 1.035000  2.625000 2.065000 ;
-      RECT  3.220000 2.675000  3.550000 3.065000 ;
-      RECT  3.490000 0.310000  3.820000 0.830000 ;
-      RECT  3.490000 0.830000  4.910000 1.000000 ;
-      RECT  3.790000 1.715000  4.545000 1.975000 ;
-      RECT  4.375000 1.000000  4.910000 1.530000 ;
-      RECT  4.375000 1.530000  4.545000 1.715000 ;
-      RECT  4.850000 1.715000  5.660000 1.975000 ;
-      RECT  5.070000 0.310000  5.400000 0.650000 ;
-      RECT  5.230000 0.650000  5.400000 1.305000 ;
-      RECT  5.230000 1.305000  5.660000 1.715000 ;
-      RECT  5.595000 0.265000  7.605000 0.435000 ;
-      RECT  5.595000 0.435000  5.845000 1.125000 ;
-      RECT  6.025000 0.615000  7.135000 0.785000 ;
-      RECT  6.025000 0.785000  6.195000 1.745000 ;
-      RECT  6.025000 1.745000  6.655000 2.155000 ;
-      RECT  6.025000 2.325000  6.655000 2.755000 ;
-      RECT  6.375000 0.965000  6.705000 1.395000 ;
-      RECT  6.375000 1.395000  7.185000 1.565000 ;
-      RECT  6.855000 1.565000  7.185000 1.665000 ;
-      RECT  6.855000 1.665000  8.550000 1.835000 ;
-      RECT  6.855000 1.835000  7.185000 2.755000 ;
-      RECT  6.885000 0.785000  7.135000 1.215000 ;
-      RECT  7.355000 0.435000  7.605000 0.975000 ;
-      RECT  7.650000 1.155000  7.980000 1.485000 ;
-      RECT  7.810000 0.895000  9.075000 1.065000 ;
-      RECT  7.810000 1.065000  7.980000 1.155000 ;
-      RECT  8.220000 1.245000  8.550000 1.665000 ;
-      RECT  8.705000 0.265000 10.575000 0.435000 ;
-      RECT  8.705000 0.435000  9.075000 0.895000 ;
-      RECT  8.745000 1.065000  9.075000 2.755000 ;
-      RECT  9.255000 0.615000 11.100000 0.785000 ;
-      RECT  9.255000 0.785000  9.505000 1.215000 ;
-      RECT  9.565000 1.715000 10.080000 1.780000 ;
-      RECT  9.565000 1.780000 11.550000 1.950000 ;
-      RECT  9.565000 1.950000  9.895000 2.780000 ;
-      RECT  9.750000 0.965000 10.080000 1.715000 ;
-      RECT 10.565000 0.965000 11.900000 1.135000 ;
-      RECT 10.565000 1.135000 10.895000 1.600000 ;
-      RECT 10.770000 0.265000 11.100000 0.615000 ;
-      RECT 11.220000 1.315000 11.550000 1.780000 ;
-      RECT 11.360000 2.130000 11.900000 2.300000 ;
-      RECT 11.360000 2.300000 11.690000 2.825000 ;
-      RECT 11.730000 0.775000 12.320000 0.945000 ;
-      RECT 11.730000 0.945000 11.900000 0.965000 ;
-      RECT 11.730000 1.135000 11.900000 2.130000 ;
-      RECT 11.990000 0.265000 13.110000 0.435000 ;
-      RECT 11.990000 0.435000 12.320000 0.775000 ;
-      RECT 12.475000 1.475000 14.165000 1.805000 ;
-      RECT 12.940000 0.435000 13.110000 1.475000 ;
-      RECT 13.545000 1.985000 14.515000 2.155000 ;
-      RECT 13.545000 2.155000 13.875000 3.025000 ;
-      RECT 14.090000 0.615000 14.420000 0.905000 ;
-      RECT 14.090000 0.905000 14.825000 1.075000 ;
-      RECT 14.345000 1.075000 14.825000 1.575000 ;
-      RECT 14.345000 1.575000 14.515000 1.985000 ;
+      RECT  0.000000 -0.085000 15.840000 0.085000 ;
+      RECT  0.000000  3.245000 15.840000 3.415000 ;
+      RECT  0.100000  0.605000  0.580000 1.165000 ;
+      RECT  0.100000  1.165000  1.685000 1.335000 ;
+      RECT  0.100000  1.335000  0.350000 3.065000 ;
+      RECT  0.630000  2.025000  0.960000 3.245000 ;
+      RECT  1.150000  0.085000  1.480000 0.985000 ;
+      RECT  1.160000  2.065000  1.490000 2.505000 ;
+      RECT  1.160000  2.505000  3.550000 2.675000 ;
+      RECT  1.160000  2.675000  1.490000 3.065000 ;
+      RECT  1.355000  1.335000  1.685000 1.835000 ;
+      RECT  1.690000  2.065000  2.625000 2.155000 ;
+      RECT  1.690000  2.155000  6.655000 2.325000 ;
+      RECT  2.160000  0.605000  2.625000 1.035000 ;
+      RECT  2.455000  1.035000  2.625000 2.065000 ;
+      RECT  2.690000  2.855000  3.020000 3.245000 ;
+      RECT  2.950000  0.085000  3.280000 1.065000 ;
+      RECT  3.220000  2.675000  3.550000 3.065000 ;
+      RECT  3.490000  0.310000  3.820000 0.830000 ;
+      RECT  3.490000  0.830000  4.910000 1.000000 ;
+      RECT  3.790000  1.715000  4.545000 1.975000 ;
+      RECT  4.280000  0.085000  4.610000 0.650000 ;
+      RECT  4.320000  2.505000  4.650000 3.245000 ;
+      RECT  4.375000  1.000000  4.910000 1.530000 ;
+      RECT  4.375000  1.530000  4.545000 1.715000 ;
+      RECT  4.850000  1.715000  5.660000 1.975000 ;
+      RECT  5.070000  0.310000  5.400000 0.650000 ;
+      RECT  5.230000  0.650000  5.400000 1.305000 ;
+      RECT  5.230000  1.305000  5.660000 1.715000 ;
+      RECT  5.595000  0.265000  7.605000 0.435000 ;
+      RECT  5.595000  0.435000  5.845000 1.125000 ;
+      RECT  6.025000  0.615000  7.135000 0.785000 ;
+      RECT  6.025000  0.785000  6.195000 1.745000 ;
+      RECT  6.025000  1.745000  6.655000 2.155000 ;
+      RECT  6.025000  2.325000  6.655000 2.755000 ;
+      RECT  6.375000  0.965000  6.705000 1.395000 ;
+      RECT  6.375000  1.395000  7.185000 1.565000 ;
+      RECT  6.855000  1.565000  7.185000 1.665000 ;
+      RECT  6.855000  1.665000  8.550000 1.835000 ;
+      RECT  6.855000  1.835000  7.185000 2.755000 ;
+      RECT  6.885000  0.785000  7.135000 1.215000 ;
+      RECT  7.355000  0.435000  7.605000 0.975000 ;
+      RECT  7.650000  1.155000  7.980000 1.485000 ;
+      RECT  7.810000  0.895000  9.075000 1.065000 ;
+      RECT  7.810000  1.065000  7.980000 1.155000 ;
+      RECT  7.850000  0.085000  8.180000 0.715000 ;
+      RECT  7.875000  2.015000  8.205000 3.245000 ;
+      RECT  8.220000  1.245000  8.550000 1.665000 ;
+      RECT  8.705000  0.265000 10.575000 0.435000 ;
+      RECT  8.705000  0.435000  9.075000 0.895000 ;
+      RECT  8.745000  1.065000  9.075000 2.755000 ;
+      RECT  9.255000  0.615000 11.100000 0.785000 ;
+      RECT  9.255000  0.785000  9.505000 1.215000 ;
+      RECT  9.565000  1.715000 10.080000 1.780000 ;
+      RECT  9.565000  1.780000 11.550000 1.950000 ;
+      RECT  9.565000  1.950000  9.895000 2.780000 ;
+      RECT  9.750000  0.965000 10.080000 1.715000 ;
+      RECT 10.565000  0.965000 11.900000 1.135000 ;
+      RECT 10.565000  1.135000 10.895000 1.600000 ;
+      RECT 10.750000  2.130000 11.080000 3.245000 ;
+      RECT 10.770000  0.265000 11.100000 0.615000 ;
+      RECT 11.220000  1.315000 11.550000 1.780000 ;
+      RECT 11.280000  0.085000 11.530000 0.595000 ;
+      RECT 11.360000  2.130000 11.900000 2.300000 ;
+      RECT 11.360000  2.300000 11.690000 2.825000 ;
+      RECT 11.730000  0.775000 12.320000 0.945000 ;
+      RECT 11.730000  0.945000 11.900000 0.965000 ;
+      RECT 11.730000  1.135000 11.900000 2.130000 ;
+      RECT 11.990000  0.265000 13.110000 0.435000 ;
+      RECT 11.990000  0.435000 12.320000 0.775000 ;
+      RECT 12.475000  1.475000 14.165000 1.805000 ;
+      RECT 12.940000  0.435000 13.110000 1.475000 ;
+      RECT 13.015000  1.985000 13.345000 3.245000 ;
+      RECT 13.300000  0.085000 13.630000 1.075000 ;
+      RECT 13.545000  1.985000 14.515000 2.155000 ;
+      RECT 13.545000  2.155000 13.875000 3.025000 ;
+      RECT 14.090000  0.615000 14.420000 0.905000 ;
+      RECT 14.090000  0.905000 14.825000 1.075000 ;
+      RECT 14.185000  2.335000 14.515000 3.245000 ;
+      RECT 14.345000  1.075000 14.825000 1.575000 ;
+      RECT 14.345000  1.575000 14.515000 1.985000 ;
+      RECT 14.620000  0.085000 14.950000 0.725000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  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_lp__sdfxbp_lp
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef
index d902365..634973a 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.magic.lef
@@ -79,37 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.560000 0.085000 ;
-        RECT 0.840000  0.085000  1.050000 0.925000 ;
-        RECT 2.655000  0.085000  2.945000 0.935000 ;
-        RECT 3.660000  0.085000  3.920000 0.545000 ;
-        RECT 6.225000  0.085000  6.555000 0.635000 ;
-        RECT 8.810000  0.085000  9.020000 0.975000 ;
-        RECT 9.740000  0.085000 10.025000 1.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -118,107 +87,134 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.560000 3.415000 ;
-        RECT 0.950000 2.640000  1.245000 3.245000 ;
-        RECT 2.755000 2.660000  2.945000 3.245000 ;
-        RECT 3.635000 2.725000  3.895000 3.245000 ;
-        RECT 6.330000 2.975000  6.660000 3.245000 ;
-        RECT 8.755000 2.345000  9.085000 3.245000 ;
-        RECT 9.740000 1.815000  9.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 ;
-        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.635000 0.620000 0.965000 ;
-      RECT 0.095000 0.965000 0.265000 1.655000 ;
-      RECT 0.095000 1.655000 1.235000 1.985000 ;
-      RECT 0.450000 1.985000 1.235000 2.300000 ;
-      RECT 0.450000 2.300000 2.235000 2.470000 ;
-      RECT 0.450000 2.470000 0.780000 3.045000 ;
-      RECT 1.750000 2.640000 2.585000 2.970000 ;
-      RECT 1.945000 0.685000 2.195000 1.155000 ;
-      RECT 1.945000 1.155000 3.075000 1.325000 ;
-      RECT 1.995000 1.965000 2.235000 2.300000 ;
-      RECT 2.415000 2.035000 3.075000 2.205000 ;
-      RECT 2.415000 2.205000 2.725000 2.490000 ;
-      RECT 2.415000 2.490000 2.585000 2.640000 ;
-      RECT 2.905000 1.325000 3.075000 2.035000 ;
-      RECT 3.115000 0.715000 4.235000 0.985000 ;
-      RECT 3.115000 2.385000 4.235000 2.555000 ;
-      RECT 3.115000 2.555000 3.445000 3.045000 ;
-      RECT 3.865000 0.985000 4.235000 2.385000 ;
-      RECT 4.065000 2.555000 4.235000 2.895000 ;
-      RECT 4.065000 2.895000 5.930000 3.065000 ;
-      RECT 4.090000 0.265000 5.850000 0.485000 ;
-      RECT 4.405000 0.485000 4.595000 2.725000 ;
-      RECT 4.765000 0.665000 5.095000 0.995000 ;
-      RECT 4.765000 0.995000 4.935000 2.225000 ;
-      RECT 4.765000 2.225000 5.170000 2.555000 ;
-      RECT 5.115000 1.175000 6.820000 1.345000 ;
-      RECT 5.115000 1.345000 5.285000 1.875000 ;
-      RECT 5.115000 1.875000 5.590000 2.045000 ;
-      RECT 5.265000 0.655000 5.510000 1.175000 ;
-      RECT 5.340000 2.045000 5.590000 2.615000 ;
-      RECT 5.465000 1.515000 5.930000 1.705000 ;
-      RECT 5.680000 0.485000 5.850000 0.815000 ;
-      RECT 5.680000 0.815000 6.905000 0.985000 ;
-      RECT 5.760000 1.705000 5.930000 2.635000 ;
-      RECT 5.760000 2.635000 7.520000 2.805000 ;
-      RECT 5.760000 2.805000 5.930000 2.895000 ;
-      RECT 6.100000 1.685000 7.170000 2.465000 ;
-      RECT 6.650000 1.345000 6.820000 1.505000 ;
-      RECT 6.735000 0.385000 7.765000 0.555000 ;
-      RECT 6.735000 0.555000 6.905000 0.815000 ;
-      RECT 7.000000 1.165000 7.265000 1.335000 ;
-      RECT 7.000000 1.335000 7.170000 1.685000 ;
-      RECT 7.075000 0.735000 7.265000 1.165000 ;
-      RECT 7.350000 1.755000 7.605000 2.085000 ;
-      RECT 7.350000 2.085000 7.520000 2.635000 ;
-      RECT 7.435000 0.555000 7.765000 1.125000 ;
-      RECT 7.435000 1.295000 8.250000 1.465000 ;
-      RECT 7.435000 1.465000 7.605000 1.755000 ;
-      RECT 7.690000 2.515000 7.955000 2.845000 ;
-      RECT 7.785000 1.645000 9.220000 1.815000 ;
-      RECT 7.785000 1.815000 7.955000 2.515000 ;
-      RECT 7.945000 0.345000 8.590000 0.675000 ;
-      RECT 7.990000 0.855000 8.250000 1.295000 ;
-      RECT 8.285000 1.985000 9.570000 2.175000 ;
-      RECT 8.420000 0.675000 8.590000 1.305000 ;
-      RECT 8.420000 1.305000 9.220000 1.645000 ;
-      RECT 9.240000 0.315000 9.570000 0.985000 ;
-      RECT 9.265000 2.175000 9.570000 2.910000 ;
-      RECT 9.400000 0.985000 9.570000 1.415000 ;
-      RECT 9.400000 1.415000 9.780000 1.645000 ;
-      RECT 9.400000 1.645000 9.570000 1.985000 ;
+      RECT 0.000000 -0.085000 10.560000 0.085000 ;
+      RECT 0.000000  3.245000 10.560000 3.415000 ;
+      RECT 0.095000  0.635000  0.620000 0.965000 ;
+      RECT 0.095000  0.965000  0.265000 1.655000 ;
+      RECT 0.095000  1.655000  1.235000 1.985000 ;
+      RECT 0.450000  1.985000  1.235000 2.300000 ;
+      RECT 0.450000  2.300000  2.235000 2.470000 ;
+      RECT 0.450000  2.470000  0.780000 3.045000 ;
+      RECT 0.840000  0.085000  1.050000 0.925000 ;
+      RECT 0.950000  2.640000  1.245000 3.245000 ;
+      RECT 1.750000  2.640000  2.585000 2.970000 ;
+      RECT 1.945000  0.685000  2.195000 1.155000 ;
+      RECT 1.945000  1.155000  3.075000 1.325000 ;
+      RECT 1.995000  1.965000  2.235000 2.300000 ;
+      RECT 2.415000  2.035000  3.075000 2.205000 ;
+      RECT 2.415000  2.205000  2.725000 2.490000 ;
+      RECT 2.415000  2.490000  2.585000 2.640000 ;
+      RECT 2.655000  0.085000  2.945000 0.935000 ;
+      RECT 2.755000  2.660000  2.945000 3.245000 ;
+      RECT 2.905000  1.325000  3.075000 2.035000 ;
+      RECT 3.115000  0.715000  4.235000 0.985000 ;
+      RECT 3.115000  2.385000  4.235000 2.555000 ;
+      RECT 3.115000  2.555000  3.445000 3.045000 ;
+      RECT 3.635000  2.725000  3.895000 3.245000 ;
+      RECT 3.660000  0.085000  3.920000 0.545000 ;
+      RECT 3.865000  0.985000  4.235000 2.385000 ;
+      RECT 4.065000  2.555000  4.235000 2.895000 ;
+      RECT 4.065000  2.895000  5.930000 3.065000 ;
+      RECT 4.090000  0.265000  5.850000 0.485000 ;
+      RECT 4.405000  0.485000  4.595000 2.725000 ;
+      RECT 4.765000  0.665000  5.095000 0.995000 ;
+      RECT 4.765000  0.995000  4.935000 2.225000 ;
+      RECT 4.765000  2.225000  5.170000 2.555000 ;
+      RECT 5.115000  1.175000  6.820000 1.345000 ;
+      RECT 5.115000  1.345000  5.285000 1.875000 ;
+      RECT 5.115000  1.875000  5.590000 2.045000 ;
+      RECT 5.265000  0.655000  5.510000 1.175000 ;
+      RECT 5.340000  2.045000  5.590000 2.615000 ;
+      RECT 5.465000  1.515000  5.930000 1.705000 ;
+      RECT 5.680000  0.485000  5.850000 0.815000 ;
+      RECT 5.680000  0.815000  6.905000 0.985000 ;
+      RECT 5.760000  1.705000  5.930000 2.635000 ;
+      RECT 5.760000  2.635000  7.520000 2.805000 ;
+      RECT 5.760000  2.805000  5.930000 2.895000 ;
+      RECT 6.100000  1.685000  7.170000 2.465000 ;
+      RECT 6.225000  0.085000  6.555000 0.635000 ;
+      RECT 6.330000  2.975000  6.660000 3.245000 ;
+      RECT 6.650000  1.345000  6.820000 1.505000 ;
+      RECT 6.735000  0.385000  7.765000 0.555000 ;
+      RECT 6.735000  0.555000  6.905000 0.815000 ;
+      RECT 7.000000  1.165000  7.265000 1.335000 ;
+      RECT 7.000000  1.335000  7.170000 1.685000 ;
+      RECT 7.075000  0.735000  7.265000 1.165000 ;
+      RECT 7.350000  1.755000  7.605000 2.085000 ;
+      RECT 7.350000  2.085000  7.520000 2.635000 ;
+      RECT 7.435000  0.555000  7.765000 1.125000 ;
+      RECT 7.435000  1.295000  8.250000 1.465000 ;
+      RECT 7.435000  1.465000  7.605000 1.755000 ;
+      RECT 7.690000  2.515000  7.955000 2.845000 ;
+      RECT 7.785000  1.645000  9.220000 1.815000 ;
+      RECT 7.785000  1.815000  7.955000 2.515000 ;
+      RECT 7.945000  0.345000  8.590000 0.675000 ;
+      RECT 7.990000  0.855000  8.250000 1.295000 ;
+      RECT 8.285000  1.985000  9.570000 2.175000 ;
+      RECT 8.420000  0.675000  8.590000 1.305000 ;
+      RECT 8.420000  1.305000  9.220000 1.645000 ;
+      RECT 8.755000  2.345000  9.085000 3.245000 ;
+      RECT 8.810000  0.085000  9.020000 0.975000 ;
+      RECT 9.240000  0.315000  9.570000 0.985000 ;
+      RECT 9.265000  2.175000  9.570000 2.910000 ;
+      RECT 9.400000  0.985000  9.570000 1.415000 ;
+      RECT 9.400000  1.415000  9.780000 1.645000 ;
+      RECT 9.400000  1.645000  9.570000 1.985000 ;
+      RECT 9.740000  0.085000 10.025000 1.245000 ;
+      RECT 9.740000  1.815000  9.975000 3.245000 ;
     LAYER mcon ;
-      RECT 2.555000 2.320000 2.725000 2.490000 ;
-      RECT 4.955000 2.320000 5.125000 2.490000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  2.320000  2.725000 2.490000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.320000  5.125000 2.490000 ;
+      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 2.495000 2.290000 2.785000 2.335000 ;
       RECT 2.495000 2.335000 5.185000 2.475000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef
index 0cdaa85..012d178 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.magic.lef
@@ -79,39 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.725000  0.085000  0.945000 0.970000 ;
-        RECT  2.695000  0.085000  3.025000 0.945000 ;
-        RECT  3.695000  0.085000  4.025000 0.530000 ;
-        RECT  6.205000  0.085000  6.545000 0.555000 ;
-        RECT  8.830000  0.085000  9.040000 0.885000 ;
-        RECT  9.745000  0.085000 10.055000 1.175000 ;
-        RECT 10.635000  0.085000 10.935000 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 ;
-        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
@@ -120,117 +87,146 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 11.040000 3.415000 ;
-        RECT  0.780000 2.640000  1.110000 3.245000 ;
-        RECT  2.625000 2.690000  2.845000 3.245000 ;
-        RECT  3.555000 2.640000  3.805000 3.245000 ;
-        RECT  6.095000 2.455000  6.375000 3.245000 ;
-        RECT  8.450000 2.325000  9.125000 3.245000 ;
-        RECT  9.745000 1.845000 10.055000 3.245000 ;
-        RECT 10.635000 1.815000 10.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 ;
-        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.110000 0.640000  0.555000 0.970000 ;
-      RECT 0.110000 0.970000  0.280000 2.300000 ;
-      RECT 0.110000 2.300000  1.170000 2.470000 ;
-      RECT 0.315000 2.470000  0.610000 3.075000 ;
-      RECT 1.000000 1.635000  1.250000 1.945000 ;
-      RECT 1.000000 1.945000  2.115000 2.275000 ;
-      RECT 1.000000 2.275000  1.170000 2.300000 ;
-      RECT 1.615000 2.445000  2.725000 2.520000 ;
-      RECT 1.615000 2.520000  2.455000 2.645000 ;
-      RECT 1.615000 2.645000  1.945000 3.075000 ;
-      RECT 1.935000 0.635000  2.135000 1.115000 ;
-      RECT 1.935000 1.115000  3.075000 1.285000 ;
-      RECT 2.285000 1.950000  3.075000 2.120000 ;
-      RECT 2.285000 2.120000  2.725000 2.445000 ;
-      RECT 2.905000 1.285000  3.075000 1.950000 ;
-      RECT 3.025000 2.300000  4.145000 2.470000 ;
-      RECT 3.025000 2.470000  3.355000 3.025000 ;
-      RECT 3.225000 0.700000  3.905000 0.860000 ;
-      RECT 3.225000 0.860000  4.145000 1.030000 ;
-      RECT 3.905000 1.030000  4.145000 2.300000 ;
-      RECT 3.975000 2.470000  4.145000 2.835000 ;
-      RECT 3.975000 2.835000  5.845000 3.005000 ;
-      RECT 4.195000 0.265000  5.965000 0.485000 ;
-      RECT 4.195000 0.485000  4.535000 0.610000 ;
-      RECT 4.315000 0.610000  4.535000 1.175000 ;
-      RECT 4.315000 1.175000  4.625000 2.665000 ;
-      RECT 4.760000 0.655000  5.090000 0.905000 ;
-      RECT 4.760000 0.905000  4.965000 0.955000 ;
-      RECT 4.795000 0.955000  4.965000 2.275000 ;
-      RECT 4.795000 2.275000  5.135000 2.590000 ;
-      RECT 5.145000 1.075000  6.935000 1.245000 ;
-      RECT 5.145000 1.245000  5.315000 1.935000 ;
-      RECT 5.145000 1.935000  5.495000 2.105000 ;
-      RECT 5.270000 0.670000  5.490000 1.075000 ;
-      RECT 5.305000 2.105000  5.495000 2.630000 ;
-      RECT 5.485000 1.425000  5.845000 1.755000 ;
-      RECT 5.660000 0.485000  5.965000 0.725000 ;
-      RECT 5.660000 0.725000  6.935000 0.895000 ;
-      RECT 5.675000 1.755000  5.845000 2.115000 ;
-      RECT 5.675000 2.115000  6.715000 2.285000 ;
-      RECT 5.675000 2.285000  5.845000 2.835000 ;
-      RECT 6.025000 1.425000  6.355000 1.495000 ;
-      RECT 6.025000 1.495000  7.295000 1.665000 ;
-      RECT 6.025000 1.665000  7.125000 1.945000 ;
-      RECT 6.545000 2.285000  6.715000 2.745000 ;
-      RECT 6.545000 2.745000  7.465000 2.915000 ;
-      RECT 6.605000 1.245000  6.935000 1.325000 ;
-      RECT 6.715000 0.255000  7.795000 0.425000 ;
-      RECT 6.715000 0.425000  6.935000 0.725000 ;
-      RECT 6.885000 1.945000  7.125000 2.575000 ;
-      RECT 7.105000 0.595000  7.295000 1.495000 ;
-      RECT 7.295000 1.835000  7.635000 2.065000 ;
-      RECT 7.295000 2.065000  7.465000 2.745000 ;
-      RECT 7.465000 0.425000  7.795000 1.095000 ;
-      RECT 7.465000 1.275000  8.320000 1.445000 ;
-      RECT 7.465000 1.445000  7.635000 1.835000 ;
-      RECT 7.635000 2.235000  7.985000 3.075000 ;
-      RECT 7.815000 1.635000  9.210000 1.805000 ;
-      RECT 7.815000 1.805000  7.985000 2.235000 ;
-      RECT 7.975000 0.335000  8.660000 0.665000 ;
-      RECT 8.020000 0.845000  8.320000 1.275000 ;
-      RECT 8.325000 1.975000  9.550000 2.155000 ;
-      RECT 8.490000 0.665000  8.660000 1.135000 ;
-      RECT 8.490000 1.135000  9.210000 1.635000 ;
-      RECT 9.210000 0.255000  9.550000 0.895000 ;
-      RECT 9.295000 2.155000  9.550000 2.905000 ;
-      RECT 9.380000 0.895000  9.550000 1.345000 ;
-      RECT 9.380000 1.345000 10.055000 1.675000 ;
-      RECT 9.380000 1.675000  9.550000 1.975000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.110000  0.640000  0.555000 0.970000 ;
+      RECT  0.110000  0.970000  0.280000 2.300000 ;
+      RECT  0.110000  2.300000  1.170000 2.470000 ;
+      RECT  0.315000  2.470000  0.610000 3.075000 ;
+      RECT  0.725000  0.085000  0.945000 0.970000 ;
+      RECT  0.780000  2.640000  1.110000 3.245000 ;
+      RECT  1.000000  1.635000  1.250000 1.945000 ;
+      RECT  1.000000  1.945000  2.115000 2.275000 ;
+      RECT  1.000000  2.275000  1.170000 2.300000 ;
+      RECT  1.615000  2.445000  2.725000 2.520000 ;
+      RECT  1.615000  2.520000  2.455000 2.645000 ;
+      RECT  1.615000  2.645000  1.945000 3.075000 ;
+      RECT  1.935000  0.635000  2.135000 1.115000 ;
+      RECT  1.935000  1.115000  3.075000 1.285000 ;
+      RECT  2.285000  1.950000  3.075000 2.120000 ;
+      RECT  2.285000  2.120000  2.725000 2.445000 ;
+      RECT  2.625000  2.690000  2.845000 3.245000 ;
+      RECT  2.695000  0.085000  3.025000 0.945000 ;
+      RECT  2.905000  1.285000  3.075000 1.950000 ;
+      RECT  3.025000  2.300000  4.145000 2.470000 ;
+      RECT  3.025000  2.470000  3.355000 3.025000 ;
+      RECT  3.225000  0.700000  3.905000 0.860000 ;
+      RECT  3.225000  0.860000  4.145000 1.030000 ;
+      RECT  3.555000  2.640000  3.805000 3.245000 ;
+      RECT  3.695000  0.085000  4.025000 0.530000 ;
+      RECT  3.905000  1.030000  4.145000 2.300000 ;
+      RECT  3.975000  2.470000  4.145000 2.835000 ;
+      RECT  3.975000  2.835000  5.845000 3.005000 ;
+      RECT  4.195000  0.265000  5.965000 0.485000 ;
+      RECT  4.195000  0.485000  4.535000 0.610000 ;
+      RECT  4.315000  0.610000  4.535000 1.175000 ;
+      RECT  4.315000  1.175000  4.625000 2.665000 ;
+      RECT  4.760000  0.655000  5.090000 0.905000 ;
+      RECT  4.760000  0.905000  4.965000 0.955000 ;
+      RECT  4.795000  0.955000  4.965000 2.275000 ;
+      RECT  4.795000  2.275000  5.135000 2.590000 ;
+      RECT  5.145000  1.075000  6.935000 1.245000 ;
+      RECT  5.145000  1.245000  5.315000 1.935000 ;
+      RECT  5.145000  1.935000  5.495000 2.105000 ;
+      RECT  5.270000  0.670000  5.490000 1.075000 ;
+      RECT  5.305000  2.105000  5.495000 2.630000 ;
+      RECT  5.485000  1.425000  5.845000 1.755000 ;
+      RECT  5.660000  0.485000  5.965000 0.725000 ;
+      RECT  5.660000  0.725000  6.935000 0.895000 ;
+      RECT  5.675000  1.755000  5.845000 2.115000 ;
+      RECT  5.675000  2.115000  6.715000 2.285000 ;
+      RECT  5.675000  2.285000  5.845000 2.835000 ;
+      RECT  6.025000  1.425000  6.355000 1.495000 ;
+      RECT  6.025000  1.495000  7.295000 1.665000 ;
+      RECT  6.025000  1.665000  7.125000 1.945000 ;
+      RECT  6.095000  2.455000  6.375000 3.245000 ;
+      RECT  6.205000  0.085000  6.545000 0.555000 ;
+      RECT  6.545000  2.285000  6.715000 2.745000 ;
+      RECT  6.545000  2.745000  7.465000 2.915000 ;
+      RECT  6.605000  1.245000  6.935000 1.325000 ;
+      RECT  6.715000  0.255000  7.795000 0.425000 ;
+      RECT  6.715000  0.425000  6.935000 0.725000 ;
+      RECT  6.885000  1.945000  7.125000 2.575000 ;
+      RECT  7.105000  0.595000  7.295000 1.495000 ;
+      RECT  7.295000  1.835000  7.635000 2.065000 ;
+      RECT  7.295000  2.065000  7.465000 2.745000 ;
+      RECT  7.465000  0.425000  7.795000 1.095000 ;
+      RECT  7.465000  1.275000  8.320000 1.445000 ;
+      RECT  7.465000  1.445000  7.635000 1.835000 ;
+      RECT  7.635000  2.235000  7.985000 3.075000 ;
+      RECT  7.815000  1.635000  9.210000 1.805000 ;
+      RECT  7.815000  1.805000  7.985000 2.235000 ;
+      RECT  7.975000  0.335000  8.660000 0.665000 ;
+      RECT  8.020000  0.845000  8.320000 1.275000 ;
+      RECT  8.325000  1.975000  9.550000 2.155000 ;
+      RECT  8.450000  2.325000  9.125000 3.245000 ;
+      RECT  8.490000  0.665000  8.660000 1.135000 ;
+      RECT  8.490000  1.135000  9.210000 1.635000 ;
+      RECT  8.830000  0.085000  9.040000 0.885000 ;
+      RECT  9.210000  0.255000  9.550000 0.895000 ;
+      RECT  9.295000  2.155000  9.550000 2.905000 ;
+      RECT  9.380000  0.895000  9.550000 1.345000 ;
+      RECT  9.380000  1.345000 10.055000 1.675000 ;
+      RECT  9.380000  1.675000  9.550000 1.975000 ;
+      RECT  9.745000  0.085000 10.055000 1.175000 ;
+      RECT  9.745000  1.845000 10.055000 3.245000 ;
+      RECT 10.635000  0.085000 10.935000 1.255000 ;
+      RECT 10.635000  1.815000 10.935000 3.245000 ;
     LAYER mcon ;
-      RECT 2.555000 2.320000 2.725000 2.490000 ;
-      RECT 4.955000 2.320000 5.125000 2.490000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  2.320000  2.725000 2.490000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.320000  5.125000 2.490000 ;
+      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 ;
     LAYER met1 ;
       RECT 2.495000 2.290000 2.785000 2.335000 ;
       RECT 2.495000 2.335000 5.185000 2.475000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef
index a0b38aa..5841dd5 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.magic.lef
@@ -86,42 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.845000  0.085000  1.175000 0.975000 ;
-        RECT  2.750000  0.085000  3.080000 0.875000 ;
-        RECT  3.795000  0.085000  4.125000 0.615000 ;
-        RECT  6.255000  0.085000  6.585000 0.385000 ;
-        RECT  8.855000  0.085000  9.175000 1.015000 ;
-        RECT  9.845000  0.085000 10.135000 1.115000 ;
-        RECT 10.705000  0.085000 11.035000 0.775000 ;
-        RECT 11.565000  0.085000 11.895000 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 ;
-        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
@@ -130,119 +94,151 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  1.025000 2.640000  1.355000 3.245000 ;
-        RECT  2.820000 2.660000  3.010000 3.245000 ;
-        RECT  3.700000 2.640000  3.960000 3.245000 ;
-        RECT  6.410000 2.975000  6.740000 3.245000 ;
-        RECT  8.495000 2.580000  9.225000 3.245000 ;
-        RECT  8.895000 2.405000  9.225000 2.580000 ;
-        RECT  9.845000 1.815000 10.140000 3.245000 ;
-        RECT 10.705000 1.995000 11.035000 3.245000 ;
-        RECT 11.565000 2.095000 11.895000 3.245000 ;
-      LAYER mcon ;
-        RECT  0.155000 3.245000  0.325000 3.415000 ;
-        RECT  0.635000 3.245000  0.805000 3.415000 ;
-        RECT  1.115000 3.245000  1.285000 3.415000 ;
-        RECT  1.595000 3.245000  1.765000 3.415000 ;
-        RECT  2.075000 3.245000  2.245000 3.415000 ;
-        RECT  2.555000 3.245000  2.725000 3.415000 ;
-        RECT  3.035000 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.130000 0.635000  0.675000 0.965000 ;
-      RECT 0.130000 0.965000  0.310000 1.655000 ;
-      RECT 0.130000 1.655000  1.270000 2.300000 ;
-      RECT 0.130000 2.300000  2.310000 2.470000 ;
-      RECT 0.130000 2.470000  0.855000 2.945000 ;
-      RECT 1.815000 2.640000  2.650000 2.970000 ;
-      RECT 1.945000 0.725000  2.135000 1.045000 ;
-      RECT 1.945000 1.045000  3.075000 1.215000 ;
-      RECT 2.050000 1.965000  2.310000 2.300000 ;
-      RECT 2.480000 2.155000  3.075000 2.335000 ;
-      RECT 2.480000 2.335000  3.010000 2.490000 ;
-      RECT 2.480000 2.490000  2.650000 2.640000 ;
-      RECT 2.905000 1.215000  3.075000 2.155000 ;
-      RECT 3.180000 2.505000  3.510000 3.075000 ;
-      RECT 3.275000 0.785000  4.300000 1.020000 ;
-      RECT 3.340000 2.300000  4.300000 2.470000 ;
-      RECT 3.340000 2.470000  3.510000 2.505000 ;
-      RECT 3.865000 1.020000  4.300000 2.300000 ;
-      RECT 4.130000 2.470000  4.300000 2.895000 ;
-      RECT 4.130000 2.895000  6.045000 3.065000 ;
-      RECT 4.295000 0.255000  5.890000 0.495000 ;
-      RECT 4.295000 0.495000  4.665000 0.595000 ;
-      RECT 4.470000 0.595000  4.665000 1.235000 ;
-      RECT 4.470000 1.235000  4.750000 2.725000 ;
-      RECT 4.835000 0.665000  5.150000 0.995000 ;
-      RECT 4.920000 0.995000  5.150000 2.295000 ;
-      RECT 4.920000 2.295000  5.190000 2.625000 ;
-      RECT 5.320000 0.665000  5.550000 1.055000 ;
-      RECT 5.320000 1.055000  7.095000 1.120000 ;
-      RECT 5.360000 1.120000  7.095000 1.305000 ;
-      RECT 5.360000 1.305000  5.540000 2.225000 ;
-      RECT 5.360000 2.225000  5.705000 2.725000 ;
-      RECT 5.710000 1.515000  6.045000 1.845000 ;
-      RECT 5.720000 0.495000  5.890000 0.555000 ;
-      RECT 5.720000 0.555000  6.935000 0.725000 ;
-      RECT 5.875000 1.845000  6.045000 2.635000 ;
-      RECT 5.875000 2.635000  7.600000 2.805000 ;
-      RECT 5.875000 2.805000  6.045000 2.895000 ;
-      RECT 6.225000 1.475000  7.445000 1.655000 ;
-      RECT 6.225000 1.655000  7.090000 2.075000 ;
-      RECT 6.765000 0.255000  7.795000 0.425000 ;
-      RECT 6.765000 0.425000  6.935000 0.555000 ;
-      RECT 6.920000 2.075000  7.090000 2.205000 ;
-      RECT 6.920000 2.205000  7.250000 2.465000 ;
-      RECT 7.115000 0.595000  7.445000 0.885000 ;
-      RECT 7.270000 1.825000  7.975000 2.005000 ;
-      RECT 7.270000 2.005000  7.600000 2.035000 ;
-      RECT 7.275000 0.885000  7.445000 1.475000 ;
-      RECT 7.430000 2.035000  7.600000 2.635000 ;
-      RECT 7.615000 0.425000  7.795000 1.165000 ;
-      RECT 7.770000 2.580000  8.325000 2.910000 ;
-      RECT 7.805000 1.345000  8.335000 1.515000 ;
-      RECT 7.805000 1.515000  7.975000 1.825000 ;
-      RECT 7.965000 0.345000  8.685000 0.675000 ;
-      RECT 7.975000 0.855000  8.335000 1.345000 ;
-      RECT 8.155000 1.695000  8.685000 1.865000 ;
-      RECT 8.155000 1.865000  8.325000 2.580000 ;
-      RECT 8.495000 2.045000  9.595000 2.215000 ;
-      RECT 8.495000 2.215000  8.725000 2.375000 ;
-      RECT 8.515000 0.675000  8.685000 1.185000 ;
-      RECT 8.515000 1.185000  9.235000 1.515000 ;
-      RECT 8.515000 1.515000  8.685000 1.695000 ;
-      RECT 9.345000 0.255000  9.605000 1.005000 ;
-      RECT 9.395000 2.215000  9.595000 2.975000 ;
-      RECT 9.405000 1.005000  9.605000 1.285000 ;
-      RECT 9.405000 1.285000 11.015000 1.485000 ;
-      RECT 9.405000 1.485000  9.595000 2.045000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.130000  0.635000  0.675000 0.965000 ;
+      RECT  0.130000  0.965000  0.310000 1.655000 ;
+      RECT  0.130000  1.655000  1.270000 2.300000 ;
+      RECT  0.130000  2.300000  2.310000 2.470000 ;
+      RECT  0.130000  2.470000  0.855000 2.945000 ;
+      RECT  0.845000  0.085000  1.175000 0.975000 ;
+      RECT  1.025000  2.640000  1.355000 3.245000 ;
+      RECT  1.815000  2.640000  2.650000 2.970000 ;
+      RECT  1.945000  0.725000  2.135000 1.045000 ;
+      RECT  1.945000  1.045000  3.075000 1.215000 ;
+      RECT  2.050000  1.965000  2.310000 2.300000 ;
+      RECT  2.480000  2.155000  3.075000 2.335000 ;
+      RECT  2.480000  2.335000  3.010000 2.490000 ;
+      RECT  2.480000  2.490000  2.650000 2.640000 ;
+      RECT  2.750000  0.085000  3.080000 0.875000 ;
+      RECT  2.820000  2.660000  3.010000 3.245000 ;
+      RECT  2.905000  1.215000  3.075000 2.155000 ;
+      RECT  3.180000  2.505000  3.510000 3.075000 ;
+      RECT  3.275000  0.785000  4.300000 1.020000 ;
+      RECT  3.340000  2.300000  4.300000 2.470000 ;
+      RECT  3.340000  2.470000  3.510000 2.505000 ;
+      RECT  3.700000  2.640000  3.960000 3.245000 ;
+      RECT  3.795000  0.085000  4.125000 0.615000 ;
+      RECT  3.865000  1.020000  4.300000 2.300000 ;
+      RECT  4.130000  2.470000  4.300000 2.895000 ;
+      RECT  4.130000  2.895000  6.045000 3.065000 ;
+      RECT  4.295000  0.255000  5.890000 0.495000 ;
+      RECT  4.295000  0.495000  4.665000 0.595000 ;
+      RECT  4.470000  0.595000  4.665000 1.235000 ;
+      RECT  4.470000  1.235000  4.750000 2.725000 ;
+      RECT  4.835000  0.665000  5.150000 0.995000 ;
+      RECT  4.920000  0.995000  5.150000 2.295000 ;
+      RECT  4.920000  2.295000  5.190000 2.625000 ;
+      RECT  5.320000  0.665000  5.550000 1.055000 ;
+      RECT  5.320000  1.055000  7.095000 1.120000 ;
+      RECT  5.360000  1.120000  7.095000 1.305000 ;
+      RECT  5.360000  1.305000  5.540000 2.225000 ;
+      RECT  5.360000  2.225000  5.705000 2.725000 ;
+      RECT  5.710000  1.515000  6.045000 1.845000 ;
+      RECT  5.720000  0.495000  5.890000 0.555000 ;
+      RECT  5.720000  0.555000  6.935000 0.725000 ;
+      RECT  5.875000  1.845000  6.045000 2.635000 ;
+      RECT  5.875000  2.635000  7.600000 2.805000 ;
+      RECT  5.875000  2.805000  6.045000 2.895000 ;
+      RECT  6.225000  1.475000  7.445000 1.655000 ;
+      RECT  6.225000  1.655000  7.090000 2.075000 ;
+      RECT  6.255000  0.085000  6.585000 0.385000 ;
+      RECT  6.410000  2.975000  6.740000 3.245000 ;
+      RECT  6.765000  0.255000  7.795000 0.425000 ;
+      RECT  6.765000  0.425000  6.935000 0.555000 ;
+      RECT  6.920000  2.075000  7.090000 2.205000 ;
+      RECT  6.920000  2.205000  7.250000 2.465000 ;
+      RECT  7.115000  0.595000  7.445000 0.885000 ;
+      RECT  7.270000  1.825000  7.975000 2.005000 ;
+      RECT  7.270000  2.005000  7.600000 2.035000 ;
+      RECT  7.275000  0.885000  7.445000 1.475000 ;
+      RECT  7.430000  2.035000  7.600000 2.635000 ;
+      RECT  7.615000  0.425000  7.795000 1.165000 ;
+      RECT  7.770000  2.580000  8.325000 2.910000 ;
+      RECT  7.805000  1.345000  8.335000 1.515000 ;
+      RECT  7.805000  1.515000  7.975000 1.825000 ;
+      RECT  7.965000  0.345000  8.685000 0.675000 ;
+      RECT  7.975000  0.855000  8.335000 1.345000 ;
+      RECT  8.155000  1.695000  8.685000 1.865000 ;
+      RECT  8.155000  1.865000  8.325000 2.580000 ;
+      RECT  8.495000  2.045000  9.595000 2.215000 ;
+      RECT  8.495000  2.215000  8.725000 2.375000 ;
+      RECT  8.495000  2.580000  9.225000 3.245000 ;
+      RECT  8.515000  0.675000  8.685000 1.185000 ;
+      RECT  8.515000  1.185000  9.235000 1.515000 ;
+      RECT  8.515000  1.515000  8.685000 1.695000 ;
+      RECT  8.855000  0.085000  9.175000 1.015000 ;
+      RECT  8.895000  2.405000  9.225000 2.580000 ;
+      RECT  9.345000  0.255000  9.605000 1.005000 ;
+      RECT  9.395000  2.215000  9.595000 2.975000 ;
+      RECT  9.405000  1.005000  9.605000 1.285000 ;
+      RECT  9.405000  1.285000 11.015000 1.485000 ;
+      RECT  9.405000  1.485000  9.595000 2.045000 ;
+      RECT  9.845000  0.085000 10.135000 1.115000 ;
+      RECT  9.845000  1.815000 10.140000 3.245000 ;
+      RECT 10.705000  0.085000 11.035000 0.775000 ;
+      RECT 10.705000  1.995000 11.035000 3.245000 ;
+      RECT 11.565000  0.085000 11.895000 0.775000 ;
+      RECT 11.565000  2.095000 11.895000 3.245000 ;
     LAYER mcon ;
-      RECT 2.555000 2.320000 2.725000 2.490000 ;
-      RECT 4.955000 2.320000 5.125000 2.490000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  2.320000  2.725000 2.490000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.320000  5.125000 2.490000 ;
+      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 ;
     LAYER met1 ;
       RECT 2.495000 2.290000 2.785000 2.335000 ;
       RECT 2.495000 2.335000 5.185000 2.475000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef
index ca69dbf..8bb6400 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.magic.lef
@@ -81,44 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  1.160000  0.085000  1.490000 0.985000 ;
-        RECT  3.090000  0.085000  3.420000 1.065000 ;
-        RECT  4.435000  0.085000  4.765000 0.650000 ;
-        RECT  8.080000  0.085000  8.410000 0.715000 ;
-        RECT 11.340000  0.085000 11.670000 0.785000 ;
-        RECT 13.475000  0.085000 13.805000 0.785000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -127,104 +89,139 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.645000 2.025000  0.975000 3.245000 ;
-        RECT  2.730000 2.855000  3.060000 3.245000 ;
-        RECT  4.435000 2.505000  4.765000 3.245000 ;
-        RECT  8.105000 2.015000  8.435000 3.245000 ;
-        RECT 10.965000 1.825000 11.295000 3.245000 ;
-        RECT 13.475000 1.920000 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.115000 0.605000  0.670000 1.165000 ;
-      RECT  0.115000 1.165000  1.755000 1.335000 ;
-      RECT  0.115000 1.335000  0.365000 3.065000 ;
-      RECT  1.200000 2.065000  1.530000 2.505000 ;
-      RECT  1.200000 2.505000  3.590000 2.675000 ;
-      RECT  1.200000 2.675000  1.530000 3.065000 ;
-      RECT  1.425000 1.335000  1.755000 1.835000 ;
-      RECT  1.730000 2.065000  2.645000 2.155000 ;
-      RECT  1.730000 2.155000  6.885000 2.325000 ;
-      RECT  2.200000 0.605000  2.645000 1.035000 ;
-      RECT  2.475000 1.035000  2.645000 2.065000 ;
-      RECT  3.260000 2.675000  3.590000 3.065000 ;
-      RECT  3.645000 0.310000  3.975000 0.830000 ;
-      RECT  3.645000 0.830000  5.045000 1.000000 ;
-      RECT  3.905000 1.715000  4.630000 1.975000 ;
-      RECT  4.460000 1.000000  5.045000 1.530000 ;
-      RECT  4.460000 1.530000  4.630000 1.715000 ;
-      RECT  4.965000 1.715000  5.820000 1.975000 ;
-      RECT  5.225000 0.310000  5.555000 1.305000 ;
-      RECT  5.225000 1.305000  5.820000 1.715000 ;
-      RECT  5.780000 0.265000  7.825000 0.435000 ;
-      RECT  5.780000 0.435000  6.030000 1.125000 ;
-      RECT  6.210000 0.615000  7.320000 0.785000 ;
-      RECT  6.210000 0.785000  6.380000 1.715000 ;
-      RECT  6.210000 1.715000  6.885000 2.155000 ;
-      RECT  6.555000 2.325000  6.885000 2.755000 ;
-      RECT  6.560000 0.965000  6.890000 1.365000 ;
-      RECT  6.560000 1.365000  7.415000 1.535000 ;
-      RECT  7.070000 0.785000  7.320000 1.185000 ;
-      RECT  7.085000 1.535000  7.415000 1.665000 ;
-      RECT  7.085000 1.665000  8.790000 1.835000 ;
-      RECT  7.085000 1.835000  7.415000 2.755000 ;
-      RECT  7.575000 0.435000  7.825000 0.975000 ;
-      RECT  7.880000 1.155000  8.210000 1.485000 ;
-      RECT  8.040000 0.895000  9.275000 1.065000 ;
-      RECT  8.040000 1.065000  8.210000 1.155000 ;
-      RECT  8.460000 1.245000  8.790000 1.665000 ;
-      RECT  8.945000 0.265000 10.685000 0.435000 ;
-      RECT  8.945000 0.435000  9.275000 0.895000 ;
-      RECT  9.105000 1.065000  9.275000 1.715000 ;
-      RECT  9.105000 1.715000  9.435000 2.755000 ;
-      RECT  9.530000 0.615000 11.160000 0.785000 ;
-      RECT  9.530000 0.785000  9.770000 1.215000 ;
-      RECT  9.840000 1.475000 11.675000 1.645000 ;
-      RECT  9.840000 1.645000 10.170000 2.825000 ;
-      RECT  9.940000 0.965000 10.270000 1.475000 ;
-      RECT 10.775000 0.965000 12.725000 1.135000 ;
-      RECT 10.775000 1.135000 11.105000 1.295000 ;
-      RECT 10.910000 0.325000 11.160000 0.615000 ;
-      RECT 11.345000 1.315000 11.675000 1.475000 ;
-      RECT 11.570000 1.825000 12.025000 2.825000 ;
-      RECT 11.855000 1.135000 12.025000 1.825000 ;
-      RECT 12.130000 0.325000 12.460000 0.785000 ;
-      RECT 12.130000 0.785000 12.300000 0.965000 ;
-      RECT 12.395000 1.135000 12.725000 1.635000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.115000  0.605000  0.670000 1.165000 ;
+      RECT  0.115000  1.165000  1.755000 1.335000 ;
+      RECT  0.115000  1.335000  0.365000 3.065000 ;
+      RECT  0.645000  2.025000  0.975000 3.245000 ;
+      RECT  1.160000  0.085000  1.490000 0.985000 ;
+      RECT  1.200000  2.065000  1.530000 2.505000 ;
+      RECT  1.200000  2.505000  3.590000 2.675000 ;
+      RECT  1.200000  2.675000  1.530000 3.065000 ;
+      RECT  1.425000  1.335000  1.755000 1.835000 ;
+      RECT  1.730000  2.065000  2.645000 2.155000 ;
+      RECT  1.730000  2.155000  6.885000 2.325000 ;
+      RECT  2.200000  0.605000  2.645000 1.035000 ;
+      RECT  2.475000  1.035000  2.645000 2.065000 ;
+      RECT  2.730000  2.855000  3.060000 3.245000 ;
+      RECT  3.090000  0.085000  3.420000 1.065000 ;
+      RECT  3.260000  2.675000  3.590000 3.065000 ;
+      RECT  3.645000  0.310000  3.975000 0.830000 ;
+      RECT  3.645000  0.830000  5.045000 1.000000 ;
+      RECT  3.905000  1.715000  4.630000 1.975000 ;
+      RECT  4.435000  0.085000  4.765000 0.650000 ;
+      RECT  4.435000  2.505000  4.765000 3.245000 ;
+      RECT  4.460000  1.000000  5.045000 1.530000 ;
+      RECT  4.460000  1.530000  4.630000 1.715000 ;
+      RECT  4.965000  1.715000  5.820000 1.975000 ;
+      RECT  5.225000  0.310000  5.555000 1.305000 ;
+      RECT  5.225000  1.305000  5.820000 1.715000 ;
+      RECT  5.780000  0.265000  7.825000 0.435000 ;
+      RECT  5.780000  0.435000  6.030000 1.125000 ;
+      RECT  6.210000  0.615000  7.320000 0.785000 ;
+      RECT  6.210000  0.785000  6.380000 1.715000 ;
+      RECT  6.210000  1.715000  6.885000 2.155000 ;
+      RECT  6.555000  2.325000  6.885000 2.755000 ;
+      RECT  6.560000  0.965000  6.890000 1.365000 ;
+      RECT  6.560000  1.365000  7.415000 1.535000 ;
+      RECT  7.070000  0.785000  7.320000 1.185000 ;
+      RECT  7.085000  1.535000  7.415000 1.665000 ;
+      RECT  7.085000  1.665000  8.790000 1.835000 ;
+      RECT  7.085000  1.835000  7.415000 2.755000 ;
+      RECT  7.575000  0.435000  7.825000 0.975000 ;
+      RECT  7.880000  1.155000  8.210000 1.485000 ;
+      RECT  8.040000  0.895000  9.275000 1.065000 ;
+      RECT  8.040000  1.065000  8.210000 1.155000 ;
+      RECT  8.080000  0.085000  8.410000 0.715000 ;
+      RECT  8.105000  2.015000  8.435000 3.245000 ;
+      RECT  8.460000  1.245000  8.790000 1.665000 ;
+      RECT  8.945000  0.265000 10.685000 0.435000 ;
+      RECT  8.945000  0.435000  9.275000 0.895000 ;
+      RECT  9.105000  1.065000  9.275000 1.715000 ;
+      RECT  9.105000  1.715000  9.435000 2.755000 ;
+      RECT  9.530000  0.615000 11.160000 0.785000 ;
+      RECT  9.530000  0.785000  9.770000 1.215000 ;
+      RECT  9.840000  1.475000 11.675000 1.645000 ;
+      RECT  9.840000  1.645000 10.170000 2.825000 ;
+      RECT  9.940000  0.965000 10.270000 1.475000 ;
+      RECT 10.775000  0.965000 12.725000 1.135000 ;
+      RECT 10.775000  1.135000 11.105000 1.295000 ;
+      RECT 10.910000  0.325000 11.160000 0.615000 ;
+      RECT 10.965000  1.825000 11.295000 3.245000 ;
+      RECT 11.340000  0.085000 11.670000 0.785000 ;
+      RECT 11.345000  1.315000 11.675000 1.475000 ;
+      RECT 11.570000  1.825000 12.025000 2.825000 ;
+      RECT 11.855000  1.135000 12.025000 1.825000 ;
+      RECT 12.130000  0.325000 12.460000 0.785000 ;
+      RECT 12.130000  0.785000 12.300000 0.965000 ;
+      RECT 12.395000  1.135000 12.725000 1.635000 ;
+      RECT 13.475000  0.085000 13.805000 0.785000 ;
+      RECT 13.475000  1.920000 13.805000 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 ;
+      RECT 13.595000 -0.085000 13.765000 0.085000 ;
+      RECT 13.595000  3.245000 13.765000 3.415000 ;
   END
 END sky130_fd_sc_lp__sdfxtp_lp
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef
index 414d71d..99d9ef9 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.magic.lef
@@ -71,30 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.680000 0.085000 ;
-        RECT 0.290000  0.085000 0.540000 0.670000 ;
-        RECT 1.245000  0.085000 1.475000 0.670000 ;
-        RECT 4.020000  0.085000 4.350000 0.355000 ;
-        RECT 5.575000  0.085000 5.785000 0.635000 ;
-        RECT 6.825000  0.085000 7.155000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 7.680000 0.245000 ;
     END
@@ -103,76 +79,97 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 7.680000 3.415000 ;
-        RECT 0.095000 2.660000 0.425000 3.245000 ;
-        RECT 1.455000 2.270000 1.715000 3.245000 ;
-        RECT 4.135000 1.985000 4.465000 3.245000 ;
-        RECT 5.620000 2.565000 5.950000 3.245000 ;
-        RECT 6.640000 2.250000 6.970000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.710000 0.390000 1.075000 0.670000 ;
-      RECT 0.710000 0.670000 0.880000 1.930000 ;
-      RECT 0.710000 1.930000 2.055000 2.100000 ;
-      RECT 0.710000 2.100000 1.215000 2.990000 ;
-      RECT 1.645000 0.390000 1.975000 1.555000 ;
-      RECT 1.645000 1.555000 2.630000 1.760000 ;
-      RECT 1.885000 2.100000 2.055000 2.875000 ;
-      RECT 1.885000 2.875000 3.085000 3.045000 ;
-      RECT 2.145000 0.370000 3.850000 0.525000 ;
-      RECT 2.145000 0.525000 5.355000 0.540000 ;
-      RECT 2.145000 0.540000 2.405000 1.345000 ;
-      RECT 2.225000 1.760000 2.630000 1.885000 ;
-      RECT 2.225000 1.885000 2.475000 2.695000 ;
-      RECT 2.640000 0.710000 2.970000 1.040000 ;
-      RECT 2.800000 1.040000 2.970000 1.500000 ;
-      RECT 2.800000 1.500000 3.085000 2.875000 ;
-      RECT 3.140000 0.710000 3.495000 1.275000 ;
-      RECT 3.140000 1.275000 4.580000 1.330000 ;
-      RECT 3.255000 1.330000 4.580000 1.475000 ;
-      RECT 3.255000 1.475000 3.495000 2.690000 ;
-      RECT 3.680000 0.540000 5.355000 0.695000 ;
-      RECT 3.685000 1.645000 4.930000 1.815000 ;
-      RECT 3.685000 1.815000 3.965000 1.975000 ;
-      RECT 4.530000 0.865000 4.930000 1.105000 ;
-      RECT 4.635000 1.815000 4.930000 2.225000 ;
-      RECT 4.635000 2.225000 5.790000 2.395000 ;
-      RECT 4.635000 2.395000 4.930000 3.075000 ;
-      RECT 4.760000 1.105000 4.930000 1.645000 ;
-      RECT 5.085000 0.305000 5.355000 0.525000 ;
-      RECT 5.110000 0.695000 5.355000 1.795000 ;
-      RECT 5.110000 1.795000 5.440000 2.055000 ;
-      RECT 5.620000 1.560000 6.630000 1.730000 ;
-      RECT 5.620000 1.730000 5.790000 2.225000 ;
-      RECT 6.130000 1.910000 6.970000 2.080000 ;
-      RECT 6.130000 2.080000 6.460000 2.440000 ;
-      RECT 6.365000 0.305000 6.635000 0.985000 ;
-      RECT 6.365000 0.985000 6.970000 1.155000 ;
-      RECT 6.365000 1.345000 6.630000 1.560000 ;
-      RECT 6.800000 1.155000 6.970000 1.185000 ;
-      RECT 6.800000 1.185000 7.155000 1.515000 ;
-      RECT 6.800000 1.515000 6.970000 1.910000 ;
+      RECT 0.000000 -0.085000 7.680000 0.085000 ;
+      RECT 0.000000  3.245000 7.680000 3.415000 ;
+      RECT 0.095000  2.660000 0.425000 3.245000 ;
+      RECT 0.290000  0.085000 0.540000 0.670000 ;
+      RECT 0.710000  0.390000 1.075000 0.670000 ;
+      RECT 0.710000  0.670000 0.880000 1.930000 ;
+      RECT 0.710000  1.930000 2.055000 2.100000 ;
+      RECT 0.710000  2.100000 1.215000 2.990000 ;
+      RECT 1.245000  0.085000 1.475000 0.670000 ;
+      RECT 1.455000  2.270000 1.715000 3.245000 ;
+      RECT 1.645000  0.390000 1.975000 1.555000 ;
+      RECT 1.645000  1.555000 2.630000 1.760000 ;
+      RECT 1.885000  2.100000 2.055000 2.875000 ;
+      RECT 1.885000  2.875000 3.085000 3.045000 ;
+      RECT 2.145000  0.370000 3.850000 0.525000 ;
+      RECT 2.145000  0.525000 5.355000 0.540000 ;
+      RECT 2.145000  0.540000 2.405000 1.345000 ;
+      RECT 2.225000  1.760000 2.630000 1.885000 ;
+      RECT 2.225000  1.885000 2.475000 2.695000 ;
+      RECT 2.640000  0.710000 2.970000 1.040000 ;
+      RECT 2.800000  1.040000 2.970000 1.500000 ;
+      RECT 2.800000  1.500000 3.085000 2.875000 ;
+      RECT 3.140000  0.710000 3.495000 1.275000 ;
+      RECT 3.140000  1.275000 4.580000 1.330000 ;
+      RECT 3.255000  1.330000 4.580000 1.475000 ;
+      RECT 3.255000  1.475000 3.495000 2.690000 ;
+      RECT 3.680000  0.540000 5.355000 0.695000 ;
+      RECT 3.685000  1.645000 4.930000 1.815000 ;
+      RECT 3.685000  1.815000 3.965000 1.975000 ;
+      RECT 4.020000  0.085000 4.350000 0.355000 ;
+      RECT 4.135000  1.985000 4.465000 3.245000 ;
+      RECT 4.530000  0.865000 4.930000 1.105000 ;
+      RECT 4.635000  1.815000 4.930000 2.225000 ;
+      RECT 4.635000  2.225000 5.790000 2.395000 ;
+      RECT 4.635000  2.395000 4.930000 3.075000 ;
+      RECT 4.760000  1.105000 4.930000 1.645000 ;
+      RECT 5.085000  0.305000 5.355000 0.525000 ;
+      RECT 5.110000  0.695000 5.355000 1.795000 ;
+      RECT 5.110000  1.795000 5.440000 2.055000 ;
+      RECT 5.575000  0.085000 5.785000 0.635000 ;
+      RECT 5.620000  1.560000 6.630000 1.730000 ;
+      RECT 5.620000  1.730000 5.790000 2.225000 ;
+      RECT 5.620000  2.565000 5.950000 3.245000 ;
+      RECT 6.130000  1.910000 6.970000 2.080000 ;
+      RECT 6.130000  2.080000 6.460000 2.440000 ;
+      RECT 6.365000  0.305000 6.635000 0.985000 ;
+      RECT 6.365000  0.985000 6.970000 1.155000 ;
+      RECT 6.365000  1.345000 6.630000 1.560000 ;
+      RECT 6.640000  2.250000 6.970000 3.245000 ;
+      RECT 6.800000  1.155000 6.970000 1.185000 ;
+      RECT 6.800000  1.185000 7.155000 1.515000 ;
+      RECT 6.800000  1.515000 6.970000 1.910000 ;
+      RECT 6.825000  0.085000 7.155000 0.815000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__sdlclkp_1
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.magic.lef
index 40162c0..2c906ce 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__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.095000  0.085000 0.425000 0.670000 ;
-        RECT 0.990000  0.085000 1.250000 0.725000 ;
-        RECT 3.915000  0.085000 4.245000 0.355000 ;
-        RECT 5.415000  0.085000 5.745000 0.670000 ;
-        RECT 6.845000  0.085000 7.175000 0.875000 ;
-        RECT 7.785000  0.085000 8.045000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,78 +80,101 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.095000 2.330000 0.415000 3.245000 ;
-        RECT 1.465000 2.505000 1.795000 3.245000 ;
-        RECT 4.045000 2.085000 4.490000 3.245000 ;
-        RECT 5.640000 2.875000 5.970000 3.245000 ;
-        RECT 6.580000 2.555000 7.185000 3.245000 ;
-        RECT 7.715000 2.555000 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.585000 0.740000 0.820000 0.930000 ;
-      RECT 0.585000 0.930000 0.755000 2.165000 ;
-      RECT 0.585000 2.165000 2.135000 2.335000 ;
-      RECT 0.585000 2.335000 1.215000 2.990000 ;
-      RECT 0.595000 0.395000 0.820000 0.740000 ;
-      RECT 1.420000 0.395000 1.715000 1.125000 ;
-      RECT 1.485000 1.125000 1.715000 1.585000 ;
-      RECT 1.485000 1.585000 2.525000 1.915000 ;
-      RECT 1.905000 0.255000 2.235000 0.525000 ;
-      RECT 1.905000 0.525000 5.245000 0.695000 ;
-      RECT 1.905000 0.695000 2.235000 0.855000 ;
-      RECT 1.965000 2.335000 2.135000 2.895000 ;
-      RECT 1.965000 2.895000 3.135000 3.065000 ;
-      RECT 2.305000 1.915000 2.525000 2.725000 ;
-      RECT 2.535000 0.865000 2.865000 1.125000 ;
-      RECT 2.695000 1.125000 2.865000 2.325000 ;
-      RECT 2.695000 2.325000 3.135000 2.895000 ;
-      RECT 3.045000 0.865000 3.545000 1.225000 ;
-      RECT 3.045000 1.225000 4.560000 1.395000 ;
-      RECT 3.305000 1.395000 3.545000 2.655000 ;
-      RECT 3.715000 1.585000 4.040000 1.745000 ;
-      RECT 3.715000 1.745000 4.900000 1.915000 ;
-      RECT 4.300000 1.395000 4.560000 1.555000 ;
-      RECT 4.425000 0.865000 4.900000 1.055000 ;
-      RECT 4.660000 1.915000 4.900000 2.535000 ;
-      RECT 4.660000 2.535000 5.955000 2.705000 ;
-      RECT 4.660000 2.705000 4.920000 3.075000 ;
-      RECT 4.730000 1.055000 4.900000 1.745000 ;
-      RECT 4.985000 0.365000 5.245000 0.525000 ;
-      RECT 5.070000 0.695000 5.245000 2.115000 ;
-      RECT 5.070000 2.115000 5.460000 2.365000 ;
-      RECT 5.785000 1.735000 6.715000 1.905000 ;
-      RECT 5.785000 1.905000 5.955000 2.535000 ;
-      RECT 6.150000 2.075000 7.115000 2.215000 ;
-      RECT 6.150000 2.215000 8.045000 2.385000 ;
-      RECT 6.150000 2.385000 6.410000 2.825000 ;
-      RECT 6.205000 0.450000 6.535000 1.045000 ;
-      RECT 6.205000 1.045000 7.115000 1.215000 ;
-      RECT 6.385000 1.385000 6.715000 1.735000 ;
-      RECT 6.895000 1.215000 7.115000 2.075000 ;
-      RECT 7.785000 1.295000 8.045000 2.215000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.095000  0.085000 0.425000 0.670000 ;
+      RECT 0.095000  2.330000 0.415000 3.245000 ;
+      RECT 0.585000  0.740000 0.820000 0.930000 ;
+      RECT 0.585000  0.930000 0.755000 2.165000 ;
+      RECT 0.585000  2.165000 2.135000 2.335000 ;
+      RECT 0.585000  2.335000 1.215000 2.990000 ;
+      RECT 0.595000  0.395000 0.820000 0.740000 ;
+      RECT 0.990000  0.085000 1.250000 0.725000 ;
+      RECT 1.420000  0.395000 1.715000 1.125000 ;
+      RECT 1.465000  2.505000 1.795000 3.245000 ;
+      RECT 1.485000  1.125000 1.715000 1.585000 ;
+      RECT 1.485000  1.585000 2.525000 1.915000 ;
+      RECT 1.905000  0.255000 2.235000 0.525000 ;
+      RECT 1.905000  0.525000 5.245000 0.695000 ;
+      RECT 1.905000  0.695000 2.235000 0.855000 ;
+      RECT 1.965000  2.335000 2.135000 2.895000 ;
+      RECT 1.965000  2.895000 3.135000 3.065000 ;
+      RECT 2.305000  1.915000 2.525000 2.725000 ;
+      RECT 2.535000  0.865000 2.865000 1.125000 ;
+      RECT 2.695000  1.125000 2.865000 2.325000 ;
+      RECT 2.695000  2.325000 3.135000 2.895000 ;
+      RECT 3.045000  0.865000 3.545000 1.225000 ;
+      RECT 3.045000  1.225000 4.560000 1.395000 ;
+      RECT 3.305000  1.395000 3.545000 2.655000 ;
+      RECT 3.715000  1.585000 4.040000 1.745000 ;
+      RECT 3.715000  1.745000 4.900000 1.915000 ;
+      RECT 3.915000  0.085000 4.245000 0.355000 ;
+      RECT 4.045000  2.085000 4.490000 3.245000 ;
+      RECT 4.300000  1.395000 4.560000 1.555000 ;
+      RECT 4.425000  0.865000 4.900000 1.055000 ;
+      RECT 4.660000  1.915000 4.900000 2.535000 ;
+      RECT 4.660000  2.535000 5.955000 2.705000 ;
+      RECT 4.660000  2.705000 4.920000 3.075000 ;
+      RECT 4.730000  1.055000 4.900000 1.745000 ;
+      RECT 4.985000  0.365000 5.245000 0.525000 ;
+      RECT 5.070000  0.695000 5.245000 2.115000 ;
+      RECT 5.070000  2.115000 5.460000 2.365000 ;
+      RECT 5.415000  0.085000 5.745000 0.670000 ;
+      RECT 5.640000  2.875000 5.970000 3.245000 ;
+      RECT 5.785000  1.735000 6.715000 1.905000 ;
+      RECT 5.785000  1.905000 5.955000 2.535000 ;
+      RECT 6.150000  2.075000 7.115000 2.215000 ;
+      RECT 6.150000  2.215000 8.045000 2.385000 ;
+      RECT 6.150000  2.385000 6.410000 2.825000 ;
+      RECT 6.205000  0.450000 6.535000 1.045000 ;
+      RECT 6.205000  1.045000 7.115000 1.215000 ;
+      RECT 6.385000  1.385000 6.715000 1.735000 ;
+      RECT 6.580000  2.555000 7.185000 3.245000 ;
+      RECT 6.845000  0.085000 7.175000 0.875000 ;
+      RECT 6.895000  1.215000 7.115000 2.075000 ;
+      RECT 7.715000  2.555000 8.045000 3.245000 ;
+      RECT 7.785000  0.085000 8.045000 1.125000 ;
+      RECT 7.785000  1.295000 8.045000 2.215000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__sdlclkp_2
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef
index 88c4fad..aa2048b 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.magic.lef
@@ -78,35 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.205000  0.085000 0.535000 0.670000 ;
-        RECT 1.170000  0.085000 1.480000 0.725000 ;
-        RECT 4.050000  0.085000 4.380000 0.355000 ;
-        RECT 5.625000  0.085000 5.955000 1.040000 ;
-        RECT 6.945000  0.085000 7.275000 0.825000 ;
-        RECT 7.805000  0.085000 8.135000 0.675000 ;
-        RECT 8.675000  0.085000 8.995000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 9.120000 0.245000 ;
     END
@@ -115,80 +86,106 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.095000 2.660000 0.365000 3.245000 ;
-        RECT 1.445000 2.300000 1.705000 3.245000 ;
-        RECT 3.935000 2.360000 4.530000 3.245000 ;
-        RECT 4.340000 1.985000 4.530000 2.360000 ;
-        RECT 5.980000 2.785000 6.190000 3.245000 ;
-        RECT 6.955000 2.185000 7.195000 3.245000 ;
-        RECT 7.780000 1.945000 8.040000 3.245000 ;
-        RECT 8.675000 1.815000 8.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 9.120000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.705000 0.395000 0.975000 0.725000 ;
-      RECT 0.705000 0.725000 0.895000 1.960000 ;
-      RECT 0.705000 1.960000 2.045000 2.130000 ;
-      RECT 0.705000 2.130000 1.215000 2.990000 ;
-      RECT 1.650000 0.395000 1.980000 0.615000 ;
-      RECT 1.650000 0.615000 2.605000 0.785000 ;
-      RECT 1.875000 2.130000 2.045000 2.885000 ;
-      RECT 1.875000 2.885000 3.010000 3.075000 ;
-      RECT 2.225000 2.045000 2.605000 2.715000 ;
-      RECT 2.265000 0.255000 3.870000 0.445000 ;
-      RECT 2.425000 0.785000 2.605000 2.045000 ;
-      RECT 2.775000 0.710000 3.010000 2.885000 ;
-      RECT 3.180000 0.710000 3.475000 1.250000 ;
-      RECT 3.180000 1.250000 4.540000 1.465000 ;
-      RECT 3.180000 1.465000 3.475000 2.695000 ;
-      RECT 3.700000 0.445000 3.870000 0.525000 ;
-      RECT 3.700000 0.525000 5.430000 0.695000 ;
-      RECT 3.805000 1.635000 4.915000 1.805000 ;
-      RECT 3.805000 1.805000 4.140000 2.095000 ;
-      RECT 4.560000 0.865000 4.915000 1.080000 ;
-      RECT 4.710000 1.805000 4.915000 2.310000 ;
-      RECT 4.710000 2.310000 6.075000 2.490000 ;
-      RECT 4.710000 2.490000 5.040000 2.930000 ;
-      RECT 4.720000 1.080000 4.915000 1.635000 ;
-      RECT 5.085000 0.270000 5.430000 0.525000 ;
-      RECT 5.085000 0.695000 5.255000 1.930000 ;
-      RECT 5.085000 1.930000 5.725000 2.140000 ;
-      RECT 5.905000 1.930000 6.435000 2.100000 ;
-      RECT 5.905000 2.100000 6.075000 2.310000 ;
-      RECT 6.265000 1.345000 6.855000 1.675000 ;
-      RECT 6.265000 1.675000 6.435000 1.930000 ;
-      RECT 6.410000 2.280000 6.785000 2.950000 ;
-      RECT 6.415000 0.255000 6.685000 0.995000 ;
-      RECT 6.415000 0.995000 7.195000 1.175000 ;
-      RECT 6.615000 1.845000 7.195000 2.015000 ;
-      RECT 6.615000 2.015000 6.785000 2.280000 ;
-      RECT 7.025000 1.175000 7.195000 1.185000 ;
-      RECT 7.025000 1.185000 8.135000 1.435000 ;
-      RECT 7.025000 1.435000 7.195000 1.845000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.095000  2.660000 0.365000 3.245000 ;
+      RECT 0.205000  0.085000 0.535000 0.670000 ;
+      RECT 0.705000  0.395000 0.975000 0.725000 ;
+      RECT 0.705000  0.725000 0.895000 1.960000 ;
+      RECT 0.705000  1.960000 2.045000 2.130000 ;
+      RECT 0.705000  2.130000 1.215000 2.990000 ;
+      RECT 1.170000  0.085000 1.480000 0.725000 ;
+      RECT 1.445000  2.300000 1.705000 3.245000 ;
+      RECT 1.650000  0.395000 1.980000 0.615000 ;
+      RECT 1.650000  0.615000 2.605000 0.785000 ;
+      RECT 1.875000  2.130000 2.045000 2.885000 ;
+      RECT 1.875000  2.885000 3.010000 3.075000 ;
+      RECT 2.225000  2.045000 2.605000 2.715000 ;
+      RECT 2.265000  0.255000 3.870000 0.445000 ;
+      RECT 2.425000  0.785000 2.605000 2.045000 ;
+      RECT 2.775000  0.710000 3.010000 2.885000 ;
+      RECT 3.180000  0.710000 3.475000 1.250000 ;
+      RECT 3.180000  1.250000 4.540000 1.465000 ;
+      RECT 3.180000  1.465000 3.475000 2.695000 ;
+      RECT 3.700000  0.445000 3.870000 0.525000 ;
+      RECT 3.700000  0.525000 5.430000 0.695000 ;
+      RECT 3.805000  1.635000 4.915000 1.805000 ;
+      RECT 3.805000  1.805000 4.140000 2.095000 ;
+      RECT 3.935000  2.360000 4.530000 3.245000 ;
+      RECT 4.050000  0.085000 4.380000 0.355000 ;
+      RECT 4.340000  1.985000 4.530000 2.360000 ;
+      RECT 4.560000  0.865000 4.915000 1.080000 ;
+      RECT 4.710000  1.805000 4.915000 2.310000 ;
+      RECT 4.710000  2.310000 6.075000 2.490000 ;
+      RECT 4.710000  2.490000 5.040000 2.930000 ;
+      RECT 4.720000  1.080000 4.915000 1.635000 ;
+      RECT 5.085000  0.270000 5.430000 0.525000 ;
+      RECT 5.085000  0.695000 5.255000 1.930000 ;
+      RECT 5.085000  1.930000 5.725000 2.140000 ;
+      RECT 5.625000  0.085000 5.955000 1.040000 ;
+      RECT 5.905000  1.930000 6.435000 2.100000 ;
+      RECT 5.905000  2.100000 6.075000 2.310000 ;
+      RECT 5.980000  2.785000 6.190000 3.245000 ;
+      RECT 6.265000  1.345000 6.855000 1.675000 ;
+      RECT 6.265000  1.675000 6.435000 1.930000 ;
+      RECT 6.410000  2.280000 6.785000 2.950000 ;
+      RECT 6.415000  0.255000 6.685000 0.995000 ;
+      RECT 6.415000  0.995000 7.195000 1.175000 ;
+      RECT 6.615000  1.845000 7.195000 2.015000 ;
+      RECT 6.615000  2.015000 6.785000 2.280000 ;
+      RECT 6.945000  0.085000 7.275000 0.825000 ;
+      RECT 6.955000  2.185000 7.195000 3.245000 ;
+      RECT 7.025000  1.175000 7.195000 1.185000 ;
+      RECT 7.025000  1.185000 8.135000 1.435000 ;
+      RECT 7.025000  1.435000 7.195000 1.845000 ;
+      RECT 7.780000  1.945000 8.040000 3.245000 ;
+      RECT 7.805000  0.085000 8.135000 0.675000 ;
+      RECT 8.675000  0.085000 8.995000 1.090000 ;
+      RECT 8.675000  1.815000 8.935000 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_lp__sdlclkp_4
diff --git a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef
index 797ea67..9d4641f 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.magic.lef
@@ -72,32 +72,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.855000 ;
-        RECT 1.725000  0.085000 2.055000 0.860000 ;
-        RECT 4.425000  0.085000 4.755000 0.675000 ;
-        RECT 6.585000  0.085000 6.835000 1.400000 ;
-        RECT 7.265000  0.085000 7.595000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 8.640000 0.245000 ;
     END
@@ -106,82 +80,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.640000 3.415000 ;
-        RECT 1.545000 2.965000 1.875000 3.245000 ;
-        RECT 4.525000 2.680000 4.855000 3.245000 ;
-        RECT 6.365000 2.840000 6.695000 3.245000 ;
-        RECT 7.505000 2.840000 7.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 8.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.445000 1.885000 0.905000 2.615000 ;
-      RECT 0.445000 2.615000 2.225000 2.785000 ;
-      RECT 0.445000 2.785000 0.775000 2.900000 ;
-      RECT 0.735000 0.485000 1.265000 1.040000 ;
-      RECT 0.735000 1.040000 2.405000 1.210000 ;
-      RECT 0.735000 1.210000 0.905000 1.885000 ;
-      RECT 1.780000 1.390000 2.110000 2.265000 ;
-      RECT 1.780000 2.265000 2.575000 2.435000 ;
-      RECT 2.055000 2.785000 3.265000 3.045000 ;
-      RECT 2.235000 0.265000 3.505000 0.435000 ;
-      RECT 2.235000 0.435000 2.405000 1.040000 ;
-      RECT 2.290000 1.390000 3.200000 1.720000 ;
-      RECT 2.290000 1.720000 2.620000 2.085000 ;
-      RECT 2.405000 2.435000 4.145000 2.605000 ;
-      RECT 2.595000 0.615000 2.970000 0.945000 ;
-      RECT 2.800000 0.945000 2.970000 1.390000 ;
-      RECT 3.175000 0.435000 3.505000 0.675000 ;
-      RECT 3.380000 0.880000 5.265000 1.050000 ;
-      RECT 3.380000 1.050000 3.550000 2.005000 ;
-      RECT 3.380000 2.005000 3.795000 2.255000 ;
-      RECT 3.685000 0.265000 3.935000 0.880000 ;
-      RECT 3.730000 1.495000 4.145000 1.825000 ;
-      RECT 3.975000 1.230000 6.045000 1.400000 ;
-      RECT 3.975000 1.400000 4.145000 1.495000 ;
-      RECT 3.975000 1.825000 4.145000 2.435000 ;
-      RECT 4.325000 1.580000 4.655000 2.330000 ;
-      RECT 4.325000 2.330000 5.420000 2.490000 ;
-      RECT 4.325000 2.490000 7.925000 2.500000 ;
-      RECT 4.935000 0.765000 5.265000 0.880000 ;
-      RECT 5.090000 2.500000 7.925000 2.660000 ;
-      RECT 5.090000 2.660000 5.420000 3.045000 ;
-      RECT 5.445000 0.265000 5.775000 0.505000 ;
-      RECT 5.445000 0.505000 6.395000 0.675000 ;
-      RECT 5.715000 0.940000 6.045000 1.230000 ;
-      RECT 5.835000 1.400000 6.045000 2.060000 ;
-      RECT 5.835000 2.060000 6.165000 2.310000 ;
-      RECT 6.225000 0.675000 6.395000 1.580000 ;
-      RECT 6.225000 1.580000 6.515000 1.750000 ;
-      RECT 6.345000 1.750000 6.515000 2.490000 ;
-      RECT 6.895000 2.060000 7.575000 2.230000 ;
-      RECT 6.895000 2.230000 7.225000 2.310000 ;
-      RECT 7.325000 0.935000 8.105000 1.105000 ;
-      RECT 7.325000 1.105000 7.575000 2.060000 ;
-      RECT 7.755000 1.315000 8.085000 1.645000 ;
-      RECT 7.755000 1.645000 7.925000 2.490000 ;
-      RECT 7.775000 0.775000 8.105000 0.935000 ;
+      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.855000 ;
+      RECT 0.445000  1.885000 0.905000 2.615000 ;
+      RECT 0.445000  2.615000 2.225000 2.785000 ;
+      RECT 0.445000  2.785000 0.775000 2.900000 ;
+      RECT 0.735000  0.485000 1.265000 1.040000 ;
+      RECT 0.735000  1.040000 2.405000 1.210000 ;
+      RECT 0.735000  1.210000 0.905000 1.885000 ;
+      RECT 1.545000  2.965000 1.875000 3.245000 ;
+      RECT 1.725000  0.085000 2.055000 0.860000 ;
+      RECT 1.780000  1.390000 2.110000 2.265000 ;
+      RECT 1.780000  2.265000 2.575000 2.435000 ;
+      RECT 2.055000  2.785000 3.265000 3.045000 ;
+      RECT 2.235000  0.265000 3.505000 0.435000 ;
+      RECT 2.235000  0.435000 2.405000 1.040000 ;
+      RECT 2.290000  1.390000 3.200000 1.720000 ;
+      RECT 2.290000  1.720000 2.620000 2.085000 ;
+      RECT 2.405000  2.435000 4.145000 2.605000 ;
+      RECT 2.595000  0.615000 2.970000 0.945000 ;
+      RECT 2.800000  0.945000 2.970000 1.390000 ;
+      RECT 3.175000  0.435000 3.505000 0.675000 ;
+      RECT 3.380000  0.880000 5.265000 1.050000 ;
+      RECT 3.380000  1.050000 3.550000 2.005000 ;
+      RECT 3.380000  2.005000 3.795000 2.255000 ;
+      RECT 3.685000  0.265000 3.935000 0.880000 ;
+      RECT 3.730000  1.495000 4.145000 1.825000 ;
+      RECT 3.975000  1.230000 6.045000 1.400000 ;
+      RECT 3.975000  1.400000 4.145000 1.495000 ;
+      RECT 3.975000  1.825000 4.145000 2.435000 ;
+      RECT 4.325000  1.580000 4.655000 2.330000 ;
+      RECT 4.325000  2.330000 5.420000 2.490000 ;
+      RECT 4.325000  2.490000 7.925000 2.500000 ;
+      RECT 4.425000  0.085000 4.755000 0.675000 ;
+      RECT 4.525000  2.680000 4.855000 3.245000 ;
+      RECT 4.935000  0.765000 5.265000 0.880000 ;
+      RECT 5.090000  2.500000 7.925000 2.660000 ;
+      RECT 5.090000  2.660000 5.420000 3.045000 ;
+      RECT 5.445000  0.265000 5.775000 0.505000 ;
+      RECT 5.445000  0.505000 6.395000 0.675000 ;
+      RECT 5.715000  0.940000 6.045000 1.230000 ;
+      RECT 5.835000  1.400000 6.045000 2.060000 ;
+      RECT 5.835000  2.060000 6.165000 2.310000 ;
+      RECT 6.225000  0.675000 6.395000 1.580000 ;
+      RECT 6.225000  1.580000 6.515000 1.750000 ;
+      RECT 6.345000  1.750000 6.515000 2.490000 ;
+      RECT 6.365000  2.840000 6.695000 3.245000 ;
+      RECT 6.585000  0.085000 6.835000 1.400000 ;
+      RECT 6.895000  2.060000 7.575000 2.230000 ;
+      RECT 6.895000  2.230000 7.225000 2.310000 ;
+      RECT 7.265000  0.085000 7.595000 0.680000 ;
+      RECT 7.325000  0.935000 8.105000 1.105000 ;
+      RECT 7.325000  1.105000 7.575000 2.060000 ;
+      RECT 7.505000  2.840000 7.835000 3.245000 ;
+      RECT 7.755000  1.315000 8.085000 1.645000 ;
+      RECT 7.755000  1.645000 7.925000 2.490000 ;
+      RECT 7.775000  0.775000 8.105000 0.935000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__sdlclkp_lp
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef
index 7e4ff23..b3b97c6 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.magic.lef
@@ -37,46 +37,6 @@
   PIN VIRTPWR
     ANTENNADIFFAREA  3.710000 ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 1.055000 1.980000 7.950000 2.240000 ;
-        RECT 1.055000 2.840000 8.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 1.895000 2.025000 2.065000 2.195000 ;
-        RECT 1.895000 2.885000 2.065000 3.055000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.255000 2.025000 2.425000 2.195000 ;
-        RECT 2.255000 2.885000 2.425000 3.055000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.450000 2.025000 3.620000 2.195000 ;
-        RECT 3.450000 2.885000 3.620000 3.055000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.810000 2.025000 3.980000 2.195000 ;
-        RECT 3.810000 2.885000 3.980000 3.055000 ;
-        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.005000 2.025000 5.175000 2.195000 ;
-        RECT 5.005000 2.885000 5.175000 3.055000 ;
-        RECT 5.365000 2.025000 5.535000 2.195000 ;
-        RECT 5.365000 2.885000 5.535000 3.055000 ;
-        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.560000 2.025000 6.730000 2.195000 ;
-        RECT 6.560000 2.885000 6.730000 3.055000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 6.920000 2.025000 7.090000 2.195000 ;
-        RECT 6.920000 2.885000 7.090000 3.055000 ;
-        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 ;
         RECT 1.845000 1.965000 2.470000 3.085000 ;
@@ -88,38 +48,78 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.055000 2.410000 7.950000 2.670000 ;
-      LAYER mcon ;
-        RECT 1.115000 2.455000 1.285000 2.625000 ;
-        RECT 1.475000 2.455000 1.645000 2.625000 ;
-        RECT 2.670000 2.455000 2.840000 2.625000 ;
-        RECT 3.030000 2.455000 3.200000 2.625000 ;
-        RECT 4.225000 2.455000 4.395000 2.625000 ;
-        RECT 4.585000 2.455000 4.755000 2.625000 ;
-        RECT 5.780000 2.455000 5.950000 2.625000 ;
-        RECT 6.140000 2.455000 6.310000 2.625000 ;
-        RECT 7.355000 2.455000 7.525000 2.625000 ;
-        RECT 7.715000 2.455000 7.885000 2.625000 ;
-      LAYER met1 ;
-        RECT 1.055000 2.410000 1.705000 2.670000 ;
-        RECT 2.610000 2.410000 3.260000 2.670000 ;
-        RECT 4.165000 2.410000 4.815000 2.670000 ;
-        RECT 5.720000 2.410000 6.370000 2.670000 ;
-        RECT 7.295000 2.410000 7.945000 2.670000 ;
       LAYER met2 ;
         RECT 0.280000 0.000000 8.840000 3.330000 ;
-      LAYER via ;
-        RECT 1.095000 2.410000 1.355000 2.670000 ;
-        RECT 1.415000 2.410000 1.675000 2.670000 ;
-        RECT 2.640000 2.410000 2.900000 2.670000 ;
-        RECT 2.960000 2.410000 3.220000 2.670000 ;
-        RECT 4.195000 2.410000 4.455000 2.670000 ;
-        RECT 4.515000 2.410000 4.775000 2.670000 ;
-        RECT 5.750000 2.410000 6.010000 2.670000 ;
-        RECT 6.070000 2.410000 6.330000 2.670000 ;
-        RECT 7.325000 2.410000 7.585000 2.670000 ;
-        RECT 7.645000 2.410000 7.905000 2.670000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 3.245000 9.120000 3.415000 ;
+      RECT 1.055000 1.980000 7.950000 2.240000 ;
+      RECT 1.055000 2.410000 7.950000 2.670000 ;
+      RECT 1.055000 2.840000 8.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 2.455000 1.285000 2.625000 ;
+      RECT 1.115000 3.245000 1.285000 3.415000 ;
+      RECT 1.475000 2.455000 1.645000 2.625000 ;
+      RECT 1.595000 3.245000 1.765000 3.415000 ;
+      RECT 1.895000 2.025000 2.065000 2.195000 ;
+      RECT 1.895000 2.885000 2.065000 3.055000 ;
+      RECT 2.075000 3.245000 2.245000 3.415000 ;
+      RECT 2.255000 2.025000 2.425000 2.195000 ;
+      RECT 2.255000 2.885000 2.425000 3.055000 ;
+      RECT 2.555000 3.245000 2.725000 3.415000 ;
+      RECT 2.670000 2.455000 2.840000 2.625000 ;
+      RECT 3.030000 2.455000 3.200000 2.625000 ;
+      RECT 3.035000 3.245000 3.205000 3.415000 ;
+      RECT 3.450000 2.025000 3.620000 2.195000 ;
+      RECT 3.450000 2.885000 3.620000 3.055000 ;
+      RECT 3.515000 3.245000 3.685000 3.415000 ;
+      RECT 3.810000 2.025000 3.980000 2.195000 ;
+      RECT 3.810000 2.885000 3.980000 3.055000 ;
+      RECT 3.995000 3.245000 4.165000 3.415000 ;
+      RECT 4.225000 2.455000 4.395000 2.625000 ;
+      RECT 4.475000 3.245000 4.645000 3.415000 ;
+      RECT 4.585000 2.455000 4.755000 2.625000 ;
+      RECT 4.955000 3.245000 5.125000 3.415000 ;
+      RECT 5.005000 2.025000 5.175000 2.195000 ;
+      RECT 5.005000 2.885000 5.175000 3.055000 ;
+      RECT 5.365000 2.025000 5.535000 2.195000 ;
+      RECT 5.365000 2.885000 5.535000 3.055000 ;
+      RECT 5.435000 3.245000 5.605000 3.415000 ;
+      RECT 5.780000 2.455000 5.950000 2.625000 ;
+      RECT 5.915000 3.245000 6.085000 3.415000 ;
+      RECT 6.140000 2.455000 6.310000 2.625000 ;
+      RECT 6.395000 3.245000 6.565000 3.415000 ;
+      RECT 6.560000 2.025000 6.730000 2.195000 ;
+      RECT 6.560000 2.885000 6.730000 3.055000 ;
+      RECT 6.875000 3.245000 7.045000 3.415000 ;
+      RECT 6.920000 2.025000 7.090000 2.195000 ;
+      RECT 6.920000 2.885000 7.090000 3.055000 ;
+      RECT 7.355000 2.455000 7.525000 2.625000 ;
+      RECT 7.355000 3.245000 7.525000 3.415000 ;
+      RECT 7.715000 2.455000 7.885000 2.625000 ;
+      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 1.055000 2.410000 1.705000 2.670000 ;
+      RECT 2.610000 2.410000 3.260000 2.670000 ;
+      RECT 4.165000 2.410000 4.815000 2.670000 ;
+      RECT 5.720000 2.410000 6.370000 2.670000 ;
+      RECT 7.295000 2.410000 7.945000 2.670000 ;
+    LAYER via ;
+      RECT 1.095000 2.410000 1.355000 2.670000 ;
+      RECT 1.415000 2.410000 1.675000 2.670000 ;
+      RECT 2.640000 2.410000 2.900000 2.670000 ;
+      RECT 2.960000 2.410000 3.220000 2.670000 ;
+      RECT 4.195000 2.410000 4.455000 2.670000 ;
+      RECT 4.515000 2.410000 4.775000 2.670000 ;
+      RECT 5.750000 2.410000 6.010000 2.670000 ;
+      RECT 6.070000 2.410000 6.330000 2.670000 ;
+      RECT 7.325000 2.410000 7.585000 2.670000 ;
+      RECT 7.645000 2.410000 7.905000 2.670000 ;
+  END
 END sky130_fd_sc_lp__sleep_pargate_plv_14
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef
index e41b09a..0db3e65 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.magic.lef
@@ -37,46 +37,6 @@
   PIN VIRTPWR
     ANTENNADIFFAREA  3.815000 ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 1.055000 1.980000 7.950000 2.240000 ;
-        RECT 1.055000 2.840000 8.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 1.895000 2.025000 2.065000 2.195000 ;
-        RECT 1.895000 2.885000 2.065000 3.055000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.255000 2.025000 2.425000 2.195000 ;
-        RECT 2.255000 2.885000 2.425000 3.055000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.450000 2.025000 3.620000 2.195000 ;
-        RECT 3.450000 2.885000 3.620000 3.055000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.810000 2.025000 3.980000 2.195000 ;
-        RECT 3.810000 2.885000 3.980000 3.055000 ;
-        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.005000 2.025000 5.175000 2.195000 ;
-        RECT 5.005000 2.885000 5.175000 3.055000 ;
-        RECT 5.365000 2.025000 5.535000 2.195000 ;
-        RECT 5.365000 2.885000 5.535000 3.055000 ;
-        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.560000 2.025000 6.730000 2.195000 ;
-        RECT 6.560000 2.885000 6.730000 3.055000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 6.920000 2.025000 7.090000 2.195000 ;
-        RECT 6.920000 2.885000 7.090000 3.055000 ;
-        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 ;
         RECT 1.845000 1.550000 2.470000 3.085000 ;
@@ -88,59 +48,99 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.055000 1.550000 7.950000 1.810000 ;
-        RECT 1.055000 2.410000 7.950000 2.670000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.595000 1.285000 1.765000 ;
-        RECT 1.115000 2.455000 1.285000 2.625000 ;
-        RECT 1.475000 1.595000 1.645000 1.765000 ;
-        RECT 1.475000 2.455000 1.645000 2.625000 ;
-        RECT 2.670000 1.595000 2.840000 1.765000 ;
-        RECT 2.670000 2.455000 2.840000 2.625000 ;
-        RECT 3.030000 1.595000 3.200000 1.765000 ;
-        RECT 3.030000 2.455000 3.200000 2.625000 ;
-        RECT 4.225000 1.595000 4.395000 1.765000 ;
-        RECT 4.225000 2.455000 4.395000 2.625000 ;
-        RECT 4.585000 1.595000 4.755000 1.765000 ;
-        RECT 4.585000 2.455000 4.755000 2.625000 ;
-        RECT 5.780000 1.595000 5.950000 1.765000 ;
-        RECT 5.780000 2.455000 5.950000 2.625000 ;
-        RECT 6.140000 1.595000 6.310000 1.765000 ;
-        RECT 6.140000 2.455000 6.310000 2.625000 ;
-        RECT 7.355000 1.595000 7.525000 1.765000 ;
-        RECT 7.355000 2.455000 7.525000 2.625000 ;
-        RECT 7.715000 1.595000 7.885000 1.765000 ;
-        RECT 7.715000 2.455000 7.885000 2.625000 ;
-      LAYER met1 ;
-        RECT 1.055000 1.550000 1.705000 2.670000 ;
-        RECT 2.610000 1.550000 3.260000 2.670000 ;
-        RECT 4.165000 1.550000 4.815000 2.670000 ;
-        RECT 5.720000 1.550000 6.370000 2.670000 ;
-        RECT 7.295000 1.550000 7.945000 2.670000 ;
       LAYER met2 ;
         RECT 0.280000 0.000000 8.840000 3.330000 ;
-      LAYER via ;
-        RECT 1.095000 1.550000 1.355000 1.810000 ;
-        RECT 1.095000 2.410000 1.355000 2.670000 ;
-        RECT 1.415000 1.550000 1.675000 1.810000 ;
-        RECT 1.415000 2.410000 1.675000 2.670000 ;
-        RECT 2.640000 1.550000 2.900000 1.810000 ;
-        RECT 2.640000 2.410000 2.900000 2.670000 ;
-        RECT 2.960000 1.550000 3.220000 1.810000 ;
-        RECT 2.960000 2.410000 3.220000 2.670000 ;
-        RECT 4.195000 1.550000 4.455000 1.810000 ;
-        RECT 4.195000 2.410000 4.455000 2.670000 ;
-        RECT 4.515000 1.550000 4.775000 1.810000 ;
-        RECT 4.515000 2.410000 4.775000 2.670000 ;
-        RECT 5.750000 1.550000 6.010000 1.810000 ;
-        RECT 5.750000 2.410000 6.010000 2.670000 ;
-        RECT 6.070000 1.550000 6.330000 1.810000 ;
-        RECT 6.070000 2.410000 6.330000 2.670000 ;
-        RECT 7.325000 1.550000 7.585000 1.810000 ;
-        RECT 7.325000 2.410000 7.585000 2.670000 ;
-        RECT 7.645000 1.550000 7.905000 1.810000 ;
-        RECT 7.645000 2.410000 7.905000 2.670000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 3.245000 9.120000 3.415000 ;
+      RECT 1.055000 1.550000 7.950000 1.810000 ;
+      RECT 1.055000 1.980000 7.950000 2.240000 ;
+      RECT 1.055000 2.410000 7.950000 2.670000 ;
+      RECT 1.055000 2.840000 8.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 1.595000 1.285000 1.765000 ;
+      RECT 1.115000 2.455000 1.285000 2.625000 ;
+      RECT 1.115000 3.245000 1.285000 3.415000 ;
+      RECT 1.475000 1.595000 1.645000 1.765000 ;
+      RECT 1.475000 2.455000 1.645000 2.625000 ;
+      RECT 1.595000 3.245000 1.765000 3.415000 ;
+      RECT 1.895000 2.025000 2.065000 2.195000 ;
+      RECT 1.895000 2.885000 2.065000 3.055000 ;
+      RECT 2.075000 3.245000 2.245000 3.415000 ;
+      RECT 2.255000 2.025000 2.425000 2.195000 ;
+      RECT 2.255000 2.885000 2.425000 3.055000 ;
+      RECT 2.555000 3.245000 2.725000 3.415000 ;
+      RECT 2.670000 1.595000 2.840000 1.765000 ;
+      RECT 2.670000 2.455000 2.840000 2.625000 ;
+      RECT 3.030000 1.595000 3.200000 1.765000 ;
+      RECT 3.030000 2.455000 3.200000 2.625000 ;
+      RECT 3.035000 3.245000 3.205000 3.415000 ;
+      RECT 3.450000 2.025000 3.620000 2.195000 ;
+      RECT 3.450000 2.885000 3.620000 3.055000 ;
+      RECT 3.515000 3.245000 3.685000 3.415000 ;
+      RECT 3.810000 2.025000 3.980000 2.195000 ;
+      RECT 3.810000 2.885000 3.980000 3.055000 ;
+      RECT 3.995000 3.245000 4.165000 3.415000 ;
+      RECT 4.225000 1.595000 4.395000 1.765000 ;
+      RECT 4.225000 2.455000 4.395000 2.625000 ;
+      RECT 4.475000 3.245000 4.645000 3.415000 ;
+      RECT 4.585000 1.595000 4.755000 1.765000 ;
+      RECT 4.585000 2.455000 4.755000 2.625000 ;
+      RECT 4.955000 3.245000 5.125000 3.415000 ;
+      RECT 5.005000 2.025000 5.175000 2.195000 ;
+      RECT 5.005000 2.885000 5.175000 3.055000 ;
+      RECT 5.365000 2.025000 5.535000 2.195000 ;
+      RECT 5.365000 2.885000 5.535000 3.055000 ;
+      RECT 5.435000 3.245000 5.605000 3.415000 ;
+      RECT 5.780000 1.595000 5.950000 1.765000 ;
+      RECT 5.780000 2.455000 5.950000 2.625000 ;
+      RECT 5.915000 3.245000 6.085000 3.415000 ;
+      RECT 6.140000 1.595000 6.310000 1.765000 ;
+      RECT 6.140000 2.455000 6.310000 2.625000 ;
+      RECT 6.395000 3.245000 6.565000 3.415000 ;
+      RECT 6.560000 2.025000 6.730000 2.195000 ;
+      RECT 6.560000 2.885000 6.730000 3.055000 ;
+      RECT 6.875000 3.245000 7.045000 3.415000 ;
+      RECT 6.920000 2.025000 7.090000 2.195000 ;
+      RECT 6.920000 2.885000 7.090000 3.055000 ;
+      RECT 7.355000 1.595000 7.525000 1.765000 ;
+      RECT 7.355000 2.455000 7.525000 2.625000 ;
+      RECT 7.355000 3.245000 7.525000 3.415000 ;
+      RECT 7.715000 1.595000 7.885000 1.765000 ;
+      RECT 7.715000 2.455000 7.885000 2.625000 ;
+      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 1.055000 1.550000 1.705000 2.670000 ;
+      RECT 2.610000 1.550000 3.260000 2.670000 ;
+      RECT 4.165000 1.550000 4.815000 2.670000 ;
+      RECT 5.720000 1.550000 6.370000 2.670000 ;
+      RECT 7.295000 1.550000 7.945000 2.670000 ;
+    LAYER via ;
+      RECT 1.095000 1.550000 1.355000 1.810000 ;
+      RECT 1.095000 2.410000 1.355000 2.670000 ;
+      RECT 1.415000 1.550000 1.675000 1.810000 ;
+      RECT 1.415000 2.410000 1.675000 2.670000 ;
+      RECT 2.640000 1.550000 2.900000 1.810000 ;
+      RECT 2.640000 2.410000 2.900000 2.670000 ;
+      RECT 2.960000 1.550000 3.220000 1.810000 ;
+      RECT 2.960000 2.410000 3.220000 2.670000 ;
+      RECT 4.195000 1.550000 4.455000 1.810000 ;
+      RECT 4.195000 2.410000 4.455000 2.670000 ;
+      RECT 4.515000 1.550000 4.775000 1.810000 ;
+      RECT 4.515000 2.410000 4.775000 2.670000 ;
+      RECT 5.750000 1.550000 6.010000 1.810000 ;
+      RECT 5.750000 2.410000 6.010000 2.670000 ;
+      RECT 6.070000 1.550000 6.330000 1.810000 ;
+      RECT 6.070000 2.410000 6.330000 2.670000 ;
+      RECT 7.325000 1.550000 7.585000 1.810000 ;
+      RECT 7.325000 2.410000 7.585000 2.670000 ;
+      RECT 7.645000 1.550000 7.905000 1.810000 ;
+      RECT 7.645000 2.410000 7.905000 2.670000 ;
+  END
 END sky130_fd_sc_lp__sleep_pargate_plv_21
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef
index 8b55204..a934f58 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.magic.lef
@@ -37,55 +37,6 @@
   PIN VIRTPWR
     ANTENNADIFFAREA  5.950000 ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 1.055000 1.120000 7.950000 1.380000 ;
-        RECT 1.055000 1.980000 7.950000 2.240000 ;
-        RECT 1.055000 2.840000 8.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 1.895000 1.165000 2.065000 1.335000 ;
-        RECT 1.895000 2.025000 2.065000 2.195000 ;
-        RECT 1.895000 2.885000 2.065000 3.055000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.255000 1.165000 2.425000 1.335000 ;
-        RECT 2.255000 2.025000 2.425000 2.195000 ;
-        RECT 2.255000 2.885000 2.425000 3.055000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.450000 1.165000 3.620000 1.335000 ;
-        RECT 3.450000 2.025000 3.620000 2.195000 ;
-        RECT 3.450000 2.885000 3.620000 3.055000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.810000 1.165000 3.980000 1.335000 ;
-        RECT 3.810000 2.025000 3.980000 2.195000 ;
-        RECT 3.810000 2.885000 3.980000 3.055000 ;
-        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.005000 1.165000 5.175000 1.335000 ;
-        RECT 5.005000 2.025000 5.175000 2.195000 ;
-        RECT 5.005000 2.885000 5.175000 3.055000 ;
-        RECT 5.365000 1.165000 5.535000 1.335000 ;
-        RECT 5.365000 2.025000 5.535000 2.195000 ;
-        RECT 5.365000 2.885000 5.535000 3.055000 ;
-        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.560000 1.165000 6.730000 1.335000 ;
-        RECT 6.560000 2.025000 6.730000 2.195000 ;
-        RECT 6.560000 2.885000 6.730000 3.055000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 6.920000 1.165000 7.090000 1.335000 ;
-        RECT 6.920000 2.025000 7.090000 2.195000 ;
-        RECT 6.920000 2.885000 7.090000 3.055000 ;
-        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 ;
         RECT 1.845000 1.105000 2.470000 3.085000 ;
@@ -97,59 +48,108 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.055000 1.550000 7.950000 1.810000 ;
-        RECT 1.055000 2.410000 7.950000 2.670000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.595000 1.285000 1.765000 ;
-        RECT 1.115000 2.455000 1.285000 2.625000 ;
-        RECT 1.475000 1.595000 1.645000 1.765000 ;
-        RECT 1.475000 2.455000 1.645000 2.625000 ;
-        RECT 2.670000 1.595000 2.840000 1.765000 ;
-        RECT 2.670000 2.455000 2.840000 2.625000 ;
-        RECT 3.030000 1.595000 3.200000 1.765000 ;
-        RECT 3.030000 2.455000 3.200000 2.625000 ;
-        RECT 4.225000 1.595000 4.395000 1.765000 ;
-        RECT 4.225000 2.455000 4.395000 2.625000 ;
-        RECT 4.585000 1.595000 4.755000 1.765000 ;
-        RECT 4.585000 2.455000 4.755000 2.625000 ;
-        RECT 5.780000 1.595000 5.950000 1.765000 ;
-        RECT 5.780000 2.455000 5.950000 2.625000 ;
-        RECT 6.140000 1.595000 6.310000 1.765000 ;
-        RECT 6.140000 2.455000 6.310000 2.625000 ;
-        RECT 7.355000 1.595000 7.525000 1.765000 ;
-        RECT 7.355000 2.455000 7.525000 2.625000 ;
-        RECT 7.715000 1.595000 7.885000 1.765000 ;
-        RECT 7.715000 2.455000 7.885000 2.625000 ;
-      LAYER met1 ;
-        RECT 1.055000 1.550000 1.705000 2.670000 ;
-        RECT 2.610000 1.550000 3.260000 2.670000 ;
-        RECT 4.165000 1.550000 4.815000 2.670000 ;
-        RECT 5.720000 1.550000 6.370000 2.670000 ;
-        RECT 7.295000 1.550000 7.945000 2.670000 ;
       LAYER met2 ;
         RECT 0.280000 0.000000 8.840000 3.330000 ;
-      LAYER via ;
-        RECT 1.095000 1.550000 1.355000 1.810000 ;
-        RECT 1.095000 2.410000 1.355000 2.670000 ;
-        RECT 1.415000 1.550000 1.675000 1.810000 ;
-        RECT 1.415000 2.410000 1.675000 2.670000 ;
-        RECT 2.640000 1.550000 2.900000 1.810000 ;
-        RECT 2.640000 2.410000 2.900000 2.670000 ;
-        RECT 2.960000 1.550000 3.220000 1.810000 ;
-        RECT 2.960000 2.410000 3.220000 2.670000 ;
-        RECT 4.195000 1.550000 4.455000 1.810000 ;
-        RECT 4.195000 2.410000 4.455000 2.670000 ;
-        RECT 4.515000 1.550000 4.775000 1.810000 ;
-        RECT 4.515000 2.410000 4.775000 2.670000 ;
-        RECT 5.750000 1.550000 6.010000 1.810000 ;
-        RECT 5.750000 2.410000 6.010000 2.670000 ;
-        RECT 6.070000 1.550000 6.330000 1.810000 ;
-        RECT 6.070000 2.410000 6.330000 2.670000 ;
-        RECT 7.325000 1.550000 7.585000 1.810000 ;
-        RECT 7.325000 2.410000 7.585000 2.670000 ;
-        RECT 7.645000 1.550000 7.905000 1.810000 ;
-        RECT 7.645000 2.410000 7.905000 2.670000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 3.245000 9.120000 3.415000 ;
+      RECT 1.055000 1.120000 7.950000 1.380000 ;
+      RECT 1.055000 1.550000 7.950000 1.810000 ;
+      RECT 1.055000 1.980000 7.950000 2.240000 ;
+      RECT 1.055000 2.410000 7.950000 2.670000 ;
+      RECT 1.055000 2.840000 8.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 1.595000 1.285000 1.765000 ;
+      RECT 1.115000 2.455000 1.285000 2.625000 ;
+      RECT 1.115000 3.245000 1.285000 3.415000 ;
+      RECT 1.475000 1.595000 1.645000 1.765000 ;
+      RECT 1.475000 2.455000 1.645000 2.625000 ;
+      RECT 1.595000 3.245000 1.765000 3.415000 ;
+      RECT 1.895000 1.165000 2.065000 1.335000 ;
+      RECT 1.895000 2.025000 2.065000 2.195000 ;
+      RECT 1.895000 2.885000 2.065000 3.055000 ;
+      RECT 2.075000 3.245000 2.245000 3.415000 ;
+      RECT 2.255000 1.165000 2.425000 1.335000 ;
+      RECT 2.255000 2.025000 2.425000 2.195000 ;
+      RECT 2.255000 2.885000 2.425000 3.055000 ;
+      RECT 2.555000 3.245000 2.725000 3.415000 ;
+      RECT 2.670000 1.595000 2.840000 1.765000 ;
+      RECT 2.670000 2.455000 2.840000 2.625000 ;
+      RECT 3.030000 1.595000 3.200000 1.765000 ;
+      RECT 3.030000 2.455000 3.200000 2.625000 ;
+      RECT 3.035000 3.245000 3.205000 3.415000 ;
+      RECT 3.450000 1.165000 3.620000 1.335000 ;
+      RECT 3.450000 2.025000 3.620000 2.195000 ;
+      RECT 3.450000 2.885000 3.620000 3.055000 ;
+      RECT 3.515000 3.245000 3.685000 3.415000 ;
+      RECT 3.810000 1.165000 3.980000 1.335000 ;
+      RECT 3.810000 2.025000 3.980000 2.195000 ;
+      RECT 3.810000 2.885000 3.980000 3.055000 ;
+      RECT 3.995000 3.245000 4.165000 3.415000 ;
+      RECT 4.225000 1.595000 4.395000 1.765000 ;
+      RECT 4.225000 2.455000 4.395000 2.625000 ;
+      RECT 4.475000 3.245000 4.645000 3.415000 ;
+      RECT 4.585000 1.595000 4.755000 1.765000 ;
+      RECT 4.585000 2.455000 4.755000 2.625000 ;
+      RECT 4.955000 3.245000 5.125000 3.415000 ;
+      RECT 5.005000 1.165000 5.175000 1.335000 ;
+      RECT 5.005000 2.025000 5.175000 2.195000 ;
+      RECT 5.005000 2.885000 5.175000 3.055000 ;
+      RECT 5.365000 1.165000 5.535000 1.335000 ;
+      RECT 5.365000 2.025000 5.535000 2.195000 ;
+      RECT 5.365000 2.885000 5.535000 3.055000 ;
+      RECT 5.435000 3.245000 5.605000 3.415000 ;
+      RECT 5.780000 1.595000 5.950000 1.765000 ;
+      RECT 5.780000 2.455000 5.950000 2.625000 ;
+      RECT 5.915000 3.245000 6.085000 3.415000 ;
+      RECT 6.140000 1.595000 6.310000 1.765000 ;
+      RECT 6.140000 2.455000 6.310000 2.625000 ;
+      RECT 6.395000 3.245000 6.565000 3.415000 ;
+      RECT 6.560000 1.165000 6.730000 1.335000 ;
+      RECT 6.560000 2.025000 6.730000 2.195000 ;
+      RECT 6.560000 2.885000 6.730000 3.055000 ;
+      RECT 6.875000 3.245000 7.045000 3.415000 ;
+      RECT 6.920000 1.165000 7.090000 1.335000 ;
+      RECT 6.920000 2.025000 7.090000 2.195000 ;
+      RECT 6.920000 2.885000 7.090000 3.055000 ;
+      RECT 7.355000 1.595000 7.525000 1.765000 ;
+      RECT 7.355000 2.455000 7.525000 2.625000 ;
+      RECT 7.355000 3.245000 7.525000 3.415000 ;
+      RECT 7.715000 1.595000 7.885000 1.765000 ;
+      RECT 7.715000 2.455000 7.885000 2.625000 ;
+      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 1.055000 1.550000 1.705000 2.670000 ;
+      RECT 2.610000 1.550000 3.260000 2.670000 ;
+      RECT 4.165000 1.550000 4.815000 2.670000 ;
+      RECT 5.720000 1.550000 6.370000 2.670000 ;
+      RECT 7.295000 1.550000 7.945000 2.670000 ;
+    LAYER via ;
+      RECT 1.095000 1.550000 1.355000 1.810000 ;
+      RECT 1.095000 2.410000 1.355000 2.670000 ;
+      RECT 1.415000 1.550000 1.675000 1.810000 ;
+      RECT 1.415000 2.410000 1.675000 2.670000 ;
+      RECT 2.640000 1.550000 2.900000 1.810000 ;
+      RECT 2.640000 2.410000 2.900000 2.670000 ;
+      RECT 2.960000 1.550000 3.220000 1.810000 ;
+      RECT 2.960000 2.410000 3.220000 2.670000 ;
+      RECT 4.195000 1.550000 4.455000 1.810000 ;
+      RECT 4.195000 2.410000 4.455000 2.670000 ;
+      RECT 4.515000 1.550000 4.775000 1.810000 ;
+      RECT 4.515000 2.410000 4.775000 2.670000 ;
+      RECT 5.750000 1.550000 6.010000 1.810000 ;
+      RECT 5.750000 2.410000 6.010000 2.670000 ;
+      RECT 6.070000 1.550000 6.330000 1.810000 ;
+      RECT 6.070000 2.410000 6.330000 2.670000 ;
+      RECT 7.325000 1.550000 7.585000 1.810000 ;
+      RECT 7.325000 2.410000 7.585000 2.670000 ;
+      RECT 7.645000 1.550000 7.905000 1.810000 ;
+      RECT 7.645000 2.410000 7.905000 2.670000 ;
+  END
 END sky130_fd_sc_lp__sleep_pargate_plv_28
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef
index 3b45540..4a4d025 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.magic.lef
@@ -37,37 +37,6 @@
   PIN VIRTPWR
     ANTENNADIFFAREA  1.855000 ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 1.055000 2.840000 8.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 1.895000 2.885000 2.065000 3.055000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.255000 2.885000 2.425000 3.055000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.450000 2.885000 3.620000 3.055000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.810000 2.885000 3.980000 3.055000 ;
-        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.005000 2.885000 5.175000 3.055000 ;
-        RECT 5.365000 2.885000 5.535000 3.055000 ;
-        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.560000 2.885000 6.730000 3.055000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 6.920000 2.885000 7.090000 3.055000 ;
-        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 ;
         RECT 1.845000 2.825000 2.470000 3.085000 ;
@@ -79,38 +48,69 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.055000 2.410000 7.950000 2.670000 ;
-      LAYER mcon ;
-        RECT 1.115000 2.455000 1.285000 2.625000 ;
-        RECT 1.475000 2.455000 1.645000 2.625000 ;
-        RECT 2.670000 2.455000 2.840000 2.625000 ;
-        RECT 3.030000 2.455000 3.200000 2.625000 ;
-        RECT 4.225000 2.455000 4.395000 2.625000 ;
-        RECT 4.585000 2.455000 4.755000 2.625000 ;
-        RECT 5.780000 2.455000 5.950000 2.625000 ;
-        RECT 6.140000 2.455000 6.310000 2.625000 ;
-        RECT 7.355000 2.455000 7.525000 2.625000 ;
-        RECT 7.715000 2.455000 7.885000 2.625000 ;
-      LAYER met1 ;
-        RECT 1.055000 2.410000 1.705000 2.670000 ;
-        RECT 2.610000 2.410000 3.260000 2.670000 ;
-        RECT 4.165000 2.410000 4.815000 2.670000 ;
-        RECT 5.720000 2.410000 6.370000 2.670000 ;
-        RECT 7.295000 2.410000 7.945000 2.670000 ;
       LAYER met2 ;
         RECT 0.280000 0.000000 8.840000 3.330000 ;
-      LAYER via ;
-        RECT 1.095000 2.410000 1.355000 2.670000 ;
-        RECT 1.415000 2.410000 1.675000 2.670000 ;
-        RECT 2.640000 2.410000 2.900000 2.670000 ;
-        RECT 2.960000 2.410000 3.220000 2.670000 ;
-        RECT 4.195000 2.410000 4.455000 2.670000 ;
-        RECT 4.515000 2.410000 4.775000 2.670000 ;
-        RECT 5.750000 2.410000 6.010000 2.670000 ;
-        RECT 6.070000 2.410000 6.330000 2.670000 ;
-        RECT 7.325000 2.410000 7.585000 2.670000 ;
-        RECT 7.645000 2.410000 7.905000 2.670000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 3.245000 9.120000 3.415000 ;
+      RECT 1.055000 2.410000 7.950000 2.670000 ;
+      RECT 1.055000 2.840000 8.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 2.455000 1.285000 2.625000 ;
+      RECT 1.115000 3.245000 1.285000 3.415000 ;
+      RECT 1.475000 2.455000 1.645000 2.625000 ;
+      RECT 1.595000 3.245000 1.765000 3.415000 ;
+      RECT 1.895000 2.885000 2.065000 3.055000 ;
+      RECT 2.075000 3.245000 2.245000 3.415000 ;
+      RECT 2.255000 2.885000 2.425000 3.055000 ;
+      RECT 2.555000 3.245000 2.725000 3.415000 ;
+      RECT 2.670000 2.455000 2.840000 2.625000 ;
+      RECT 3.030000 2.455000 3.200000 2.625000 ;
+      RECT 3.035000 3.245000 3.205000 3.415000 ;
+      RECT 3.450000 2.885000 3.620000 3.055000 ;
+      RECT 3.515000 3.245000 3.685000 3.415000 ;
+      RECT 3.810000 2.885000 3.980000 3.055000 ;
+      RECT 3.995000 3.245000 4.165000 3.415000 ;
+      RECT 4.225000 2.455000 4.395000 2.625000 ;
+      RECT 4.475000 3.245000 4.645000 3.415000 ;
+      RECT 4.585000 2.455000 4.755000 2.625000 ;
+      RECT 4.955000 3.245000 5.125000 3.415000 ;
+      RECT 5.005000 2.885000 5.175000 3.055000 ;
+      RECT 5.365000 2.885000 5.535000 3.055000 ;
+      RECT 5.435000 3.245000 5.605000 3.415000 ;
+      RECT 5.780000 2.455000 5.950000 2.625000 ;
+      RECT 5.915000 3.245000 6.085000 3.415000 ;
+      RECT 6.140000 2.455000 6.310000 2.625000 ;
+      RECT 6.395000 3.245000 6.565000 3.415000 ;
+      RECT 6.560000 2.885000 6.730000 3.055000 ;
+      RECT 6.875000 3.245000 7.045000 3.415000 ;
+      RECT 6.920000 2.885000 7.090000 3.055000 ;
+      RECT 7.355000 2.455000 7.525000 2.625000 ;
+      RECT 7.355000 3.245000 7.525000 3.415000 ;
+      RECT 7.715000 2.455000 7.885000 2.625000 ;
+      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 1.055000 2.410000 1.705000 2.670000 ;
+      RECT 2.610000 2.410000 3.260000 2.670000 ;
+      RECT 4.165000 2.410000 4.815000 2.670000 ;
+      RECT 5.720000 2.410000 6.370000 2.670000 ;
+      RECT 7.295000 2.410000 7.945000 2.670000 ;
+    LAYER via ;
+      RECT 1.095000 2.410000 1.355000 2.670000 ;
+      RECT 1.415000 2.410000 1.675000 2.670000 ;
+      RECT 2.640000 2.410000 2.900000 2.670000 ;
+      RECT 2.960000 2.410000 3.220000 2.670000 ;
+      RECT 4.195000 2.410000 4.455000 2.670000 ;
+      RECT 4.515000 2.410000 4.775000 2.670000 ;
+      RECT 5.750000 2.410000 6.010000 2.670000 ;
+      RECT 6.070000 2.410000 6.330000 2.670000 ;
+      RECT 7.325000 2.410000 7.585000 2.670000 ;
+      RECT 7.645000 2.410000 7.905000 2.670000 ;
+  END
 END sky130_fd_sc_lp__sleep_pargate_plv_7
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef
index 98c3231..5f7ce3c 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.magic.lef
@@ -37,46 +37,6 @@
   PIN VIRTPWR
     ANTENNADIFFAREA  3.710000 ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 1.055000 1.980000 7.950000 2.240000 ;
-        RECT 1.055000 2.840000 8.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 1.895000 2.025000 2.065000 2.195000 ;
-        RECT 1.895000 2.885000 2.065000 3.055000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.255000 2.025000 2.425000 2.195000 ;
-        RECT 2.255000 2.885000 2.425000 3.055000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.450000 2.025000 3.620000 2.195000 ;
-        RECT 3.450000 2.885000 3.620000 3.055000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.810000 2.025000 3.980000 2.195000 ;
-        RECT 3.810000 2.885000 3.980000 3.055000 ;
-        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.005000 2.025000 5.175000 2.195000 ;
-        RECT 5.005000 2.885000 5.175000 3.055000 ;
-        RECT 5.365000 2.025000 5.535000 2.195000 ;
-        RECT 5.365000 2.885000 5.535000 3.055000 ;
-        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.560000 2.025000 6.730000 2.195000 ;
-        RECT 6.560000 2.885000 6.730000 3.055000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 6.920000 2.025000 7.090000 2.195000 ;
-        RECT 6.920000 2.885000 7.090000 3.055000 ;
-        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 ;
         RECT 1.845000 1.965000 2.470000 3.085000 ;
@@ -88,38 +48,78 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.055000 2.410000 7.950000 2.670000 ;
-      LAYER mcon ;
-        RECT 1.115000 2.455000 1.285000 2.625000 ;
-        RECT 1.475000 2.455000 1.645000 2.625000 ;
-        RECT 2.670000 2.455000 2.840000 2.625000 ;
-        RECT 3.030000 2.455000 3.200000 2.625000 ;
-        RECT 4.225000 2.455000 4.395000 2.625000 ;
-        RECT 4.585000 2.455000 4.755000 2.625000 ;
-        RECT 5.780000 2.455000 5.950000 2.625000 ;
-        RECT 6.140000 2.455000 6.310000 2.625000 ;
-        RECT 7.355000 2.455000 7.525000 2.625000 ;
-        RECT 7.715000 2.455000 7.885000 2.625000 ;
-      LAYER met1 ;
-        RECT 1.055000 2.410000 1.705000 2.670000 ;
-        RECT 2.610000 2.410000 3.260000 2.670000 ;
-        RECT 4.165000 2.410000 4.815000 2.670000 ;
-        RECT 5.720000 2.410000 6.370000 2.670000 ;
-        RECT 7.295000 2.410000 7.945000 2.670000 ;
       LAYER met2 ;
         RECT 0.280000 0.000000 8.840000 3.330000 ;
-      LAYER via ;
-        RECT 1.095000 2.410000 1.355000 2.670000 ;
-        RECT 1.415000 2.410000 1.675000 2.670000 ;
-        RECT 2.640000 2.410000 2.900000 2.670000 ;
-        RECT 2.960000 2.410000 3.220000 2.670000 ;
-        RECT 4.195000 2.410000 4.455000 2.670000 ;
-        RECT 4.515000 2.410000 4.775000 2.670000 ;
-        RECT 5.750000 2.410000 6.010000 2.670000 ;
-        RECT 6.070000 2.410000 6.330000 2.670000 ;
-        RECT 7.325000 2.410000 7.585000 2.670000 ;
-        RECT 7.645000 2.410000 7.905000 2.670000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 3.245000 9.120000 3.415000 ;
+      RECT 1.055000 1.980000 7.950000 2.240000 ;
+      RECT 1.055000 2.410000 7.950000 2.670000 ;
+      RECT 1.055000 2.840000 8.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 2.455000 1.285000 2.625000 ;
+      RECT 1.115000 3.245000 1.285000 3.415000 ;
+      RECT 1.475000 2.455000 1.645000 2.625000 ;
+      RECT 1.595000 3.245000 1.765000 3.415000 ;
+      RECT 1.895000 2.025000 2.065000 2.195000 ;
+      RECT 1.895000 2.885000 2.065000 3.055000 ;
+      RECT 2.075000 3.245000 2.245000 3.415000 ;
+      RECT 2.255000 2.025000 2.425000 2.195000 ;
+      RECT 2.255000 2.885000 2.425000 3.055000 ;
+      RECT 2.555000 3.245000 2.725000 3.415000 ;
+      RECT 2.670000 2.455000 2.840000 2.625000 ;
+      RECT 3.030000 2.455000 3.200000 2.625000 ;
+      RECT 3.035000 3.245000 3.205000 3.415000 ;
+      RECT 3.450000 2.025000 3.620000 2.195000 ;
+      RECT 3.450000 2.885000 3.620000 3.055000 ;
+      RECT 3.515000 3.245000 3.685000 3.415000 ;
+      RECT 3.810000 2.025000 3.980000 2.195000 ;
+      RECT 3.810000 2.885000 3.980000 3.055000 ;
+      RECT 3.995000 3.245000 4.165000 3.415000 ;
+      RECT 4.225000 2.455000 4.395000 2.625000 ;
+      RECT 4.475000 3.245000 4.645000 3.415000 ;
+      RECT 4.585000 2.455000 4.755000 2.625000 ;
+      RECT 4.955000 3.245000 5.125000 3.415000 ;
+      RECT 5.005000 2.025000 5.175000 2.195000 ;
+      RECT 5.005000 2.885000 5.175000 3.055000 ;
+      RECT 5.365000 2.025000 5.535000 2.195000 ;
+      RECT 5.365000 2.885000 5.535000 3.055000 ;
+      RECT 5.435000 3.245000 5.605000 3.415000 ;
+      RECT 5.780000 2.455000 5.950000 2.625000 ;
+      RECT 5.915000 3.245000 6.085000 3.415000 ;
+      RECT 6.140000 2.455000 6.310000 2.625000 ;
+      RECT 6.395000 3.245000 6.565000 3.415000 ;
+      RECT 6.560000 2.025000 6.730000 2.195000 ;
+      RECT 6.560000 2.885000 6.730000 3.055000 ;
+      RECT 6.875000 3.245000 7.045000 3.415000 ;
+      RECT 6.920000 2.025000 7.090000 2.195000 ;
+      RECT 6.920000 2.885000 7.090000 3.055000 ;
+      RECT 7.355000 2.455000 7.525000 2.625000 ;
+      RECT 7.355000 3.245000 7.525000 3.415000 ;
+      RECT 7.715000 2.455000 7.885000 2.625000 ;
+      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 1.055000 2.410000 1.705000 2.670000 ;
+      RECT 2.610000 2.410000 3.260000 2.670000 ;
+      RECT 4.165000 2.410000 4.815000 2.670000 ;
+      RECT 5.720000 2.410000 6.370000 2.670000 ;
+      RECT 7.295000 2.410000 7.945000 2.670000 ;
+    LAYER via ;
+      RECT 1.095000 2.410000 1.355000 2.670000 ;
+      RECT 1.415000 2.410000 1.675000 2.670000 ;
+      RECT 2.640000 2.410000 2.900000 2.670000 ;
+      RECT 2.960000 2.410000 3.220000 2.670000 ;
+      RECT 4.195000 2.410000 4.455000 2.670000 ;
+      RECT 4.515000 2.410000 4.775000 2.670000 ;
+      RECT 5.750000 2.410000 6.010000 2.670000 ;
+      RECT 6.070000 2.410000 6.330000 2.670000 ;
+      RECT 7.325000 2.410000 7.585000 2.670000 ;
+      RECT 7.645000 2.410000 7.905000 2.670000 ;
+  END
 END sky130_fd_sc_lp__sleep_sergate_plv_14
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef
index 9036aee..6a25377 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.magic.lef
@@ -37,46 +37,6 @@
   PIN VIRTPWR
     ANTENNADIFFAREA  3.815000 ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 1.055000 1.980000 7.950000 2.240000 ;
-        RECT 1.055000 2.840000 8.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 1.895000 2.025000 2.065000 2.195000 ;
-        RECT 1.895000 2.885000 2.065000 3.055000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.255000 2.025000 2.425000 2.195000 ;
-        RECT 2.255000 2.885000 2.425000 3.055000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.450000 2.025000 3.620000 2.195000 ;
-        RECT 3.450000 2.885000 3.620000 3.055000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.810000 2.025000 3.980000 2.195000 ;
-        RECT 3.810000 2.885000 3.980000 3.055000 ;
-        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.005000 2.025000 5.175000 2.195000 ;
-        RECT 5.005000 2.885000 5.175000 3.055000 ;
-        RECT 5.365000 2.025000 5.535000 2.195000 ;
-        RECT 5.365000 2.885000 5.535000 3.055000 ;
-        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.560000 2.025000 6.730000 2.195000 ;
-        RECT 6.560000 2.885000 6.730000 3.055000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 6.920000 2.025000 7.090000 2.195000 ;
-        RECT 6.920000 2.885000 7.090000 3.055000 ;
-        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 ;
         RECT 1.845000 1.550000 2.470000 3.085000 ;
@@ -88,59 +48,99 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.055000 1.550000 7.950000 1.810000 ;
-        RECT 1.055000 2.410000 7.950000 2.670000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.595000 1.285000 1.765000 ;
-        RECT 1.115000 2.455000 1.285000 2.625000 ;
-        RECT 1.475000 1.595000 1.645000 1.765000 ;
-        RECT 1.475000 2.455000 1.645000 2.625000 ;
-        RECT 2.670000 1.595000 2.840000 1.765000 ;
-        RECT 2.670000 2.455000 2.840000 2.625000 ;
-        RECT 3.030000 1.595000 3.200000 1.765000 ;
-        RECT 3.030000 2.455000 3.200000 2.625000 ;
-        RECT 4.225000 1.595000 4.395000 1.765000 ;
-        RECT 4.225000 2.455000 4.395000 2.625000 ;
-        RECT 4.585000 1.595000 4.755000 1.765000 ;
-        RECT 4.585000 2.455000 4.755000 2.625000 ;
-        RECT 5.780000 1.595000 5.950000 1.765000 ;
-        RECT 5.780000 2.455000 5.950000 2.625000 ;
-        RECT 6.140000 1.595000 6.310000 1.765000 ;
-        RECT 6.140000 2.455000 6.310000 2.625000 ;
-        RECT 7.355000 1.595000 7.525000 1.765000 ;
-        RECT 7.355000 2.455000 7.525000 2.625000 ;
-        RECT 7.715000 1.595000 7.885000 1.765000 ;
-        RECT 7.715000 2.455000 7.885000 2.625000 ;
-      LAYER met1 ;
-        RECT 1.055000 1.550000 1.705000 2.670000 ;
-        RECT 2.610000 1.550000 3.260000 2.670000 ;
-        RECT 4.165000 1.550000 4.815000 2.670000 ;
-        RECT 5.720000 1.550000 6.370000 2.670000 ;
-        RECT 7.295000 1.550000 7.945000 2.670000 ;
       LAYER met2 ;
         RECT 0.280000 0.000000 8.840000 3.330000 ;
-      LAYER via ;
-        RECT 1.095000 1.550000 1.355000 1.810000 ;
-        RECT 1.095000 2.410000 1.355000 2.670000 ;
-        RECT 1.415000 1.550000 1.675000 1.810000 ;
-        RECT 1.415000 2.410000 1.675000 2.670000 ;
-        RECT 2.640000 1.550000 2.900000 1.810000 ;
-        RECT 2.640000 2.410000 2.900000 2.670000 ;
-        RECT 2.960000 1.550000 3.220000 1.810000 ;
-        RECT 2.960000 2.410000 3.220000 2.670000 ;
-        RECT 4.195000 1.550000 4.455000 1.810000 ;
-        RECT 4.195000 2.410000 4.455000 2.670000 ;
-        RECT 4.515000 1.550000 4.775000 1.810000 ;
-        RECT 4.515000 2.410000 4.775000 2.670000 ;
-        RECT 5.750000 1.550000 6.010000 1.810000 ;
-        RECT 5.750000 2.410000 6.010000 2.670000 ;
-        RECT 6.070000 1.550000 6.330000 1.810000 ;
-        RECT 6.070000 2.410000 6.330000 2.670000 ;
-        RECT 7.325000 1.550000 7.585000 1.810000 ;
-        RECT 7.325000 2.410000 7.585000 2.670000 ;
-        RECT 7.645000 1.550000 7.905000 1.810000 ;
-        RECT 7.645000 2.410000 7.905000 2.670000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 3.245000 9.120000 3.415000 ;
+      RECT 1.055000 1.550000 7.950000 1.810000 ;
+      RECT 1.055000 1.980000 7.950000 2.240000 ;
+      RECT 1.055000 2.410000 7.950000 2.670000 ;
+      RECT 1.055000 2.840000 8.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 1.595000 1.285000 1.765000 ;
+      RECT 1.115000 2.455000 1.285000 2.625000 ;
+      RECT 1.115000 3.245000 1.285000 3.415000 ;
+      RECT 1.475000 1.595000 1.645000 1.765000 ;
+      RECT 1.475000 2.455000 1.645000 2.625000 ;
+      RECT 1.595000 3.245000 1.765000 3.415000 ;
+      RECT 1.895000 2.025000 2.065000 2.195000 ;
+      RECT 1.895000 2.885000 2.065000 3.055000 ;
+      RECT 2.075000 3.245000 2.245000 3.415000 ;
+      RECT 2.255000 2.025000 2.425000 2.195000 ;
+      RECT 2.255000 2.885000 2.425000 3.055000 ;
+      RECT 2.555000 3.245000 2.725000 3.415000 ;
+      RECT 2.670000 1.595000 2.840000 1.765000 ;
+      RECT 2.670000 2.455000 2.840000 2.625000 ;
+      RECT 3.030000 1.595000 3.200000 1.765000 ;
+      RECT 3.030000 2.455000 3.200000 2.625000 ;
+      RECT 3.035000 3.245000 3.205000 3.415000 ;
+      RECT 3.450000 2.025000 3.620000 2.195000 ;
+      RECT 3.450000 2.885000 3.620000 3.055000 ;
+      RECT 3.515000 3.245000 3.685000 3.415000 ;
+      RECT 3.810000 2.025000 3.980000 2.195000 ;
+      RECT 3.810000 2.885000 3.980000 3.055000 ;
+      RECT 3.995000 3.245000 4.165000 3.415000 ;
+      RECT 4.225000 1.595000 4.395000 1.765000 ;
+      RECT 4.225000 2.455000 4.395000 2.625000 ;
+      RECT 4.475000 3.245000 4.645000 3.415000 ;
+      RECT 4.585000 1.595000 4.755000 1.765000 ;
+      RECT 4.585000 2.455000 4.755000 2.625000 ;
+      RECT 4.955000 3.245000 5.125000 3.415000 ;
+      RECT 5.005000 2.025000 5.175000 2.195000 ;
+      RECT 5.005000 2.885000 5.175000 3.055000 ;
+      RECT 5.365000 2.025000 5.535000 2.195000 ;
+      RECT 5.365000 2.885000 5.535000 3.055000 ;
+      RECT 5.435000 3.245000 5.605000 3.415000 ;
+      RECT 5.780000 1.595000 5.950000 1.765000 ;
+      RECT 5.780000 2.455000 5.950000 2.625000 ;
+      RECT 5.915000 3.245000 6.085000 3.415000 ;
+      RECT 6.140000 1.595000 6.310000 1.765000 ;
+      RECT 6.140000 2.455000 6.310000 2.625000 ;
+      RECT 6.395000 3.245000 6.565000 3.415000 ;
+      RECT 6.560000 2.025000 6.730000 2.195000 ;
+      RECT 6.560000 2.885000 6.730000 3.055000 ;
+      RECT 6.875000 3.245000 7.045000 3.415000 ;
+      RECT 6.920000 2.025000 7.090000 2.195000 ;
+      RECT 6.920000 2.885000 7.090000 3.055000 ;
+      RECT 7.355000 1.595000 7.525000 1.765000 ;
+      RECT 7.355000 2.455000 7.525000 2.625000 ;
+      RECT 7.355000 3.245000 7.525000 3.415000 ;
+      RECT 7.715000 1.595000 7.885000 1.765000 ;
+      RECT 7.715000 2.455000 7.885000 2.625000 ;
+      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 1.055000 1.550000 1.705000 2.670000 ;
+      RECT 2.610000 1.550000 3.260000 2.670000 ;
+      RECT 4.165000 1.550000 4.815000 2.670000 ;
+      RECT 5.720000 1.550000 6.370000 2.670000 ;
+      RECT 7.295000 1.550000 7.945000 2.670000 ;
+    LAYER via ;
+      RECT 1.095000 1.550000 1.355000 1.810000 ;
+      RECT 1.095000 2.410000 1.355000 2.670000 ;
+      RECT 1.415000 1.550000 1.675000 1.810000 ;
+      RECT 1.415000 2.410000 1.675000 2.670000 ;
+      RECT 2.640000 1.550000 2.900000 1.810000 ;
+      RECT 2.640000 2.410000 2.900000 2.670000 ;
+      RECT 2.960000 1.550000 3.220000 1.810000 ;
+      RECT 2.960000 2.410000 3.220000 2.670000 ;
+      RECT 4.195000 1.550000 4.455000 1.810000 ;
+      RECT 4.195000 2.410000 4.455000 2.670000 ;
+      RECT 4.515000 1.550000 4.775000 1.810000 ;
+      RECT 4.515000 2.410000 4.775000 2.670000 ;
+      RECT 5.750000 1.550000 6.010000 1.810000 ;
+      RECT 5.750000 2.410000 6.010000 2.670000 ;
+      RECT 6.070000 1.550000 6.330000 1.810000 ;
+      RECT 6.070000 2.410000 6.330000 2.670000 ;
+      RECT 7.325000 1.550000 7.585000 1.810000 ;
+      RECT 7.325000 2.410000 7.585000 2.670000 ;
+      RECT 7.645000 1.550000 7.905000 1.810000 ;
+      RECT 7.645000 2.410000 7.905000 2.670000 ;
+  END
 END sky130_fd_sc_lp__sleep_sergate_plv_21
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef
index e0561d5..9ba8092 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.magic.lef
@@ -37,55 +37,6 @@
   PIN VIRTPWR
     ANTENNADIFFAREA  5.950000 ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 1.055000 1.120000 7.950000 1.380000 ;
-        RECT 1.055000 1.980000 7.950000 2.240000 ;
-        RECT 1.055000 2.840000 8.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 1.895000 1.165000 2.065000 1.335000 ;
-        RECT 1.895000 2.025000 2.065000 2.195000 ;
-        RECT 1.895000 2.885000 2.065000 3.055000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.255000 1.165000 2.425000 1.335000 ;
-        RECT 2.255000 2.025000 2.425000 2.195000 ;
-        RECT 2.255000 2.885000 2.425000 3.055000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 3.245000 3.205000 3.415000 ;
-        RECT 3.450000 1.165000 3.620000 1.335000 ;
-        RECT 3.450000 2.025000 3.620000 2.195000 ;
-        RECT 3.450000 2.885000 3.620000 3.055000 ;
-        RECT 3.515000 3.245000 3.685000 3.415000 ;
-        RECT 3.810000 1.165000 3.980000 1.335000 ;
-        RECT 3.810000 2.025000 3.980000 2.195000 ;
-        RECT 3.810000 2.885000 3.980000 3.055000 ;
-        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.005000 1.165000 5.175000 1.335000 ;
-        RECT 5.005000 2.025000 5.175000 2.195000 ;
-        RECT 5.005000 2.885000 5.175000 3.055000 ;
-        RECT 5.365000 1.165000 5.535000 1.335000 ;
-        RECT 5.365000 2.025000 5.535000 2.195000 ;
-        RECT 5.365000 2.885000 5.535000 3.055000 ;
-        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.560000 1.165000 6.730000 1.335000 ;
-        RECT 6.560000 2.025000 6.730000 2.195000 ;
-        RECT 6.560000 2.885000 6.730000 3.055000 ;
-        RECT 6.875000 3.245000 7.045000 3.415000 ;
-        RECT 6.920000 1.165000 7.090000 1.335000 ;
-        RECT 6.920000 2.025000 7.090000 2.195000 ;
-        RECT 6.920000 2.885000 7.090000 3.055000 ;
-        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 ;
         RECT 1.845000 1.105000 2.470000 3.085000 ;
@@ -97,59 +48,108 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 1.055000 1.550000 7.950000 1.810000 ;
-        RECT 1.055000 2.410000 7.950000 2.670000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.595000 1.285000 1.765000 ;
-        RECT 1.115000 2.455000 1.285000 2.625000 ;
-        RECT 1.475000 1.595000 1.645000 1.765000 ;
-        RECT 1.475000 2.455000 1.645000 2.625000 ;
-        RECT 2.670000 1.595000 2.840000 1.765000 ;
-        RECT 2.670000 2.455000 2.840000 2.625000 ;
-        RECT 3.030000 1.595000 3.200000 1.765000 ;
-        RECT 3.030000 2.455000 3.200000 2.625000 ;
-        RECT 4.225000 1.595000 4.395000 1.765000 ;
-        RECT 4.225000 2.455000 4.395000 2.625000 ;
-        RECT 4.585000 1.595000 4.755000 1.765000 ;
-        RECT 4.585000 2.455000 4.755000 2.625000 ;
-        RECT 5.780000 1.595000 5.950000 1.765000 ;
-        RECT 5.780000 2.455000 5.950000 2.625000 ;
-        RECT 6.140000 1.595000 6.310000 1.765000 ;
-        RECT 6.140000 2.455000 6.310000 2.625000 ;
-        RECT 7.355000 1.595000 7.525000 1.765000 ;
-        RECT 7.355000 2.455000 7.525000 2.625000 ;
-        RECT 7.715000 1.595000 7.885000 1.765000 ;
-        RECT 7.715000 2.455000 7.885000 2.625000 ;
-      LAYER met1 ;
-        RECT 1.055000 1.550000 1.705000 2.670000 ;
-        RECT 2.610000 1.550000 3.260000 2.670000 ;
-        RECT 4.165000 1.550000 4.815000 2.670000 ;
-        RECT 5.720000 1.550000 6.370000 2.670000 ;
-        RECT 7.295000 1.550000 7.945000 2.670000 ;
       LAYER met2 ;
         RECT 0.280000 0.000000 8.840000 3.330000 ;
-      LAYER via ;
-        RECT 1.095000 1.550000 1.355000 1.810000 ;
-        RECT 1.095000 2.410000 1.355000 2.670000 ;
-        RECT 1.415000 1.550000 1.675000 1.810000 ;
-        RECT 1.415000 2.410000 1.675000 2.670000 ;
-        RECT 2.640000 1.550000 2.900000 1.810000 ;
-        RECT 2.640000 2.410000 2.900000 2.670000 ;
-        RECT 2.960000 1.550000 3.220000 1.810000 ;
-        RECT 2.960000 2.410000 3.220000 2.670000 ;
-        RECT 4.195000 1.550000 4.455000 1.810000 ;
-        RECT 4.195000 2.410000 4.455000 2.670000 ;
-        RECT 4.515000 1.550000 4.775000 1.810000 ;
-        RECT 4.515000 2.410000 4.775000 2.670000 ;
-        RECT 5.750000 1.550000 6.010000 1.810000 ;
-        RECT 5.750000 2.410000 6.010000 2.670000 ;
-        RECT 6.070000 1.550000 6.330000 1.810000 ;
-        RECT 6.070000 2.410000 6.330000 2.670000 ;
-        RECT 7.325000 1.550000 7.585000 1.810000 ;
-        RECT 7.325000 2.410000 7.585000 2.670000 ;
-        RECT 7.645000 1.550000 7.905000 1.810000 ;
-        RECT 7.645000 2.410000 7.905000 2.670000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 3.245000 9.120000 3.415000 ;
+      RECT 1.055000 1.120000 7.950000 1.380000 ;
+      RECT 1.055000 1.550000 7.950000 1.810000 ;
+      RECT 1.055000 1.980000 7.950000 2.240000 ;
+      RECT 1.055000 2.410000 7.950000 2.670000 ;
+      RECT 1.055000 2.840000 8.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 1.595000 1.285000 1.765000 ;
+      RECT 1.115000 2.455000 1.285000 2.625000 ;
+      RECT 1.115000 3.245000 1.285000 3.415000 ;
+      RECT 1.475000 1.595000 1.645000 1.765000 ;
+      RECT 1.475000 2.455000 1.645000 2.625000 ;
+      RECT 1.595000 3.245000 1.765000 3.415000 ;
+      RECT 1.895000 1.165000 2.065000 1.335000 ;
+      RECT 1.895000 2.025000 2.065000 2.195000 ;
+      RECT 1.895000 2.885000 2.065000 3.055000 ;
+      RECT 2.075000 3.245000 2.245000 3.415000 ;
+      RECT 2.255000 1.165000 2.425000 1.335000 ;
+      RECT 2.255000 2.025000 2.425000 2.195000 ;
+      RECT 2.255000 2.885000 2.425000 3.055000 ;
+      RECT 2.555000 3.245000 2.725000 3.415000 ;
+      RECT 2.670000 1.595000 2.840000 1.765000 ;
+      RECT 2.670000 2.455000 2.840000 2.625000 ;
+      RECT 3.030000 1.595000 3.200000 1.765000 ;
+      RECT 3.030000 2.455000 3.200000 2.625000 ;
+      RECT 3.035000 3.245000 3.205000 3.415000 ;
+      RECT 3.450000 1.165000 3.620000 1.335000 ;
+      RECT 3.450000 2.025000 3.620000 2.195000 ;
+      RECT 3.450000 2.885000 3.620000 3.055000 ;
+      RECT 3.515000 3.245000 3.685000 3.415000 ;
+      RECT 3.810000 1.165000 3.980000 1.335000 ;
+      RECT 3.810000 2.025000 3.980000 2.195000 ;
+      RECT 3.810000 2.885000 3.980000 3.055000 ;
+      RECT 3.995000 3.245000 4.165000 3.415000 ;
+      RECT 4.225000 1.595000 4.395000 1.765000 ;
+      RECT 4.225000 2.455000 4.395000 2.625000 ;
+      RECT 4.475000 3.245000 4.645000 3.415000 ;
+      RECT 4.585000 1.595000 4.755000 1.765000 ;
+      RECT 4.585000 2.455000 4.755000 2.625000 ;
+      RECT 4.955000 3.245000 5.125000 3.415000 ;
+      RECT 5.005000 1.165000 5.175000 1.335000 ;
+      RECT 5.005000 2.025000 5.175000 2.195000 ;
+      RECT 5.005000 2.885000 5.175000 3.055000 ;
+      RECT 5.365000 1.165000 5.535000 1.335000 ;
+      RECT 5.365000 2.025000 5.535000 2.195000 ;
+      RECT 5.365000 2.885000 5.535000 3.055000 ;
+      RECT 5.435000 3.245000 5.605000 3.415000 ;
+      RECT 5.780000 1.595000 5.950000 1.765000 ;
+      RECT 5.780000 2.455000 5.950000 2.625000 ;
+      RECT 5.915000 3.245000 6.085000 3.415000 ;
+      RECT 6.140000 1.595000 6.310000 1.765000 ;
+      RECT 6.140000 2.455000 6.310000 2.625000 ;
+      RECT 6.395000 3.245000 6.565000 3.415000 ;
+      RECT 6.560000 1.165000 6.730000 1.335000 ;
+      RECT 6.560000 2.025000 6.730000 2.195000 ;
+      RECT 6.560000 2.885000 6.730000 3.055000 ;
+      RECT 6.875000 3.245000 7.045000 3.415000 ;
+      RECT 6.920000 1.165000 7.090000 1.335000 ;
+      RECT 6.920000 2.025000 7.090000 2.195000 ;
+      RECT 6.920000 2.885000 7.090000 3.055000 ;
+      RECT 7.355000 1.595000 7.525000 1.765000 ;
+      RECT 7.355000 2.455000 7.525000 2.625000 ;
+      RECT 7.355000 3.245000 7.525000 3.415000 ;
+      RECT 7.715000 1.595000 7.885000 1.765000 ;
+      RECT 7.715000 2.455000 7.885000 2.625000 ;
+      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 1.055000 1.550000 1.705000 2.670000 ;
+      RECT 2.610000 1.550000 3.260000 2.670000 ;
+      RECT 4.165000 1.550000 4.815000 2.670000 ;
+      RECT 5.720000 1.550000 6.370000 2.670000 ;
+      RECT 7.295000 1.550000 7.945000 2.670000 ;
+    LAYER via ;
+      RECT 1.095000 1.550000 1.355000 1.810000 ;
+      RECT 1.095000 2.410000 1.355000 2.670000 ;
+      RECT 1.415000 1.550000 1.675000 1.810000 ;
+      RECT 1.415000 2.410000 1.675000 2.670000 ;
+      RECT 2.640000 1.550000 2.900000 1.810000 ;
+      RECT 2.640000 2.410000 2.900000 2.670000 ;
+      RECT 2.960000 1.550000 3.220000 1.810000 ;
+      RECT 2.960000 2.410000 3.220000 2.670000 ;
+      RECT 4.195000 1.550000 4.455000 1.810000 ;
+      RECT 4.195000 2.410000 4.455000 2.670000 ;
+      RECT 4.515000 1.550000 4.775000 1.810000 ;
+      RECT 4.515000 2.410000 4.775000 2.670000 ;
+      RECT 5.750000 1.550000 6.010000 1.810000 ;
+      RECT 5.750000 2.410000 6.010000 2.670000 ;
+      RECT 6.070000 1.550000 6.330000 1.810000 ;
+      RECT 6.070000 2.410000 6.330000 2.670000 ;
+      RECT 7.325000 1.550000 7.585000 1.810000 ;
+      RECT 7.325000 2.410000 7.585000 2.670000 ;
+      RECT 7.645000 1.550000 7.905000 1.810000 ;
+      RECT 7.645000 2.410000 7.905000 2.670000 ;
+  END
 END sky130_fd_sc_lp__sleep_sergate_plv_28
diff --git a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef
index b92db62..4a1daf5 100644
--- a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef
+++ b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.magic.lef
@@ -55,12 +55,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.945000 1.920000 1.315000 2.255000 ;
-        RECT 9.225000 1.550000 9.955000 2.150000 ;
-      LAYER mcon ;
-        RECT 1.115000 1.950000 1.285000 2.120000 ;
-        RECT 9.275000 1.950000 9.445000 2.120000 ;
       LAYER met1 ;
         RECT 1.055000 1.920000 1.345000 1.965000 ;
         RECT 1.055000 1.965000 9.505000 2.105000 ;
@@ -91,16 +85,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  4.940000 2.660000  5.635000 2.990000 ;
-        RECT  5.885000 2.660000  6.395000 2.990000 ;
-        RECT  8.270000 2.660000  8.600000 3.075000 ;
-        RECT 10.020000 2.660000 10.435000 3.075000 ;
-      LAYER mcon ;
-        RECT  5.435000 2.735000  5.605000 2.905000 ;
-        RECT  5.915000 2.735000  6.085000 2.905000 ;
-        RECT  8.315000 2.735000  8.485000 2.905000 ;
-        RECT 10.235000 2.735000 10.405000 2.905000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 11.930000 2.945000 ;
     END
@@ -109,39 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.000000 0.085000 ;
-        RECT  0.945000  0.085000  1.195000 0.845000 ;
-        RECT  3.660000  0.085000  3.990000 0.355000 ;
-        RECT  6.150000  0.085000  6.480000 0.630000 ;
-        RECT  8.610000  0.085000  8.940000 0.365000 ;
-        RECT 11.125000  0.085000 11.375000 0.965000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -150,115 +101,157 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.000000 3.415000 ;
-        RECT  0.115000 2.765000  0.445000 3.245000 ;
-        RECT  1.160000 2.425000  1.490000 3.245000 ;
-        RECT  4.300000 2.975000  4.630000 3.245000 ;
-        RECT 11.125000 1.815000 11.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 ;
-        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.465000  0.445000 0.740000 ;
-      RECT  0.115000 0.740000  0.775000 0.910000 ;
-      RECT  0.605000 0.910000  0.775000 1.580000 ;
-      RECT  0.605000 1.580000  1.470000 1.750000 ;
-      RECT  0.605000 1.750000  0.775000 2.425000 ;
-      RECT  0.605000 2.425000  0.945000 2.595000 ;
-      RECT  0.615000 2.595000  0.945000 3.075000 ;
-      RECT  1.140000 1.015000  1.470000 1.580000 ;
-      RECT  1.375000 0.465000  1.830000 0.845000 ;
-      RECT  1.660000 0.845000  1.830000 2.415000 ;
-      RECT  1.660000 2.415000  1.990000 3.075000 ;
-      RECT  2.000000 0.255000  3.010000 0.425000 ;
-      RECT  2.000000 0.425000  2.170000 1.095000 ;
-      RECT  2.000000 1.095000  2.330000 1.425000 ;
-      RECT  2.360000 0.595000  2.670000 0.865000 ;
-      RECT  2.360000 0.865000  3.730000 0.925000 ;
-      RECT  2.450000 2.415000  2.780000 3.075000 ;
-      RECT  2.500000 0.925000  3.730000 1.035000 ;
-      RECT  2.500000 1.035000  2.780000 2.415000 ;
-      RECT  2.840000 0.425000  3.010000 0.525000 ;
-      RECT  2.840000 0.525000  4.535000 0.695000 ;
-      RECT  2.960000 1.205000  3.390000 1.445000 ;
-      RECT  2.960000 1.445000  3.130000 2.635000 ;
-      RECT  2.960000 2.635000  4.770000 2.805000 ;
-      RECT  3.300000 1.615000  3.730000 1.785000 ;
-      RECT  3.300000 1.785000  3.470000 2.295000 ;
-      RECT  3.300000 2.295000  4.430000 2.465000 ;
-      RECT  3.560000 1.035000  3.730000 1.615000 ;
-      RECT  3.640000 1.955000  4.070000 2.125000 ;
-      RECT  3.900000 0.695000  4.535000 0.925000 ;
-      RECT  3.900000 0.925000  4.070000 1.955000 ;
-      RECT  4.205000 0.255000  5.975000 0.425000 ;
-      RECT  4.205000 0.425000  4.535000 0.525000 ;
-      RECT  4.260000 1.980000  7.760000 2.150000 ;
-      RECT  4.260000 2.150000  4.430000 2.295000 ;
-      RECT  4.375000 1.105000  4.875000 1.640000 ;
-      RECT  4.375000 1.640000  5.735000 1.810000 ;
-      RECT  4.600000 2.320000  6.735000 2.490000 ;
-      RECT  4.600000 2.490000  4.770000 2.635000 ;
-      RECT  4.705000 0.595000  5.220000 0.920000 ;
-      RECT  4.705000 0.920000  4.875000 1.105000 ;
-      RECT  5.805000 0.425000  5.975000 0.800000 ;
-      RECT  5.805000 0.800000  7.000000 0.970000 ;
-      RECT  6.565000 2.490000  6.735000 2.905000 ;
-      RECT  6.565000 2.905000  8.100000 3.075000 ;
-      RECT  6.710000 1.640000  7.040000 1.810000 ;
-      RECT  6.830000 0.255000  7.920000 0.425000 ;
-      RECT  6.830000 0.425000  7.000000 0.800000 ;
-      RECT  6.870000 1.140000  7.420000 1.310000 ;
-      RECT  6.870000 1.310000  7.040000 1.640000 ;
-      RECT  7.170000 0.595000  7.420000 0.875000 ;
-      RECT  7.170000 0.875000  8.715000 1.135000 ;
-      RECT  7.170000 1.135000  7.420000 1.140000 ;
-      RECT  7.270000 2.150000  7.760000 2.735000 ;
-      RECT  7.590000 0.425000  7.920000 0.585000 ;
-      RECT  7.590000 1.305000  9.765000 1.365000 ;
-      RECT  7.590000 1.365000  9.055000 1.475000 ;
-      RECT  7.590000 1.475000  7.760000 1.980000 ;
-      RECT  7.930000 1.645000  8.365000 1.935000 ;
-      RECT  7.930000 1.935000  8.100000 2.320000 ;
-      RECT  7.930000 2.320000 10.295000 2.490000 ;
-      RECT  7.930000 2.490000  8.100000 2.905000 ;
-      RECT  8.180000 0.255000  8.430000 0.535000 ;
-      RECT  8.180000 0.535000  9.455000 0.705000 ;
-      RECT  8.885000 1.035000  9.765000 1.305000 ;
-      RECT  9.125000 0.255000  9.455000 0.535000 ;
-      RECT  9.375000 2.490000  9.705000 3.075000 ;
-      RECT  9.920000 0.255000 10.295000 0.675000 ;
-      RECT 10.125000 0.675000 10.295000 2.320000 ;
-      RECT 10.580000 0.255000 10.910000 1.315000 ;
-      RECT 10.580000 1.315000 11.575000 1.645000 ;
-      RECT 10.580000 1.645000 10.910000 2.490000 ;
+      RECT  0.000000 -0.085000 12.000000 0.085000 ;
+      RECT  0.000000  3.245000 12.000000 3.415000 ;
+      RECT  0.115000  0.465000  0.445000 0.740000 ;
+      RECT  0.115000  0.740000  0.775000 0.910000 ;
+      RECT  0.115000  2.765000  0.445000 3.245000 ;
+      RECT  0.605000  0.910000  0.775000 1.580000 ;
+      RECT  0.605000  1.580000  1.470000 1.750000 ;
+      RECT  0.605000  1.750000  0.775000 2.425000 ;
+      RECT  0.605000  2.425000  0.945000 2.595000 ;
+      RECT  0.615000  2.595000  0.945000 3.075000 ;
+      RECT  0.945000  0.085000  1.195000 0.845000 ;
+      RECT  0.945000  1.920000  1.315000 2.255000 ;
+      RECT  1.140000  1.015000  1.470000 1.580000 ;
+      RECT  1.160000  2.425000  1.490000 3.245000 ;
+      RECT  1.375000  0.465000  1.830000 0.845000 ;
+      RECT  1.660000  0.845000  1.830000 2.415000 ;
+      RECT  1.660000  2.415000  1.990000 3.075000 ;
+      RECT  2.000000  0.255000  3.010000 0.425000 ;
+      RECT  2.000000  0.425000  2.170000 1.095000 ;
+      RECT  2.000000  1.095000  2.330000 1.425000 ;
+      RECT  2.360000  0.595000  2.670000 0.865000 ;
+      RECT  2.360000  0.865000  3.730000 0.925000 ;
+      RECT  2.450000  2.415000  2.780000 3.075000 ;
+      RECT  2.500000  0.925000  3.730000 1.035000 ;
+      RECT  2.500000  1.035000  2.780000 2.415000 ;
+      RECT  2.840000  0.425000  3.010000 0.525000 ;
+      RECT  2.840000  0.525000  4.535000 0.695000 ;
+      RECT  2.960000  1.205000  3.390000 1.445000 ;
+      RECT  2.960000  1.445000  3.130000 2.635000 ;
+      RECT  2.960000  2.635000  4.770000 2.805000 ;
+      RECT  3.300000  1.615000  3.730000 1.785000 ;
+      RECT  3.300000  1.785000  3.470000 2.295000 ;
+      RECT  3.300000  2.295000  4.430000 2.465000 ;
+      RECT  3.560000  1.035000  3.730000 1.615000 ;
+      RECT  3.640000  1.955000  4.070000 2.125000 ;
+      RECT  3.660000  0.085000  3.990000 0.355000 ;
+      RECT  3.900000  0.695000  4.535000 0.925000 ;
+      RECT  3.900000  0.925000  4.070000 1.955000 ;
+      RECT  4.205000  0.255000  5.975000 0.425000 ;
+      RECT  4.205000  0.425000  4.535000 0.525000 ;
+      RECT  4.260000  1.980000  7.760000 2.150000 ;
+      RECT  4.260000  2.150000  4.430000 2.295000 ;
+      RECT  4.300000  2.975000  4.630000 3.245000 ;
+      RECT  4.375000  1.105000  4.875000 1.640000 ;
+      RECT  4.375000  1.640000  5.735000 1.810000 ;
+      RECT  4.600000  2.320000  6.735000 2.490000 ;
+      RECT  4.600000  2.490000  4.770000 2.635000 ;
+      RECT  4.705000  0.595000  5.220000 0.920000 ;
+      RECT  4.705000  0.920000  4.875000 1.105000 ;
+      RECT  4.940000  2.660000  5.635000 2.990000 ;
+      RECT  5.805000  0.425000  5.975000 0.800000 ;
+      RECT  5.805000  0.800000  7.000000 0.970000 ;
+      RECT  5.885000  2.660000  6.395000 2.990000 ;
+      RECT  6.150000  0.085000  6.480000 0.630000 ;
+      RECT  6.565000  2.490000  6.735000 2.905000 ;
+      RECT  6.565000  2.905000  8.100000 3.075000 ;
+      RECT  6.710000  1.640000  7.040000 1.810000 ;
+      RECT  6.830000  0.255000  7.920000 0.425000 ;
+      RECT  6.830000  0.425000  7.000000 0.800000 ;
+      RECT  6.870000  1.140000  7.420000 1.310000 ;
+      RECT  6.870000  1.310000  7.040000 1.640000 ;
+      RECT  7.170000  0.595000  7.420000 0.875000 ;
+      RECT  7.170000  0.875000  8.715000 1.135000 ;
+      RECT  7.170000  1.135000  7.420000 1.140000 ;
+      RECT  7.270000  2.150000  7.760000 2.735000 ;
+      RECT  7.590000  0.425000  7.920000 0.585000 ;
+      RECT  7.590000  1.305000  9.765000 1.365000 ;
+      RECT  7.590000  1.365000  9.055000 1.475000 ;
+      RECT  7.590000  1.475000  7.760000 1.980000 ;
+      RECT  7.930000  1.645000  8.365000 1.935000 ;
+      RECT  7.930000  1.935000  8.100000 2.320000 ;
+      RECT  7.930000  2.320000 10.295000 2.490000 ;
+      RECT  7.930000  2.490000  8.100000 2.905000 ;
+      RECT  8.180000  0.255000  8.430000 0.535000 ;
+      RECT  8.180000  0.535000  9.455000 0.705000 ;
+      RECT  8.270000  2.660000  8.600000 3.075000 ;
+      RECT  8.610000  0.085000  8.940000 0.365000 ;
+      RECT  8.885000  1.035000  9.765000 1.305000 ;
+      RECT  9.125000  0.255000  9.455000 0.535000 ;
+      RECT  9.225000  1.550000  9.955000 2.150000 ;
+      RECT  9.375000  2.490000  9.705000 3.075000 ;
+      RECT  9.920000  0.255000 10.295000 0.675000 ;
+      RECT 10.020000  2.660000 10.435000 3.075000 ;
+      RECT 10.125000  0.675000 10.295000 2.320000 ;
+      RECT 10.580000  0.255000 10.910000 1.315000 ;
+      RECT 10.580000  1.315000 11.575000 1.645000 ;
+      RECT 10.580000  1.645000 10.910000 2.490000 ;
+      RECT 11.125000  0.085000 11.375000 0.965000 ;
+      RECT 11.125000  1.815000 11.375000 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  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  2.735000  5.605000 2.905000 ;
+      RECT  5.435000  3.245000  5.605000 3.415000 ;
+      RECT  5.915000 -0.085000  6.085000 0.085000 ;
+      RECT  5.915000  2.735000  6.085000 2.905000 ;
+      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  2.735000  8.485000 2.905000 ;
+      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.950000  9.445000 2.120000 ;
+      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  2.735000 10.405000 2.905000 ;
+      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_lp__srdlrtp_1
diff --git a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef
index ff4601e..c576943 100644
--- a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef
+++ b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.magic.lef
@@ -82,16 +82,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 4.615000 2.655000 5.155000 3.075000 ;
-        RECT 6.810000 2.655000 7.140000 2.985000 ;
-        RECT 8.600000 2.660000 8.995000 2.990000 ;
-        RECT 9.245000 2.660000 9.940000 2.990000 ;
-      LAYER mcon ;
-        RECT 4.955000 2.735000 5.125000 2.905000 ;
-        RECT 6.875000 2.735000 7.045000 2.905000 ;
-        RECT 8.795000 2.735000 8.965000 2.905000 ;
-        RECT 9.275000 2.735000 9.445000 2.905000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 12.890000 2.945000 ;
     END
@@ -100,45 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.960000 0.085000 ;
-        RECT  0.095000  0.085000  0.345000 0.785000 ;
-        RECT  1.640000  0.085000  1.810000 0.645000 ;
-        RECT  1.640000  0.645000  2.165000 0.815000 ;
-        RECT  1.835000  0.815000  2.165000 1.310000 ;
-        RECT  5.935000  0.085000  6.185000 0.945000 ;
-        RECT  6.820000  0.085000  7.150000 1.015000 ;
-        RECT  9.715000  0.085000 10.045000 1.310000 ;
-        RECT 11.055000  0.085000 11.305000 1.095000 ;
-        RECT 12.075000  0.085000 12.325000 1.145000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -147,106 +98,150 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 12.960000 3.415000 ;
-        RECT  0.640000 2.320000  0.970000 3.245000 ;
-        RECT  1.610000 2.845000  1.940000 3.245000 ;
-        RECT 12.005000 1.815000 12.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 12.960000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.105000 1.980000  0.855000 2.150000 ;
-      RECT  0.105000 2.150000  0.435000 2.660000 ;
-      RECT  0.525000 0.325000  0.855000 0.785000 ;
-      RECT  0.685000 0.785000  0.855000 1.480000 ;
-      RECT  0.685000 1.480000  1.130000 1.810000 ;
-      RECT  0.685000 1.810000  0.855000 1.980000 ;
-      RECT  1.045000 0.630000  1.470000 1.310000 ;
-      RECT  1.150000 1.980000  1.470000 2.505000 ;
-      RECT  1.150000 2.505000  3.015000 2.675000 ;
-      RECT  1.150000 2.675000  1.400000 2.860000 ;
-      RECT  1.300000 1.310000  1.470000 1.980000 ;
-      RECT  2.145000 1.480000  2.515000 2.335000 ;
-      RECT  2.345000 0.850000  2.690000 0.985000 ;
-      RECT  2.345000 0.985000  3.160000 1.255000 ;
-      RECT  2.345000 1.255000  2.515000 1.480000 ;
-      RECT  2.685000 1.425000  3.500000 1.595000 ;
-      RECT  2.685000 1.595000  2.855000 2.265000 ;
-      RECT  2.685000 2.265000  3.015000 2.505000 ;
-      RECT  2.685000 2.675000  3.015000 3.075000 ;
-      RECT  2.880000 0.595000  3.500000 0.815000 ;
-      RECT  3.025000 1.765000  3.355000 2.095000 ;
-      RECT  3.185000 2.095000  3.355000 2.905000 ;
-      RECT  3.185000 2.905000  4.400000 3.075000 ;
-      RECT  3.330000 0.815000  3.500000 1.425000 ;
-      RECT  3.590000 2.075000  3.920000 2.735000 ;
-      RECT  3.670000 0.595000  4.740000 0.895000 ;
-      RECT  3.670000 0.895000  3.840000 2.075000 ;
-      RECT  4.070000 1.125000  4.400000 1.455000 ;
-      RECT  4.230000 1.455000  4.400000 2.315000 ;
-      RECT  4.230000 2.315000  8.090000 2.485000 ;
-      RECT  4.230000 2.485000  4.400000 2.905000 ;
-      RECT  4.570000 0.895000  4.740000 1.285000 ;
-      RECT  4.570000 1.285000  5.310000 1.455000 ;
-      RECT  4.640000 1.625000  4.970000 1.975000 ;
-      RECT  4.640000 1.975000  7.750000 2.145000 ;
-      RECT  5.015000 0.595000  5.265000 0.840000 ;
-      RECT  5.015000 0.840000  5.650000 1.010000 ;
-      RECT  5.140000 1.455000  7.410000 1.515000 ;
-      RECT  5.140000 1.515000  7.250000 1.625000 ;
-      RECT  5.480000 1.010000  5.650000 1.115000 ;
-      RECT  5.480000 1.115000  6.640000 1.285000 ;
-      RECT  5.560000 1.625000  5.890000 1.805000 ;
-      RECT  6.390000 0.615000  6.640000 1.115000 ;
-      RECT  7.080000 1.185000  7.410000 1.455000 ;
-      RECT  7.420000 1.685000  7.750000 1.975000 ;
-      RECT  7.580000 0.800000  8.205000 0.970000 ;
-      RECT  7.580000 0.970000  7.750000 1.685000 ;
-      RECT  7.875000 0.340000  8.205000 0.800000 ;
-      RECT  7.920000 1.140000  9.395000 1.310000 ;
-      RECT  7.920000 1.310000  8.090000 2.315000 ;
-      RECT  8.050000 2.745000  8.430000 3.075000 ;
-      RECT  8.260000 2.320000 10.505000 2.490000 ;
-      RECT  8.260000 2.490000  8.430000 2.745000 ;
-      RECT  8.425000 0.850000  8.755000 1.140000 ;
-      RECT  9.065000 1.310000  9.395000 2.150000 ;
-      RECT 10.255000 0.635000 10.595000 1.095000 ;
-      RECT 10.255000 1.095000 10.505000 2.320000 ;
-      RECT 10.255000 2.490000 10.505000 2.860000 ;
-      RECT 11.310000 1.475000 12.335000 1.645000 ;
-      RECT 11.310000 1.645000 11.640000 2.495000 ;
-      RECT 11.485000 0.635000 11.815000 1.315000 ;
-      RECT 11.485000 1.315000 12.335000 1.475000 ;
+      RECT  0.000000 -0.085000 12.960000 0.085000 ;
+      RECT  0.000000  3.245000 12.960000 3.415000 ;
+      RECT  0.095000  0.085000  0.345000 0.785000 ;
+      RECT  0.105000  1.980000  0.855000 2.150000 ;
+      RECT  0.105000  2.150000  0.435000 2.660000 ;
+      RECT  0.525000  0.325000  0.855000 0.785000 ;
+      RECT  0.640000  2.320000  0.970000 3.245000 ;
+      RECT  0.685000  0.785000  0.855000 1.480000 ;
+      RECT  0.685000  1.480000  1.130000 1.810000 ;
+      RECT  0.685000  1.810000  0.855000 1.980000 ;
+      RECT  1.045000  0.630000  1.470000 1.310000 ;
+      RECT  1.150000  1.980000  1.470000 2.505000 ;
+      RECT  1.150000  2.505000  3.015000 2.675000 ;
+      RECT  1.150000  2.675000  1.400000 2.860000 ;
+      RECT  1.300000  1.310000  1.470000 1.980000 ;
+      RECT  1.610000  2.845000  1.940000 3.245000 ;
+      RECT  1.640000  0.085000  1.810000 0.645000 ;
+      RECT  1.640000  0.645000  2.165000 0.815000 ;
+      RECT  1.835000  0.815000  2.165000 1.310000 ;
+      RECT  2.145000  1.480000  2.515000 2.335000 ;
+      RECT  2.345000  0.850000  2.690000 0.985000 ;
+      RECT  2.345000  0.985000  3.160000 1.255000 ;
+      RECT  2.345000  1.255000  2.515000 1.480000 ;
+      RECT  2.685000  1.425000  3.500000 1.595000 ;
+      RECT  2.685000  1.595000  2.855000 2.265000 ;
+      RECT  2.685000  2.265000  3.015000 2.505000 ;
+      RECT  2.685000  2.675000  3.015000 3.075000 ;
+      RECT  2.880000  0.595000  3.500000 0.815000 ;
+      RECT  3.025000  1.765000  3.355000 2.095000 ;
+      RECT  3.185000  2.095000  3.355000 2.905000 ;
+      RECT  3.185000  2.905000  4.400000 3.075000 ;
+      RECT  3.330000  0.815000  3.500000 1.425000 ;
+      RECT  3.590000  2.075000  3.920000 2.735000 ;
+      RECT  3.670000  0.595000  4.740000 0.895000 ;
+      RECT  3.670000  0.895000  3.840000 2.075000 ;
+      RECT  4.070000  1.125000  4.400000 1.455000 ;
+      RECT  4.230000  1.455000  4.400000 2.315000 ;
+      RECT  4.230000  2.315000  8.090000 2.485000 ;
+      RECT  4.230000  2.485000  4.400000 2.905000 ;
+      RECT  4.570000  0.895000  4.740000 1.285000 ;
+      RECT  4.570000  1.285000  5.310000 1.455000 ;
+      RECT  4.615000  2.655000  5.155000 3.075000 ;
+      RECT  4.640000  1.625000  4.970000 1.975000 ;
+      RECT  4.640000  1.975000  7.750000 2.145000 ;
+      RECT  5.015000  0.595000  5.265000 0.840000 ;
+      RECT  5.015000  0.840000  5.650000 1.010000 ;
+      RECT  5.140000  1.455000  7.410000 1.515000 ;
+      RECT  5.140000  1.515000  7.250000 1.625000 ;
+      RECT  5.480000  1.010000  5.650000 1.115000 ;
+      RECT  5.480000  1.115000  6.640000 1.285000 ;
+      RECT  5.560000  1.625000  5.890000 1.805000 ;
+      RECT  5.935000  0.085000  6.185000 0.945000 ;
+      RECT  6.390000  0.615000  6.640000 1.115000 ;
+      RECT  6.810000  2.655000  7.140000 2.985000 ;
+      RECT  6.820000  0.085000  7.150000 1.015000 ;
+      RECT  7.080000  1.185000  7.410000 1.455000 ;
+      RECT  7.420000  1.685000  7.750000 1.975000 ;
+      RECT  7.580000  0.800000  8.205000 0.970000 ;
+      RECT  7.580000  0.970000  7.750000 1.685000 ;
+      RECT  7.875000  0.340000  8.205000 0.800000 ;
+      RECT  7.920000  1.140000  9.395000 1.310000 ;
+      RECT  7.920000  1.310000  8.090000 2.315000 ;
+      RECT  8.050000  2.745000  8.430000 3.075000 ;
+      RECT  8.260000  2.320000 10.505000 2.490000 ;
+      RECT  8.260000  2.490000  8.430000 2.745000 ;
+      RECT  8.425000  0.850000  8.755000 1.140000 ;
+      RECT  8.600000  2.660000  8.995000 2.990000 ;
+      RECT  9.065000  1.310000  9.395000 2.150000 ;
+      RECT  9.245000  2.660000  9.940000 2.990000 ;
+      RECT  9.715000  0.085000 10.045000 1.310000 ;
+      RECT 10.255000  0.635000 10.595000 1.095000 ;
+      RECT 10.255000  1.095000 10.505000 2.320000 ;
+      RECT 10.255000  2.490000 10.505000 2.860000 ;
+      RECT 11.055000  0.085000 11.305000 1.095000 ;
+      RECT 11.310000  1.475000 12.335000 1.645000 ;
+      RECT 11.310000  1.645000 11.640000 2.495000 ;
+      RECT 11.485000  0.635000 11.815000 1.315000 ;
+      RECT 11.485000  1.315000 12.335000 1.475000 ;
+      RECT 12.005000  1.815000 12.335000 3.245000 ;
+      RECT 12.075000  0.085000 12.325000 1.145000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.735000  5.125000 2.905000 ;
+      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  2.735000  7.045000 2.905000 ;
+      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  2.735000  8.965000 2.905000 ;
+      RECT  8.795000  3.245000  8.965000 3.415000 ;
+      RECT  9.275000 -0.085000  9.445000 0.085000 ;
+      RECT  9.275000  2.735000  9.445000 2.905000 ;
+      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_lp__srdlstp_1
diff --git a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef
index 9633bdb..b0552be 100644
--- a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef
+++ b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.magic.lef
@@ -72,16 +72,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 4.710000 2.415000 5.155000 2.720000 ;
-        RECT 4.710000 2.720000 6.145000 2.890000 ;
-        RECT 4.710000 2.890000 5.155000 3.075000 ;
-        RECT 5.815000 2.415000 6.145000 2.525000 ;
-        RECT 5.815000 2.525000 7.330000 2.695000 ;
-        RECT 5.815000 2.695000 6.145000 2.720000 ;
-        RECT 7.000000 1.655000 7.330000 2.525000 ;
-      LAYER mcon ;
-        RECT 4.955000 2.735000 5.125000 2.905000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 9.050000 2.945000 ;
     END
@@ -90,33 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.120000 0.085000 ;
-        RECT 0.115000  0.085000 0.365000 1.335000 ;
-        RECT 1.825000  0.085000 2.155000 0.445000 ;
-        RECT 4.640000  0.085000 4.970000 0.675000 ;
-        RECT 7.140000  0.085000 7.470000 0.605000 ;
-        RECT 8.245000  0.085000 8.495000 1.135000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -125,80 +88,112 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.120000 3.415000 ;
-        RECT 0.115000 2.395000 0.365000 3.245000 ;
-        RECT 1.610000 2.775000 1.940000 3.245000 ;
-        RECT 8.175000 1.815000 8.505000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.535000 0.875000 0.795000 1.285000 ;
-      RECT 0.535000 1.285000 2.950000 1.455000 ;
-      RECT 0.535000 1.455000 0.705000 2.395000 ;
-      RECT 0.535000 2.395000 0.875000 3.075000 ;
-      RECT 0.875000 1.625000 2.640000 1.795000 ;
-      RECT 0.875000 1.795000 1.205000 1.955000 ;
-      RECT 1.110000 2.435000 2.105000 2.605000 ;
-      RECT 1.110000 2.605000 1.440000 3.075000 ;
-      RECT 1.165000 0.255000 1.655000 0.615000 ;
-      RECT 1.485000 0.615000 2.190000 0.785000 ;
-      RECT 1.775000 1.965000 2.105000 2.435000 ;
-      RECT 1.860000 0.785000 2.190000 1.095000 ;
-      RECT 2.310000 1.795000 2.640000 1.955000 ;
-      RECT 2.310000 1.955000 2.480000 2.905000 ;
-      RECT 2.310000 2.905000 4.375000 3.075000 ;
-      RECT 2.360000 0.255000 2.690000 0.505000 ;
-      RECT 2.360000 0.505000 3.290000 0.675000 ;
-      RECT 2.620000 1.055000 2.950000 1.285000 ;
-      RECT 2.650000 2.445000 2.980000 2.735000 ;
-      RECT 2.810000 1.625000 3.290000 1.795000 ;
-      RECT 2.810000 1.795000 2.980000 2.445000 ;
-      RECT 3.120000 0.675000 3.290000 1.625000 ;
-      RECT 3.150000 1.965000 3.475000 2.905000 ;
-      RECT 3.460000 0.255000 3.790000 0.845000 ;
-      RECT 3.460000 0.845000 5.275000 1.015000 ;
-      RECT 3.690000 1.015000 3.860000 2.075000 ;
-      RECT 3.690000 2.075000 4.020000 2.735000 ;
-      RECT 4.045000 1.185000 4.375000 1.515000 ;
-      RECT 4.205000 1.515000 4.375000 2.075000 ;
-      RECT 4.205000 2.075000 6.830000 2.245000 ;
-      RECT 4.205000 2.245000 4.375000 2.905000 ;
-      RECT 4.585000 1.575000 5.615000 1.905000 ;
-      RECT 4.945000 1.015000 5.275000 1.175000 ;
-      RECT 5.430000 0.255000 5.760000 0.675000 ;
-      RECT 5.445000 0.675000 5.615000 1.575000 ;
-      RECT 5.990000 0.255000 6.320000 0.505000 ;
-      RECT 5.990000 0.505000 6.830000 0.675000 ;
-      RECT 6.580000 0.675000 6.830000 2.075000 ;
-      RECT 6.580000 2.245000 6.830000 2.335000 ;
-      RECT 7.630000 1.815000 7.960000 2.495000 ;
-      RECT 7.700000 0.255000 8.030000 0.605000 ;
-      RECT 7.790000 0.605000 8.030000 1.315000 ;
-      RECT 7.790000 1.315000 8.665000 1.645000 ;
-      RECT 7.790000 1.645000 7.960000 1.815000 ;
+      RECT 0.000000 -0.085000 9.120000 0.085000 ;
+      RECT 0.000000  3.245000 9.120000 3.415000 ;
+      RECT 0.115000  0.085000 0.365000 1.335000 ;
+      RECT 0.115000  2.395000 0.365000 3.245000 ;
+      RECT 0.535000  0.875000 0.795000 1.285000 ;
+      RECT 0.535000  1.285000 2.950000 1.455000 ;
+      RECT 0.535000  1.455000 0.705000 2.395000 ;
+      RECT 0.535000  2.395000 0.875000 3.075000 ;
+      RECT 0.875000  1.625000 2.640000 1.795000 ;
+      RECT 0.875000  1.795000 1.205000 1.955000 ;
+      RECT 1.110000  2.435000 2.105000 2.605000 ;
+      RECT 1.110000  2.605000 1.440000 3.075000 ;
+      RECT 1.165000  0.255000 1.655000 0.615000 ;
+      RECT 1.485000  0.615000 2.190000 0.785000 ;
+      RECT 1.610000  2.775000 1.940000 3.245000 ;
+      RECT 1.775000  1.965000 2.105000 2.435000 ;
+      RECT 1.825000  0.085000 2.155000 0.445000 ;
+      RECT 1.860000  0.785000 2.190000 1.095000 ;
+      RECT 2.310000  1.795000 2.640000 1.955000 ;
+      RECT 2.310000  1.955000 2.480000 2.905000 ;
+      RECT 2.310000  2.905000 4.375000 3.075000 ;
+      RECT 2.360000  0.255000 2.690000 0.505000 ;
+      RECT 2.360000  0.505000 3.290000 0.675000 ;
+      RECT 2.620000  1.055000 2.950000 1.285000 ;
+      RECT 2.650000  2.445000 2.980000 2.735000 ;
+      RECT 2.810000  1.625000 3.290000 1.795000 ;
+      RECT 2.810000  1.795000 2.980000 2.445000 ;
+      RECT 3.120000  0.675000 3.290000 1.625000 ;
+      RECT 3.150000  1.965000 3.475000 2.905000 ;
+      RECT 3.460000  0.255000 3.790000 0.845000 ;
+      RECT 3.460000  0.845000 5.275000 1.015000 ;
+      RECT 3.690000  1.015000 3.860000 2.075000 ;
+      RECT 3.690000  2.075000 4.020000 2.735000 ;
+      RECT 4.045000  1.185000 4.375000 1.515000 ;
+      RECT 4.205000  1.515000 4.375000 2.075000 ;
+      RECT 4.205000  2.075000 6.830000 2.245000 ;
+      RECT 4.205000  2.245000 4.375000 2.905000 ;
+      RECT 4.585000  1.575000 5.615000 1.905000 ;
+      RECT 4.640000  0.085000 4.970000 0.675000 ;
+      RECT 4.710000  2.415000 5.155000 2.720000 ;
+      RECT 4.710000  2.720000 6.145000 2.890000 ;
+      RECT 4.710000  2.890000 5.155000 3.075000 ;
+      RECT 4.945000  1.015000 5.275000 1.175000 ;
+      RECT 5.430000  0.255000 5.760000 0.675000 ;
+      RECT 5.445000  0.675000 5.615000 1.575000 ;
+      RECT 5.815000  2.415000 6.145000 2.525000 ;
+      RECT 5.815000  2.525000 7.330000 2.695000 ;
+      RECT 5.815000  2.695000 6.145000 2.720000 ;
+      RECT 5.990000  0.255000 6.320000 0.505000 ;
+      RECT 5.990000  0.505000 6.830000 0.675000 ;
+      RECT 6.580000  0.675000 6.830000 2.075000 ;
+      RECT 6.580000  2.245000 6.830000 2.335000 ;
+      RECT 7.000000  1.655000 7.330000 2.525000 ;
+      RECT 7.140000  0.085000 7.470000 0.605000 ;
+      RECT 7.630000  1.815000 7.960000 2.495000 ;
+      RECT 7.700000  0.255000 8.030000 0.605000 ;
+      RECT 7.790000  0.605000 8.030000 1.315000 ;
+      RECT 7.790000  1.315000 8.665000 1.645000 ;
+      RECT 7.790000  1.645000 7.960000 1.815000 ;
+      RECT 8.175000  1.815000 8.505000 3.245000 ;
+      RECT 8.245000  0.085000 8.495000 1.135000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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  2.735000 5.125000 2.905000 ;
+      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_lp__srdlxtp_1
diff --git a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef
index 303bc14..ad5bb9e 100644
--- a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef
+++ b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.magic.lef
@@ -35,14 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.745000 1.375000  8.075000 1.705000 ;
-        RECT  7.745000 1.705000  8.035000 2.150000 ;
-        RECT 11.165000 1.805000 11.835000 2.095000 ;
-        RECT 11.165000 2.095000 11.395000 2.150000 ;
-      LAYER mcon ;
-        RECT  7.835000 1.950000  8.005000 2.120000 ;
-        RECT 11.195000 1.950000 11.365000 2.120000 ;
       LAYER met1 ;
         RECT  7.775000 1.920000  8.065000 1.965000 ;
         RECT  7.775000 1.965000 11.425000 2.105000 ;
@@ -65,10 +57,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 12.965000 0.265000 13.325000 2.145000 ;
-      LAYER mcon ;
-        RECT 13.115000 1.210000 13.285000 1.380000 ;
       LAYER met1 ;
         RECT 13.055000 1.180000 13.345000 1.410000 ;
         RECT 13.130000 1.410000 13.270000 1.965000 ;
@@ -80,12 +68,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 13.905000 1.835000 14.310000 3.065000 ;
-        RECT 13.935000 0.265000 14.310000 1.145000 ;
-        RECT 14.140000 1.145000 14.310000 1.835000 ;
-      LAYER mcon ;
-        RECT 14.075000 1.950000 14.245000 2.120000 ;
       LAYER met1 ;
         RECT 13.595000 1.225000 14.230000 1.365000 ;
         RECT 14.015000 1.920000 14.305000 2.150000 ;
@@ -125,48 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.115000  0.085000  0.365000 0.710000 ;
-        RECT  1.105000  0.085000  1.435000 0.675000 ;
-        RECT  2.795000  0.085000  3.045000 0.675000 ;
-        RECT  4.335000  0.085000  4.665000 0.650000 ;
-        RECT  7.050000  0.085000  7.380000 1.195000 ;
-        RECT  8.635000  0.085000  8.885000 1.195000 ;
-        RECT 10.655000  0.085000 10.985000 0.805000 ;
-        RECT 12.005000  0.085000 12.255000 0.725000 ;
-        RECT 13.505000  0.085000 13.755000 1.145000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -175,130 +115,180 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.865000 2.635000  1.195000 3.245000 ;
-        RECT  2.645000 2.845000  2.975000 3.245000 ;
-        RECT  4.215000 2.045000  4.545000 3.245000 ;
-        RECT  6.570000 2.295000  6.820000 3.245000 ;
-        RECT  7.595000 2.680000  7.925000 3.245000 ;
-        RECT  8.700000 1.885000  9.030000 3.245000 ;
-        RECT 10.690000 2.680000 11.020000 3.245000 ;
-        RECT 11.710000 2.275000 12.040000 3.245000 ;
-        RECT 13.395000 2.675000 13.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.130000 0.890000  1.140000 1.220000 ;
-      RECT  0.130000 1.220000  0.300000 1.985000 ;
-      RECT  0.130000 1.985000  2.280000 2.315000 ;
-      RECT  0.130000 2.315000  0.300000 2.635000 ;
-      RECT  0.130000 2.635000  0.685000 3.065000 ;
-      RECT  0.545000 0.265000  0.875000 0.890000 ;
-      RECT  1.685000 2.495000  2.800000 2.665000 ;
-      RECT  1.685000 2.665000  2.015000 3.065000 ;
-      RECT  1.975000 0.265000  2.305000 0.675000 ;
-      RECT  2.135000 0.675000  2.305000 0.855000 ;
-      RECT  2.135000 0.855000  2.800000 1.025000 ;
-      RECT  2.630000 1.025000  2.800000 2.165000 ;
-      RECT  2.630000 2.165000  3.335000 2.495000 ;
-      RECT  3.155000 2.675000  3.685000 2.845000 ;
-      RECT  3.155000 2.845000  3.485000 3.065000 ;
-      RECT  3.225000 0.265000  3.715000 0.675000 ;
-      RECT  3.515000 0.675000  3.685000 2.675000 ;
-      RECT  3.865000 1.695000  4.545000 1.865000 ;
-      RECT  3.865000 1.865000  4.035000 3.065000 ;
-      RECT  3.905000 0.265000  4.155000 0.830000 ;
-      RECT  3.905000 0.830000  4.545000 1.000000 ;
-      RECT  4.375000 1.000000  4.545000 1.225000 ;
-      RECT  4.375000 1.225000  4.850000 1.555000 ;
-      RECT  4.375000 1.555000  4.545000 1.695000 ;
-      RECT  4.725000 1.735000  5.690000 1.905000 ;
-      RECT  4.725000 1.905000  5.030000 3.065000 ;
-      RECT  4.845000 0.265000  5.200000 1.045000 ;
-      RECT  5.030000 1.045000  5.200000 1.550000 ;
-      RECT  5.030000 1.550000  5.690000 1.735000 ;
-      RECT  5.240000 2.085000  6.040000 2.255000 ;
-      RECT  5.240000 2.255000  5.490000 2.755000 ;
-      RECT  5.405000 0.440000  6.040000 1.035000 ;
-      RECT  5.670000 2.435000  6.390000 2.755000 ;
-      RECT  5.870000 1.035000  6.040000 2.085000 ;
-      RECT  6.220000 0.575000  6.470000 1.375000 ;
-      RECT  6.220000 1.375000  7.505000 1.545000 ;
-      RECT  6.220000 1.545000  6.390000 2.435000 ;
-      RECT  6.580000 1.785000  6.910000 1.885000 ;
-      RECT  6.580000 1.885000  7.380000 2.115000 ;
-      RECT  7.050000 2.115000  7.380000 2.330000 ;
-      RECT  7.050000 2.330000  8.470000 2.500000 ;
-      RECT  7.050000 2.500000  7.380000 2.725000 ;
-      RECT  7.175000 1.545000  7.505000 1.705000 ;
-      RECT  7.870000 0.575000  8.425000 1.195000 ;
-      RECT  8.220000 1.885000  8.470000 2.330000 ;
-      RECT  8.220000 2.500000  8.470000 2.725000 ;
-      RECT  8.255000 1.195000  8.425000 1.375000 ;
-      RECT  8.255000 1.375000  9.065000 1.705000 ;
-      RECT  8.255000 1.705000  8.425000 1.885000 ;
-      RECT  9.245000 1.375000  9.695000 1.780000 ;
-      RECT  9.605000 0.435000 10.045000 0.985000 ;
-      RECT  9.605000 0.985000 11.110000 1.195000 ;
-      RECT  9.640000 2.025000 10.045000 2.195000 ;
-      RECT  9.640000 2.195000  9.970000 2.905000 ;
-      RECT  9.875000 1.195000 10.045000 2.025000 ;
-      RECT 10.420000 1.765000 10.750000 2.095000 ;
-      RECT 10.580000 1.455000 12.430000 1.625000 ;
-      RECT 10.580000 1.625000 10.750000 1.765000 ;
-      RECT 10.580000 2.095000 10.750000 2.330000 ;
-      RECT 10.580000 2.330000 11.530000 2.500000 ;
-      RECT 10.780000 1.195000 11.110000 1.275000 ;
-      RECT 11.200000 2.500000 11.530000 3.065000 ;
-      RECT 11.445000 0.265000 11.775000 1.455000 ;
-      RECT 12.100000 1.625000 12.430000 1.785000 ;
-      RECT 12.255000 2.235000 12.780000 2.325000 ;
-      RECT 12.255000 2.325000 13.725000 2.495000 ;
-      RECT 12.255000 2.495000 12.585000 2.915000 ;
-      RECT 12.435000 0.265000 12.780000 0.725000 ;
-      RECT 12.610000 0.725000 12.780000 2.235000 ;
-      RECT 13.555000 1.325000 13.960000 1.655000 ;
-      RECT 13.555000 1.655000 13.725000 2.325000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.115000  0.085000  0.365000 0.710000 ;
+      RECT  0.130000  0.890000  1.140000 1.220000 ;
+      RECT  0.130000  1.220000  0.300000 1.985000 ;
+      RECT  0.130000  1.985000  2.280000 2.315000 ;
+      RECT  0.130000  2.315000  0.300000 2.635000 ;
+      RECT  0.130000  2.635000  0.685000 3.065000 ;
+      RECT  0.545000  0.265000  0.875000 0.890000 ;
+      RECT  0.865000  2.635000  1.195000 3.245000 ;
+      RECT  1.105000  0.085000  1.435000 0.675000 ;
+      RECT  1.685000  2.495000  2.800000 2.665000 ;
+      RECT  1.685000  2.665000  2.015000 3.065000 ;
+      RECT  1.975000  0.265000  2.305000 0.675000 ;
+      RECT  2.135000  0.675000  2.305000 0.855000 ;
+      RECT  2.135000  0.855000  2.800000 1.025000 ;
+      RECT  2.630000  1.025000  2.800000 2.165000 ;
+      RECT  2.630000  2.165000  3.335000 2.495000 ;
+      RECT  2.645000  2.845000  2.975000 3.245000 ;
+      RECT  2.795000  0.085000  3.045000 0.675000 ;
+      RECT  3.155000  2.675000  3.685000 2.845000 ;
+      RECT  3.155000  2.845000  3.485000 3.065000 ;
+      RECT  3.225000  0.265000  3.715000 0.675000 ;
+      RECT  3.515000  0.675000  3.685000 2.675000 ;
+      RECT  3.865000  1.695000  4.545000 1.865000 ;
+      RECT  3.865000  1.865000  4.035000 3.065000 ;
+      RECT  3.905000  0.265000  4.155000 0.830000 ;
+      RECT  3.905000  0.830000  4.545000 1.000000 ;
+      RECT  4.215000  2.045000  4.545000 3.245000 ;
+      RECT  4.335000  0.085000  4.665000 0.650000 ;
+      RECT  4.375000  1.000000  4.545000 1.225000 ;
+      RECT  4.375000  1.225000  4.850000 1.555000 ;
+      RECT  4.375000  1.555000  4.545000 1.695000 ;
+      RECT  4.725000  1.735000  5.690000 1.905000 ;
+      RECT  4.725000  1.905000  5.030000 3.065000 ;
+      RECT  4.845000  0.265000  5.200000 1.045000 ;
+      RECT  5.030000  1.045000  5.200000 1.550000 ;
+      RECT  5.030000  1.550000  5.690000 1.735000 ;
+      RECT  5.240000  2.085000  6.040000 2.255000 ;
+      RECT  5.240000  2.255000  5.490000 2.755000 ;
+      RECT  5.405000  0.440000  6.040000 1.035000 ;
+      RECT  5.670000  2.435000  6.390000 2.755000 ;
+      RECT  5.870000  1.035000  6.040000 2.085000 ;
+      RECT  6.220000  0.575000  6.470000 1.375000 ;
+      RECT  6.220000  1.375000  7.505000 1.545000 ;
+      RECT  6.220000  1.545000  6.390000 2.435000 ;
+      RECT  6.570000  2.295000  6.820000 3.245000 ;
+      RECT  6.580000  1.785000  6.910000 1.885000 ;
+      RECT  6.580000  1.885000  7.380000 2.115000 ;
+      RECT  7.050000  0.085000  7.380000 1.195000 ;
+      RECT  7.050000  2.115000  7.380000 2.330000 ;
+      RECT  7.050000  2.330000  8.470000 2.500000 ;
+      RECT  7.050000  2.500000  7.380000 2.725000 ;
+      RECT  7.175000  1.545000  7.505000 1.705000 ;
+      RECT  7.595000  2.680000  7.925000 3.245000 ;
+      RECT  7.745000  1.375000  8.075000 1.705000 ;
+      RECT  7.745000  1.705000  8.035000 2.150000 ;
+      RECT  7.870000  0.575000  8.425000 1.195000 ;
+      RECT  8.220000  1.885000  8.470000 2.330000 ;
+      RECT  8.220000  2.500000  8.470000 2.725000 ;
+      RECT  8.255000  1.195000  8.425000 1.375000 ;
+      RECT  8.255000  1.375000  9.065000 1.705000 ;
+      RECT  8.255000  1.705000  8.425000 1.885000 ;
+      RECT  8.635000  0.085000  8.885000 1.195000 ;
+      RECT  8.700000  1.885000  9.030000 3.245000 ;
+      RECT  9.245000  1.375000  9.695000 1.780000 ;
+      RECT  9.605000  0.435000 10.045000 0.985000 ;
+      RECT  9.605000  0.985000 11.110000 1.195000 ;
+      RECT  9.640000  2.025000 10.045000 2.195000 ;
+      RECT  9.640000  2.195000  9.970000 2.905000 ;
+      RECT  9.875000  1.195000 10.045000 2.025000 ;
+      RECT 10.420000  1.765000 10.750000 2.095000 ;
+      RECT 10.580000  1.455000 12.430000 1.625000 ;
+      RECT 10.580000  1.625000 10.750000 1.765000 ;
+      RECT 10.580000  2.095000 10.750000 2.330000 ;
+      RECT 10.580000  2.330000 11.530000 2.500000 ;
+      RECT 10.655000  0.085000 10.985000 0.805000 ;
+      RECT 10.690000  2.680000 11.020000 3.245000 ;
+      RECT 10.780000  1.195000 11.110000 1.275000 ;
+      RECT 11.165000  1.805000 11.835000 2.095000 ;
+      RECT 11.165000  2.095000 11.395000 2.150000 ;
+      RECT 11.200000  2.500000 11.530000 3.065000 ;
+      RECT 11.445000  0.265000 11.775000 1.455000 ;
+      RECT 11.710000  2.275000 12.040000 3.245000 ;
+      RECT 12.005000  0.085000 12.255000 0.725000 ;
+      RECT 12.100000  1.625000 12.430000 1.785000 ;
+      RECT 12.255000  2.235000 12.780000 2.325000 ;
+      RECT 12.255000  2.325000 13.725000 2.495000 ;
+      RECT 12.255000  2.495000 12.585000 2.915000 ;
+      RECT 12.435000  0.265000 12.780000 0.725000 ;
+      RECT 12.610000  0.725000 12.780000 2.235000 ;
+      RECT 12.965000  0.265000 13.325000 2.145000 ;
+      RECT 13.395000  2.675000 13.725000 3.245000 ;
+      RECT 13.505000  0.085000 13.755000 1.145000 ;
+      RECT 13.555000  1.325000 13.960000 1.655000 ;
+      RECT 13.555000  1.655000 13.725000 2.325000 ;
+      RECT 13.905000  1.835000 14.310000 3.065000 ;
+      RECT 13.935000  0.265000 14.310000 1.145000 ;
+      RECT 14.140000  1.145000 14.310000 1.835000 ;
     LAYER mcon ;
-      RECT 3.515000 0.470000 3.685000 0.640000 ;
-      RECT 5.435000 0.470000 5.605000 0.640000 ;
-      RECT 5.435000 1.580000 5.605000 1.750000 ;
-      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  3.245000  3.205000 3.415000 ;
+      RECT  3.515000 -0.085000  3.685000 0.085000 ;
+      RECT  3.515000  0.470000  3.685000 0.640000 ;
+      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  0.470000  5.605000 0.640000 ;
+      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  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  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  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  1.210000 13.285000 1.380000 ;
+      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 ;
     LAYER met1 ;
       RECT 3.455000 0.440000 3.745000 0.485000 ;
       RECT 3.455000 0.485000 5.665000 0.625000 ;
diff --git a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef
index cd732d3..f6a60b7 100644
--- a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef
+++ b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.magic.lef
@@ -35,14 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.745000 1.375000  8.075000 1.705000 ;
-        RECT  7.745000 1.705000  8.035000 2.150000 ;
-        RECT 11.165000 1.805000 11.835000 2.095000 ;
-        RECT 11.165000 2.095000 11.395000 2.150000 ;
-      LAYER mcon ;
-        RECT  7.835000 1.950000  8.005000 2.120000 ;
-        RECT 11.195000 1.950000 11.365000 2.120000 ;
       LAYER met1 ;
         RECT  7.775000 1.920000  8.065000 1.965000 ;
         RECT  7.775000 1.965000 11.425000 2.105000 ;
@@ -65,12 +57,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 13.905000 1.835000 14.310000 3.065000 ;
-        RECT 13.935000 0.265000 14.310000 1.145000 ;
-        RECT 14.140000 1.145000 14.310000 1.835000 ;
-      LAYER mcon ;
-        RECT 14.075000 1.950000 14.245000 2.120000 ;
       LAYER met1 ;
         RECT 13.595000 1.965000 14.305000 2.105000 ;
         RECT 14.015000 1.920000 14.305000 1.965000 ;
@@ -83,10 +69,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 12.965000 0.265000 13.325000 2.145000 ;
-      LAYER mcon ;
-        RECT 13.115000 1.210000 13.285000 1.380000 ;
       LAYER met1 ;
         RECT 13.055000 1.180000 13.345000 1.225000 ;
         RECT 13.055000 1.225000 13.765000 1.365000 ;
@@ -127,48 +109,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.400000 0.085000 ;
-        RECT  0.115000  0.085000  0.365000 0.710000 ;
-        RECT  1.105000  0.085000  1.435000 0.675000 ;
-        RECT  2.795000  0.085000  3.045000 0.675000 ;
-        RECT  4.335000  0.085000  4.665000 0.650000 ;
-        RECT  7.050000  0.085000  7.380000 1.195000 ;
-        RECT  8.635000  0.085000  8.885000 1.195000 ;
-        RECT 10.655000  0.085000 10.985000 0.805000 ;
-        RECT 12.005000  0.085000 12.255000 0.725000 ;
-        RECT 13.505000  0.085000 13.755000 1.145000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -177,130 +117,180 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 14.400000 3.415000 ;
-        RECT  0.865000 2.635000  1.195000 3.245000 ;
-        RECT  2.645000 2.845000  2.975000 3.245000 ;
-        RECT  4.215000 2.045000  4.545000 3.245000 ;
-        RECT  6.570000 2.295000  6.820000 3.245000 ;
-        RECT  7.595000 2.680000  7.925000 3.245000 ;
-        RECT  8.700000 1.885000  9.030000 3.245000 ;
-        RECT 10.690000 2.680000 11.020000 3.245000 ;
-        RECT 11.710000 2.275000 12.040000 3.245000 ;
-        RECT 13.395000 2.675000 13.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 14.400000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.130000 0.890000  1.140000 1.220000 ;
-      RECT  0.130000 1.220000  0.300000 1.985000 ;
-      RECT  0.130000 1.985000  2.280000 2.315000 ;
-      RECT  0.130000 2.315000  0.300000 2.635000 ;
-      RECT  0.130000 2.635000  0.685000 3.065000 ;
-      RECT  0.545000 0.265000  0.875000 0.890000 ;
-      RECT  1.685000 2.495000  2.800000 2.665000 ;
-      RECT  1.685000 2.665000  2.015000 3.065000 ;
-      RECT  1.975000 0.265000  2.305000 0.675000 ;
-      RECT  2.135000 0.675000  2.305000 0.855000 ;
-      RECT  2.135000 0.855000  2.800000 1.025000 ;
-      RECT  2.630000 1.025000  2.800000 2.165000 ;
-      RECT  2.630000 2.165000  3.335000 2.495000 ;
-      RECT  3.155000 2.675000  3.685000 2.845000 ;
-      RECT  3.155000 2.845000  3.485000 3.065000 ;
-      RECT  3.225000 0.265000  3.715000 0.675000 ;
-      RECT  3.515000 0.675000  3.685000 2.675000 ;
-      RECT  3.865000 1.695000  4.545000 1.865000 ;
-      RECT  3.865000 1.865000  4.035000 3.065000 ;
-      RECT  3.905000 0.265000  4.155000 0.830000 ;
-      RECT  3.905000 0.830000  4.545000 1.000000 ;
-      RECT  4.375000 1.000000  4.545000 1.225000 ;
-      RECT  4.375000 1.225000  4.850000 1.555000 ;
-      RECT  4.375000 1.555000  4.545000 1.695000 ;
-      RECT  4.725000 1.735000  5.690000 1.905000 ;
-      RECT  4.725000 1.905000  5.030000 3.065000 ;
-      RECT  4.845000 0.265000  5.200000 1.045000 ;
-      RECT  5.030000 1.045000  5.200000 1.550000 ;
-      RECT  5.030000 1.550000  5.690000 1.735000 ;
-      RECT  5.240000 2.085000  6.040000 2.255000 ;
-      RECT  5.240000 2.255000  5.490000 2.755000 ;
-      RECT  5.405000 0.440000  6.040000 1.035000 ;
-      RECT  5.670000 2.435000  6.390000 2.755000 ;
-      RECT  5.870000 1.035000  6.040000 2.085000 ;
-      RECT  6.220000 0.575000  6.470000 1.375000 ;
-      RECT  6.220000 1.375000  7.505000 1.545000 ;
-      RECT  6.220000 1.545000  6.390000 2.435000 ;
-      RECT  6.580000 1.785000  6.910000 1.885000 ;
-      RECT  6.580000 1.885000  7.380000 2.115000 ;
-      RECT  7.050000 2.115000  7.380000 2.330000 ;
-      RECT  7.050000 2.330000  8.470000 2.500000 ;
-      RECT  7.050000 2.500000  7.380000 2.725000 ;
-      RECT  7.175000 1.545000  7.505000 1.705000 ;
-      RECT  7.870000 0.575000  8.425000 1.195000 ;
-      RECT  8.220000 1.885000  8.470000 2.330000 ;
-      RECT  8.220000 2.500000  8.470000 2.725000 ;
-      RECT  8.255000 1.195000  8.425000 1.375000 ;
-      RECT  8.255000 1.375000  9.065000 1.705000 ;
-      RECT  8.255000 1.705000  8.425000 1.885000 ;
-      RECT  9.245000 1.375000  9.695000 1.780000 ;
-      RECT  9.605000 0.435000 10.045000 0.985000 ;
-      RECT  9.605000 0.985000 11.110000 1.195000 ;
-      RECT  9.640000 2.025000 10.045000 2.195000 ;
-      RECT  9.640000 2.195000  9.970000 2.905000 ;
-      RECT  9.875000 1.195000 10.045000 2.025000 ;
-      RECT 10.420000 1.765000 10.750000 2.095000 ;
-      RECT 10.580000 1.455000 12.430000 1.625000 ;
-      RECT 10.580000 1.625000 10.750000 1.765000 ;
-      RECT 10.580000 2.095000 10.750000 2.330000 ;
-      RECT 10.580000 2.330000 11.530000 2.500000 ;
-      RECT 10.780000 1.195000 11.110000 1.275000 ;
-      RECT 11.200000 2.500000 11.530000 3.065000 ;
-      RECT 11.445000 0.265000 11.775000 1.455000 ;
-      RECT 12.100000 1.625000 12.430000 1.785000 ;
-      RECT 12.255000 2.235000 12.780000 2.325000 ;
-      RECT 12.255000 2.325000 13.725000 2.495000 ;
-      RECT 12.255000 2.495000 12.585000 2.915000 ;
-      RECT 12.435000 0.265000 12.780000 0.725000 ;
-      RECT 12.610000 0.725000 12.780000 2.235000 ;
-      RECT 13.555000 1.325000 13.960000 1.655000 ;
-      RECT 13.555000 1.655000 13.725000 2.325000 ;
+      RECT  0.000000 -0.085000 14.400000 0.085000 ;
+      RECT  0.000000  3.245000 14.400000 3.415000 ;
+      RECT  0.115000  0.085000  0.365000 0.710000 ;
+      RECT  0.130000  0.890000  1.140000 1.220000 ;
+      RECT  0.130000  1.220000  0.300000 1.985000 ;
+      RECT  0.130000  1.985000  2.280000 2.315000 ;
+      RECT  0.130000  2.315000  0.300000 2.635000 ;
+      RECT  0.130000  2.635000  0.685000 3.065000 ;
+      RECT  0.545000  0.265000  0.875000 0.890000 ;
+      RECT  0.865000  2.635000  1.195000 3.245000 ;
+      RECT  1.105000  0.085000  1.435000 0.675000 ;
+      RECT  1.685000  2.495000  2.800000 2.665000 ;
+      RECT  1.685000  2.665000  2.015000 3.065000 ;
+      RECT  1.975000  0.265000  2.305000 0.675000 ;
+      RECT  2.135000  0.675000  2.305000 0.855000 ;
+      RECT  2.135000  0.855000  2.800000 1.025000 ;
+      RECT  2.630000  1.025000  2.800000 2.165000 ;
+      RECT  2.630000  2.165000  3.335000 2.495000 ;
+      RECT  2.645000  2.845000  2.975000 3.245000 ;
+      RECT  2.795000  0.085000  3.045000 0.675000 ;
+      RECT  3.155000  2.675000  3.685000 2.845000 ;
+      RECT  3.155000  2.845000  3.485000 3.065000 ;
+      RECT  3.225000  0.265000  3.715000 0.675000 ;
+      RECT  3.515000  0.675000  3.685000 2.675000 ;
+      RECT  3.865000  1.695000  4.545000 1.865000 ;
+      RECT  3.865000  1.865000  4.035000 3.065000 ;
+      RECT  3.905000  0.265000  4.155000 0.830000 ;
+      RECT  3.905000  0.830000  4.545000 1.000000 ;
+      RECT  4.215000  2.045000  4.545000 3.245000 ;
+      RECT  4.335000  0.085000  4.665000 0.650000 ;
+      RECT  4.375000  1.000000  4.545000 1.225000 ;
+      RECT  4.375000  1.225000  4.850000 1.555000 ;
+      RECT  4.375000  1.555000  4.545000 1.695000 ;
+      RECT  4.725000  1.735000  5.690000 1.905000 ;
+      RECT  4.725000  1.905000  5.030000 3.065000 ;
+      RECT  4.845000  0.265000  5.200000 1.045000 ;
+      RECT  5.030000  1.045000  5.200000 1.550000 ;
+      RECT  5.030000  1.550000  5.690000 1.735000 ;
+      RECT  5.240000  2.085000  6.040000 2.255000 ;
+      RECT  5.240000  2.255000  5.490000 2.755000 ;
+      RECT  5.405000  0.440000  6.040000 1.035000 ;
+      RECT  5.670000  2.435000  6.390000 2.755000 ;
+      RECT  5.870000  1.035000  6.040000 2.085000 ;
+      RECT  6.220000  0.575000  6.470000 1.375000 ;
+      RECT  6.220000  1.375000  7.505000 1.545000 ;
+      RECT  6.220000  1.545000  6.390000 2.435000 ;
+      RECT  6.570000  2.295000  6.820000 3.245000 ;
+      RECT  6.580000  1.785000  6.910000 1.885000 ;
+      RECT  6.580000  1.885000  7.380000 2.115000 ;
+      RECT  7.050000  0.085000  7.380000 1.195000 ;
+      RECT  7.050000  2.115000  7.380000 2.330000 ;
+      RECT  7.050000  2.330000  8.470000 2.500000 ;
+      RECT  7.050000  2.500000  7.380000 2.725000 ;
+      RECT  7.175000  1.545000  7.505000 1.705000 ;
+      RECT  7.595000  2.680000  7.925000 3.245000 ;
+      RECT  7.745000  1.375000  8.075000 1.705000 ;
+      RECT  7.745000  1.705000  8.035000 2.150000 ;
+      RECT  7.870000  0.575000  8.425000 1.195000 ;
+      RECT  8.220000  1.885000  8.470000 2.330000 ;
+      RECT  8.220000  2.500000  8.470000 2.725000 ;
+      RECT  8.255000  1.195000  8.425000 1.375000 ;
+      RECT  8.255000  1.375000  9.065000 1.705000 ;
+      RECT  8.255000  1.705000  8.425000 1.885000 ;
+      RECT  8.635000  0.085000  8.885000 1.195000 ;
+      RECT  8.700000  1.885000  9.030000 3.245000 ;
+      RECT  9.245000  1.375000  9.695000 1.780000 ;
+      RECT  9.605000  0.435000 10.045000 0.985000 ;
+      RECT  9.605000  0.985000 11.110000 1.195000 ;
+      RECT  9.640000  2.025000 10.045000 2.195000 ;
+      RECT  9.640000  2.195000  9.970000 2.905000 ;
+      RECT  9.875000  1.195000 10.045000 2.025000 ;
+      RECT 10.420000  1.765000 10.750000 2.095000 ;
+      RECT 10.580000  1.455000 12.430000 1.625000 ;
+      RECT 10.580000  1.625000 10.750000 1.765000 ;
+      RECT 10.580000  2.095000 10.750000 2.330000 ;
+      RECT 10.580000  2.330000 11.530000 2.500000 ;
+      RECT 10.655000  0.085000 10.985000 0.805000 ;
+      RECT 10.690000  2.680000 11.020000 3.245000 ;
+      RECT 10.780000  1.195000 11.110000 1.275000 ;
+      RECT 11.165000  1.805000 11.835000 2.095000 ;
+      RECT 11.165000  2.095000 11.395000 2.150000 ;
+      RECT 11.200000  2.500000 11.530000 3.065000 ;
+      RECT 11.445000  0.265000 11.775000 1.455000 ;
+      RECT 11.710000  2.275000 12.040000 3.245000 ;
+      RECT 12.005000  0.085000 12.255000 0.725000 ;
+      RECT 12.100000  1.625000 12.430000 1.785000 ;
+      RECT 12.255000  2.235000 12.780000 2.325000 ;
+      RECT 12.255000  2.325000 13.725000 2.495000 ;
+      RECT 12.255000  2.495000 12.585000 2.915000 ;
+      RECT 12.435000  0.265000 12.780000 0.725000 ;
+      RECT 12.610000  0.725000 12.780000 2.235000 ;
+      RECT 12.965000  0.265000 13.325000 2.145000 ;
+      RECT 13.395000  2.675000 13.725000 3.245000 ;
+      RECT 13.505000  0.085000 13.755000 1.145000 ;
+      RECT 13.555000  1.325000 13.960000 1.655000 ;
+      RECT 13.555000  1.655000 13.725000 2.325000 ;
+      RECT 13.905000  1.835000 14.310000 3.065000 ;
+      RECT 13.935000  0.265000 14.310000 1.145000 ;
+      RECT 14.140000  1.145000 14.310000 1.835000 ;
     LAYER mcon ;
-      RECT 2.075000 0.470000 2.245000 0.640000 ;
-      RECT 5.435000 0.470000 5.605000 0.640000 ;
-      RECT 5.435000 1.580000 5.605000 1.750000 ;
-      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  0.470000  2.245000 0.640000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  0.470000  5.605000 0.640000 ;
+      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  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  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  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  1.210000 13.285000 1.380000 ;
+      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 ;
     LAYER met1 ;
       RECT 2.015000 0.440000 2.305000 0.485000 ;
       RECT 2.015000 0.485000 5.665000 0.625000 ;
diff --git a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef
index bf3c501..b4e5304 100644
--- a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef
+++ b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.magic.lef
@@ -100,16 +100,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  7.415000 2.690000  8.035000 3.075000 ;
-        RECT  8.285000 2.690000  9.240000 3.020000 ;
-        RECT 10.845000 2.350000 11.015000 2.905000 ;
-        RECT 10.845000 2.905000 12.050000 3.075000 ;
-        RECT 11.645000 2.290000 12.050000 2.905000 ;
-      LAYER mcon ;
-        RECT  7.835000 2.690000  8.005000 2.860000 ;
-        RECT  8.315000 2.690000  8.485000 2.860000 ;
-        RECT 11.675000 2.690000 11.845000 2.860000 ;
       LAYER met1 ;
         RECT  0.070000 2.675000 18.170000 2.945000 ;
         RECT  7.775000 2.660000  8.065000 2.675000 ;
@@ -121,54 +111,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 18.240000 0.085000 ;
-        RECT  0.535000  0.085000  0.865000 0.715000 ;
-        RECT  3.835000  0.085000  4.165000 0.755000 ;
-        RECT  7.780000  0.085000  8.110000 0.365000 ;
-        RECT  8.825000  0.085000  9.075000 0.675000 ;
-        RECT 11.910000  0.085000 12.160000 0.445000 ;
-        RECT 15.120000  0.085000 15.450000 0.935000 ;
-        RECT 17.365000  0.085000 17.615000 1.145000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -177,174 +119,226 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 18.240000 3.415000 ;
-        RECT  0.780000 2.435000  1.110000 3.245000 ;
-        RECT  2.670000 2.785000  2.920000 3.245000 ;
-        RECT  4.285000 2.075000  4.455000 3.245000 ;
-        RECT 15.445000 2.305000 15.695000 3.245000 ;
-        RECT 16.385000 2.295000 16.635000 3.245000 ;
-        RECT 17.375000 1.815000 17.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 ;
-        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.105000 0.255000  0.355000 1.950000 ;
-      RECT  0.105000 1.950000  2.305000 2.120000 ;
-      RECT  0.105000 2.120000  0.610000 3.075000 ;
-      RECT  1.070000 0.255000  3.080000 0.425000 ;
-      RECT  1.070000 0.425000  1.320000 0.925000 ;
-      RECT  1.500000 0.595000  2.145000 0.925000 ;
-      RECT  1.600000 2.445000  3.260000 2.615000 ;
-      RECT  1.600000 2.615000  1.930000 3.075000 ;
-      RECT  1.975000 0.925000  2.145000 1.265000 ;
-      RECT  1.975000 1.265000  3.210000 1.435000 ;
-      RECT  1.975000 1.945000  2.305000 1.950000 ;
-      RECT  1.975000 2.120000  2.305000 2.275000 ;
-      RECT  2.400000 0.595000  2.570000 0.925000 ;
-      RECT  2.400000 0.925000  4.700000 1.095000 ;
-      RECT  2.750000 0.425000  3.080000 0.755000 ;
-      RECT  3.040000 1.435000  3.210000 2.445000 ;
-      RECT  3.090000 2.615000  3.260000 2.905000 ;
-      RECT  3.090000 2.905000  4.115000 3.075000 ;
-      RECT  3.380000 1.265000  3.735000 1.595000 ;
-      RECT  3.485000 1.595000  3.735000 2.735000 ;
-      RECT  3.945000 1.735000  4.805000 1.905000 ;
-      RECT  3.945000 1.905000  4.115000 2.905000 ;
-      RECT  4.370000 0.595000  4.700000 0.925000 ;
-      RECT  4.635000 1.265000  5.380000 1.435000 ;
-      RECT  4.635000 1.435000  4.805000 1.735000 ;
-      RECT  4.635000 1.905000  4.805000 2.105000 ;
-      RECT  4.635000 2.105000  4.965000 2.755000 ;
-      RECT  5.015000 0.595000  6.730000 0.765000 ;
-      RECT  5.050000 1.605000  5.380000 1.935000 ;
-      RECT  5.210000 0.935000  6.670000 1.105000 ;
-      RECT  5.210000 1.105000  5.380000 1.265000 ;
-      RECT  5.210000 1.935000  5.380000 2.905000 ;
-      RECT  5.210000 2.905000  7.245000 3.075000 ;
-      RECT  5.550000 1.275000  5.985000 2.320000 ;
-      RECT  5.550000 2.320000  6.905000 2.490000 ;
-      RECT  5.550000 2.490000  5.985000 2.735000 ;
-      RECT  6.155000 1.605000  6.565000 2.150000 ;
-      RECT  6.340000 1.105000  6.670000 1.435000 ;
-      RECT  6.735000 1.950000  8.185000 2.010000 ;
-      RECT  6.735000 2.010000 10.335000 2.180000 ;
-      RECT  6.735000 2.180000  6.905000 2.320000 ;
-      RECT  7.075000 2.350000  9.580000 2.520000 ;
-      RECT  7.075000 2.520000  7.245000 2.905000 ;
-      RECT  7.240000 0.365000  7.570000 0.535000 ;
-      RECT  7.240000 0.535000  8.645000 0.705000 ;
-      RECT  7.240000 0.875000  9.865000 1.045000 ;
-      RECT  7.240000 1.045000  7.570000 1.440000 ;
-      RECT  8.315000 0.255000  8.645000 0.535000 ;
-      RECT  8.355000 1.045000  8.525000 1.670000 ;
-      RECT  8.355000 1.670000  9.960000 1.840000 ;
-      RECT  8.695000 1.215000 10.205000 1.385000 ;
-      RECT  8.695000 1.385000  9.025000 1.500000 ;
-      RECT  9.410000 2.520000  9.580000 2.725000 ;
-      RECT  9.410000 2.725000 10.675000 2.895000 ;
-      RECT  9.535000 0.255000 11.705000 0.425000 ;
-      RECT  9.535000 0.425000  9.865000 0.875000 ;
-      RECT  9.630000 1.590000  9.960000 1.670000 ;
-      RECT 10.035000 0.595000 11.365000 0.765000 ;
-      RECT 10.035000 0.765000 10.205000 1.215000 ;
-      RECT 10.080000 2.180000 10.335000 2.555000 ;
-      RECT 10.420000 0.935000 11.025000 1.265000 ;
-      RECT 10.505000 2.010000 12.080000 2.120000 ;
-      RECT 10.505000 2.120000 11.445000 2.180000 ;
-      RECT 10.505000 2.180000 10.675000 2.725000 ;
-      RECT 10.855000 1.265000 11.025000 2.010000 ;
-      RECT 11.195000 0.765000 11.365000 0.955000 ;
-      RECT 11.195000 0.955000 13.485000 1.125000 ;
-      RECT 11.195000 1.950000 12.080000 2.010000 ;
-      RECT 11.195000 2.180000 11.445000 2.735000 ;
-      RECT 11.535000 0.425000 11.705000 0.615000 ;
-      RECT 11.535000 0.615000 12.595000 0.785000 ;
-      RECT 11.910000 1.375000 13.145000 1.545000 ;
-      RECT 11.910000 1.545000 12.080000 1.950000 ;
-      RECT 12.250000 1.715000 12.580000 1.905000 ;
-      RECT 12.250000 1.905000 13.485000 2.075000 ;
-      RECT 12.250000 2.075000 12.580000 2.755000 ;
-      RECT 12.425000 0.255000 14.700000 0.425000 ;
-      RECT 12.425000 0.425000 12.595000 0.615000 ;
-      RECT 12.750000 1.545000 13.145000 1.735000 ;
-      RECT 12.765000 0.595000 13.095000 0.955000 ;
-      RECT 12.770000 2.245000 13.100000 2.905000 ;
-      RECT 12.770000 2.905000 15.265000 3.075000 ;
-      RECT 13.315000 1.125000 13.485000 1.905000 ;
-      RECT 13.325000 0.425000 13.655000 0.615000 ;
-      RECT 13.655000 0.785000 14.155000 0.955000 ;
-      RECT 13.655000 0.955000 13.905000 2.565000 ;
-      RECT 13.655000 2.565000 14.925000 2.735000 ;
-      RECT 13.825000 0.595000 14.155000 0.785000 ;
-      RECT 14.075000 1.125000 14.360000 1.455000 ;
-      RECT 14.075000 1.455000 14.245000 2.150000 ;
-      RECT 14.415000 1.625000 14.700000 1.795000 ;
-      RECT 14.415000 1.795000 14.585000 2.395000 ;
-      RECT 14.530000 0.425000 14.700000 1.625000 ;
-      RECT 14.755000 1.965000 15.040000 2.135000 ;
-      RECT 14.755000 2.135000 14.925000 2.565000 ;
-      RECT 14.870000 1.105000 15.790000 1.275000 ;
-      RECT 14.870000 1.275000 15.040000 1.965000 ;
-      RECT 15.095000 2.305000 15.265000 2.905000 ;
-      RECT 15.210000 1.805000 16.205000 2.135000 ;
-      RECT 15.620000 0.255000 16.650000 0.425000 ;
-      RECT 15.620000 0.425000 15.790000 1.105000 ;
-      RECT 15.875000 2.135000 16.205000 2.755000 ;
-      RECT 16.035000 0.595000 16.305000 0.935000 ;
-      RECT 16.035000 0.935000 16.205000 1.805000 ;
-      RECT 16.480000 0.425000 16.650000 0.895000 ;
-      RECT 16.480000 0.895000 16.810000 1.565000 ;
-      RECT 16.820000 0.265000 17.150000 0.725000 ;
-      RECT 16.840000 2.435000 17.170000 3.075000 ;
-      RECT 16.980000 0.725000 17.150000 1.315000 ;
-      RECT 16.980000 1.315000 17.625000 1.645000 ;
-      RECT 16.980000 1.645000 17.170000 2.435000 ;
+      RECT  0.000000 -0.085000 18.240000 0.085000 ;
+      RECT  0.000000  3.245000 18.240000 3.415000 ;
+      RECT  0.105000  0.255000  0.355000 1.950000 ;
+      RECT  0.105000  1.950000  2.305000 2.120000 ;
+      RECT  0.105000  2.120000  0.610000 3.075000 ;
+      RECT  0.535000  0.085000  0.865000 0.715000 ;
+      RECT  0.780000  2.435000  1.110000 3.245000 ;
+      RECT  1.070000  0.255000  3.080000 0.425000 ;
+      RECT  1.070000  0.425000  1.320000 0.925000 ;
+      RECT  1.500000  0.595000  2.145000 0.925000 ;
+      RECT  1.600000  2.445000  3.260000 2.615000 ;
+      RECT  1.600000  2.615000  1.930000 3.075000 ;
+      RECT  1.975000  0.925000  2.145000 1.265000 ;
+      RECT  1.975000  1.265000  3.210000 1.435000 ;
+      RECT  1.975000  1.945000  2.305000 1.950000 ;
+      RECT  1.975000  2.120000  2.305000 2.275000 ;
+      RECT  2.400000  0.595000  2.570000 0.925000 ;
+      RECT  2.400000  0.925000  4.700000 1.095000 ;
+      RECT  2.670000  2.785000  2.920000 3.245000 ;
+      RECT  2.750000  0.425000  3.080000 0.755000 ;
+      RECT  3.040000  1.435000  3.210000 2.445000 ;
+      RECT  3.090000  2.615000  3.260000 2.905000 ;
+      RECT  3.090000  2.905000  4.115000 3.075000 ;
+      RECT  3.380000  1.265000  3.735000 1.595000 ;
+      RECT  3.485000  1.595000  3.735000 2.735000 ;
+      RECT  3.835000  0.085000  4.165000 0.755000 ;
+      RECT  3.945000  1.735000  4.805000 1.905000 ;
+      RECT  3.945000  1.905000  4.115000 2.905000 ;
+      RECT  4.285000  2.075000  4.455000 3.245000 ;
+      RECT  4.370000  0.595000  4.700000 0.925000 ;
+      RECT  4.635000  1.265000  5.380000 1.435000 ;
+      RECT  4.635000  1.435000  4.805000 1.735000 ;
+      RECT  4.635000  1.905000  4.805000 2.105000 ;
+      RECT  4.635000  2.105000  4.965000 2.755000 ;
+      RECT  5.015000  0.595000  6.730000 0.765000 ;
+      RECT  5.050000  1.605000  5.380000 1.935000 ;
+      RECT  5.210000  0.935000  6.670000 1.105000 ;
+      RECT  5.210000  1.105000  5.380000 1.265000 ;
+      RECT  5.210000  1.935000  5.380000 2.905000 ;
+      RECT  5.210000  2.905000  7.245000 3.075000 ;
+      RECT  5.550000  1.275000  5.985000 2.320000 ;
+      RECT  5.550000  2.320000  6.905000 2.490000 ;
+      RECT  5.550000  2.490000  5.985000 2.735000 ;
+      RECT  6.155000  1.605000  6.565000 2.150000 ;
+      RECT  6.340000  1.105000  6.670000 1.435000 ;
+      RECT  6.735000  1.950000  8.185000 2.010000 ;
+      RECT  6.735000  2.010000 10.335000 2.180000 ;
+      RECT  6.735000  2.180000  6.905000 2.320000 ;
+      RECT  7.075000  2.350000  9.580000 2.520000 ;
+      RECT  7.075000  2.520000  7.245000 2.905000 ;
+      RECT  7.240000  0.365000  7.570000 0.535000 ;
+      RECT  7.240000  0.535000  8.645000 0.705000 ;
+      RECT  7.240000  0.875000  9.865000 1.045000 ;
+      RECT  7.240000  1.045000  7.570000 1.440000 ;
+      RECT  7.415000  2.690000  8.035000 3.075000 ;
+      RECT  7.780000  0.085000  8.110000 0.365000 ;
+      RECT  8.285000  2.690000  9.240000 3.020000 ;
+      RECT  8.315000  0.255000  8.645000 0.535000 ;
+      RECT  8.355000  1.045000  8.525000 1.670000 ;
+      RECT  8.355000  1.670000  9.960000 1.840000 ;
+      RECT  8.695000  1.215000 10.205000 1.385000 ;
+      RECT  8.695000  1.385000  9.025000 1.500000 ;
+      RECT  8.825000  0.085000  9.075000 0.675000 ;
+      RECT  9.410000  2.520000  9.580000 2.725000 ;
+      RECT  9.410000  2.725000 10.675000 2.895000 ;
+      RECT  9.535000  0.255000 11.705000 0.425000 ;
+      RECT  9.535000  0.425000  9.865000 0.875000 ;
+      RECT  9.630000  1.590000  9.960000 1.670000 ;
+      RECT 10.035000  0.595000 11.365000 0.765000 ;
+      RECT 10.035000  0.765000 10.205000 1.215000 ;
+      RECT 10.080000  2.180000 10.335000 2.555000 ;
+      RECT 10.420000  0.935000 11.025000 1.265000 ;
+      RECT 10.505000  2.010000 12.080000 2.120000 ;
+      RECT 10.505000  2.120000 11.445000 2.180000 ;
+      RECT 10.505000  2.180000 10.675000 2.725000 ;
+      RECT 10.845000  2.350000 11.015000 2.905000 ;
+      RECT 10.845000  2.905000 12.050000 3.075000 ;
+      RECT 10.855000  1.265000 11.025000 2.010000 ;
+      RECT 11.195000  0.765000 11.365000 0.955000 ;
+      RECT 11.195000  0.955000 13.485000 1.125000 ;
+      RECT 11.195000  1.950000 12.080000 2.010000 ;
+      RECT 11.195000  2.180000 11.445000 2.735000 ;
+      RECT 11.535000  0.425000 11.705000 0.615000 ;
+      RECT 11.535000  0.615000 12.595000 0.785000 ;
+      RECT 11.645000  2.290000 12.050000 2.905000 ;
+      RECT 11.910000  0.085000 12.160000 0.445000 ;
+      RECT 11.910000  1.375000 13.145000 1.545000 ;
+      RECT 11.910000  1.545000 12.080000 1.950000 ;
+      RECT 12.250000  1.715000 12.580000 1.905000 ;
+      RECT 12.250000  1.905000 13.485000 2.075000 ;
+      RECT 12.250000  2.075000 12.580000 2.755000 ;
+      RECT 12.425000  0.255000 14.700000 0.425000 ;
+      RECT 12.425000  0.425000 12.595000 0.615000 ;
+      RECT 12.750000  1.545000 13.145000 1.735000 ;
+      RECT 12.765000  0.595000 13.095000 0.955000 ;
+      RECT 12.770000  2.245000 13.100000 2.905000 ;
+      RECT 12.770000  2.905000 15.265000 3.075000 ;
+      RECT 13.315000  1.125000 13.485000 1.905000 ;
+      RECT 13.325000  0.425000 13.655000 0.615000 ;
+      RECT 13.655000  0.785000 14.155000 0.955000 ;
+      RECT 13.655000  0.955000 13.905000 2.565000 ;
+      RECT 13.655000  2.565000 14.925000 2.735000 ;
+      RECT 13.825000  0.595000 14.155000 0.785000 ;
+      RECT 14.075000  1.125000 14.360000 1.455000 ;
+      RECT 14.075000  1.455000 14.245000 2.150000 ;
+      RECT 14.415000  1.625000 14.700000 1.795000 ;
+      RECT 14.415000  1.795000 14.585000 2.395000 ;
+      RECT 14.530000  0.425000 14.700000 1.625000 ;
+      RECT 14.755000  1.965000 15.040000 2.135000 ;
+      RECT 14.755000  2.135000 14.925000 2.565000 ;
+      RECT 14.870000  1.105000 15.790000 1.275000 ;
+      RECT 14.870000  1.275000 15.040000 1.965000 ;
+      RECT 15.095000  2.305000 15.265000 2.905000 ;
+      RECT 15.120000  0.085000 15.450000 0.935000 ;
+      RECT 15.210000  1.805000 16.205000 2.135000 ;
+      RECT 15.445000  2.305000 15.695000 3.245000 ;
+      RECT 15.620000  0.255000 16.650000 0.425000 ;
+      RECT 15.620000  0.425000 15.790000 1.105000 ;
+      RECT 15.875000  2.135000 16.205000 2.755000 ;
+      RECT 16.035000  0.595000 16.305000 0.935000 ;
+      RECT 16.035000  0.935000 16.205000 1.805000 ;
+      RECT 16.385000  2.295000 16.635000 3.245000 ;
+      RECT 16.480000  0.425000 16.650000 0.895000 ;
+      RECT 16.480000  0.895000 16.810000 1.565000 ;
+      RECT 16.820000  0.265000 17.150000 0.725000 ;
+      RECT 16.840000  2.435000 17.170000 3.075000 ;
+      RECT 16.980000  0.725000 17.150000 1.315000 ;
+      RECT 16.980000  1.315000 17.625000 1.645000 ;
+      RECT 16.980000  1.645000 17.170000 2.435000 ;
+      RECT 17.365000  0.085000 17.615000 1.145000 ;
+      RECT 17.375000  1.815000 17.625000 3.245000 ;
     LAYER mcon ;
-      RECT  3.515000 1.950000  3.685000 2.120000 ;
-      RECT  6.395000 1.950000  6.565000 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  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  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.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  2.690000  8.005000 2.860000 ;
+      RECT  7.835000  3.245000  8.005000 3.415000 ;
+      RECT  8.315000 -0.085000  8.485000 0.085000 ;
+      RECT  8.315000  2.690000  8.485000 2.860000 ;
+      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  2.690000 11.845000 2.860000 ;
+      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 ;
+      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  3.455000 1.920000  3.745000 1.965000 ;
       RECT  3.455000 1.965000 14.305000 2.105000 ;
diff --git a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef
index a7d2e30..cc6114a 100644
--- a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef
+++ b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.magic.lef
@@ -99,14 +99,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 14.525000 2.690000 14.975000 2.970000 ;
-        RECT 16.280000 2.690000 16.675000 2.970000 ;
-        RECT 16.925000 2.690000 17.730000 3.025000 ;
-      LAYER mcon ;
-        RECT 14.555000 2.735000 14.725000 2.905000 ;
-        RECT 16.475000 2.735000 16.645000 2.905000 ;
-        RECT 16.955000 2.735000 17.125000 2.905000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 20.570000 2.945000 ;
     END
@@ -115,61 +107,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 20.640000 0.085000 ;
-        RECT  0.535000  0.085000  0.865000 0.990000 ;
-        RECT  3.615000  0.085000  3.865000 1.040000 ;
-        RECT  7.050000  0.085000  7.380000 0.835000 ;
-        RECT  8.020000  0.085000  8.350000 0.825000 ;
-        RECT 11.365000  0.085000 11.695000 0.985000 ;
-        RECT 13.125000  0.085000 13.455000 0.810000 ;
-        RECT 17.475000  0.085000 17.805000 0.610000 ;
-        RECT 18.805000  0.085000 19.055000 0.805000 ;
-        RECT 19.855000  0.085000 20.025000 1.145000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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 ;
-        RECT 18.395000 -0.085000 18.565000 0.085000 ;
-        RECT 18.875000 -0.085000 19.045000 0.085000 ;
-        RECT 19.355000 -0.085000 19.525000 0.085000 ;
-        RECT 19.835000 -0.085000 20.005000 0.085000 ;
-        RECT 20.315000 -0.085000 20.485000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 20.640000 0.245000 ;
     END
@@ -178,172 +115,230 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 20.640000 3.415000 ;
-        RECT  0.620000 2.340000  0.950000 3.245000 ;
-        RECT  3.245000 2.440000  3.575000 3.245000 ;
-        RECT  6.120000 2.770000  6.450000 3.245000 ;
-        RECT  7.850000 2.605000  8.180000 3.245000 ;
-        RECT 19.495000 1.815000 19.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 ;
-        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 ;
-        RECT 18.395000 3.245000 18.565000 3.415000 ;
-        RECT 18.875000 3.245000 19.045000 3.415000 ;
-        RECT 19.355000 3.245000 19.525000 3.415000 ;
-        RECT 19.835000 3.245000 20.005000 3.415000 ;
-        RECT 20.315000 3.245000 20.485000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 20.640000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.105000 0.530000  0.355000 1.160000 ;
-      RECT  0.105000 1.160000  1.660000 1.330000 ;
-      RECT  0.105000 1.330000  0.435000 2.990000 ;
-      RECT  1.070000 0.255000  3.405000 0.425000 ;
-      RECT  1.070000 0.425000  1.320000 0.990000 ;
-      RECT  1.225000 1.500000  2.080000 1.670000 ;
-      RECT  1.225000 1.670000  1.395000 2.340000 ;
-      RECT  1.225000 2.340000  2.635000 2.510000 ;
-      RECT  1.490000 0.595000  2.475000 0.765000 ;
-      RECT  1.490000 0.765000  1.660000 1.160000 ;
-      RECT  1.830000 0.935000  2.080000 1.500000 ;
-      RECT  2.305000 0.765000  2.475000 1.600000 ;
-      RECT  2.305000 1.600000  2.880000 1.930000 ;
-      RECT  2.305000 2.100000  4.755000 2.270000 ;
-      RECT  2.305000 2.270000  2.635000 2.340000 ;
-      RECT  2.305000 2.510000  2.635000 2.990000 ;
-      RECT  2.645000 0.740000  2.975000 1.210000 ;
-      RECT  2.645000 1.210000  4.375000 1.380000 ;
-      RECT  3.155000 0.425000  3.405000 1.040000 ;
-      RECT  4.045000 0.580000  4.375000 1.210000 ;
-      RECT  4.425000 2.270000  4.755000 2.990000 ;
-      RECT  4.545000 1.250000  5.205000 1.420000 ;
-      RECT  4.545000 1.420000  4.715000 2.100000 ;
-      RECT  4.615000 0.255000  6.590000 0.425000 ;
-      RECT  4.615000 0.425000  4.865000 1.080000 ;
-      RECT  4.885000 1.590000  5.215000 1.920000 ;
-      RECT  4.925000 1.920000  5.095000 2.600000 ;
-      RECT  4.925000 2.600000  5.950000 2.770000 ;
-      RECT  5.035000 0.595000  6.055000 0.765000 ;
-      RECT  5.035000 0.765000  5.205000 1.250000 ;
-      RECT  5.265000 2.090000  7.110000 2.260000 ;
-      RECT  5.265000 2.260000  5.555000 2.430000 ;
-      RECT  5.375000 0.935000  5.555000 1.265000 ;
-      RECT  5.385000 1.265000  5.555000 2.090000 ;
-      RECT  5.725000 0.765000  6.055000 1.265000 ;
-      RECT  5.780000 2.430000  8.725000 2.435000 ;
-      RECT  5.780000 2.435000  7.680000 2.600000 ;
-      RECT  5.960000 1.435000  6.610000 1.605000 ;
-      RECT  5.960000 1.605000  6.290000 1.825000 ;
-      RECT  6.260000 0.425000  6.590000 0.835000 ;
-      RECT  6.280000 1.005000  9.530000 1.165000 ;
-      RECT  6.280000 1.165000  8.135000 1.175000 ;
-      RECT  6.280000 1.175000  6.610000 1.435000 ;
-      RECT  6.780000 1.345000  7.795000 1.675000 ;
-      RECT  6.780000 1.675000  7.110000 2.090000 ;
-      RECT  7.340000 1.845000  8.135000 2.095000 ;
-      RECT  7.510000 2.265000  8.725000 2.430000 ;
-      RECT  7.590000 0.575000  7.840000 0.995000 ;
-      RECT  7.590000 0.995000  9.530000 1.005000 ;
-      RECT  7.965000 1.175000  8.135000 1.845000 ;
-      RECT  8.395000 1.335000  8.990000 1.495000 ;
-      RECT  8.395000 1.495000  9.540000 1.665000 ;
-      RECT  8.395000 1.665000  8.725000 2.265000 ;
-      RECT  8.395000 2.435000  8.725000 2.825000 ;
-      RECT  8.555000 2.825000  8.725000 2.905000 ;
-      RECT  8.555000 2.905000 13.455000 3.075000 ;
-      RECT  9.200000 0.265000 10.930000 0.435000 ;
-      RECT  9.200000 0.435000  9.530000 0.995000 ;
-      RECT  9.200000 1.165000  9.530000 1.285000 ;
-      RECT  9.210000 1.665000  9.540000 1.825000 ;
-      RECT  9.890000 2.040000 10.500000 2.565000 ;
-      RECT  9.890000 2.565000 12.540000 2.735000 ;
-      RECT 10.190000 0.605000 10.500000 2.040000 ;
-      RECT 10.680000 0.435000 10.930000 2.395000 ;
-      RECT 11.100000 1.155000 12.235000 1.325000 ;
-      RECT 11.100000 1.325000 11.430000 2.010000 ;
-      RECT 11.100000 2.010000 14.955000 2.180000 ;
-      RECT 11.640000 1.510000 11.970000 1.670000 ;
-      RECT 11.640000 1.670000 14.525000 1.840000 ;
-      RECT 11.905000 0.575000 12.235000 1.155000 ;
-      RECT 12.210000 2.350000 19.325000 2.520000 ;
-      RECT 12.210000 2.520000 12.540000 2.565000 ;
-      RECT 12.695000 0.575000 12.945000 0.980000 ;
-      RECT 12.695000 0.980000 13.845000 1.150000 ;
-      RECT 12.930000 1.320000 14.185000 1.500000 ;
-      RECT 13.125000 2.745000 13.455000 2.905000 ;
-      RECT 13.625000 2.520000 13.955000 2.970000 ;
-      RECT 13.675000 0.575000 13.845000 0.980000 ;
-      RECT 14.015000 0.600000 15.315000 0.770000 ;
-      RECT 14.015000 0.770000 14.185000 1.320000 ;
-      RECT 14.355000 0.940000 16.435000 0.950000 ;
-      RECT 14.355000 0.950000 16.760000 1.110000 ;
-      RECT 14.355000 1.110000 14.525000 1.670000 ;
-      RECT 14.695000 1.280000 14.955000 1.440000 ;
-      RECT 14.695000 1.440000 15.815000 1.610000 ;
-      RECT 14.695000 1.610000 14.955000 2.010000 ;
-      RECT 14.985000 0.255000 17.100000 0.425000 ;
-      RECT 14.985000 0.425000 15.315000 0.600000 ;
-      RECT 15.645000 1.610000 15.815000 1.930000 ;
-      RECT 15.645000 1.930000 16.080000 2.180000 ;
-      RECT 15.985000 1.410000 16.420000 1.740000 ;
-      RECT 16.105000 0.595000 16.435000 0.940000 ;
-      RECT 16.105000 1.110000 16.760000 1.120000 ;
-      RECT 16.250000 1.740000 16.420000 2.350000 ;
-      RECT 16.590000 1.120000 17.495000 1.290000 ;
-      RECT 16.855000 2.010000 17.495000 2.180000 ;
-      RECT 16.930000 0.425000 17.100000 0.780000 ;
-      RECT 16.930000 0.780000 18.345000 0.950000 ;
-      RECT 17.325000 1.290000 17.495000 2.010000 ;
-      RECT 17.895000 0.950000 18.065000 1.850000 ;
-      RECT 17.895000 1.850000 18.490000 2.180000 ;
-      RECT 18.015000 0.345000 18.345000 0.780000 ;
-      RECT 18.735000 0.975000 19.685000 1.145000 ;
-      RECT 18.735000 1.145000 18.905000 1.815000 ;
-      RECT 18.735000 1.815000 18.985000 2.180000 ;
-      RECT 19.075000 1.315000 19.345000 1.645000 ;
-      RECT 19.155000 1.645000 19.325000 2.350000 ;
-      RECT 19.235000 0.345000 19.685000 0.975000 ;
-      RECT 19.515000 1.145000 19.685000 1.315000 ;
-      RECT 19.515000 1.315000 20.020000 1.645000 ;
+      RECT  0.000000 -0.085000 20.640000 0.085000 ;
+      RECT  0.000000  3.245000 20.640000 3.415000 ;
+      RECT  0.105000  0.530000  0.355000 1.160000 ;
+      RECT  0.105000  1.160000  1.660000 1.330000 ;
+      RECT  0.105000  1.330000  0.435000 2.990000 ;
+      RECT  0.535000  0.085000  0.865000 0.990000 ;
+      RECT  0.620000  2.340000  0.950000 3.245000 ;
+      RECT  1.070000  0.255000  3.405000 0.425000 ;
+      RECT  1.070000  0.425000  1.320000 0.990000 ;
+      RECT  1.225000  1.500000  2.080000 1.670000 ;
+      RECT  1.225000  1.670000  1.395000 2.340000 ;
+      RECT  1.225000  2.340000  2.635000 2.510000 ;
+      RECT  1.490000  0.595000  2.475000 0.765000 ;
+      RECT  1.490000  0.765000  1.660000 1.160000 ;
+      RECT  1.830000  0.935000  2.080000 1.500000 ;
+      RECT  2.305000  0.765000  2.475000 1.600000 ;
+      RECT  2.305000  1.600000  2.880000 1.930000 ;
+      RECT  2.305000  2.100000  4.755000 2.270000 ;
+      RECT  2.305000  2.270000  2.635000 2.340000 ;
+      RECT  2.305000  2.510000  2.635000 2.990000 ;
+      RECT  2.645000  0.740000  2.975000 1.210000 ;
+      RECT  2.645000  1.210000  4.375000 1.380000 ;
+      RECT  3.155000  0.425000  3.405000 1.040000 ;
+      RECT  3.245000  2.440000  3.575000 3.245000 ;
+      RECT  3.615000  0.085000  3.865000 1.040000 ;
+      RECT  4.045000  0.580000  4.375000 1.210000 ;
+      RECT  4.425000  2.270000  4.755000 2.990000 ;
+      RECT  4.545000  1.250000  5.205000 1.420000 ;
+      RECT  4.545000  1.420000  4.715000 2.100000 ;
+      RECT  4.615000  0.255000  6.590000 0.425000 ;
+      RECT  4.615000  0.425000  4.865000 1.080000 ;
+      RECT  4.885000  1.590000  5.215000 1.920000 ;
+      RECT  4.925000  1.920000  5.095000 2.600000 ;
+      RECT  4.925000  2.600000  5.950000 2.770000 ;
+      RECT  5.035000  0.595000  6.055000 0.765000 ;
+      RECT  5.035000  0.765000  5.205000 1.250000 ;
+      RECT  5.265000  2.090000  7.110000 2.260000 ;
+      RECT  5.265000  2.260000  5.555000 2.430000 ;
+      RECT  5.375000  0.935000  5.555000 1.265000 ;
+      RECT  5.385000  1.265000  5.555000 2.090000 ;
+      RECT  5.725000  0.765000  6.055000 1.265000 ;
+      RECT  5.780000  2.430000  8.725000 2.435000 ;
+      RECT  5.780000  2.435000  7.680000 2.600000 ;
+      RECT  5.960000  1.435000  6.610000 1.605000 ;
+      RECT  5.960000  1.605000  6.290000 1.825000 ;
+      RECT  6.120000  2.770000  6.450000 3.245000 ;
+      RECT  6.260000  0.425000  6.590000 0.835000 ;
+      RECT  6.280000  1.005000  9.530000 1.165000 ;
+      RECT  6.280000  1.165000  8.135000 1.175000 ;
+      RECT  6.280000  1.175000  6.610000 1.435000 ;
+      RECT  6.780000  1.345000  7.795000 1.675000 ;
+      RECT  6.780000  1.675000  7.110000 2.090000 ;
+      RECT  7.050000  0.085000  7.380000 0.835000 ;
+      RECT  7.340000  1.845000  8.135000 2.095000 ;
+      RECT  7.510000  2.265000  8.725000 2.430000 ;
+      RECT  7.590000  0.575000  7.840000 0.995000 ;
+      RECT  7.590000  0.995000  9.530000 1.005000 ;
+      RECT  7.850000  2.605000  8.180000 3.245000 ;
+      RECT  7.965000  1.175000  8.135000 1.845000 ;
+      RECT  8.020000  0.085000  8.350000 0.825000 ;
+      RECT  8.395000  1.335000  8.990000 1.495000 ;
+      RECT  8.395000  1.495000  9.540000 1.665000 ;
+      RECT  8.395000  1.665000  8.725000 2.265000 ;
+      RECT  8.395000  2.435000  8.725000 2.825000 ;
+      RECT  8.555000  2.825000  8.725000 2.905000 ;
+      RECT  8.555000  2.905000 13.455000 3.075000 ;
+      RECT  9.200000  0.265000 10.930000 0.435000 ;
+      RECT  9.200000  0.435000  9.530000 0.995000 ;
+      RECT  9.200000  1.165000  9.530000 1.285000 ;
+      RECT  9.210000  1.665000  9.540000 1.825000 ;
+      RECT  9.890000  2.040000 10.500000 2.565000 ;
+      RECT  9.890000  2.565000 12.540000 2.735000 ;
+      RECT 10.190000  0.605000 10.500000 2.040000 ;
+      RECT 10.680000  0.435000 10.930000 2.395000 ;
+      RECT 11.100000  1.155000 12.235000 1.325000 ;
+      RECT 11.100000  1.325000 11.430000 2.010000 ;
+      RECT 11.100000  2.010000 14.955000 2.180000 ;
+      RECT 11.365000  0.085000 11.695000 0.985000 ;
+      RECT 11.640000  1.510000 11.970000 1.670000 ;
+      RECT 11.640000  1.670000 14.525000 1.840000 ;
+      RECT 11.905000  0.575000 12.235000 1.155000 ;
+      RECT 12.210000  2.350000 19.325000 2.520000 ;
+      RECT 12.210000  2.520000 12.540000 2.565000 ;
+      RECT 12.695000  0.575000 12.945000 0.980000 ;
+      RECT 12.695000  0.980000 13.845000 1.150000 ;
+      RECT 12.930000  1.320000 14.185000 1.500000 ;
+      RECT 13.125000  0.085000 13.455000 0.810000 ;
+      RECT 13.125000  2.745000 13.455000 2.905000 ;
+      RECT 13.625000  2.520000 13.955000 2.970000 ;
+      RECT 13.675000  0.575000 13.845000 0.980000 ;
+      RECT 14.015000  0.600000 15.315000 0.770000 ;
+      RECT 14.015000  0.770000 14.185000 1.320000 ;
+      RECT 14.355000  0.940000 16.435000 0.950000 ;
+      RECT 14.355000  0.950000 16.760000 1.110000 ;
+      RECT 14.355000  1.110000 14.525000 1.670000 ;
+      RECT 14.525000  2.690000 14.975000 2.970000 ;
+      RECT 14.695000  1.280000 14.955000 1.440000 ;
+      RECT 14.695000  1.440000 15.815000 1.610000 ;
+      RECT 14.695000  1.610000 14.955000 2.010000 ;
+      RECT 14.985000  0.255000 17.100000 0.425000 ;
+      RECT 14.985000  0.425000 15.315000 0.600000 ;
+      RECT 15.645000  1.610000 15.815000 1.930000 ;
+      RECT 15.645000  1.930000 16.080000 2.180000 ;
+      RECT 15.985000  1.410000 16.420000 1.740000 ;
+      RECT 16.105000  0.595000 16.435000 0.940000 ;
+      RECT 16.105000  1.110000 16.760000 1.120000 ;
+      RECT 16.250000  1.740000 16.420000 2.350000 ;
+      RECT 16.280000  2.690000 16.675000 2.970000 ;
+      RECT 16.590000  1.120000 17.495000 1.290000 ;
+      RECT 16.855000  2.010000 17.495000 2.180000 ;
+      RECT 16.925000  2.690000 17.730000 3.025000 ;
+      RECT 16.930000  0.425000 17.100000 0.780000 ;
+      RECT 16.930000  0.780000 18.345000 0.950000 ;
+      RECT 17.325000  1.290000 17.495000 2.010000 ;
+      RECT 17.475000  0.085000 17.805000 0.610000 ;
+      RECT 17.895000  0.950000 18.065000 1.850000 ;
+      RECT 17.895000  1.850000 18.490000 2.180000 ;
+      RECT 18.015000  0.345000 18.345000 0.780000 ;
+      RECT 18.735000  0.975000 19.685000 1.145000 ;
+      RECT 18.735000  1.145000 18.905000 1.815000 ;
+      RECT 18.735000  1.815000 18.985000 2.180000 ;
+      RECT 18.805000  0.085000 19.055000 0.805000 ;
+      RECT 19.075000  1.315000 19.345000 1.645000 ;
+      RECT 19.155000  1.645000 19.325000 2.350000 ;
+      RECT 19.235000  0.345000 19.685000 0.975000 ;
+      RECT 19.495000  1.815000 19.825000 3.245000 ;
+      RECT 19.515000  1.145000 19.685000 1.315000 ;
+      RECT 19.515000  1.315000 20.020000 1.645000 ;
+      RECT 19.855000  0.085000 20.025000 1.145000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.735000 14.725000 2.905000 ;
+      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  2.735000 16.645000 2.905000 ;
+      RECT 16.475000  3.245000 16.645000 3.415000 ;
+      RECT 16.955000 -0.085000 17.125000 0.085000 ;
+      RECT 16.955000  2.735000 17.125000 2.905000 ;
+      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 ;
+      RECT 18.395000 -0.085000 18.565000 0.085000 ;
+      RECT 18.395000  3.245000 18.565000 3.415000 ;
+      RECT 18.875000 -0.085000 19.045000 0.085000 ;
+      RECT 18.875000  3.245000 19.045000 3.415000 ;
+      RECT 19.355000 -0.085000 19.525000 0.085000 ;
+      RECT 19.355000  3.245000 19.525000 3.415000 ;
+      RECT 19.835000 -0.085000 20.005000 0.085000 ;
+      RECT 19.835000  3.245000 20.005000 3.415000 ;
+      RECT 20.315000 -0.085000 20.485000 0.085000 ;
+      RECT 20.315000  3.245000 20.485000 3.415000 ;
   END
 END sky130_fd_sc_lp__srsdfrtp_1
diff --git a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef
index 0653adb..2b0ab4e 100644
--- a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef
+++ b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.magic.lef
@@ -97,13 +97,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 12.655000 2.905000 15.235000 3.075000 ;
-        RECT 14.905000 2.660000 15.235000 2.905000 ;
-        RECT 15.965000 2.660000 16.305000 2.940000 ;
-      LAYER mcon ;
-        RECT 15.035000 2.735000 15.205000 2.905000 ;
-        RECT 15.995000 2.735000 16.165000 2.905000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 18.650000 2.945000 ;
     END
@@ -112,57 +105,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 18.720000 0.085000 ;
-        RECT  0.100000  0.085000  0.430000 1.035000 ;
-        RECT  1.940000  0.085000  2.190000 1.035000 ;
-        RECT  2.920000  0.085000  3.250000 1.010000 ;
-        RECT  5.465000  0.085000  5.795000 0.505000 ;
-        RECT  7.115000  0.085000  7.365000 0.960000 ;
-        RECT 10.775000  0.085000 11.025000 1.035000 ;
-        RECT 11.745000  0.085000 11.995000 0.955000 ;
-        RECT 16.085000  0.085000 16.335000 0.710000 ;
-        RECT 17.860000  0.085000 18.190000 1.015000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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 ;
-        RECT 18.395000 -0.085000 18.565000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 18.720000 0.245000 ;
     END
@@ -171,173 +113,226 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 18.720000 3.415000 ;
-        RECT  0.600000 2.385000  0.850000 3.245000 ;
-        RECT  2.920000 2.565000  3.250000 3.245000 ;
-        RECT  6.025000 2.655000  6.355000 3.245000 ;
-        RECT  7.250000 2.265000  7.580000 3.245000 ;
-        RECT 17.855000 1.815000 18.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 ;
-        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 ;
-        RECT 18.395000 3.245000 18.565000 3.415000 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 18.720000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.100000 2.045000  1.190000 2.215000 ;
-      RECT  0.100000 2.215000  0.430000 3.065000 ;
-      RECT  0.920000 0.575000  1.250000 0.865000 ;
-      RECT  0.920000 0.865000  1.770000 1.035000 ;
-      RECT  1.020000 2.215000  1.190000 2.905000 ;
-      RECT  1.020000 2.905000  2.190000 3.075000 ;
-      RECT  1.430000 2.225000  3.835000 2.395000 ;
-      RECT  1.430000 2.395000  1.770000 2.735000 ;
-      RECT  1.600000 1.035000  1.770000 2.225000 ;
-      RECT  1.940000 1.305000  2.555000 1.725000 ;
-      RECT  1.940000 1.725000  2.720000 2.055000 ;
-      RECT  1.940000 2.565000  2.190000 2.905000 ;
-      RECT  2.385000 0.675000  2.740000 1.010000 ;
-      RECT  2.385000 1.010000  2.555000 1.305000 ;
-      RECT  3.420000 0.255000  5.280000 0.425000 ;
-      RECT  3.420000 0.425000  4.015000 0.585000 ;
-      RECT  3.420000 0.585000  3.750000 1.725000 ;
-      RECT  3.420000 1.725000  4.260000 2.055000 ;
-      RECT  3.665000 2.395000  3.835000 2.655000 ;
-      RECT  3.665000 2.655000  5.035000 2.825000 ;
-      RECT  3.980000 0.755000  4.230000 1.385000 ;
-      RECT  3.980000 1.385000  4.600000 1.555000 ;
-      RECT  4.005000 2.055000  4.260000 2.395000 ;
-      RECT  4.410000 0.675000  4.940000 1.135000 ;
-      RECT  4.430000 1.555000  4.600000 2.655000 ;
-      RECT  4.600000 2.825000  5.035000 3.075000 ;
-      RECT  4.770000 1.135000  4.940000 1.905000 ;
-      RECT  4.770000 1.905000  7.675000 2.075000 ;
-      RECT  5.110000 0.425000  5.280000 1.545000 ;
-      RECT  5.110000 1.545000  8.015000 1.640000 ;
-      RECT  5.110000 1.640000  6.120000 1.715000 ;
-      RECT  5.205000 2.075000  5.535000 3.075000 ;
-      RECT  5.450000 0.675000  6.135000 0.845000 ;
-      RECT  5.450000 0.845000  5.780000 1.375000 ;
-      RECT  5.900000 2.245000  6.230000 2.265000 ;
-      RECT  5.900000 2.265000  7.010000 2.485000 ;
-      RECT  5.950000 1.470000  8.015000 1.545000 ;
-      RECT  5.965000 0.255000  6.895000 0.425000 ;
-      RECT  5.965000 0.425000  6.135000 0.675000 ;
-      RECT  5.990000 1.015000  6.555000 1.300000 ;
-      RECT  6.305000 0.595000  6.555000 1.015000 ;
-      RECT  6.440000 1.810000  7.675000 1.905000 ;
-      RECT  6.440000 2.075000  7.675000 2.095000 ;
-      RECT  6.680000 2.485000  7.010000 2.695000 ;
-      RECT  6.725000 0.425000  6.895000 1.130000 ;
-      RECT  6.725000 1.130000  7.705000 1.300000 ;
-      RECT  7.535000 0.255000 10.255000 0.425000 ;
-      RECT  7.535000 0.425000  7.705000 1.130000 ;
-      RECT  7.755000 2.905000  8.695000 3.075000 ;
-      RECT  7.845000 1.640000  8.015000 2.905000 ;
-      RECT  7.875000 0.595000  8.145000 1.095000 ;
-      RECT  7.875000 1.095000  8.355000 1.265000 ;
-      RECT  8.185000 1.265000  8.355000 2.565000 ;
-      RECT  8.525000 0.595000  9.535000 0.765000 ;
-      RECT  8.525000 0.765000  8.695000 1.410000 ;
-      RECT  8.525000 1.410000  8.755000 1.740000 ;
-      RECT  8.525000 1.740000  8.695000 2.905000 ;
-      RECT  8.865000 0.935000  9.195000 1.225000 ;
-      RECT  8.895000 2.235000  9.145000 2.745000 ;
-      RECT  8.925000 1.225000  9.095000 2.235000 ;
-      RECT  8.940000 2.745000 12.485000 3.075000 ;
-      RECT  9.315000 1.885000  9.535000 2.135000 ;
-      RECT  9.315000 2.135000  9.485000 2.405000 ;
-      RECT  9.315000 2.405000 12.145000 2.575000 ;
-      RECT  9.365000 0.765000  9.535000 1.885000 ;
-      RECT 10.085000 0.425000 10.255000 1.545000 ;
-      RECT 10.085000 1.545000 12.675000 1.715000 ;
-      RECT 10.165000 1.715000 10.415000 2.145000 ;
-      RECT 10.425000 0.605000 10.595000 1.205000 ;
-      RECT 10.425000 1.205000 11.455000 1.375000 ;
-      RECT 10.655000 1.885000 13.015000 2.055000 ;
-      RECT 10.655000 2.055000 10.985000 2.215000 ;
-      RECT 11.205000 0.605000 11.455000 1.205000 ;
-      RECT 11.475000 2.055000 11.805000 2.235000 ;
-      RECT 11.625000 1.125000 12.335000 1.375000 ;
-      RECT 11.975000 2.225000 13.355000 2.395000 ;
-      RECT 11.975000 2.395000 12.145000 2.405000 ;
-      RECT 12.165000 0.255000 15.915000 0.425000 ;
-      RECT 12.165000 0.425000 12.335000 1.125000 ;
-      RECT 12.315000 2.565000 14.130000 2.735000 ;
-      RECT 12.315000 2.735000 12.485000 2.745000 ;
-      RECT 12.505000 0.595000 13.355000 0.765000 ;
-      RECT 12.505000 0.765000 12.675000 1.545000 ;
-      RECT 12.845000 0.935000 13.015000 1.240000 ;
-      RECT 12.845000 1.240000 14.755000 1.410000 ;
-      RECT 12.845000 1.410000 13.015000 1.885000 ;
-      RECT 13.185000 0.765000 13.355000 0.900000 ;
-      RECT 13.185000 0.900000 14.255000 1.070000 ;
-      RECT 13.185000 2.010000 14.210000 2.180000 ;
-      RECT 13.185000 2.180000 13.355000 2.225000 ;
-      RECT 13.525000 0.425000 13.855000 0.730000 ;
-      RECT 13.800000 2.350000 17.220000 2.490000 ;
-      RECT 13.800000 2.490000 14.595000 2.520000 ;
-      RECT 13.800000 2.520000 14.130000 2.565000 ;
-      RECT 14.040000 1.580000 14.370000 1.910000 ;
-      RECT 14.040000 1.910000 14.210000 2.010000 ;
-      RECT 14.085000 0.595000 15.575000 0.845000 ;
-      RECT 14.085000 0.845000 14.255000 0.900000 ;
-      RECT 14.425000 1.040000 14.755000 1.240000 ;
-      RECT 14.425000 2.320000 17.220000 2.350000 ;
-      RECT 15.405000 0.845000 15.575000 1.900000 ;
-      RECT 15.405000 1.900000 15.765000 2.150000 ;
-      RECT 15.745000 0.425000 15.915000 0.880000 ;
-      RECT 15.745000 0.880000 16.835000 1.050000 ;
-      RECT 16.455000 1.050000 16.835000 2.150000 ;
-      RECT 16.665000 0.630000 17.125000 0.800000 ;
-      RECT 16.665000 0.800000 16.835000 0.880000 ;
-      RECT 16.795000 0.420000 17.125000 0.630000 ;
-      RECT 17.005000 1.495000 17.335000 1.825000 ;
-      RECT 17.050000 1.825000 17.220000 2.320000 ;
-      RECT 17.325000 0.295000 17.675000 0.675000 ;
-      RECT 17.390000 1.995000 17.675000 2.675000 ;
-      RECT 17.505000 0.675000 17.675000 1.185000 ;
-      RECT 17.505000 1.185000 18.195000 1.515000 ;
-      RECT 17.505000 1.515000 17.675000 1.995000 ;
+      RECT  0.000000 -0.085000 18.720000 0.085000 ;
+      RECT  0.000000  3.245000 18.720000 3.415000 ;
+      RECT  0.100000  0.085000  0.430000 1.035000 ;
+      RECT  0.100000  2.045000  1.190000 2.215000 ;
+      RECT  0.100000  2.215000  0.430000 3.065000 ;
+      RECT  0.600000  2.385000  0.850000 3.245000 ;
+      RECT  0.920000  0.575000  1.250000 0.865000 ;
+      RECT  0.920000  0.865000  1.770000 1.035000 ;
+      RECT  1.020000  2.215000  1.190000 2.905000 ;
+      RECT  1.020000  2.905000  2.190000 3.075000 ;
+      RECT  1.430000  2.225000  3.835000 2.395000 ;
+      RECT  1.430000  2.395000  1.770000 2.735000 ;
+      RECT  1.600000  1.035000  1.770000 2.225000 ;
+      RECT  1.940000  0.085000  2.190000 1.035000 ;
+      RECT  1.940000  1.305000  2.555000 1.725000 ;
+      RECT  1.940000  1.725000  2.720000 2.055000 ;
+      RECT  1.940000  2.565000  2.190000 2.905000 ;
+      RECT  2.385000  0.675000  2.740000 1.010000 ;
+      RECT  2.385000  1.010000  2.555000 1.305000 ;
+      RECT  2.920000  0.085000  3.250000 1.010000 ;
+      RECT  2.920000  2.565000  3.250000 3.245000 ;
+      RECT  3.420000  0.255000  5.280000 0.425000 ;
+      RECT  3.420000  0.425000  4.015000 0.585000 ;
+      RECT  3.420000  0.585000  3.750000 1.725000 ;
+      RECT  3.420000  1.725000  4.260000 2.055000 ;
+      RECT  3.665000  2.395000  3.835000 2.655000 ;
+      RECT  3.665000  2.655000  5.035000 2.825000 ;
+      RECT  3.980000  0.755000  4.230000 1.385000 ;
+      RECT  3.980000  1.385000  4.600000 1.555000 ;
+      RECT  4.005000  2.055000  4.260000 2.395000 ;
+      RECT  4.410000  0.675000  4.940000 1.135000 ;
+      RECT  4.430000  1.555000  4.600000 2.655000 ;
+      RECT  4.600000  2.825000  5.035000 3.075000 ;
+      RECT  4.770000  1.135000  4.940000 1.905000 ;
+      RECT  4.770000  1.905000  7.675000 2.075000 ;
+      RECT  5.110000  0.425000  5.280000 1.545000 ;
+      RECT  5.110000  1.545000  8.015000 1.640000 ;
+      RECT  5.110000  1.640000  6.120000 1.715000 ;
+      RECT  5.205000  2.075000  5.535000 3.075000 ;
+      RECT  5.450000  0.675000  6.135000 0.845000 ;
+      RECT  5.450000  0.845000  5.780000 1.375000 ;
+      RECT  5.465000  0.085000  5.795000 0.505000 ;
+      RECT  5.900000  2.245000  6.230000 2.265000 ;
+      RECT  5.900000  2.265000  7.010000 2.485000 ;
+      RECT  5.950000  1.470000  8.015000 1.545000 ;
+      RECT  5.965000  0.255000  6.895000 0.425000 ;
+      RECT  5.965000  0.425000  6.135000 0.675000 ;
+      RECT  5.990000  1.015000  6.555000 1.300000 ;
+      RECT  6.025000  2.655000  6.355000 3.245000 ;
+      RECT  6.305000  0.595000  6.555000 1.015000 ;
+      RECT  6.440000  1.810000  7.675000 1.905000 ;
+      RECT  6.440000  2.075000  7.675000 2.095000 ;
+      RECT  6.680000  2.485000  7.010000 2.695000 ;
+      RECT  6.725000  0.425000  6.895000 1.130000 ;
+      RECT  6.725000  1.130000  7.705000 1.300000 ;
+      RECT  7.115000  0.085000  7.365000 0.960000 ;
+      RECT  7.250000  2.265000  7.580000 3.245000 ;
+      RECT  7.535000  0.255000 10.255000 0.425000 ;
+      RECT  7.535000  0.425000  7.705000 1.130000 ;
+      RECT  7.755000  2.905000  8.695000 3.075000 ;
+      RECT  7.845000  1.640000  8.015000 2.905000 ;
+      RECT  7.875000  0.595000  8.145000 1.095000 ;
+      RECT  7.875000  1.095000  8.355000 1.265000 ;
+      RECT  8.185000  1.265000  8.355000 2.565000 ;
+      RECT  8.525000  0.595000  9.535000 0.765000 ;
+      RECT  8.525000  0.765000  8.695000 1.410000 ;
+      RECT  8.525000  1.410000  8.755000 1.740000 ;
+      RECT  8.525000  1.740000  8.695000 2.905000 ;
+      RECT  8.865000  0.935000  9.195000 1.225000 ;
+      RECT  8.895000  2.235000  9.145000 2.745000 ;
+      RECT  8.925000  1.225000  9.095000 2.235000 ;
+      RECT  8.940000  2.745000 12.485000 3.075000 ;
+      RECT  9.315000  1.885000  9.535000 2.135000 ;
+      RECT  9.315000  2.135000  9.485000 2.405000 ;
+      RECT  9.315000  2.405000 12.145000 2.575000 ;
+      RECT  9.365000  0.765000  9.535000 1.885000 ;
+      RECT 10.085000  0.425000 10.255000 1.545000 ;
+      RECT 10.085000  1.545000 12.675000 1.715000 ;
+      RECT 10.165000  1.715000 10.415000 2.145000 ;
+      RECT 10.425000  0.605000 10.595000 1.205000 ;
+      RECT 10.425000  1.205000 11.455000 1.375000 ;
+      RECT 10.655000  1.885000 13.015000 2.055000 ;
+      RECT 10.655000  2.055000 10.985000 2.215000 ;
+      RECT 10.775000  0.085000 11.025000 1.035000 ;
+      RECT 11.205000  0.605000 11.455000 1.205000 ;
+      RECT 11.475000  2.055000 11.805000 2.235000 ;
+      RECT 11.625000  1.125000 12.335000 1.375000 ;
+      RECT 11.745000  0.085000 11.995000 0.955000 ;
+      RECT 11.975000  2.225000 13.355000 2.395000 ;
+      RECT 11.975000  2.395000 12.145000 2.405000 ;
+      RECT 12.165000  0.255000 15.915000 0.425000 ;
+      RECT 12.165000  0.425000 12.335000 1.125000 ;
+      RECT 12.315000  2.565000 14.130000 2.735000 ;
+      RECT 12.315000  2.735000 12.485000 2.745000 ;
+      RECT 12.505000  0.595000 13.355000 0.765000 ;
+      RECT 12.505000  0.765000 12.675000 1.545000 ;
+      RECT 12.655000  2.905000 15.235000 3.075000 ;
+      RECT 12.845000  0.935000 13.015000 1.240000 ;
+      RECT 12.845000  1.240000 14.755000 1.410000 ;
+      RECT 12.845000  1.410000 13.015000 1.885000 ;
+      RECT 13.185000  0.765000 13.355000 0.900000 ;
+      RECT 13.185000  0.900000 14.255000 1.070000 ;
+      RECT 13.185000  2.010000 14.210000 2.180000 ;
+      RECT 13.185000  2.180000 13.355000 2.225000 ;
+      RECT 13.525000  0.425000 13.855000 0.730000 ;
+      RECT 13.800000  2.350000 17.220000 2.490000 ;
+      RECT 13.800000  2.490000 14.595000 2.520000 ;
+      RECT 13.800000  2.520000 14.130000 2.565000 ;
+      RECT 14.040000  1.580000 14.370000 1.910000 ;
+      RECT 14.040000  1.910000 14.210000 2.010000 ;
+      RECT 14.085000  0.595000 15.575000 0.845000 ;
+      RECT 14.085000  0.845000 14.255000 0.900000 ;
+      RECT 14.425000  1.040000 14.755000 1.240000 ;
+      RECT 14.425000  2.320000 17.220000 2.350000 ;
+      RECT 14.905000  2.660000 15.235000 2.905000 ;
+      RECT 15.405000  0.845000 15.575000 1.900000 ;
+      RECT 15.405000  1.900000 15.765000 2.150000 ;
+      RECT 15.745000  0.425000 15.915000 0.880000 ;
+      RECT 15.745000  0.880000 16.835000 1.050000 ;
+      RECT 15.965000  2.660000 16.305000 2.940000 ;
+      RECT 16.085000  0.085000 16.335000 0.710000 ;
+      RECT 16.455000  1.050000 16.835000 2.150000 ;
+      RECT 16.665000  0.630000 17.125000 0.800000 ;
+      RECT 16.665000  0.800000 16.835000 0.880000 ;
+      RECT 16.795000  0.420000 17.125000 0.630000 ;
+      RECT 17.005000  1.495000 17.335000 1.825000 ;
+      RECT 17.050000  1.825000 17.220000 2.320000 ;
+      RECT 17.325000  0.295000 17.675000 0.675000 ;
+      RECT 17.390000  1.995000 17.675000 2.675000 ;
+      RECT 17.505000  0.675000 17.675000 1.185000 ;
+      RECT 17.505000  1.185000 18.195000 1.515000 ;
+      RECT 17.505000  1.515000 17.675000 1.995000 ;
+      RECT 17.855000  1.815000 18.185000 3.245000 ;
+      RECT 17.860000  0.085000 18.190000 1.015000 ;
+    LAYER mcon ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.765000 0.085000 ;
+      RECT  1.595000  3.245000  1.765000 3.415000 ;
+      RECT  2.075000 -0.085000  2.245000 0.085000 ;
+      RECT  2.075000  3.245000  2.245000 3.415000 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.735000 15.205000 2.905000 ;
+      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  2.735000 16.165000 2.905000 ;
+      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 ;
+      RECT 18.395000 -0.085000 18.565000 0.085000 ;
+      RECT 18.395000  3.245000 18.565000 3.415000 ;
   END
 END sky130_fd_sc_lp__srsdfstp_1
diff --git a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef
index 5d071da..1ceeaa0 100644
--- a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef
+++ b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.magic.lef
@@ -96,12 +96,6 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  9.725000 2.680000 10.005000 3.075000 ;
-        RECT 11.195000 2.680000 11.365000 3.075000 ;
-      LAYER mcon ;
-        RECT  9.755000 2.735000  9.925000 2.905000 ;
-        RECT 11.195000 2.735000 11.365000 2.905000 ;
       LAYER met1 ;
         RECT 0.070000 2.675000 13.850000 2.945000 ;
     END
@@ -110,44 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.920000 0.085000 ;
-        RECT  0.595000  0.085000  0.925000 0.670000 ;
-        RECT  2.475000  0.085000  2.645000 0.670000 ;
-        RECT  4.805000  0.085000  5.055000 0.445000 ;
-        RECT  7.950000  0.085000  8.280000 0.915000 ;
-        RECT 12.020000  0.085000 12.270000 1.330000 ;
-        RECT 13.045000  0.085000 13.295000 1.145000 ;
-      LAYER mcon ;
-        RECT  0.155000 -0.085000  0.325000 0.085000 ;
-        RECT  0.635000 -0.085000  0.805000 0.085000 ;
-        RECT  1.115000 -0.085000  1.285000 0.085000 ;
-        RECT  1.595000 -0.085000  1.765000 0.085000 ;
-        RECT  2.075000 -0.085000  2.245000 0.085000 ;
-        RECT  2.555000 -0.085000  2.725000 0.085000 ;
-        RECT  3.035000 -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
@@ -156,135 +112,174 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 3.245000 13.920000 3.415000 ;
-        RECT  0.565000 2.365000  0.895000 3.245000 ;
-        RECT  2.400000 2.660000  2.650000 3.245000 ;
-        RECT  5.495000 2.965000  5.825000 3.245000 ;
-        RECT 13.045000 1.815000 13.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 13.920000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.255000  0.415000 0.675000 ;
-      RECT  0.085000 0.675000  0.255000 1.910000 ;
-      RECT  0.085000 1.910000  1.905000 2.080000 ;
-      RECT  0.085000 2.080000  0.385000 3.045000 ;
-      RECT  0.585000 1.555000  0.915000 1.750000 ;
-      RECT  0.585000 1.750000  1.905000 1.910000 ;
-      RECT  1.385000 2.320000  2.990000 2.490000 ;
-      RECT  1.385000 2.490000  1.715000 3.045000 ;
-      RECT  1.525000 0.255000  1.855000 0.500000 ;
-      RECT  1.525000 0.500000  2.305000 0.670000 ;
-      RECT  2.135000 0.670000  2.305000 0.840000 ;
-      RECT  2.135000 0.840000  2.655000 1.010000 ;
-      RECT  2.485000 1.010000  2.830000 1.180000 ;
-      RECT  2.660000 1.180000  2.830000 2.320000 ;
-      RECT  2.820000 2.490000  2.990000 2.905000 ;
-      RECT  2.820000 2.905000  4.425000 3.075000 ;
-      RECT  2.825000 0.255000  4.575000 0.425000 ;
-      RECT  2.825000 0.425000  3.570000 0.585000 ;
-      RECT  2.825000 0.585000  3.170000 0.675000 ;
-      RECT  3.000000 0.675000  3.170000 1.980000 ;
-      RECT  3.000000 1.980000  3.455000 2.150000 ;
-      RECT  3.205000 2.150000  3.455000 2.405000 ;
-      RECT  3.205000 2.405000  3.925000 2.735000 ;
-      RECT  3.475000 0.755000  3.805000 1.135000 ;
-      RECT  3.635000 1.135000  3.805000 2.065000 ;
-      RECT  3.635000 2.065000  4.425000 2.235000 ;
-      RECT  3.985000 0.675000  4.235000 1.725000 ;
-      RECT  3.985000 1.725000  5.440000 1.895000 ;
-      RECT  4.095000 2.235000  4.425000 2.905000 ;
-      RECT  4.405000 0.425000  4.575000 0.615000 ;
-      RECT  4.405000 0.615000  5.440000 0.785000 ;
-      RECT  4.570000 0.955000  5.780000 1.125000 ;
-      RECT  4.570000 1.125000  4.900000 1.555000 ;
-      RECT  4.595000 1.895000  4.925000 2.625000 ;
-      RECT  4.595000 2.625000  6.165000 2.795000 ;
-      RECT  4.595000 2.795000  4.925000 3.075000 ;
-      RECT  5.110000 1.295000  5.440000 1.725000 ;
-      RECT  5.270000 0.255000  7.780000 0.425000 ;
-      RECT  5.270000 0.425000  5.440000 0.615000 ;
-      RECT  5.290000 2.105000  6.665000 2.455000 ;
-      RECT  5.610000 0.595000  5.780000 0.955000 ;
-      RECT  5.610000 1.125000  5.780000 2.105000 ;
-      RECT  5.950000 0.425000  6.120000 1.095000 ;
-      RECT  5.950000 1.095000  6.540000 1.425000 ;
-      RECT  5.995000 2.795000  6.165000 2.905000 ;
-      RECT  5.995000 2.905000  8.340000 3.075000 ;
-      RECT  6.335000 2.455000  6.665000 2.735000 ;
-      RECT  6.880000 0.595000  7.210000 0.925000 ;
-      RECT  7.040000 0.925000  7.210000 1.425000 ;
-      RECT  7.040000 1.425000  8.880000 1.595000 ;
-      RECT  7.195000 1.595000  7.525000 2.265000 ;
-      RECT  7.195000 2.265000  9.065000 2.340000 ;
-      RECT  7.195000 2.340000 10.345000 2.435000 ;
-      RECT  7.195000 2.435000  7.525000 2.735000 ;
-      RECT  7.380000 0.425000  7.780000 1.085000 ;
-      RECT  7.380000 1.085000  9.420000 1.255000 ;
-      RECT  8.010000 1.765000  8.340000 1.925000 ;
-      RECT  8.010000 1.925000  9.405000 2.000000 ;
-      RECT  8.010000 2.000000 11.350000 2.095000 ;
-      RECT  8.010000 2.745000  8.340000 2.905000 ;
-      RECT  8.550000 1.595000  8.880000 1.755000 ;
-      RECT  8.735000 2.435000 10.345000 2.510000 ;
-      RECT  8.735000 2.510000  9.065000 3.075000 ;
-      RECT  8.970000 0.585000  9.300000 0.745000 ;
-      RECT  8.970000 0.745000 11.315000 0.765000 ;
-      RECT  8.970000 0.765000 10.475000 0.915000 ;
-      RECT  9.090000 1.255000  9.420000 1.725000 ;
-      RECT  9.235000 2.095000 11.350000 2.170000 ;
-      RECT  9.590000 0.915000  9.920000 1.120000 ;
-      RECT 10.175000 2.510000 10.345000 2.905000 ;
-      RECT 10.175000 2.905000 11.025000 3.075000 ;
-      RECT 10.305000 0.595000 11.315000 0.745000 ;
-      RECT 10.515000 2.170000 10.685000 2.735000 ;
-      RECT 10.645000 0.935000 10.975000 1.160000 ;
-      RECT 10.645000 1.160000 11.350000 1.330000 ;
-      RECT 10.855000 2.340000 11.705000 2.510000 ;
-      RECT 10.855000 2.510000 11.025000 2.905000 ;
-      RECT 11.145000 0.765000 11.315000 0.820000 ;
-      RECT 11.145000 0.820000 11.690000 0.990000 ;
-      RECT 11.180000 1.330000 11.350000 2.000000 ;
-      RECT 11.520000 0.990000 11.690000 2.000000 ;
-      RECT 11.520000 2.000000 12.125000 2.170000 ;
-      RECT 11.535000 2.510000 11.705000 2.745000 ;
-      RECT 11.535000 2.745000 12.595000 3.075000 ;
-      RECT 11.875000 2.170000 12.125000 2.575000 ;
-      RECT 12.500000 0.265000 12.830000 1.315000 ;
-      RECT 12.500000 1.315000 13.495000 1.645000 ;
-      RECT 12.500000 1.645000 12.830000 2.495000 ;
+      RECT  0.000000 -0.085000 13.920000 0.085000 ;
+      RECT  0.000000  3.245000 13.920000 3.415000 ;
+      RECT  0.085000  0.255000  0.415000 0.675000 ;
+      RECT  0.085000  0.675000  0.255000 1.910000 ;
+      RECT  0.085000  1.910000  1.905000 2.080000 ;
+      RECT  0.085000  2.080000  0.385000 3.045000 ;
+      RECT  0.565000  2.365000  0.895000 3.245000 ;
+      RECT  0.585000  1.555000  0.915000 1.750000 ;
+      RECT  0.585000  1.750000  1.905000 1.910000 ;
+      RECT  0.595000  0.085000  0.925000 0.670000 ;
+      RECT  1.385000  2.320000  2.990000 2.490000 ;
+      RECT  1.385000  2.490000  1.715000 3.045000 ;
+      RECT  1.525000  0.255000  1.855000 0.500000 ;
+      RECT  1.525000  0.500000  2.305000 0.670000 ;
+      RECT  2.135000  0.670000  2.305000 0.840000 ;
+      RECT  2.135000  0.840000  2.655000 1.010000 ;
+      RECT  2.400000  2.660000  2.650000 3.245000 ;
+      RECT  2.475000  0.085000  2.645000 0.670000 ;
+      RECT  2.485000  1.010000  2.830000 1.180000 ;
+      RECT  2.660000  1.180000  2.830000 2.320000 ;
+      RECT  2.820000  2.490000  2.990000 2.905000 ;
+      RECT  2.820000  2.905000  4.425000 3.075000 ;
+      RECT  2.825000  0.255000  4.575000 0.425000 ;
+      RECT  2.825000  0.425000  3.570000 0.585000 ;
+      RECT  2.825000  0.585000  3.170000 0.675000 ;
+      RECT  3.000000  0.675000  3.170000 1.980000 ;
+      RECT  3.000000  1.980000  3.455000 2.150000 ;
+      RECT  3.205000  2.150000  3.455000 2.405000 ;
+      RECT  3.205000  2.405000  3.925000 2.735000 ;
+      RECT  3.475000  0.755000  3.805000 1.135000 ;
+      RECT  3.635000  1.135000  3.805000 2.065000 ;
+      RECT  3.635000  2.065000  4.425000 2.235000 ;
+      RECT  3.985000  0.675000  4.235000 1.725000 ;
+      RECT  3.985000  1.725000  5.440000 1.895000 ;
+      RECT  4.095000  2.235000  4.425000 2.905000 ;
+      RECT  4.405000  0.425000  4.575000 0.615000 ;
+      RECT  4.405000  0.615000  5.440000 0.785000 ;
+      RECT  4.570000  0.955000  5.780000 1.125000 ;
+      RECT  4.570000  1.125000  4.900000 1.555000 ;
+      RECT  4.595000  1.895000  4.925000 2.625000 ;
+      RECT  4.595000  2.625000  6.165000 2.795000 ;
+      RECT  4.595000  2.795000  4.925000 3.075000 ;
+      RECT  4.805000  0.085000  5.055000 0.445000 ;
+      RECT  5.110000  1.295000  5.440000 1.725000 ;
+      RECT  5.270000  0.255000  7.780000 0.425000 ;
+      RECT  5.270000  0.425000  5.440000 0.615000 ;
+      RECT  5.290000  2.105000  6.665000 2.455000 ;
+      RECT  5.495000  2.965000  5.825000 3.245000 ;
+      RECT  5.610000  0.595000  5.780000 0.955000 ;
+      RECT  5.610000  1.125000  5.780000 2.105000 ;
+      RECT  5.950000  0.425000  6.120000 1.095000 ;
+      RECT  5.950000  1.095000  6.540000 1.425000 ;
+      RECT  5.995000  2.795000  6.165000 2.905000 ;
+      RECT  5.995000  2.905000  8.340000 3.075000 ;
+      RECT  6.335000  2.455000  6.665000 2.735000 ;
+      RECT  6.880000  0.595000  7.210000 0.925000 ;
+      RECT  7.040000  0.925000  7.210000 1.425000 ;
+      RECT  7.040000  1.425000  8.880000 1.595000 ;
+      RECT  7.195000  1.595000  7.525000 2.265000 ;
+      RECT  7.195000  2.265000  9.065000 2.340000 ;
+      RECT  7.195000  2.340000 10.345000 2.435000 ;
+      RECT  7.195000  2.435000  7.525000 2.735000 ;
+      RECT  7.380000  0.425000  7.780000 1.085000 ;
+      RECT  7.380000  1.085000  9.420000 1.255000 ;
+      RECT  7.950000  0.085000  8.280000 0.915000 ;
+      RECT  8.010000  1.765000  8.340000 1.925000 ;
+      RECT  8.010000  1.925000  9.405000 2.000000 ;
+      RECT  8.010000  2.000000 11.350000 2.095000 ;
+      RECT  8.010000  2.745000  8.340000 2.905000 ;
+      RECT  8.550000  1.595000  8.880000 1.755000 ;
+      RECT  8.735000  2.435000 10.345000 2.510000 ;
+      RECT  8.735000  2.510000  9.065000 3.075000 ;
+      RECT  8.970000  0.585000  9.300000 0.745000 ;
+      RECT  8.970000  0.745000 11.315000 0.765000 ;
+      RECT  8.970000  0.765000 10.475000 0.915000 ;
+      RECT  9.090000  1.255000  9.420000 1.725000 ;
+      RECT  9.235000  2.095000 11.350000 2.170000 ;
+      RECT  9.590000  0.915000  9.920000 1.120000 ;
+      RECT  9.725000  2.680000 10.005000 3.075000 ;
+      RECT 10.175000  2.510000 10.345000 2.905000 ;
+      RECT 10.175000  2.905000 11.025000 3.075000 ;
+      RECT 10.305000  0.595000 11.315000 0.745000 ;
+      RECT 10.515000  2.170000 10.685000 2.735000 ;
+      RECT 10.645000  0.935000 10.975000 1.160000 ;
+      RECT 10.645000  1.160000 11.350000 1.330000 ;
+      RECT 10.855000  2.340000 11.705000 2.510000 ;
+      RECT 10.855000  2.510000 11.025000 2.905000 ;
+      RECT 11.145000  0.765000 11.315000 0.820000 ;
+      RECT 11.145000  0.820000 11.690000 0.990000 ;
+      RECT 11.180000  1.330000 11.350000 2.000000 ;
+      RECT 11.195000  2.680000 11.365000 3.075000 ;
+      RECT 11.520000  0.990000 11.690000 2.000000 ;
+      RECT 11.520000  2.000000 12.125000 2.170000 ;
+      RECT 11.535000  2.510000 11.705000 2.745000 ;
+      RECT 11.535000  2.745000 12.595000 3.075000 ;
+      RECT 11.875000  2.170000 12.125000 2.575000 ;
+      RECT 12.020000  0.085000 12.270000 1.330000 ;
+      RECT 12.500000  0.265000 12.830000 1.315000 ;
+      RECT 12.500000  1.315000 13.495000 1.645000 ;
+      RECT 12.500000  1.645000 12.830000 2.495000 ;
+      RECT 13.045000  0.085000 13.295000 1.145000 ;
+      RECT 13.045000  1.815000 13.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 ;
+      RECT  2.555000 -0.085000  2.725000 0.085000 ;
+      RECT  2.555000  3.245000  2.725000 3.415000 ;
+      RECT  3.035000 -0.085000  3.205000 0.085000 ;
+      RECT  3.035000  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  2.735000  9.925000 2.905000 ;
+      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  2.735000 11.365000 2.905000 ;
+      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_lp__srsdfxtp_1
diff --git a/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef b/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
index 4c3d5b3..0a8ce0b 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_lp__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_lp__tap_1
diff --git a/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef b/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
index d8c79a7..0ce7d98 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_2.magic.lef
+++ b/cells/tap/sky130_fd_sc_lp__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_lp__tap_2
diff --git a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
index 3009911..8e2fc92 100644
--- a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_lp__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.095000 2.660000 0.385000 2.890000 ;
     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_lp__tapvgnd_1
diff --git a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
index 01f2d6a..377e7c5 100644
--- a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_lp__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.095000 2.290000 0.385000 2.520000 ;
     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_lp__tapvgnd2_1
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
index 238813d..6c77fbc 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_lp__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_lp__tapvpwrvgnd_1
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef
index b9fb5f0..f310deb 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.magic.lef
@@ -69,18 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.095000  0.085000 0.375000 1.260000 ;
-        RECT 1.925000  0.085000 2.180000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.360000 0.245000 ;
     END
@@ -89,34 +77,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.260000 2.415000 0.570000 3.245000 ;
-        RECT 1.160000 2.605000 1.790000 3.245000 ;
-        RECT 2.770000 2.745000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.740000 2.265000 2.100000 2.435000 ;
-      RECT 0.740000 2.435000 0.990000 3.065000 ;
-      RECT 0.885000 0.930000 1.215000 1.260000 ;
-      RECT 0.885000 1.260000 1.125000 2.265000 ;
-      RECT 1.510000 0.345000 1.755000 0.845000 ;
-      RECT 1.510000 0.845000 2.580000 1.035000 ;
-      RECT 1.930000 2.065000 2.930000 2.235000 ;
-      RECT 1.930000 2.235000 2.100000 2.265000 ;
-      RECT 2.350000 0.345000 2.580000 0.845000 ;
-      RECT 2.670000 1.565000 2.930000 2.065000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  0.085000 0.375000 1.260000 ;
+      RECT 0.260000  2.415000 0.570000 3.245000 ;
+      RECT 0.740000  2.265000 2.100000 2.435000 ;
+      RECT 0.740000  2.435000 0.990000 3.065000 ;
+      RECT 0.885000  0.930000 1.215000 1.260000 ;
+      RECT 0.885000  1.260000 1.125000 2.265000 ;
+      RECT 1.160000  2.605000 1.790000 3.245000 ;
+      RECT 1.510000  0.345000 1.755000 0.845000 ;
+      RECT 1.510000  0.845000 2.580000 1.035000 ;
+      RECT 1.925000  0.085000 2.180000 0.675000 ;
+      RECT 1.930000  2.065000 2.930000 2.235000 ;
+      RECT 1.930000  2.235000 2.100000 2.265000 ;
+      RECT 2.350000  0.345000 2.580000 0.845000 ;
+      RECT 2.670000  1.565000 2.930000 2.065000 ;
+      RECT 2.770000  2.745000 3.060000 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_lp__xnor2_0
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef
index da80312..70c246d 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.magic.lef
@@ -68,18 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.950000  0.085000 1.280000 0.915000 ;
-        RECT 1.970000  0.085000 2.300000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -88,38 +76,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.125000 2.260000 0.385000 3.245000 ;
-        RECT 0.985000 2.600000 1.825000 3.245000 ;
-        RECT 2.935000 2.725000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 0.265000 0.455000 0.845000 ;
-      RECT 0.125000 0.845000 0.780000 1.015000 ;
-      RECT 0.555000 2.260000 2.335000 2.430000 ;
-      RECT 0.555000 2.430000 0.815000 3.075000 ;
-      RECT 0.610000 1.015000 0.780000 1.085000 ;
-      RECT 0.610000 1.085000 2.845000 1.255000 ;
-      RECT 1.470000 0.255000 1.800000 0.745000 ;
-      RECT 1.470000 0.745000 2.835000 0.915000 ;
-      RECT 2.165000 2.015000 2.845000 2.185000 ;
-      RECT 2.165000 2.185000 2.335000 2.260000 ;
-      RECT 2.505000 0.255000 2.835000 0.745000 ;
-      RECT 2.675000 1.255000 2.845000 1.345000 ;
-      RECT 2.675000 1.345000 2.925000 1.675000 ;
-      RECT 2.675000 1.675000 2.845000 2.015000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.125000  0.265000 0.455000 0.845000 ;
+      RECT 0.125000  0.845000 0.780000 1.015000 ;
+      RECT 0.125000  2.260000 0.385000 3.245000 ;
+      RECT 0.555000  2.260000 2.335000 2.430000 ;
+      RECT 0.555000  2.430000 0.815000 3.075000 ;
+      RECT 0.610000  1.015000 0.780000 1.085000 ;
+      RECT 0.610000  1.085000 2.845000 1.255000 ;
+      RECT 0.950000  0.085000 1.280000 0.915000 ;
+      RECT 0.985000  2.600000 1.825000 3.245000 ;
+      RECT 1.470000  0.255000 1.800000 0.745000 ;
+      RECT 1.470000  0.745000 2.835000 0.915000 ;
+      RECT 1.970000  0.085000 2.300000 0.575000 ;
+      RECT 2.165000  2.015000 2.845000 2.185000 ;
+      RECT 2.165000  2.185000 2.335000 2.260000 ;
+      RECT 2.505000  0.255000 2.835000 0.745000 ;
+      RECT 2.675000  1.255000 2.845000 1.345000 ;
+      RECT 2.675000  1.345000 2.925000 1.675000 ;
+      RECT 2.675000  1.675000 2.845000 2.015000 ;
+      RECT 2.935000  2.725000 3.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 ;
   END
 END sky130_fd_sc_lp__xnor2_1
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef
index 6c35a9f..a31e4fa 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.magic.lef
@@ -77,25 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.585000  0.085000 0.805000 0.565000 ;
-        RECT 3.165000  0.085000 3.495000 0.895000 ;
-        RECT 4.025000  0.085000 4.785000 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 ;
-        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,63 +85,79 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.300000 1.815000 0.510000 2.270000 ;
-        RECT 0.300000 2.270000 0.645000 3.245000 ;
-        RECT 1.235000 2.260000 1.565000 3.245000 ;
-        RECT 2.195000 2.435000 2.525000 3.245000 ;
-        RECT 3.200000 2.775000 3.460000 3.245000 ;
-        RECT 5.385000 2.115000 5.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 ;
-        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.095000 0.255000 0.415000 0.735000 ;
-      RECT 0.095000 0.735000 1.145000 0.905000 ;
-      RECT 0.095000 0.905000 0.425000 1.095000 ;
-      RECT 0.680000 1.075000 1.485000 1.245000 ;
-      RECT 0.680000 1.245000 0.850000 1.920000 ;
-      RECT 0.680000 1.920000 1.945000 2.085000 ;
-      RECT 0.680000 2.085000 4.855000 2.090000 ;
-      RECT 0.680000 2.090000 1.065000 2.100000 ;
-      RECT 0.815000 2.100000 1.065000 3.075000 ;
-      RECT 0.975000 0.255000 2.515000 0.445000 ;
-      RECT 0.975000 0.445000 1.145000 0.735000 ;
-      RECT 1.315000 0.615000 2.015000 0.815000 ;
-      RECT 1.315000 0.815000 1.485000 1.075000 ;
-      RECT 1.745000 2.090000 3.855000 2.255000 ;
-      RECT 1.745000 2.255000 2.015000 3.075000 ;
-      RECT 2.185000 0.445000 2.515000 0.835000 ;
-      RECT 2.700000 2.435000 3.855000 2.605000 ;
-      RECT 2.700000 2.605000 3.030000 3.075000 ;
-      RECT 2.805000 0.300000 2.995000 1.065000 ;
-      RECT 2.805000 1.065000 5.145000 1.235000 ;
-      RECT 3.630000 2.605000 3.855000 2.895000 ;
-      RECT 3.630000 2.895000 4.855000 3.065000 ;
-      RECT 3.645000 1.920000 4.855000 2.085000 ;
-      RECT 3.665000 0.300000 3.855000 1.065000 ;
-      RECT 4.525000 2.600000 4.855000 2.895000 ;
-      RECT 4.685000 1.405000 5.715000 1.605000 ;
-      RECT 4.685000 1.605000 4.855000 1.920000 ;
-      RECT 4.955000 0.255000 6.145000 0.425000 ;
-      RECT 4.955000 0.425000 5.145000 1.065000 ;
-      RECT 5.815000 0.425000 6.145000 0.895000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.095000  0.255000 0.415000 0.735000 ;
+      RECT 0.095000  0.735000 1.145000 0.905000 ;
+      RECT 0.095000  0.905000 0.425000 1.095000 ;
+      RECT 0.300000  1.815000 0.510000 2.270000 ;
+      RECT 0.300000  2.270000 0.645000 3.245000 ;
+      RECT 0.585000  0.085000 0.805000 0.565000 ;
+      RECT 0.680000  1.075000 1.485000 1.245000 ;
+      RECT 0.680000  1.245000 0.850000 1.920000 ;
+      RECT 0.680000  1.920000 1.945000 2.085000 ;
+      RECT 0.680000  2.085000 4.855000 2.090000 ;
+      RECT 0.680000  2.090000 1.065000 2.100000 ;
+      RECT 0.815000  2.100000 1.065000 3.075000 ;
+      RECT 0.975000  0.255000 2.515000 0.445000 ;
+      RECT 0.975000  0.445000 1.145000 0.735000 ;
+      RECT 1.235000  2.260000 1.565000 3.245000 ;
+      RECT 1.315000  0.615000 2.015000 0.815000 ;
+      RECT 1.315000  0.815000 1.485000 1.075000 ;
+      RECT 1.745000  2.090000 3.855000 2.255000 ;
+      RECT 1.745000  2.255000 2.015000 3.075000 ;
+      RECT 2.185000  0.445000 2.515000 0.835000 ;
+      RECT 2.195000  2.435000 2.525000 3.245000 ;
+      RECT 2.700000  2.435000 3.855000 2.605000 ;
+      RECT 2.700000  2.605000 3.030000 3.075000 ;
+      RECT 2.805000  0.300000 2.995000 1.065000 ;
+      RECT 2.805000  1.065000 5.145000 1.235000 ;
+      RECT 3.165000  0.085000 3.495000 0.895000 ;
+      RECT 3.200000  2.775000 3.460000 3.245000 ;
+      RECT 3.630000  2.605000 3.855000 2.895000 ;
+      RECT 3.630000  2.895000 4.855000 3.065000 ;
+      RECT 3.645000  1.920000 4.855000 2.085000 ;
+      RECT 3.665000  0.300000 3.855000 1.065000 ;
+      RECT 4.025000  0.085000 4.785000 0.895000 ;
+      RECT 4.525000  2.600000 4.855000 2.895000 ;
+      RECT 4.685000  1.405000 5.715000 1.605000 ;
+      RECT 4.685000  1.605000 4.855000 1.920000 ;
+      RECT 4.955000  0.255000 6.145000 0.425000 ;
+      RECT 4.955000  0.425000 5.145000 1.065000 ;
+      RECT 5.385000  2.115000 5.715000 3.245000 ;
+      RECT 5.815000  0.425000 6.145000 0.895000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__xnor2_2
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef
index 865ae96..9d9bc3c 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.magic.lef
@@ -51,13 +51,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.810000 1.415000 3.160000 1.595000 ;
-        RECT 2.075000 1.595000 3.160000 1.750000 ;
-        RECT 8.240000 1.425000 9.590000 1.750000 ;
-      LAYER mcon ;
-        RECT 2.075000 1.580000 2.245000 1.750000 ;
-        RECT 8.315000 1.580000 8.485000 1.750000 ;
       LAYER met1 ;
         RECT 2.015000 1.550000 2.305000 1.595000 ;
         RECT 2.015000 1.595000 8.545000 1.735000 ;
@@ -89,36 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.635000  0.085000  0.965000 0.565000 ;
-        RECT 1.505000  0.085000  1.835000 0.565000 ;
-        RECT 2.365000  0.085000  2.695000 0.565000 ;
-        RECT 3.225000  0.085000  3.555000 0.565000 ;
-        RECT 6.635000  0.085000  6.965000 0.575000 ;
-        RECT 7.505000  0.085000  7.835000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -127,79 +90,111 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.095000 2.260000  0.425000 3.245000 ;
-        RECT 1.035000 2.960000  1.365000 3.245000 ;
-        RECT 3.715000 2.620000  4.045000 3.245000 ;
-        RECT 4.815000 2.445000  5.650000 3.245000 ;
-        RECT 6.250000 2.125000  6.470000 3.245000 ;
-        RECT 7.040000 2.125000  7.370000 3.245000 ;
-        RECT 7.900000 2.260000  8.230000 3.245000 ;
-        RECT 8.760000 2.260000  9.090000 3.245000 ;
-        RECT 9.620000 2.260000  9.950000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.135000 0.295000 0.465000 0.735000 ;
-      RECT 0.135000 0.735000 4.065000 0.905000 ;
-      RECT 0.595000 2.620000 3.545000 2.790000 ;
-      RECT 0.595000 2.790000 0.865000 2.950000 ;
-      RECT 1.155000 0.285000 1.335000 0.735000 ;
-      RECT 1.535000 2.790000 3.545000 2.960000 ;
-      RECT 2.005000 0.285000 2.195000 0.735000 ;
-      RECT 2.865000 0.285000 3.055000 0.735000 ;
-      RECT 3.735000 0.255000 5.935000 0.425000 ;
-      RECT 3.735000 0.425000 4.935000 0.435000 ;
-      RECT 3.735000 0.435000 4.065000 0.735000 ;
-      RECT 4.040000 1.415000 6.135000 1.585000 ;
-      RECT 4.605000 0.435000 4.935000 0.905000 ;
-      RECT 5.605000 0.425000 5.935000 0.915000 ;
-      RECT 5.625000 1.085000 9.990000 1.255000 ;
-      RECT 5.625000 1.255000 6.135000 1.415000 ;
-      RECT 6.135000 0.305000 6.465000 0.745000 ;
-      RECT 6.135000 0.745000 8.195000 0.915000 ;
-      RECT 6.645000 1.775000 7.800000 1.920000 ;
-      RECT 6.645000 1.920000 9.990000 1.945000 ;
-      RECT 6.645000 1.945000 6.870000 3.075000 ;
-      RECT 7.135000 0.285000 7.335000 0.745000 ;
-      RECT 7.540000 1.945000 9.990000 2.090000 ;
-      RECT 7.540000 2.090000 7.730000 3.075000 ;
-      RECT 8.005000 0.255000 9.985000 0.425000 ;
-      RECT 8.005000 0.425000 9.055000 0.435000 ;
-      RECT 8.005000 0.435000 8.195000 0.745000 ;
-      RECT 8.365000 0.615000 8.695000 1.065000 ;
-      RECT 8.365000 1.065000 9.990000 1.085000 ;
-      RECT 8.400000 2.090000 8.590000 3.075000 ;
-      RECT 8.865000 0.435000 9.055000 0.895000 ;
-      RECT 9.225000 0.615000 9.555000 1.065000 ;
-      RECT 9.260000 2.090000 9.450000 3.075000 ;
-      RECT 9.725000 0.425000 9.985000 0.895000 ;
-      RECT 9.770000 1.255000 9.990000 1.920000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.095000  2.260000  0.425000 3.245000 ;
+      RECT 0.135000  0.295000  0.465000 0.735000 ;
+      RECT 0.135000  0.735000  4.065000 0.905000 ;
+      RECT 0.595000  2.620000  3.545000 2.790000 ;
+      RECT 0.595000  2.790000  0.865000 2.950000 ;
+      RECT 0.635000  0.085000  0.965000 0.565000 ;
+      RECT 1.035000  2.960000  1.365000 3.245000 ;
+      RECT 1.155000  0.285000  1.335000 0.735000 ;
+      RECT 1.505000  0.085000  1.835000 0.565000 ;
+      RECT 1.535000  2.790000  3.545000 2.960000 ;
+      RECT 1.810000  1.415000  3.160000 1.595000 ;
+      RECT 2.005000  0.285000  2.195000 0.735000 ;
+      RECT 2.075000  1.595000  3.160000 1.750000 ;
+      RECT 2.365000  0.085000  2.695000 0.565000 ;
+      RECT 2.865000  0.285000  3.055000 0.735000 ;
+      RECT 3.225000  0.085000  3.555000 0.565000 ;
+      RECT 3.715000  2.620000  4.045000 3.245000 ;
+      RECT 3.735000  0.255000  5.935000 0.425000 ;
+      RECT 3.735000  0.425000  4.935000 0.435000 ;
+      RECT 3.735000  0.435000  4.065000 0.735000 ;
+      RECT 4.040000  1.415000  6.135000 1.585000 ;
+      RECT 4.605000  0.435000  4.935000 0.905000 ;
+      RECT 4.815000  2.445000  5.650000 3.245000 ;
+      RECT 5.605000  0.425000  5.935000 0.915000 ;
+      RECT 5.625000  1.085000  9.990000 1.255000 ;
+      RECT 5.625000  1.255000  6.135000 1.415000 ;
+      RECT 6.135000  0.305000  6.465000 0.745000 ;
+      RECT 6.135000  0.745000  8.195000 0.915000 ;
+      RECT 6.250000  2.125000  6.470000 3.245000 ;
+      RECT 6.635000  0.085000  6.965000 0.575000 ;
+      RECT 6.645000  1.775000  7.800000 1.920000 ;
+      RECT 6.645000  1.920000  9.990000 1.945000 ;
+      RECT 6.645000  1.945000  6.870000 3.075000 ;
+      RECT 7.040000  2.125000  7.370000 3.245000 ;
+      RECT 7.135000  0.285000  7.335000 0.745000 ;
+      RECT 7.505000  0.085000  7.835000 0.575000 ;
+      RECT 7.540000  1.945000  9.990000 2.090000 ;
+      RECT 7.540000  2.090000  7.730000 3.075000 ;
+      RECT 7.900000  2.260000  8.230000 3.245000 ;
+      RECT 8.005000  0.255000  9.985000 0.425000 ;
+      RECT 8.005000  0.425000  9.055000 0.435000 ;
+      RECT 8.005000  0.435000  8.195000 0.745000 ;
+      RECT 8.240000  1.425000  9.590000 1.750000 ;
+      RECT 8.365000  0.615000  8.695000 1.065000 ;
+      RECT 8.365000  1.065000  9.990000 1.085000 ;
+      RECT 8.400000  2.090000  8.590000 3.075000 ;
+      RECT 8.760000  2.260000  9.090000 3.245000 ;
+      RECT 8.865000  0.435000  9.055000 0.895000 ;
+      RECT 9.225000  0.615000  9.555000 1.065000 ;
+      RECT 9.260000  2.090000  9.450000 3.075000 ;
+      RECT 9.620000  2.260000  9.950000 3.245000 ;
+      RECT 9.725000  0.425000  9.985000 0.895000 ;
+      RECT 9.770000  1.255000  9.990000 1.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  1.580000 2.245000 1.750000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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.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 ;
   END
 END sky130_fd_sc_lp__xnor2_4
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef
index a6299e6..02466f8 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.magic.lef
@@ -64,18 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.075000  0.085000 1.405000 0.935000 ;
-        RECT 2.095000  0.085000 2.345000 1.065000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,33 +72,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.315000 2.325000 0.645000 3.245000 ;
-        RECT 1.865000 2.370000 2.195000 3.245000 ;
-        RECT 2.925000 2.370000 3.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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.540000 1.465000 1.525000 1.795000 ;
-      RECT 0.615000 0.440000 0.865000 1.115000 ;
-      RECT 0.615000 1.115000 1.835000 1.285000 ;
-      RECT 1.355000 1.795000 1.525000 2.020000 ;
-      RECT 1.355000 2.020000 3.270000 2.190000 ;
-      RECT 1.585000 0.605000 1.835000 1.115000 ;
-      RECT 2.395000 2.190000 2.725000 3.065000 ;
-      RECT 2.915000 0.605000 3.270000 1.065000 ;
-      RECT 3.100000 1.065000 3.270000 2.020000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.315000  2.325000 0.645000 3.245000 ;
+      RECT 0.540000  1.465000 1.525000 1.795000 ;
+      RECT 0.615000  0.440000 0.865000 1.115000 ;
+      RECT 0.615000  1.115000 1.835000 1.285000 ;
+      RECT 1.075000  0.085000 1.405000 0.935000 ;
+      RECT 1.355000  1.795000 1.525000 2.020000 ;
+      RECT 1.355000  2.020000 3.270000 2.190000 ;
+      RECT 1.585000  0.605000 1.835000 1.115000 ;
+      RECT 1.865000  2.370000 2.195000 3.245000 ;
+      RECT 2.095000  0.085000 2.345000 1.065000 ;
+      RECT 2.395000  2.190000 2.725000 3.065000 ;
+      RECT 2.915000  0.605000 3.270000 1.065000 ;
+      RECT 2.925000  2.370000 3.255000 3.245000 ;
+      RECT 3.100000  1.065000 3.270000 2.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 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__xnor2_lp
diff --git a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef
index d44868a..770fbbf 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.magic.lef
@@ -63,19 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 1.090000  0.085000 1.280000 0.860000 ;
-        RECT 1.090000  0.860000 2.300000 1.030000 ;
-        RECT 1.970000  0.620000 2.300000 0.860000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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,33 +71,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.240000 2.280000 0.570000 3.245000 ;
-        RECT 1.100000 2.280000 1.430000 2.490000 ;
-        RECT 1.100000 2.490000 1.270000 3.245000 ;
-        RECT 2.905000 2.180000 3.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.240000 0.620000 0.570000 0.830000 ;
-      RECT 0.240000 0.830000 0.410000 1.930000 ;
-      RECT 0.240000 1.930000 2.375000 2.100000 ;
-      RECT 0.750000 2.100000 0.920000 2.420000 ;
-      RECT 1.460000 0.270000 3.190000 0.440000 ;
-      RECT 1.460000 0.440000 1.790000 0.680000 ;
-      RECT 2.205000 1.280000 2.375000 1.930000 ;
-      RECT 3.000000 0.440000 3.190000 0.760000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.240000  0.620000 0.570000 0.830000 ;
+      RECT 0.240000  0.830000 0.410000 1.930000 ;
+      RECT 0.240000  1.930000 2.375000 2.100000 ;
+      RECT 0.240000  2.280000 0.570000 3.245000 ;
+      RECT 0.750000  2.100000 0.920000 2.420000 ;
+      RECT 1.090000  0.085000 1.280000 0.860000 ;
+      RECT 1.090000  0.860000 2.300000 1.030000 ;
+      RECT 1.100000  2.280000 1.430000 2.490000 ;
+      RECT 1.100000  2.490000 1.270000 3.245000 ;
+      RECT 1.460000  0.270000 3.190000 0.440000 ;
+      RECT 1.460000  0.440000 1.790000 0.680000 ;
+      RECT 1.970000  0.620000 2.300000 0.860000 ;
+      RECT 2.205000  1.280000 2.375000 1.930000 ;
+      RECT 2.905000  2.180000 3.095000 3.245000 ;
+      RECT 3.000000  0.440000 3.190000 0.760000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__xnor2_m
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.magic.lef
index a3984c4..46e67e3 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_lp__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.650000  0.085000 0.980000 0.365000 ;
-        RECT 3.305000  0.085000 3.635000 0.445000 ;
-        RECT 7.115000  0.085000 7.445000 0.605000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,100 +80,119 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 8.160000 3.415000 ;
-        RECT 0.530000 2.290000 0.780000 3.245000 ;
-        RECT 3.315000 2.865000 3.645000 3.245000 ;
-        RECT 7.160000 2.345000 7.490000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.440000 1.295000 0.780000 1.625000 ;
-      RECT 0.610000 0.535000 2.575000 0.705000 ;
-      RECT 0.610000 0.705000 0.780000 1.295000 ;
-      RECT 0.610000 1.625000 0.780000 1.950000 ;
-      RECT 0.610000 1.950000 1.120000 2.120000 ;
-      RECT 0.950000 2.120000 1.120000 2.865000 ;
-      RECT 0.950000 2.865000 2.505000 3.035000 ;
-      RECT 1.195000 0.875000 1.655000 1.125000 ;
-      RECT 1.290000 1.950000 1.655000 2.495000 ;
-      RECT 1.485000 1.125000 1.655000 1.555000 ;
-      RECT 1.485000 1.555000 2.665000 1.885000 ;
-      RECT 1.485000 1.885000 1.655000 1.950000 ;
-      RECT 1.825000 0.875000 2.075000 1.180000 ;
-      RECT 1.825000 1.180000 3.005000 1.385000 ;
-      RECT 1.825000 2.235000 2.075000 2.525000 ;
-      RECT 1.825000 2.525000 5.210000 2.540000 ;
-      RECT 1.825000 2.540000 3.345000 2.695000 ;
-      RECT 2.245000 0.525000 2.575000 0.535000 ;
-      RECT 2.245000 0.705000 2.575000 1.010000 ;
-      RECT 2.745000 0.525000 3.075000 0.615000 ;
-      RECT 2.745000 0.615000 6.445000 0.765000 ;
-      RECT 2.745000 0.765000 5.080000 0.785000 ;
-      RECT 2.745000 0.785000 3.345000 1.010000 ;
-      RECT 2.835000 1.385000 3.005000 2.355000 ;
-      RECT 3.175000 1.010000 3.345000 2.370000 ;
-      RECT 3.175000 2.370000 5.210000 2.525000 ;
-      RECT 3.745000 1.950000 4.185000 2.030000 ;
-      RECT 3.745000 2.030000 4.660000 2.200000 ;
-      RECT 3.850000 0.955000 4.185000 1.125000 ;
-      RECT 4.015000 1.125000 4.185000 1.950000 ;
-      RECT 4.335000 2.710000 4.665000 2.895000 ;
-      RECT 4.335000 2.895000 6.945000 3.065000 ;
-      RECT 4.410000 0.255000 6.945000 0.425000 ;
-      RECT 4.410000 0.425000 4.740000 0.445000 ;
-      RECT 4.490000 1.375000 4.785000 1.705000 ;
-      RECT 4.490000 1.705000 4.660000 2.030000 ;
-      RECT 4.880000 1.875000 5.210000 2.370000 ;
-      RECT 4.880000 2.540000 5.210000 2.725000 ;
-      RECT 4.910000 0.595000 6.445000 0.615000 ;
-      RECT 4.925000 0.955000 5.285000 1.205000 ;
-      RECT 4.955000 1.205000 5.285000 1.455000 ;
-      RECT 4.955000 1.455000 6.105000 1.625000 ;
-      RECT 5.425000 1.845000 5.755000 2.515000 ;
-      RECT 5.425000 2.515000 6.445000 2.685000 ;
-      RECT 5.455000 0.935000 5.785000 1.115000 ;
-      RECT 5.455000 1.115000 6.565000 1.285000 ;
-      RECT 5.935000 1.625000 6.105000 2.345000 ;
-      RECT 6.115000 0.765000 6.445000 0.940000 ;
-      RECT 6.275000 1.285000 6.565000 1.675000 ;
-      RECT 6.275000 1.675000 6.445000 2.515000 ;
-      RECT 6.615000 0.425000 6.945000 0.775000 ;
-      RECT 6.615000 0.775000 7.525000 0.945000 ;
-      RECT 6.615000 1.845000 7.525000 2.175000 ;
-      RECT 6.615000 2.175000 6.945000 2.895000 ;
-      RECT 7.355000 0.945000 7.525000 1.190000 ;
-      RECT 7.355000 1.190000 7.645000 1.520000 ;
-      RECT 7.355000 1.520000 7.525000 1.845000 ;
-      RECT 7.695000 0.340000 8.075000 1.020000 ;
-      RECT 7.695000 1.895000 8.075000 2.935000 ;
-      RECT 7.835000 1.020000 8.075000 1.895000 ;
+      RECT 0.000000 -0.085000 8.160000 0.085000 ;
+      RECT 0.000000  3.245000 8.160000 3.415000 ;
+      RECT 0.440000  1.295000 0.780000 1.625000 ;
+      RECT 0.530000  2.290000 0.780000 3.245000 ;
+      RECT 0.610000  0.535000 2.575000 0.705000 ;
+      RECT 0.610000  0.705000 0.780000 1.295000 ;
+      RECT 0.610000  1.625000 0.780000 1.950000 ;
+      RECT 0.610000  1.950000 1.120000 2.120000 ;
+      RECT 0.650000  0.085000 0.980000 0.365000 ;
+      RECT 0.950000  2.120000 1.120000 2.865000 ;
+      RECT 0.950000  2.865000 2.505000 3.035000 ;
+      RECT 1.195000  0.875000 1.655000 1.125000 ;
+      RECT 1.290000  1.950000 1.655000 2.495000 ;
+      RECT 1.485000  1.125000 1.655000 1.555000 ;
+      RECT 1.485000  1.555000 2.665000 1.885000 ;
+      RECT 1.485000  1.885000 1.655000 1.950000 ;
+      RECT 1.825000  0.875000 2.075000 1.180000 ;
+      RECT 1.825000  1.180000 3.005000 1.385000 ;
+      RECT 1.825000  2.235000 2.075000 2.525000 ;
+      RECT 1.825000  2.525000 5.210000 2.540000 ;
+      RECT 1.825000  2.540000 3.345000 2.695000 ;
+      RECT 2.245000  0.525000 2.575000 0.535000 ;
+      RECT 2.245000  0.705000 2.575000 1.010000 ;
+      RECT 2.745000  0.525000 3.075000 0.615000 ;
+      RECT 2.745000  0.615000 6.445000 0.765000 ;
+      RECT 2.745000  0.765000 5.080000 0.785000 ;
+      RECT 2.745000  0.785000 3.345000 1.010000 ;
+      RECT 2.835000  1.385000 3.005000 2.355000 ;
+      RECT 3.175000  1.010000 3.345000 2.370000 ;
+      RECT 3.175000  2.370000 5.210000 2.525000 ;
+      RECT 3.305000  0.085000 3.635000 0.445000 ;
+      RECT 3.315000  2.865000 3.645000 3.245000 ;
+      RECT 3.745000  1.950000 4.185000 2.030000 ;
+      RECT 3.745000  2.030000 4.660000 2.200000 ;
+      RECT 3.850000  0.955000 4.185000 1.125000 ;
+      RECT 4.015000  1.125000 4.185000 1.950000 ;
+      RECT 4.335000  2.710000 4.665000 2.895000 ;
+      RECT 4.335000  2.895000 6.945000 3.065000 ;
+      RECT 4.410000  0.255000 6.945000 0.425000 ;
+      RECT 4.410000  0.425000 4.740000 0.445000 ;
+      RECT 4.490000  1.375000 4.785000 1.705000 ;
+      RECT 4.490000  1.705000 4.660000 2.030000 ;
+      RECT 4.880000  1.875000 5.210000 2.370000 ;
+      RECT 4.880000  2.540000 5.210000 2.725000 ;
+      RECT 4.910000  0.595000 6.445000 0.615000 ;
+      RECT 4.925000  0.955000 5.285000 1.205000 ;
+      RECT 4.955000  1.205000 5.285000 1.455000 ;
+      RECT 4.955000  1.455000 6.105000 1.625000 ;
+      RECT 5.425000  1.845000 5.755000 2.515000 ;
+      RECT 5.425000  2.515000 6.445000 2.685000 ;
+      RECT 5.455000  0.935000 5.785000 1.115000 ;
+      RECT 5.455000  1.115000 6.565000 1.285000 ;
+      RECT 5.935000  1.625000 6.105000 2.345000 ;
+      RECT 6.115000  0.765000 6.445000 0.940000 ;
+      RECT 6.275000  1.285000 6.565000 1.675000 ;
+      RECT 6.275000  1.675000 6.445000 2.515000 ;
+      RECT 6.615000  0.425000 6.945000 0.775000 ;
+      RECT 6.615000  0.775000 7.525000 0.945000 ;
+      RECT 6.615000  1.845000 7.525000 2.175000 ;
+      RECT 6.615000  2.175000 6.945000 2.895000 ;
+      RECT 7.115000  0.085000 7.445000 0.605000 ;
+      RECT 7.160000  2.345000 7.490000 3.245000 ;
+      RECT 7.355000  0.945000 7.525000 1.190000 ;
+      RECT 7.355000  1.190000 7.645000 1.520000 ;
+      RECT 7.355000  1.520000 7.525000 1.845000 ;
+      RECT 7.695000  0.340000 8.075000 1.020000 ;
+      RECT 7.695000  1.895000 8.075000 2.935000 ;
+      RECT 7.835000  1.020000 8.075000 1.895000 ;
     LAYER mcon ;
-      RECT 2.555000 1.210000 2.725000 1.380000 ;
-      RECT 4.955000 1.210000 5.125000 1.380000 ;
-      RECT 5.435000 2.320000 5.605000 2.490000 ;
-      RECT 7.835000 2.320000 8.005000 2.490000 ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.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  2.320000 5.605000 2.490000 ;
+      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  2.320000 8.005000 2.490000 ;
+      RECT 7.835000  3.245000 8.005000 3.415000 ;
     LAYER met1 ;
       RECT 2.495000 1.180000 2.785000 1.225000 ;
       RECT 2.495000 1.225000 5.185000 1.365000 ;
diff --git a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef
index 5f77ea9..08bed47 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.magic.lef
@@ -72,35 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.905000  0.085000  1.155000 0.985000 ;
-        RECT 2.475000  0.085000  2.725000 0.815000 ;
-        RECT 8.845000  0.730000  9.535000 0.900000 ;
-        RECT 8.845000  0.900000  9.175000 1.100000 ;
-        RECT 9.365000  0.085000  9.535000 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 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 10.080000 0.245000 ;
     END
@@ -109,93 +80,119 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.770000 2.025000  1.100000 3.245000 ;
-        RECT 2.600000 2.595000  2.930000 3.245000 ;
-        RECT 8.845000 1.985000  9.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 ;
-        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.525000 0.445000 1.165000 ;
-      RECT 0.115000 1.165000 1.505000 1.335000 ;
-      RECT 0.115000 1.335000 0.285000 2.025000 ;
-      RECT 0.115000 2.025000 0.570000 3.065000 ;
-      RECT 1.175000 1.335000 1.505000 1.835000 ;
-      RECT 1.300000 2.025000 1.865000 2.245000 ;
-      RECT 1.300000 2.245000 4.735000 2.415000 ;
-      RECT 1.300000 2.415000 1.630000 3.065000 ;
-      RECT 1.335000 0.265000 2.295000 0.435000 ;
-      RECT 1.335000 0.435000 1.505000 1.165000 ;
-      RECT 1.695000 0.615000 1.945000 0.985000 ;
-      RECT 1.695000 0.985000 1.865000 2.025000 ;
-      RECT 2.125000 0.435000 2.295000 0.995000 ;
-      RECT 2.125000 0.995000 3.075000 1.165000 ;
-      RECT 2.905000 0.265000 3.895000 0.435000 ;
-      RECT 2.905000 0.435000 3.075000 0.995000 ;
-      RECT 3.210000 1.815000 3.540000 2.065000 ;
-      RECT 3.295000 0.615000 3.545000 1.245000 ;
-      RECT 3.295000 1.245000 3.830000 1.575000 ;
-      RECT 3.295000 1.575000 3.540000 1.815000 ;
-      RECT 3.725000 0.435000 3.895000 0.895000 ;
-      RECT 3.725000 0.895000 4.595000 1.065000 ;
-      RECT 3.795000 2.595000 4.125000 2.895000 ;
-      RECT 3.795000 2.895000 8.065000 3.065000 ;
-      RECT 4.075000 0.265000 6.475000 0.435000 ;
-      RECT 4.075000 0.435000 4.245000 0.715000 ;
-      RECT 4.405000 1.245000 5.105000 1.415000 ;
-      RECT 4.405000 1.415000 4.735000 2.245000 ;
-      RECT 4.405000 2.415000 4.735000 2.715000 ;
-      RECT 4.425000 0.615000 6.125000 0.785000 ;
-      RECT 4.425000 0.785000 4.595000 0.895000 ;
-      RECT 4.775000 0.965000 5.105000 1.245000 ;
-      RECT 4.915000 1.795000 5.615000 1.965000 ;
-      RECT 4.915000 1.965000 5.085000 2.895000 ;
-      RECT 5.265000 2.145000 5.595000 2.155000 ;
-      RECT 5.265000 2.155000 7.005000 2.325000 ;
-      RECT 5.265000 2.325000 5.595000 2.715000 ;
-      RECT 5.285000 0.965000 5.615000 1.795000 ;
-      RECT 5.795000 0.785000 6.125000 1.965000 ;
-      RECT 6.305000 0.435000 6.475000 2.155000 ;
-      RECT 6.325000 2.505000 6.655000 2.895000 ;
-      RECT 6.715000 0.265000 9.185000 0.435000 ;
-      RECT 6.715000 0.435000 6.965000 1.645000 ;
-      RECT 6.715000 1.645000 7.185000 1.975000 ;
-      RECT 6.835000 2.325000 7.715000 2.495000 ;
-      RECT 7.145000 0.615000 7.535000 0.995000 ;
-      RECT 7.365000 0.995000 7.535000 1.975000 ;
-      RECT 7.365000 1.975000 8.065000 2.145000 ;
-      RECT 7.465000 2.495000 7.715000 2.685000 ;
-      RECT 7.715000 0.615000 8.645000 0.795000 ;
-      RECT 7.895000 2.145000 8.065000 2.895000 ;
-      RECT 8.050000 1.560000 8.645000 1.795000 ;
-      RECT 8.315000 1.795000 8.645000 3.025000 ;
-      RECT 8.475000 0.795000 8.645000 1.560000 ;
-      RECT 8.855000 0.435000 9.185000 0.550000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.115000  0.525000  0.445000 1.165000 ;
+      RECT 0.115000  1.165000  1.505000 1.335000 ;
+      RECT 0.115000  1.335000  0.285000 2.025000 ;
+      RECT 0.115000  2.025000  0.570000 3.065000 ;
+      RECT 0.770000  2.025000  1.100000 3.245000 ;
+      RECT 0.905000  0.085000  1.155000 0.985000 ;
+      RECT 1.175000  1.335000  1.505000 1.835000 ;
+      RECT 1.300000  2.025000  1.865000 2.245000 ;
+      RECT 1.300000  2.245000  4.735000 2.415000 ;
+      RECT 1.300000  2.415000  1.630000 3.065000 ;
+      RECT 1.335000  0.265000  2.295000 0.435000 ;
+      RECT 1.335000  0.435000  1.505000 1.165000 ;
+      RECT 1.695000  0.615000  1.945000 0.985000 ;
+      RECT 1.695000  0.985000  1.865000 2.025000 ;
+      RECT 2.125000  0.435000  2.295000 0.995000 ;
+      RECT 2.125000  0.995000  3.075000 1.165000 ;
+      RECT 2.475000  0.085000  2.725000 0.815000 ;
+      RECT 2.600000  2.595000  2.930000 3.245000 ;
+      RECT 2.905000  0.265000  3.895000 0.435000 ;
+      RECT 2.905000  0.435000  3.075000 0.995000 ;
+      RECT 3.210000  1.815000  3.540000 2.065000 ;
+      RECT 3.295000  0.615000  3.545000 1.245000 ;
+      RECT 3.295000  1.245000  3.830000 1.575000 ;
+      RECT 3.295000  1.575000  3.540000 1.815000 ;
+      RECT 3.725000  0.435000  3.895000 0.895000 ;
+      RECT 3.725000  0.895000  4.595000 1.065000 ;
+      RECT 3.795000  2.595000  4.125000 2.895000 ;
+      RECT 3.795000  2.895000  8.065000 3.065000 ;
+      RECT 4.075000  0.265000  6.475000 0.435000 ;
+      RECT 4.075000  0.435000  4.245000 0.715000 ;
+      RECT 4.405000  1.245000  5.105000 1.415000 ;
+      RECT 4.405000  1.415000  4.735000 2.245000 ;
+      RECT 4.405000  2.415000  4.735000 2.715000 ;
+      RECT 4.425000  0.615000  6.125000 0.785000 ;
+      RECT 4.425000  0.785000  4.595000 0.895000 ;
+      RECT 4.775000  0.965000  5.105000 1.245000 ;
+      RECT 4.915000  1.795000  5.615000 1.965000 ;
+      RECT 4.915000  1.965000  5.085000 2.895000 ;
+      RECT 5.265000  2.145000  5.595000 2.155000 ;
+      RECT 5.265000  2.155000  7.005000 2.325000 ;
+      RECT 5.265000  2.325000  5.595000 2.715000 ;
+      RECT 5.285000  0.965000  5.615000 1.795000 ;
+      RECT 5.795000  0.785000  6.125000 1.965000 ;
+      RECT 6.305000  0.435000  6.475000 2.155000 ;
+      RECT 6.325000  2.505000  6.655000 2.895000 ;
+      RECT 6.715000  0.265000  9.185000 0.435000 ;
+      RECT 6.715000  0.435000  6.965000 1.645000 ;
+      RECT 6.715000  1.645000  7.185000 1.975000 ;
+      RECT 6.835000  2.325000  7.715000 2.495000 ;
+      RECT 7.145000  0.615000  7.535000 0.995000 ;
+      RECT 7.365000  0.995000  7.535000 1.975000 ;
+      RECT 7.365000  1.975000  8.065000 2.145000 ;
+      RECT 7.465000  2.495000  7.715000 2.685000 ;
+      RECT 7.715000  0.615000  8.645000 0.795000 ;
+      RECT 7.895000  2.145000  8.065000 2.895000 ;
+      RECT 8.050000  1.560000  8.645000 1.795000 ;
+      RECT 8.315000  1.795000  8.645000 3.025000 ;
+      RECT 8.475000  0.795000  8.645000 1.560000 ;
+      RECT 8.845000  0.730000  9.535000 0.900000 ;
+      RECT 8.845000  0.900000  9.175000 1.100000 ;
+      RECT 8.845000  1.985000  9.175000 3.245000 ;
+      RECT 8.855000  0.435000  9.185000 0.550000 ;
+      RECT 9.365000  0.085000  9.535000 0.730000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__xnor3_lp
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef
index 367cbb3..b87aefd 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_0.magic.lef
@@ -65,19 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.270000  0.085000 0.560000 0.800000 ;
-        RECT 1.130000  0.085000 1.460000 0.700000 ;
-        RECT 2.985000  0.085000 3.255000 0.800000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -86,34 +73,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.915000 2.385000 1.210000 3.245000 ;
-        RECT 1.810000 2.705000 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 ;
-        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 2.025000 2.375000 2.195000 ;
-      RECT 0.095000 2.195000 0.425000 3.065000 ;
-      RECT 0.730000 0.395000 0.960000 0.870000 ;
-      RECT 0.730000 0.870000 2.475000 1.040000 ;
-      RECT 1.380000 2.365000 2.375000 2.535000 ;
-      RECT 1.380000 2.535000 1.640000 3.065000 ;
-      RECT 2.205000 1.040000 2.475000 1.625000 ;
-      RECT 2.205000 1.625000 2.375000 2.025000 ;
-      RECT 2.205000 2.535000 2.375000 2.665000 ;
-      RECT 2.205000 2.665000 3.255000 2.835000 ;
-      RECT 2.985000 1.815000 3.255000 2.665000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.095000  2.025000 2.375000 2.195000 ;
+      RECT 0.095000  2.195000 0.425000 3.065000 ;
+      RECT 0.270000  0.085000 0.560000 0.800000 ;
+      RECT 0.730000  0.395000 0.960000 0.870000 ;
+      RECT 0.730000  0.870000 2.475000 1.040000 ;
+      RECT 0.915000  2.385000 1.210000 3.245000 ;
+      RECT 1.130000  0.085000 1.460000 0.700000 ;
+      RECT 1.380000  2.365000 2.375000 2.535000 ;
+      RECT 1.380000  2.535000 1.640000 3.065000 ;
+      RECT 1.810000  2.705000 2.035000 3.245000 ;
+      RECT 2.205000  1.040000 2.475000 1.625000 ;
+      RECT 2.205000  1.625000 2.375000 2.025000 ;
+      RECT 2.205000  2.535000 2.375000 2.665000 ;
+      RECT 2.205000  2.665000 3.255000 2.835000 ;
+      RECT 2.985000  0.085000 3.255000 0.800000 ;
+      RECT 2.985000  1.815000 3.255000 2.665000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__xor2_0
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef
index 8c2d30f..ecaff3c 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_1.magic.lef
@@ -67,19 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.170000  0.085000 0.430000 1.040000 ;
-        RECT 1.030000  0.085000 1.360000 0.700000 ;
-        RECT 2.965000  0.085000 3.215000 1.060000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -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
@@ -88,38 +75,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.990000 2.405000 1.270000 3.245000 ;
-        RECT 1.965000 2.915000 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 ;
-        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.170000 2.065000 2.110000 2.235000 ;
-      RECT 0.170000 2.235000 0.500000 3.075000 ;
-      RECT 0.600000 0.335000 0.860000 0.870000 ;
-      RECT 0.600000 0.870000 1.870000 1.040000 ;
-      RECT 1.440000 2.405000 1.770000 2.575000 ;
-      RECT 1.440000 2.575000 3.265000 2.745000 ;
-      RECT 1.440000 2.745000 1.770000 3.075000 ;
-      RECT 1.700000 0.255000 2.795000 0.425000 ;
-      RECT 1.700000 0.425000 1.870000 0.870000 ;
-      RECT 1.940000 2.235000 3.235000 2.405000 ;
-      RECT 2.625000 0.425000 2.795000 1.230000 ;
-      RECT 2.625000 1.230000 3.235000 1.400000 ;
-      RECT 2.905000 1.400000 3.235000 1.625000 ;
-      RECT 2.935000 2.745000 3.265000 2.925000 ;
-      RECT 3.065000 1.625000 3.235000 2.235000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.170000  0.085000 0.430000 1.040000 ;
+      RECT 0.170000  2.065000 2.110000 2.235000 ;
+      RECT 0.170000  2.235000 0.500000 3.075000 ;
+      RECT 0.600000  0.335000 0.860000 0.870000 ;
+      RECT 0.600000  0.870000 1.870000 1.040000 ;
+      RECT 0.990000  2.405000 1.270000 3.245000 ;
+      RECT 1.030000  0.085000 1.360000 0.700000 ;
+      RECT 1.440000  2.405000 1.770000 2.575000 ;
+      RECT 1.440000  2.575000 3.265000 2.745000 ;
+      RECT 1.440000  2.745000 1.770000 3.075000 ;
+      RECT 1.700000  0.255000 2.795000 0.425000 ;
+      RECT 1.700000  0.425000 1.870000 0.870000 ;
+      RECT 1.940000  2.235000 3.235000 2.405000 ;
+      RECT 1.965000  2.915000 2.295000 3.245000 ;
+      RECT 2.625000  0.425000 2.795000 1.230000 ;
+      RECT 2.625000  1.230000 3.235000 1.400000 ;
+      RECT 2.905000  1.400000 3.235000 1.625000 ;
+      RECT 2.935000  2.745000 3.265000 2.925000 ;
+      RECT 2.965000  0.085000 3.215000 1.060000 ;
+      RECT 3.065000  1.625000 3.235000 2.235000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  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_lp__xor2_1
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef
index 24df55c..d3dd40a 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_2.magic.lef
@@ -54,12 +54,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.015000 1.345000 1.425000 1.780000 ;
-        RECT 4.285000 1.415000 4.955000 1.750000 ;
-      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 ;
@@ -88,27 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.240000 0.085000 ;
-        RECT 0.195000  0.085000 0.525000 0.445000 ;
-        RECT 1.230000  0.085000 1.560000 0.445000 ;
-        RECT 2.480000  0.085000 2.810000 0.445000 ;
-        RECT 3.535000  0.085000 3.865000 0.445000 ;
-        RECT 5.795000  0.085000 6.125000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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
@@ -117,48 +90,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 6.240000 3.415000 ;
-        RECT 0.255000 1.820000 0.505000 2.290000 ;
-        RECT 0.255000 2.290000 0.620000 3.245000 ;
-        RECT 2.100000 2.630000 2.430000 3.245000 ;
-        RECT 3.990000 2.940000 4.320000 3.245000 ;
-        RECT 5.010000 2.940000 5.340000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.720000 0.955000 2.700000 1.175000 ;
-      RECT 0.790000 2.290000 1.020000 2.800000 ;
-      RECT 0.790000 2.800000 1.930000 3.075000 ;
-      RECT 1.190000 2.290000 2.700000 2.460000 ;
-      RECT 1.190000 2.460000 1.430000 2.630000 ;
-      RECT 1.600000 2.630000 1.930000 2.800000 ;
-      RECT 2.530000 1.175000 2.700000 1.330000 ;
-      RECT 2.530000 1.330000 3.030000 1.605000 ;
-      RECT 2.530000 1.605000 2.700000 2.290000 ;
-      RECT 2.620000 2.630000 5.850000 2.770000 ;
-      RECT 2.620000 2.770000 3.810000 3.075000 ;
-      RECT 2.965000 2.600000 5.850000 2.630000 ;
-      RECT 4.090000 0.255000 5.625000 0.425000 ;
-      RECT 4.090000 0.425000 4.305000 1.185000 ;
-      RECT 4.975000 0.425000 5.625000 0.640000 ;
-      RECT 5.295000 0.640000 5.625000 0.905000 ;
+      RECT 0.000000 -0.085000 6.240000 0.085000 ;
+      RECT 0.000000  3.245000 6.240000 3.415000 ;
+      RECT 0.195000  0.085000 0.525000 0.445000 ;
+      RECT 0.255000  1.820000 0.505000 2.290000 ;
+      RECT 0.255000  2.290000 0.620000 3.245000 ;
+      RECT 0.720000  0.955000 2.700000 1.175000 ;
+      RECT 0.790000  2.290000 1.020000 2.800000 ;
+      RECT 0.790000  2.800000 1.930000 3.075000 ;
+      RECT 1.015000  1.345000 1.425000 1.780000 ;
+      RECT 1.190000  2.290000 2.700000 2.460000 ;
+      RECT 1.190000  2.460000 1.430000 2.630000 ;
+      RECT 1.230000  0.085000 1.560000 0.445000 ;
+      RECT 1.600000  2.630000 1.930000 2.800000 ;
+      RECT 2.100000  2.630000 2.430000 3.245000 ;
+      RECT 2.480000  0.085000 2.810000 0.445000 ;
+      RECT 2.530000  1.175000 2.700000 1.330000 ;
+      RECT 2.530000  1.330000 3.030000 1.605000 ;
+      RECT 2.530000  1.605000 2.700000 2.290000 ;
+      RECT 2.620000  2.630000 5.850000 2.770000 ;
+      RECT 2.620000  2.770000 3.810000 3.075000 ;
+      RECT 2.965000  2.600000 5.850000 2.630000 ;
+      RECT 3.535000  0.085000 3.865000 0.445000 ;
+      RECT 3.990000  2.940000 4.320000 3.245000 ;
+      RECT 4.090000  0.255000 5.625000 0.425000 ;
+      RECT 4.090000  0.425000 4.305000 1.185000 ;
+      RECT 4.285000  1.415000 4.955000 1.750000 ;
+      RECT 4.975000  0.425000 5.625000 0.640000 ;
+      RECT 5.010000  2.940000 5.340000 3.245000 ;
+      RECT 5.295000  0.640000 5.625000 0.905000 ;
+      RECT 5.795000  0.085000 6.125000 0.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 ;
   END
 END sky130_fd_sc_lp__xor2_2
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef
index 10432e9..a4a6e01 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_4.magic.lef
@@ -35,17 +35,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.400000 1.275000 1.555000 1.525000 ;
-        RECT 1.260000 1.075000 3.685000 1.245000 ;
-        RECT 1.260000 1.245000 1.555000 1.275000 ;
-        RECT 3.340000 1.245000 3.685000 1.435000 ;
-        RECT 6.305000 1.200000 7.075000 1.355000 ;
-        RECT 6.305000 1.355000 7.655000 1.535000 ;
-      LAYER mcon ;
-        RECT 1.320000 1.210000 1.490000 1.380000 ;
-        RECT 3.515000 1.210000 3.685000 1.380000 ;
-        RECT 6.395000 1.210000 6.565000 1.380000 ;
       LAYER met1 ;
         RECT 1.260000 1.180000 1.550000 1.225000 ;
         RECT 1.260000 1.225000 6.625000 1.365000 ;
@@ -61,13 +50,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.735000 1.415000 3.085000 1.775000 ;
-        RECT 7.825000 1.355000 9.600000 1.535000 ;
-        RECT 7.825000 1.535000 8.015000 1.800000 ;
-      LAYER mcon ;
-        RECT 2.555000 1.580000 2.725000 1.750000 ;
-        RECT 7.835000 1.580000 8.005000 1.750000 ;
       LAYER met1 ;
         RECT 2.495000 1.550000 2.785000 1.595000 ;
         RECT 2.495000 1.595000 8.065000 1.735000 ;
@@ -96,40 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.080000 0.085000 ;
-        RECT 0.095000  0.085000  0.425000 1.095000 ;
-        RECT 0.985000  0.085000  1.215000 0.565000 ;
-        RECT 3.605000  0.085000  3.935000 0.525000 ;
-        RECT 4.465000  0.085000  4.795000 0.845000 ;
-        RECT 5.325000  0.085000  6.215000 0.690000 ;
-        RECT 5.325000  0.690000  5.655000 1.105000 ;
-        RECT 6.745000  0.085000  7.075000 0.690000 ;
-        RECT 7.605000  0.085000  7.935000 0.845000 ;
-        RECT 8.465000  0.085000  8.795000 0.845000 ;
-        RECT 9.325000  0.085000  9.655000 0.845000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,76 +86,121 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 10.080000 3.415000 ;
-        RECT 0.525000 2.035000  0.855000 3.245000 ;
-        RECT 1.385000 2.285000  1.715000 3.245000 ;
-        RECT 2.245000 2.285000  2.575000 3.245000 ;
-        RECT 3.120000 2.285000  3.450000 3.245000 ;
-        RECT 6.385000 2.310000  6.715000 3.245000 ;
-        RECT 7.245000 2.310000  7.575000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.095000 1.695000 1.225000 1.865000 ;
-      RECT 0.095000 1.865000 0.355000 3.075000 ;
-      RECT 0.595000 0.255000 0.815000 0.735000 ;
-      RECT 0.595000 0.735000 1.645000 0.905000 ;
-      RECT 0.595000 0.905000 0.785000 1.095000 ;
-      RECT 1.025000 1.865000 1.225000 1.945000 ;
-      RECT 1.025000 1.945000 3.825000 2.115000 ;
-      RECT 1.025000 2.115000 1.215000 3.075000 ;
-      RECT 1.385000 0.255000 3.435000 0.525000 ;
-      RECT 1.385000 0.525000 1.645000 0.735000 ;
-      RECT 1.885000 2.115000 2.075000 3.075000 ;
-      RECT 2.745000 2.115000 2.950000 3.075000 ;
-      RECT 3.625000 2.115000 3.825000 2.775000 ;
-      RECT 3.625000 2.775000 5.625000 3.075000 ;
-      RECT 4.445000 1.355000 6.135000 1.535000 ;
-      RECT 5.365000 1.815000 5.625000 2.775000 ;
-      RECT 5.825000 0.860000 7.435000 1.015000 ;
-      RECT 5.825000 1.015000 9.995000 1.030000 ;
-      RECT 5.825000 1.030000 6.135000 1.355000 ;
-      RECT 5.955000 1.970000 7.935000 2.140000 ;
-      RECT 5.955000 2.140000 6.215000 3.075000 ;
-      RECT 6.385000 0.255000 6.575000 0.860000 ;
-      RECT 6.885000 2.140000 7.075000 3.075000 ;
-      RECT 7.245000 0.255000 7.435000 0.860000 ;
-      RECT 7.245000 1.030000 9.995000 1.185000 ;
-      RECT 7.745000 2.140000 7.935000 2.905000 ;
-      RECT 7.745000 2.905000 9.725000 3.075000 ;
-      RECT 8.105000 0.255000 8.295000 1.015000 ;
-      RECT 8.185000 1.705000 9.995000 1.875000 ;
-      RECT 8.185000 1.875000 8.435000 2.735000 ;
-      RECT 8.605000 2.045000 8.795000 2.905000 ;
-      RECT 8.965000 0.255000 9.155000 1.015000 ;
-      RECT 8.965000 1.875000 9.295000 2.735000 ;
-      RECT 9.465000 2.045000 9.725000 2.905000 ;
-      RECT 9.770000 1.185000 9.995000 1.705000 ;
+      RECT 0.000000 -0.085000 10.080000 0.085000 ;
+      RECT 0.000000  3.245000 10.080000 3.415000 ;
+      RECT 0.095000  0.085000  0.425000 1.095000 ;
+      RECT 0.095000  1.695000  1.225000 1.865000 ;
+      RECT 0.095000  1.865000  0.355000 3.075000 ;
+      RECT 0.400000  1.275000  1.555000 1.525000 ;
+      RECT 0.525000  2.035000  0.855000 3.245000 ;
+      RECT 0.595000  0.255000  0.815000 0.735000 ;
+      RECT 0.595000  0.735000  1.645000 0.905000 ;
+      RECT 0.595000  0.905000  0.785000 1.095000 ;
+      RECT 0.985000  0.085000  1.215000 0.565000 ;
+      RECT 1.025000  1.865000  1.225000 1.945000 ;
+      RECT 1.025000  1.945000  3.825000 2.115000 ;
+      RECT 1.025000  2.115000  1.215000 3.075000 ;
+      RECT 1.260000  1.075000  3.685000 1.245000 ;
+      RECT 1.260000  1.245000  1.555000 1.275000 ;
+      RECT 1.385000  0.255000  3.435000 0.525000 ;
+      RECT 1.385000  0.525000  1.645000 0.735000 ;
+      RECT 1.385000  2.285000  1.715000 3.245000 ;
+      RECT 1.735000  1.415000  3.085000 1.775000 ;
+      RECT 1.885000  2.115000  2.075000 3.075000 ;
+      RECT 2.245000  2.285000  2.575000 3.245000 ;
+      RECT 2.745000  2.115000  2.950000 3.075000 ;
+      RECT 3.120000  2.285000  3.450000 3.245000 ;
+      RECT 3.340000  1.245000  3.685000 1.435000 ;
+      RECT 3.605000  0.085000  3.935000 0.525000 ;
+      RECT 3.625000  2.115000  3.825000 2.775000 ;
+      RECT 3.625000  2.775000  5.625000 3.075000 ;
+      RECT 4.445000  1.355000  6.135000 1.535000 ;
+      RECT 4.465000  0.085000  4.795000 0.845000 ;
+      RECT 5.325000  0.085000  6.215000 0.690000 ;
+      RECT 5.325000  0.690000  5.655000 1.105000 ;
+      RECT 5.365000  1.815000  5.625000 2.775000 ;
+      RECT 5.825000  0.860000  7.435000 1.015000 ;
+      RECT 5.825000  1.015000  9.995000 1.030000 ;
+      RECT 5.825000  1.030000  6.135000 1.355000 ;
+      RECT 5.955000  1.970000  7.935000 2.140000 ;
+      RECT 5.955000  2.140000  6.215000 3.075000 ;
+      RECT 6.305000  1.200000  7.075000 1.355000 ;
+      RECT 6.305000  1.355000  7.655000 1.535000 ;
+      RECT 6.385000  0.255000  6.575000 0.860000 ;
+      RECT 6.385000  2.310000  6.715000 3.245000 ;
+      RECT 6.745000  0.085000  7.075000 0.690000 ;
+      RECT 6.885000  2.140000  7.075000 3.075000 ;
+      RECT 7.245000  0.255000  7.435000 0.860000 ;
+      RECT 7.245000  1.030000  9.995000 1.185000 ;
+      RECT 7.245000  2.310000  7.575000 3.245000 ;
+      RECT 7.605000  0.085000  7.935000 0.845000 ;
+      RECT 7.745000  2.140000  7.935000 2.905000 ;
+      RECT 7.745000  2.905000  9.725000 3.075000 ;
+      RECT 7.825000  1.355000  9.600000 1.535000 ;
+      RECT 7.825000  1.535000  8.015000 1.800000 ;
+      RECT 8.105000  0.255000  8.295000 1.015000 ;
+      RECT 8.185000  1.705000  9.995000 1.875000 ;
+      RECT 8.185000  1.875000  8.435000 2.735000 ;
+      RECT 8.465000  0.085000  8.795000 0.845000 ;
+      RECT 8.605000  2.045000  8.795000 2.905000 ;
+      RECT 8.965000  0.255000  9.155000 1.015000 ;
+      RECT 8.965000  1.875000  9.295000 2.735000 ;
+      RECT 9.325000  0.085000  9.655000 0.845000 ;
+      RECT 9.465000  2.045000  9.725000 2.905000 ;
+      RECT 9.770000  1.185000  9.995000 1.705000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.320000  1.210000 1.490000 1.380000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.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  1.210000 3.685000 1.380000 ;
+      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  1.210000 6.565000 1.380000 ;
+      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 ;
   END
 END sky130_fd_sc_lp__xor2_4
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef
index db3be1e..cafd9ae 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_lp.magic.lef
@@ -67,20 +67,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.035000 ;
-        RECT 1.775000  0.085000 2.105000 0.780000 ;
-        RECT 3.385000  0.085000 3.715000 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 ;
-        RECT 3.515000 -0.085000 3.685000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.245000 3.840000 0.245000 ;
     END
@@ -89,34 +75,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.840000 3.415000 ;
-        RECT 1.300000 2.740000 1.630000 3.245000 ;
-        RECT 3.385000 2.390000 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.535000 1.565000 0.905000 1.895000 ;
-      RECT 0.735000 1.895000 0.905000 2.040000 ;
-      RECT 0.735000 2.040000 3.615000 2.210000 ;
-      RECT 0.770000 2.390000 2.160000 2.560000 ;
-      RECT 0.770000 2.560000 1.100000 3.065000 ;
-      RECT 1.830000 2.560000 2.160000 3.065000 ;
-      RECT 2.395000 2.210000 2.725000 3.065000 ;
-      RECT 2.595000 0.320000 2.925000 0.830000 ;
-      RECT 2.595000 0.830000 3.615000 1.000000 ;
-      RECT 3.445000 1.000000 3.615000 2.040000 ;
+      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.035000 ;
+      RECT 0.535000  1.565000 0.905000 1.895000 ;
+      RECT 0.735000  1.895000 0.905000 2.040000 ;
+      RECT 0.735000  2.040000 3.615000 2.210000 ;
+      RECT 0.770000  2.390000 2.160000 2.560000 ;
+      RECT 0.770000  2.560000 1.100000 3.065000 ;
+      RECT 1.300000  2.740000 1.630000 3.245000 ;
+      RECT 1.775000  0.085000 2.105000 0.780000 ;
+      RECT 1.830000  2.560000 2.160000 3.065000 ;
+      RECT 2.395000  2.210000 2.725000 3.065000 ;
+      RECT 2.595000  0.320000 2.925000 0.830000 ;
+      RECT 2.595000  0.830000 3.615000 1.000000 ;
+      RECT 3.385000  0.085000 3.715000 0.650000 ;
+      RECT 3.385000  2.390000 3.715000 3.245000 ;
+      RECT 3.445000  1.000000 3.615000 2.040000 ;
+    LAYER mcon ;
+      RECT 0.155000 -0.085000 0.325000 0.085000 ;
+      RECT 0.155000  3.245000 0.325000 3.415000 ;
+      RECT 0.635000 -0.085000 0.805000 0.085000 ;
+      RECT 0.635000  3.245000 0.805000 3.415000 ;
+      RECT 1.115000 -0.085000 1.285000 0.085000 ;
+      RECT 1.115000  3.245000 1.285000 3.415000 ;
+      RECT 1.595000 -0.085000 1.765000 0.085000 ;
+      RECT 1.595000  3.245000 1.765000 3.415000 ;
+      RECT 2.075000 -0.085000 2.245000 0.085000 ;
+      RECT 2.075000  3.245000 2.245000 3.415000 ;
+      RECT 2.555000 -0.085000 2.725000 0.085000 ;
+      RECT 2.555000  3.245000 2.725000 3.415000 ;
+      RECT 3.035000 -0.085000 3.205000 0.085000 ;
+      RECT 3.035000  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_lp__xor2_lp
diff --git a/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef b/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef
index 61f0fc9..b997793 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_m.magic.lef
@@ -64,19 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.360000 0.085000 ;
-        RECT 0.225000  0.085000 0.415000 1.090000 ;
-        RECT 1.045000  0.085000 1.375000 1.030000 ;
-        RECT 2.870000  0.085000 3.200000 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
@@ -85,30 +72,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 3.360000 3.415000 ;
-        RECT 0.955000 2.845000 1.285000 3.245000 ;
-        RECT 1.875000 2.785000 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 ;
       LAYER met1 ;
         RECT 0.000000 3.085000 3.360000 3.575000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.225000 1.560000 2.855000 1.730000 ;
-      RECT 0.225000 1.730000 0.435000 3.000000 ;
-      RECT 0.655000 0.890000 0.865000 1.560000 ;
-      RECT 1.465000 2.435000 2.585000 2.605000 ;
-      RECT 1.465000 2.605000 1.655000 2.985000 ;
-      RECT 2.335000 2.605000 2.585000 2.765000 ;
-      RECT 2.685000 1.730000 2.855000 2.230000 ;
+      RECT 0.000000 -0.085000 3.360000 0.085000 ;
+      RECT 0.000000  3.245000 3.360000 3.415000 ;
+      RECT 0.225000  0.085000 0.415000 1.090000 ;
+      RECT 0.225000  1.560000 2.855000 1.730000 ;
+      RECT 0.225000  1.730000 0.435000 3.000000 ;
+      RECT 0.655000  0.890000 0.865000 1.560000 ;
+      RECT 0.955000  2.845000 1.285000 3.245000 ;
+      RECT 1.045000  0.085000 1.375000 1.030000 ;
+      RECT 1.465000  2.435000 2.585000 2.605000 ;
+      RECT 1.465000  2.605000 1.655000 2.985000 ;
+      RECT 1.875000  2.785000 2.085000 3.245000 ;
+      RECT 2.335000  2.605000 2.585000 2.765000 ;
+      RECT 2.685000  1.730000 2.855000 2.230000 ;
+      RECT 2.870000  0.085000 3.200000 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 ;
   END
 END sky130_fd_sc_lp__xor2_m
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef
index ebbb8a0..735fa7f 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_1.magic.lef
@@ -71,32 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.600000 0.085000 ;
-        RECT 0.785000  0.085000 1.115000 0.385000 ;
-        RECT 5.610000  0.085000 5.860000 0.595000 ;
-        RECT 8.530000  0.085000 8.860000 1.125000 ;
-      LAYER mcon ;
-        RECT 0.155000 -0.085000 0.325000 0.085000 ;
-        RECT 0.635000 -0.085000 0.805000 0.085000 ;
-        RECT 1.115000 -0.085000 1.285000 0.085000 ;
-        RECT 1.595000 -0.085000 1.765000 0.085000 ;
-        RECT 2.075000 -0.085000 2.245000 0.085000 ;
-        RECT 2.555000 -0.085000 2.725000 0.085000 ;
-        RECT 3.035000 -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,95 +79,117 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 9.600000 3.415000 ;
-        RECT 0.620000 2.195000 0.950000 3.245000 ;
-        RECT 5.260000 1.765000 5.590000 3.245000 ;
-        RECT 8.440000 1.815000 8.610000 3.245000 ;
-      LAYER mcon ;
-        RECT 0.155000 3.245000 0.325000 3.415000 ;
-        RECT 0.635000 3.245000 0.805000 3.415000 ;
-        RECT 1.115000 3.245000 1.285000 3.415000 ;
-        RECT 1.595000 3.245000 1.765000 3.415000 ;
-        RECT 2.075000 3.245000 2.245000 3.415000 ;
-        RECT 2.555000 3.245000 2.725000 3.415000 ;
-        RECT 3.035000 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.090000 0.565000 2.000000 0.735000 ;
-      RECT 0.090000 0.735000 0.605000 1.245000 ;
-      RECT 0.090000 1.245000 0.260000 2.035000 ;
-      RECT 0.090000 2.035000 0.440000 3.065000 ;
-      RECT 0.440000 1.525000 0.790000 1.845000 ;
-      RECT 0.440000 1.845000 1.650000 1.855000 ;
-      RECT 0.620000 1.855000 1.650000 2.015000 ;
-      RECT 1.440000 2.015000 1.770000 2.895000 ;
-      RECT 1.440000 2.895000 4.060000 3.065000 ;
-      RECT 1.480000 0.915000 1.650000 1.845000 ;
-      RECT 1.830000 0.735000 2.000000 1.425000 ;
-      RECT 1.830000 1.425000 2.825000 1.595000 ;
-      RECT 1.985000 2.035000 2.315000 2.545000 ;
-      RECT 1.985000 2.545000 3.710000 2.715000 ;
-      RECT 2.180000 0.265000 3.360000 0.435000 ;
-      RECT 2.180000 0.435000 2.430000 1.245000 ;
-      RECT 2.495000 1.595000 2.825000 2.365000 ;
-      RECT 2.655000 0.615000 3.010000 1.245000 ;
-      RECT 2.655000 1.245000 2.825000 1.425000 ;
-      RECT 3.005000 1.865000 3.360000 2.365000 ;
-      RECT 3.190000 0.435000 3.360000 1.865000 ;
-      RECT 3.540000 0.265000 5.430000 0.435000 ;
-      RECT 3.540000 0.435000 3.710000 2.545000 ;
-      RECT 3.890000 0.615000 5.080000 0.785000 ;
-      RECT 3.890000 0.785000 4.060000 1.395000 ;
-      RECT 3.890000 1.395000 4.160000 1.725000 ;
-      RECT 3.890000 1.905000 4.570000 2.745000 ;
-      RECT 3.890000 2.745000 4.060000 2.895000 ;
-      RECT 4.240000 0.965000 4.570000 1.215000 ;
-      RECT 4.400000 1.215000 4.570000 1.905000 ;
-      RECT 4.830000 0.785000 5.080000 3.065000 ;
-      RECT 5.260000 0.435000 5.430000 0.775000 ;
-      RECT 5.260000 0.775000 6.340000 0.945000 ;
-      RECT 5.885000 1.125000 6.690000 1.295000 ;
-      RECT 5.885000 1.295000 6.135000 2.825000 ;
-      RECT 6.090000 0.265000 7.885000 0.435000 ;
-      RECT 6.090000 0.435000 6.340000 0.775000 ;
-      RECT 6.315000 1.475000 6.645000 2.895000 ;
-      RECT 6.315000 2.895000 8.235000 3.065000 ;
-      RECT 6.520000 0.615000 7.470000 0.785000 ;
-      RECT 6.520000 0.785000 6.690000 1.125000 ;
-      RECT 6.825000 1.920000 7.155000 2.715000 ;
-      RECT 6.870000 0.965000 7.040000 1.920000 ;
-      RECT 7.220000 0.785000 7.470000 1.000000 ;
-      RECT 7.335000 1.895000 7.885000 2.065000 ;
-      RECT 7.335000 2.065000 7.715000 2.715000 ;
-      RECT 7.715000 0.435000 7.885000 1.895000 ;
-      RECT 7.895000 2.245000 8.235000 2.895000 ;
-      RECT 8.065000 0.665000 8.315000 1.125000 ;
-      RECT 8.065000 1.125000 8.235000 2.245000 ;
-      RECT 8.680000 1.305000 9.010000 1.635000 ;
-      RECT 8.790000 1.635000 9.010000 2.150000 ;
+      RECT 0.000000 -0.085000 9.600000 0.085000 ;
+      RECT 0.000000  3.245000 9.600000 3.415000 ;
+      RECT 0.090000  0.565000 2.000000 0.735000 ;
+      RECT 0.090000  0.735000 0.605000 1.245000 ;
+      RECT 0.090000  1.245000 0.260000 2.035000 ;
+      RECT 0.090000  2.035000 0.440000 3.065000 ;
+      RECT 0.440000  1.525000 0.790000 1.845000 ;
+      RECT 0.440000  1.845000 1.650000 1.855000 ;
+      RECT 0.620000  1.855000 1.650000 2.015000 ;
+      RECT 0.620000  2.195000 0.950000 3.245000 ;
+      RECT 0.785000  0.085000 1.115000 0.385000 ;
+      RECT 1.440000  2.015000 1.770000 2.895000 ;
+      RECT 1.440000  2.895000 4.060000 3.065000 ;
+      RECT 1.480000  0.915000 1.650000 1.845000 ;
+      RECT 1.830000  0.735000 2.000000 1.425000 ;
+      RECT 1.830000  1.425000 2.825000 1.595000 ;
+      RECT 1.985000  2.035000 2.315000 2.545000 ;
+      RECT 1.985000  2.545000 3.710000 2.715000 ;
+      RECT 2.180000  0.265000 3.360000 0.435000 ;
+      RECT 2.180000  0.435000 2.430000 1.245000 ;
+      RECT 2.495000  1.595000 2.825000 2.365000 ;
+      RECT 2.655000  0.615000 3.010000 1.245000 ;
+      RECT 2.655000  1.245000 2.825000 1.425000 ;
+      RECT 3.005000  1.865000 3.360000 2.365000 ;
+      RECT 3.190000  0.435000 3.360000 1.865000 ;
+      RECT 3.540000  0.265000 5.430000 0.435000 ;
+      RECT 3.540000  0.435000 3.710000 2.545000 ;
+      RECT 3.890000  0.615000 5.080000 0.785000 ;
+      RECT 3.890000  0.785000 4.060000 1.395000 ;
+      RECT 3.890000  1.395000 4.160000 1.725000 ;
+      RECT 3.890000  1.905000 4.570000 2.745000 ;
+      RECT 3.890000  2.745000 4.060000 2.895000 ;
+      RECT 4.240000  0.965000 4.570000 1.215000 ;
+      RECT 4.400000  1.215000 4.570000 1.905000 ;
+      RECT 4.830000  0.785000 5.080000 3.065000 ;
+      RECT 5.260000  0.435000 5.430000 0.775000 ;
+      RECT 5.260000  0.775000 6.340000 0.945000 ;
+      RECT 5.260000  1.765000 5.590000 3.245000 ;
+      RECT 5.610000  0.085000 5.860000 0.595000 ;
+      RECT 5.885000  1.125000 6.690000 1.295000 ;
+      RECT 5.885000  1.295000 6.135000 2.825000 ;
+      RECT 6.090000  0.265000 7.885000 0.435000 ;
+      RECT 6.090000  0.435000 6.340000 0.775000 ;
+      RECT 6.315000  1.475000 6.645000 2.895000 ;
+      RECT 6.315000  2.895000 8.235000 3.065000 ;
+      RECT 6.520000  0.615000 7.470000 0.785000 ;
+      RECT 6.520000  0.785000 6.690000 1.125000 ;
+      RECT 6.825000  1.920000 7.155000 2.715000 ;
+      RECT 6.870000  0.965000 7.040000 1.920000 ;
+      RECT 7.220000  0.785000 7.470000 1.000000 ;
+      RECT 7.335000  1.895000 7.885000 2.065000 ;
+      RECT 7.335000  2.065000 7.715000 2.715000 ;
+      RECT 7.715000  0.435000 7.885000 1.895000 ;
+      RECT 7.895000  2.245000 8.235000 2.895000 ;
+      RECT 8.065000  0.665000 8.315000 1.125000 ;
+      RECT 8.065000  1.125000 8.235000 2.245000 ;
+      RECT 8.440000  1.815000 8.610000 3.245000 ;
+      RECT 8.530000  0.085000 8.860000 1.125000 ;
+      RECT 8.680000  1.305000 9.010000 1.635000 ;
+      RECT 8.790000  1.635000 9.010000 2.150000 ;
     LAYER mcon ;
-      RECT 3.035000 1.950000 3.205000 2.120000 ;
-      RECT 5.915000 1.950000 6.085000 2.120000 ;
-      RECT 6.875000 1.950000 7.045000 2.120000 ;
-      RECT 8.795000 1.950000 8.965000 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  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  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  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 ;
     LAYER met1 ;
       RECT 2.975000 1.920000 3.265000 1.965000 ;
       RECT 2.975000 1.965000 6.145000 2.105000 ;
diff --git a/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef b/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef
index 897d1a6..6ea90f2 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_lp.magic.lef
@@ -75,36 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  1.055000  0.085000  1.385000 0.915000 ;
-        RECT  6.560000  0.085000  6.890000 0.885000 ;
-        RECT  9.775000  0.775000 10.495000 1.000000 ;
-        RECT 10.325000  0.085000 10.495000 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 ;
-        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
@@ -113,103 +83,129 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 3.245000 11.040000 3.415000 ;
-        RECT 0.855000 2.680000  1.185000 3.245000 ;
-        RECT 6.260000 1.960000  6.430000 3.245000 ;
-        RECT 9.595000 2.095000  9.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.265000 0.545000  0.595000 1.095000 ;
-      RECT  0.265000 1.095000  1.735000 1.425000 ;
-      RECT  0.265000 1.425000  0.655000 2.330000 ;
-      RECT  0.265000 2.330000  1.535000 2.500000 ;
-      RECT  0.265000 2.500000  0.655000 3.065000 ;
-      RECT  1.365000 2.500000  1.535000 2.895000 ;
-      RECT  1.365000 2.895000  3.840000 3.065000 ;
-      RECT  1.565000 0.265000  4.150000 0.435000 ;
-      RECT  1.565000 0.435000  1.735000 1.095000 ;
-      RECT  1.915000 0.810000  2.845000 1.005000 ;
-      RECT  1.915000 1.005000  2.245000 2.715000 ;
-      RECT  2.425000 1.185000  3.435000 1.355000 ;
-      RECT  2.425000 1.355000  2.595000 2.075000 ;
-      RECT  2.425000 2.075000  4.190000 2.245000 ;
-      RECT  2.425000 2.245000  2.775000 2.715000 ;
-      RECT  2.515000 0.625000  2.845000 0.810000 ;
-      RECT  3.105000 0.615000  3.435000 1.185000 ;
-      RECT  3.510000 2.425000  3.840000 2.895000 ;
-      RECT  3.820000 0.435000  4.150000 0.685000 ;
-      RECT  4.020000 2.245000  4.190000 2.895000 ;
-      RECT  4.020000 2.895000  6.080000 3.065000 ;
-      RECT  4.330000 0.310000  4.660000 1.035000 ;
-      RECT  4.330000 1.035000  4.500000 1.215000 ;
-      RECT  4.330000 1.215000  4.775000 1.385000 ;
-      RECT  4.390000 2.310000  4.775000 2.715000 ;
-      RECT  4.605000 1.385000  4.775000 2.310000 ;
-      RECT  4.840000 0.575000  5.170000 1.035000 ;
-      RECT  4.955000 1.035000  5.170000 1.040000 ;
-      RECT  4.955000 1.040000  5.125000 1.960000 ;
-      RECT  4.955000 1.960000  5.250000 2.715000 ;
-      RECT  5.305000 1.450000  5.730000 1.780000 ;
-      RECT  5.350000 0.265000  5.730000 0.425000 ;
-      RECT  5.350000 0.425000  6.100000 0.595000 ;
-      RECT  5.480000 1.780000  5.730000 2.715000 ;
-      RECT  5.560000 0.595000  6.100000 0.885000 ;
-      RECT  5.560000 0.885000  5.730000 1.450000 ;
-      RECT  5.910000 1.150000  7.290000 1.320000 ;
-      RECT  5.910000 1.320000  6.080000 2.895000 ;
-      RECT  6.615000 1.320000  6.785000 2.010000 ;
-      RECT  6.615000 2.010000  7.070000 3.050000 ;
-      RECT  6.965000 1.500000  8.135000 1.565000 ;
-      RECT  6.965000 1.565000  7.640000 1.830000 ;
-      RECT  7.120000 0.595000  7.450000 1.055000 ;
-      RECT  7.120000 1.055000  7.290000 1.150000 ;
-      RECT  7.270000 2.010000  7.600000 2.895000 ;
-      RECT  7.270000 2.895000  9.415000 3.065000 ;
-      RECT  7.470000 1.235000  8.135000 1.500000 ;
-      RECT  7.630000 0.265000 10.145000 0.435000 ;
-      RECT  7.630000 0.435000  7.960000 1.055000 ;
-      RECT  7.800000 2.010000  8.485000 2.715000 ;
-      RECT  8.140000 0.615000  8.485000 1.055000 ;
-      RECT  8.315000 1.055000  8.485000 2.010000 ;
-      RECT  8.665000 0.685000  9.065000 2.715000 ;
-      RECT  9.245000 1.745000 10.465000 1.915000 ;
-      RECT  9.245000 1.915000  9.415000 2.895000 ;
-      RECT  9.870000 0.435000 10.145000 0.595000 ;
-      RECT 10.135000 1.235000 10.465000 1.745000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  3.245000 11.040000 3.415000 ;
+      RECT  0.265000  0.545000  0.595000 1.095000 ;
+      RECT  0.265000  1.095000  1.735000 1.425000 ;
+      RECT  0.265000  1.425000  0.655000 2.330000 ;
+      RECT  0.265000  2.330000  1.535000 2.500000 ;
+      RECT  0.265000  2.500000  0.655000 3.065000 ;
+      RECT  0.855000  2.680000  1.185000 3.245000 ;
+      RECT  1.055000  0.085000  1.385000 0.915000 ;
+      RECT  1.365000  2.500000  1.535000 2.895000 ;
+      RECT  1.365000  2.895000  3.840000 3.065000 ;
+      RECT  1.565000  0.265000  4.150000 0.435000 ;
+      RECT  1.565000  0.435000  1.735000 1.095000 ;
+      RECT  1.915000  0.810000  2.845000 1.005000 ;
+      RECT  1.915000  1.005000  2.245000 2.715000 ;
+      RECT  2.425000  1.185000  3.435000 1.355000 ;
+      RECT  2.425000  1.355000  2.595000 2.075000 ;
+      RECT  2.425000  2.075000  4.190000 2.245000 ;
+      RECT  2.425000  2.245000  2.775000 2.715000 ;
+      RECT  2.515000  0.625000  2.845000 0.810000 ;
+      RECT  3.105000  0.615000  3.435000 1.185000 ;
+      RECT  3.510000  2.425000  3.840000 2.895000 ;
+      RECT  3.820000  0.435000  4.150000 0.685000 ;
+      RECT  4.020000  2.245000  4.190000 2.895000 ;
+      RECT  4.020000  2.895000  6.080000 3.065000 ;
+      RECT  4.330000  0.310000  4.660000 1.035000 ;
+      RECT  4.330000  1.035000  4.500000 1.215000 ;
+      RECT  4.330000  1.215000  4.775000 1.385000 ;
+      RECT  4.390000  2.310000  4.775000 2.715000 ;
+      RECT  4.605000  1.385000  4.775000 2.310000 ;
+      RECT  4.840000  0.575000  5.170000 1.035000 ;
+      RECT  4.955000  1.035000  5.170000 1.040000 ;
+      RECT  4.955000  1.040000  5.125000 1.960000 ;
+      RECT  4.955000  1.960000  5.250000 2.715000 ;
+      RECT  5.305000  1.450000  5.730000 1.780000 ;
+      RECT  5.350000  0.265000  5.730000 0.425000 ;
+      RECT  5.350000  0.425000  6.100000 0.595000 ;
+      RECT  5.480000  1.780000  5.730000 2.715000 ;
+      RECT  5.560000  0.595000  6.100000 0.885000 ;
+      RECT  5.560000  0.885000  5.730000 1.450000 ;
+      RECT  5.910000  1.150000  7.290000 1.320000 ;
+      RECT  5.910000  1.320000  6.080000 2.895000 ;
+      RECT  6.260000  1.960000  6.430000 3.245000 ;
+      RECT  6.560000  0.085000  6.890000 0.885000 ;
+      RECT  6.615000  1.320000  6.785000 2.010000 ;
+      RECT  6.615000  2.010000  7.070000 3.050000 ;
+      RECT  6.965000  1.500000  8.135000 1.565000 ;
+      RECT  6.965000  1.565000  7.640000 1.830000 ;
+      RECT  7.120000  0.595000  7.450000 1.055000 ;
+      RECT  7.120000  1.055000  7.290000 1.150000 ;
+      RECT  7.270000  2.010000  7.600000 2.895000 ;
+      RECT  7.270000  2.895000  9.415000 3.065000 ;
+      RECT  7.470000  1.235000  8.135000 1.500000 ;
+      RECT  7.630000  0.265000 10.145000 0.435000 ;
+      RECT  7.630000  0.435000  7.960000 1.055000 ;
+      RECT  7.800000  2.010000  8.485000 2.715000 ;
+      RECT  8.140000  0.615000  8.485000 1.055000 ;
+      RECT  8.315000  1.055000  8.485000 2.010000 ;
+      RECT  8.665000  0.685000  9.065000 2.715000 ;
+      RECT  9.245000  1.745000 10.465000 1.915000 ;
+      RECT  9.245000  1.915000  9.415000 2.895000 ;
+      RECT  9.595000  2.095000  9.925000 3.245000 ;
+      RECT  9.775000  0.775000 10.495000 1.000000 ;
+      RECT  9.870000  0.435000 10.145000 0.595000 ;
+      RECT 10.135000  1.235000 10.465000 1.745000 ;
+      RECT 10.325000  0.085000 10.495000 0.775000 ;
     LAYER mcon ;
-      RECT 2.075000 0.840000 2.245000 1.010000 ;
-      RECT 4.475000 2.320000 4.645000 2.490000 ;
-      RECT 4.955000 0.840000 5.125000 1.010000 ;
-      RECT 7.835000 2.320000 8.005000 2.490000 ;
+      RECT  0.155000 -0.085000  0.325000 0.085000 ;
+      RECT  0.155000  3.245000  0.325000 3.415000 ;
+      RECT  0.635000 -0.085000  0.805000 0.085000 ;
+      RECT  0.635000  3.245000  0.805000 3.415000 ;
+      RECT  1.115000 -0.085000  1.285000 0.085000 ;
+      RECT  1.115000  3.245000  1.285000 3.415000 ;
+      RECT  1.595000 -0.085000  1.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  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  2.320000  4.645000 2.490000 ;
+      RECT  4.475000  3.245000  4.645000 3.415000 ;
+      RECT  4.955000 -0.085000  5.125000 0.085000 ;
+      RECT  4.955000  0.840000  5.125000 1.010000 ;
+      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  2.320000  8.005000 2.490000 ;
+      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 ;
     LAYER met1 ;
       RECT 2.015000 0.810000 2.305000 0.855000 ;
       RECT 2.015000 0.855000 5.185000 0.995000 ;