diff --git a/sky130/openlane/common_pdn.tcl b/sky130/openlane/common_pdn.tcl
index 51f9329..a7a271b 100644
--- a/sky130/openlane/common_pdn.tcl
+++ b/sky130/openlane/common_pdn.tcl
@@ -4,10 +4,11 @@
 
 set ::macro_blockage_layer_list "li1 met1 met2 met3 met4 met5"
 
-pdngen::specify_grid stdcell {
+# Used if the design is the core of the chip
+set stdcell_core {
     name grid
     rails {
-	    met1 {width $::env(PDN_RAIL_WIDTH) pitch $::env(PLACE_SITE_HEIGHT) offset 0}
+	    met1 {width $::env(FP_PDN_RAIL_WIDTH) pitch $::env(PLACE_SITE_HEIGHT) offset $::env(FP_PDN_RAIL_OFFSET)}
     }
     straps {
 	    met4 {width $::env(FP_PDN_VWIDTH) pitch $::env(FP_PDN_VPITCH) offset $::env(FP_PDN_VOFFSET)}
@@ -16,6 +17,42 @@
     connect {{met1 met4} {met4 met5}}
 }
 
+# Used if the design is a macro in the core
+set stdcell_macro {
+    name grid
+    rails {
+	    met1 {width $::env(FP_PDN_RAIL_WIDTH) pitch $::env(PLACE_SITE_HEIGHT) offset $::env(FP_PDN_RAIL_OFFSET)}
+    }
+    straps {
+	    met4 {width $::env(FP_PDN_VWIDTH) pitch $::env(FP_PDN_VPITCH) offset $::env(FP_PDN_VOFFSET)}
+    }
+    connect {{met1 met4}}
+}
+
+# Assesses whether the deisgn is the core of the chip or not based on the value of $::env(DESIGN_IS_CORE) and uses the appropriate stdcell section
+if { [info exists ::env(DESIGN_IS_CORE)] } {
+    if { $::env(DESIGN_IS_CORE) == 1 } {
+        set stdcell $stdcell_core
+    } else {
+        set stdcell $stdcell_macro
+    }
+} else {
+    set stdcell $stdcell_core
+}
+
+# Adds the core ring if enabled.
+if { [info exists ::env(FP_PDN_CORE_RING)] } {
+    if { $::env(FP_PDN_CORE_RING) == 1 } {
+        dict append stdcell core_ring {
+                met4 {width $::env(FP_PDN_CORE_RING_VWIDTH) spacing $::env(FP_PDN_CORE_RING_VSPACING) core_offset $::env(FP_PDN_CORE_RING_VOFFSET)}
+                met5 {width $::env(FP_PDN_CORE_RING_HWIDTH) spacing $::env(FP_PDN_CORE_RING_HSPACING) core_offset $::env(FP_PDN_CORE_RING_HOFFSET)}
+            }
+    }
+}
+
+pdngen::specify_grid stdcell $stdcell
+
+# A general macro that follows the premise of the set heirarchy. You may want to modify this or add other macro configs
 pdngen::specify_grid macro {
     orient {R0 R180 MX MY R90 R270 MXR90 MYR90}
     power_pins "VDDE"
@@ -23,7 +60,7 @@
     blockages "li1 met1 met2 met3 met4 met5" 
     straps { 
     } 
-    connect { }
+    connect {{met4_PIN_ver met5}}
 }
 
 set ::halo 0
diff --git a/sky130/openlane/config.tcl b/sky130/openlane/config.tcl
index 5c37eaa..757d298 100755
--- a/sky130/openlane/config.tcl
+++ b/sky130/openlane/config.tcl
@@ -49,3 +49,11 @@
 set ::env(FP_PDN_RAIL_OFFSET) 0
 set ::env(FP_PDN_VWIDTH) 1.6
 set ::env(FP_PDN_HWIDTH) 1.6
+
+# Core Ring PDN defaults
+set ::env(FP_PDN_CORE_RING_VWIDTH) 20
+set ::env(FP_PDN_CORE_RING_HWIDTH) 20
+set ::env(FP_PDN_CORE_RING_VSPACING) 5
+set ::env(FP_PDN_CORE_RING_HSPACING) 5
+set ::env(FP_PDN_CORE_RING_VOFFSET) 20
+set ::env(FP_PDN_CORE_RING_HOFFSET) 20
\ No newline at end of file
diff --git a/sky130/openlane/sky130_fd_sc_hd/config.tcl b/sky130/openlane/sky130_fd_sc_hd/config.tcl
index 3a964e0..000ce19 100755
--- a/sky130/openlane/sky130_fd_sc_hd/config.tcl
+++ b/sky130/openlane/sky130_fd_sc_hd/config.tcl
@@ -45,14 +45,13 @@
 set ::env(DECAP_CELL) "sky130_fd_sc_hd__decap_"
 set ::env(RE_BUFFER_CELL) "sky130_fd_sc_hd__buf_4"
 
-
 # Diode insertaion
 set ::env(DIODE_CELL) "sky130_fd_sc_hd__diode_2"
 set ::env(FAKEDIODE_CELL) "sky130_fd_sc_hd__fakediode_2"
 set ::env(DIODE_CELL_PIN) "DIODE"
 
 set ::env(CELL_PAD) 8
-set ::env(CELL_PAD_EXECLUDE) "sky130_fd_sc_hd__tap* sky130_fd_sc_hd__decap* sky130_fd_sc_hd__fill*"
+set ::env(CELL_PAD_EXCLUDE) "sky130_fd_sc_hd__tap* sky130_fd_sc_hd__decap* sky130_fd_sc_hd__fill*"
 
 # Clk Buffers info CTS data
 set ::env(ROOT_CLK_BUFFER) sky130_fd_sc_hd__clkbuf_16
@@ -60,8 +59,5 @@
 set ::env(CLK_BUFFER_INPUT) A
 set ::env(CLK_BUFFER_OUTPUT) X
 set ::env(CTS_CLK_BUFFER_LIST) "sky130_fd_sc_hd__clkbuf_1 sky130_fd_sc_hd__clkbuf_2 sky130_fd_sc_hd__clkbuf_4 sky130_fd_sc_hd__clkbuf_8"
-set ::env(CTS_SQR_CAP) 0.258e-3
-set ::env(CTS_SQR_RES) 0.125
 set ::env(CTS_MAX_CAP) 1.53169
-
-set ::env(PDN_RAIL_WIDTH) 0.48
+set ::env(FP_PDN_RAIL_WIDTH) 0.48
diff --git a/sky130/openlane/sky130_fd_sc_hd/no_synth.cells b/sky130/openlane/sky130_fd_sc_hd/no_synth.cells
index 192afe1..0a45d32 100644
--- a/sky130/openlane/sky130_fd_sc_hd/no_synth.cells
+++ b/sky130/openlane/sky130_fd_sc_hd/no_synth.cells
@@ -1,171 +1,49 @@
-sky130_fd_sc_hd__probe_p_8
-sky130_fd_sc_hd__probec_p_8
-sky130_fd_sc_hd__dfstp_2
-sky130_fd_sc_hd__xor3_4
-sky130_fd_sc_hd__or2b_2
-sky130_fd_sc_hd__xnor3_2
-sky130_fd_sc_hd__sdfbbn_2
-sky130_fd_sc_hd__sdfxtp_2
-sky130_fd_sc_hd__dfxtp_2
-sky130_fd_sc_hd__xor2_2
-sky130_fd_sc_hd__o311ai_2
-sky130_fd_sc_hd__nand2_2
-sky130_fd_sc_hd__sdfrtp_2
-sky130_fd_sc_hd__and4_2
-sky130_fd_sc_hd__dfsbp_2
-sky130_fd_sc_hd__or4_2
-sky130_fd_sc_hd__inv_2
-sky130_fd_sc_hd__dlymetal6s4s_1
-sky130_fd_sc_hd__o31ai_2
-sky130_fd_sc_hd__bufbuf_16
-sky130_fd_sc_hd__dlygate4sd3_1
-sky130_fd_sc_hd__o22ai_2
-sky130_fd_sc_hd__o32ai_2
-sky130_fd_sc_hd__and3_2
-sky130_fd_sc_hd__o2111ai_2
-sky130_fd_sc_hd__dlrbp_2
-sky130_fd_sc_hd__and4bb_2
-sky130_fd_sc_hd__nand3b_2
-sky130_fd_sc_hd__buf_6
-sky130_fd_sc_hd__and4b_2
-sky130_fd_sc_hd__a2bb2oi_2
-sky130_fd_sc_hd__buf_12
-sky130_fd_sc_hd__and2_2
-sky130_fd_sc_hd__dlxbn_2
-sky130_fd_sc_hd__dlrtp_2
-sky130_fd_sc_hd__xor3_1
-sky130_fd_sc_hd__a21oi_2
-sky130_fd_sc_hd__inv_12
-sky130_fd_sc_hd__o21ai_2
-sky130_fd_sc_hd__a311oi_2
-sky130_fd_sc_hd__o21bai_2
-sky130_fd_sc_hd__nand3_2
-sky130_fd_sc_hd__dlygate4sd2_1
-sky130_fd_sc_hd__o211ai_2
-sky130_fd_sc_hd__or4b_2
-sky130_fd_sc_hd__and3b_2
-sky130_fd_sc_hd__or4bb_2
-sky130_fd_sc_hd__sdfrbp_2
-sky130_fd_sc_hd__o2bb2ai_2
-sky130_fd_sc_hd__bufinv_16
-sky130_fd_sc_hd__xor3_2
-sky130_fd_sc_hd__o41ai_2
-sky130_fd_sc_hd__or3b_2
-sky130_fd_sc_hd__or2_2
-sky130_fd_sc_hd__dfrtp_2
-sky130_fd_sc_hd__bufbuf_8
-sky130_fd_sc_hd__bufinv_8
-sky130_fd_sc_hd__buf_2
-sky130_fd_sc_hd__inv_6
-sky130_fd_sc_hd__xnor3_4
-sky130_fd_sc_hd__and2b_2
-sky130_fd_sc_hd__a2111oi_2
-sky130_fd_sc_hd__xnor3_1
-sky130_fd_sc_hd__dlymetal6s6s_1
-sky130_fd_sc_hd__o221ai_2
-sky130_fd_sc_hd__sdfstp_2
-sky130_fd_sc_hd__a31oi_2
-sky130_fd_sc_hd__a211oi_2
-sky130_fd_sc_hd__nand2b_2
-sky130_fd_sc_hd__a22oi_2
-sky130_fd_sc_hd__dlymetal6s2s_1
-sky130_fd_sc_hd__dlxtn_2
-sky130_fd_sc_hd__a21boi_2
-sky130_fd_sc_hd__dlrtn_2
-sky130_fd_sc_hd__a221oi_2
-sky130_fd_sc_hd__or3_2
-sky130_fd_sc_hd__sdfsbp_2
-sky130_fd_sc_hd__xnor2_2
-sky130_fd_sc_hd__sdfxbp_2
-sky130_fd_sc_hd__clkbuf_1
-sky130_fd_sc_hd__clkbuf_2
-sky130_fd_sc_hd__clkbuf_4
-sky130_fd_sc_hd__clkbuf_8
-sky130_fd_sc_hd__clkbuf_16
-sky130_fd_sc_hd__o22a_1
-sky130_fd_sc_hd__o22ai_1
-sky130_fd_sc_hd__o21a_1
-sky130_fd_sc_hd__o21ai_1
-sky130_fd_sc_hd__a211o_1
-sky130_fd_sc_hd__a211oi_2
-sky130_fd_sc_hd__a21oi_2
-sky130_fd_sc_hd__a22oi_2
-sky130_fd_sc_hd__a311oi_2
-sky130_fd_sc_hd__and2_2
-sky130_fd_sc_hd__and3_2
-sky130_fd_sc_hd__and4_2
-sky130_fd_sc_hd__and4bb_2
-sky130_fd_sc_hd__buf_6
-sky130_fd_sc_hd__bufbuf_8
-sky130_fd_sc_hd__bufinv_8
-sky130_fd_sc_hd__clkbuf_16
-sky130_fd_sc_hd__clkbuf_4
-sky130_fd_sc_hd__dfrtp_2
-sky130_fd_sc_hd__dfstp_2
-sky130_fd_sc_hd__dlrbp_2
-sky130_fd_sc_hd__dlrtp_2
-sky130_fd_sc_hd__dlxtn_2
-sky130_fd_sc_hd__dlygate4sd3_1
-sky130_fd_sc_hd__dlymetal6s4s_1
-sky130_fd_sc_hd__inv_12
-sky130_fd_sc_hd__inv_6
-sky130_fd_sc_hd__nand2b_2
-sky130_fd_sc_hd__nand3b_2
-sky130_fd_sc_hd__o211ai_2
-sky130_fd_sc_hd__o21ai_1
-sky130_fd_sc_hd__o21bai_2
-sky130_fd_sc_hd__o22a_1
-sky130_fd_sc_hd__o22ai_2
-sky130_fd_sc_hd__o311ai_2
-sky130_fd_sc_hd__o32ai_2
-sky130_fd_sc_hd__or2_2
-sky130_fd_sc_hd__or3_2
-sky130_fd_sc_hd__or4_2
-sky130_fd_sc_hd__or4bb_2
-sky130_fd_sc_hd__sdfrbp_2
-sky130_fd_sc_hd__sdfsbp_2
-sky130_fd_sc_hd__sdfxbp_2
-sky130_fd_sc_hd__xnor2_2
-sky130_fd_sc_hd__xnor3_2
-sky130_fd_sc_hd__xor2_2
-sky130_fd_sc_hd__xor3_2
-sky130_fd_sc_hd__buf_12
 sky130_fd_sc_hd__a2111o_1
 sky130_fd_sc_hd__a2111o_2
 sky130_fd_sc_hd__a2111oi_0
 sky130_fd_sc_hd__a2111oi_1
+sky130_fd_sc_hd__a2111oi_2
+sky130_fd_sc_hd__a211o_1
 sky130_fd_sc_hd__a211o_2
 sky130_fd_sc_hd__a211oi_1
+sky130_fd_sc_hd__a211oi_2
 sky130_fd_sc_hd__a211oi_4
 sky130_fd_sc_hd__a21bo_1
 sky130_fd_sc_hd__a21bo_2
 sky130_fd_sc_hd__a21boi_0
 sky130_fd_sc_hd__a21boi_1
+sky130_fd_sc_hd__a21boi_2
 sky130_fd_sc_hd__a21o_1
 sky130_fd_sc_hd__a21o_2
 sky130_fd_sc_hd__a21oi_1
+sky130_fd_sc_hd__a21oi_2
 sky130_fd_sc_hd__a221o_1
 sky130_fd_sc_hd__a221o_2
 sky130_fd_sc_hd__a221o_4
 sky130_fd_sc_hd__a221oi_1
+sky130_fd_sc_hd__a221oi_2
 sky130_fd_sc_hd__a221oi_4
 sky130_fd_sc_hd__a222oi_1
 sky130_fd_sc_hd__a22o_1
 sky130_fd_sc_hd__a22o_2
 sky130_fd_sc_hd__a22o_4
 sky130_fd_sc_hd__a22oi_1
+sky130_fd_sc_hd__a22oi_2
 sky130_fd_sc_hd__a2bb2o_1
 sky130_fd_sc_hd__a2bb2o_2
 sky130_fd_sc_hd__a2bb2oi_1
+sky130_fd_sc_hd__a2bb2oi_2
 sky130_fd_sc_hd__a311o_1
 sky130_fd_sc_hd__a311o_2
 sky130_fd_sc_hd__a311o_4
 sky130_fd_sc_hd__a311oi_1
+sky130_fd_sc_hd__a311oi_2
 sky130_fd_sc_hd__a311oi_4
 sky130_fd_sc_hd__a31o_1
 sky130_fd_sc_hd__a31o_2
 sky130_fd_sc_hd__a31o_4
 sky130_fd_sc_hd__a31oi_1
+sky130_fd_sc_hd__a31oi_2
 sky130_fd_sc_hd__a31oi_4
 sky130_fd_sc_hd__a32o_1
 sky130_fd_sc_hd__a32o_2
@@ -178,15 +56,28 @@
 sky130_fd_sc_hd__and2_0
 sky130_fd_sc_hd__and2_1
 sky130_fd_sc_hd__and2b_1
+sky130_fd_sc_hd__and2b_2
 sky130_fd_sc_hd__and2b_4
 sky130_fd_sc_hd__and3_1
 sky130_fd_sc_hd__and3b_1
+sky130_fd_sc_hd__and3b_2
 sky130_fd_sc_hd__and3b_4
 sky130_fd_sc_hd__and4_1
 sky130_fd_sc_hd__and4b_1
+sky130_fd_sc_hd__and4b_2
 sky130_fd_sc_hd__and4b_4
 sky130_fd_sc_hd__and4bb_1
+sky130_fd_sc_hd__and4bb_2
 sky130_fd_sc_hd__and4bb_4
+sky130_fd_sc_hd__bufbuf_16
+sky130_fd_sc_hd__bufbuf_8
+sky130_fd_sc_hd__bufinv_16
+sky130_fd_sc_hd__bufinv_8
+sky130_fd_sc_hd__clkbuf_1
+sky130_fd_sc_hd__clkbuf_16
+sky130_fd_sc_hd__clkbuf_2
+sky130_fd_sc_hd__clkbuf_4
+sky130_fd_sc_hd__clkbuf_8
 sky130_fd_sc_hd__clkdlybuf4s15_1
 sky130_fd_sc_hd__clkdlybuf4s15_2
 sky130_fd_sc_hd__clkdlybuf4s18_1
@@ -212,10 +103,14 @@
 sky130_fd_sc_hd__dfrbp_1
 sky130_fd_sc_hd__dfrtn_1
 sky130_fd_sc_hd__dfrtp_1
+sky130_fd_sc_hd__dfrtp_2
 sky130_fd_sc_hd__dfsbp_1
+sky130_fd_sc_hd__dfsbp_2
 sky130_fd_sc_hd__dfstp_1
+sky130_fd_sc_hd__dfstp_2
 sky130_fd_sc_hd__dfxbp_1
 sky130_fd_sc_hd__dfxtp_1
+sky130_fd_sc_hd__dfxtp_2
 sky130_fd_sc_hd__diode_2
 sky130_fd_sc_hd__dlclkp_1
 sky130_fd_sc_hd__dlclkp_2
@@ -223,16 +118,24 @@
 sky130_fd_sc_hd__dlrbn_1
 sky130_fd_sc_hd__dlrbn_2
 sky130_fd_sc_hd__dlrbp_1
+sky130_fd_sc_hd__dlrbp_2
 sky130_fd_sc_hd__dlrtn_1
+sky130_fd_sc_hd__dlrtn_2
 sky130_fd_sc_hd__dlrtn_4
 sky130_fd_sc_hd__dlrtp_1
+sky130_fd_sc_hd__dlrtp_2
 sky130_fd_sc_hd__dlrtp_4
-sky130_fd_sc_hd__dlxbn_1
+sky130_fd_sc_hd__dlxbn_2
 sky130_fd_sc_hd__dlxbp_1
 sky130_fd_sc_hd__dlxtn_1
+sky130_fd_sc_hd__dlxtn_2
 sky130_fd_sc_hd__dlxtn_4
-sky130_fd_sc_hd__dlxtp_1
 sky130_fd_sc_hd__dlygate4sd1_1
+sky130_fd_sc_hd__dlygate4sd2_1
+sky130_fd_sc_hd__dlygate4sd3_1
+sky130_fd_sc_hd__dlymetal6s2s_1
+sky130_fd_sc_hd__dlymetal6s4s_1
+sky130_fd_sc_hd__dlymetal6s6s_1
 sky130_fd_sc_hd__ebufn_1
 sky130_fd_sc_hd__ebufn_2
 sky130_fd_sc_hd__ebufn_4
@@ -258,7 +161,10 @@
 sky130_fd_sc_hd__ha_2
 sky130_fd_sc_hd__ha_4
 sky130_fd_sc_hd__inv_1
+sky130_fd_sc_hd__inv_12
+sky130_fd_sc_hd__inv_2
 sky130_fd_sc_hd__inv_4
+sky130_fd_sc_hd__inv_6
 sky130_fd_sc_hd__lpflow_bleeder_1
 sky130_fd_sc_hd__lpflow_clkbufkapwr_1
 sky130_fd_sc_hd__lpflow_clkbufkapwr_16
@@ -286,6 +192,9 @@
 sky130_fd_sc_hd__lpflow_isobufsrc_4
 sky130_fd_sc_hd__lpflow_isobufsrc_8
 sky130_fd_sc_hd__lpflow_isobufsrckapwr_16
+sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
+sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
+sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
 sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
 sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1
 sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2
@@ -305,12 +214,13 @@
 sky130_fd_sc_hd__nand2_1
 sky130_fd_sc_hd__nand2_8
 sky130_fd_sc_hd__nand2b_1
+sky130_fd_sc_hd__nand2b_2
 sky130_fd_sc_hd__nand2b_4
 sky130_fd_sc_hd__nand3_1
 sky130_fd_sc_hd__nand3b_1
+sky130_fd_sc_hd__nand3b_2
 sky130_fd_sc_hd__nand3b_4
 sky130_fd_sc_hd__nand4_1
-sky130_fd_sc_hd__nand4_2
 sky130_fd_sc_hd__nand4b_1
 sky130_fd_sc_hd__nand4b_2
 sky130_fd_sc_hd__nand4b_4
@@ -318,18 +228,15 @@
 sky130_fd_sc_hd__nand4bb_2
 sky130_fd_sc_hd__nand4bb_4
 sky130_fd_sc_hd__nor2_1
-sky130_fd_sc_hd__nor2_2
 sky130_fd_sc_hd__nor2_8
 sky130_fd_sc_hd__nor2b_1
 sky130_fd_sc_hd__nor2b_2
 sky130_fd_sc_hd__nor2b_4
 sky130_fd_sc_hd__nor3_1
-sky130_fd_sc_hd__nor3_2
 sky130_fd_sc_hd__nor3b_1
 sky130_fd_sc_hd__nor3b_2
 sky130_fd_sc_hd__nor3b_4
 sky130_fd_sc_hd__nor4_1
-sky130_fd_sc_hd__nor4_2
 sky130_fd_sc_hd__nor4b_1
 sky130_fd_sc_hd__nor4b_2
 sky130_fd_sc_hd__nor4b_4
@@ -340,73 +247,99 @@
 sky130_fd_sc_hd__o2111a_2
 sky130_fd_sc_hd__o2111a_4
 sky130_fd_sc_hd__o2111ai_1
+sky130_fd_sc_hd__o2111ai_2
 sky130_fd_sc_hd__o2111ai_4
 sky130_fd_sc_hd__o211a_1
 sky130_fd_sc_hd__o211a_2
 sky130_fd_sc_hd__o211a_4
 sky130_fd_sc_hd__o211ai_1
+sky130_fd_sc_hd__o211ai_2
 sky130_fd_sc_hd__o211ai_4
+sky130_fd_sc_hd__o21a_1
 sky130_fd_sc_hd__o21a_2
 sky130_fd_sc_hd__o21ai_0
+sky130_fd_sc_hd__o21ai_1
+sky130_fd_sc_hd__o21ai_2
 sky130_fd_sc_hd__o21ba_1
 sky130_fd_sc_hd__o21ba_2
 sky130_fd_sc_hd__o21ba_4
 sky130_fd_sc_hd__o21bai_1
+sky130_fd_sc_hd__o21bai_2
 sky130_fd_sc_hd__o21bai_4
 sky130_fd_sc_hd__o221a_1
 sky130_fd_sc_hd__o221a_2
 sky130_fd_sc_hd__o221a_4
 sky130_fd_sc_hd__o221ai_1
+sky130_fd_sc_hd__o221ai_2
 sky130_fd_sc_hd__o221ai_4
+sky130_fd_sc_hd__o22a_1
 sky130_fd_sc_hd__o22a_2
+sky130_fd_sc_hd__o22ai_1
+sky130_fd_sc_hd__o22ai_2
 sky130_fd_sc_hd__o22ai_4
 sky130_fd_sc_hd__o2bb2a_1
 sky130_fd_sc_hd__o2bb2a_2
 sky130_fd_sc_hd__o2bb2a_4
 sky130_fd_sc_hd__o2bb2ai_1
+sky130_fd_sc_hd__o2bb2ai_2
 sky130_fd_sc_hd__o2bb2ai_4
 sky130_fd_sc_hd__o311a_1
 sky130_fd_sc_hd__o311a_2
 sky130_fd_sc_hd__o311a_4
 sky130_fd_sc_hd__o311ai_0
 sky130_fd_sc_hd__o311ai_1
+sky130_fd_sc_hd__o311ai_2
 sky130_fd_sc_hd__o311ai_4
 sky130_fd_sc_hd__o31a_1
 sky130_fd_sc_hd__o31a_2
 sky130_fd_sc_hd__o31a_4
 sky130_fd_sc_hd__o31ai_1
+sky130_fd_sc_hd__o31ai_2
 sky130_fd_sc_hd__o31ai_4
 sky130_fd_sc_hd__o32a_1
 sky130_fd_sc_hd__o32a_2
 sky130_fd_sc_hd__o32ai_1
+sky130_fd_sc_hd__o32ai_2
 sky130_fd_sc_hd__o41a_1
 sky130_fd_sc_hd__o41a_2
 sky130_fd_sc_hd__o41ai_1
+sky130_fd_sc_hd__o41ai_2
 sky130_fd_sc_hd__or2_0
 sky130_fd_sc_hd__or2_1
 sky130_fd_sc_hd__or2b_1
+sky130_fd_sc_hd__or2b_2
 sky130_fd_sc_hd__or2b_4
 sky130_fd_sc_hd__or3_1
 sky130_fd_sc_hd__or3b_1
+sky130_fd_sc_hd__or3b_2
 sky130_fd_sc_hd__or3b_4
 sky130_fd_sc_hd__or4_1
 sky130_fd_sc_hd__or4b_1
+sky130_fd_sc_hd__or4b_2
 sky130_fd_sc_hd__or4b_4
 sky130_fd_sc_hd__or4bb_1
+sky130_fd_sc_hd__or4bb_2
 sky130_fd_sc_hd__or4bb_4
-sky130_fd_sc_hd__probe_s8p_8
-sky130_fd_sc_hd__probec_s8p_8
+sky130_fd_sc_hd__probe_p_8
+sky130_fd_sc_hd__probec_p_8
 sky130_fd_sc_hd__sdfbbn_1
+sky130_fd_sc_hd__sdfbbn_2
 sky130_fd_sc_hd__sdfbbp_1
 sky130_fd_sc_hd__sdfrbp_1
+sky130_fd_sc_hd__sdfrbp_2
 sky130_fd_sc_hd__sdfrtn_1
 sky130_fd_sc_hd__sdfrtp_1
+sky130_fd_sc_hd__sdfrtp_2
 sky130_fd_sc_hd__sdfrtp_4
 sky130_fd_sc_hd__sdfsbp_1
+sky130_fd_sc_hd__sdfsbp_2
 sky130_fd_sc_hd__sdfstp_1
+sky130_fd_sc_hd__sdfstp_2
 sky130_fd_sc_hd__sdfstp_4
 sky130_fd_sc_hd__sdfxbp_1
+sky130_fd_sc_hd__sdfxbp_2
 sky130_fd_sc_hd__sdfxtp_1
+sky130_fd_sc_hd__sdfxtp_2
 sky130_fd_sc_hd__sdfxtp_4
 sky130_fd_sc_hd__sdlclkp_1
 sky130_fd_sc_hd__sdlclkp_2
@@ -417,8 +350,10 @@
 sky130_fd_sc_hd__sedfxtp_2
 sky130_fd_sc_hd__sedfxtp_4
 sky130_fd_sc_hd__xnor2_1
+sky130_fd_sc_hd__xnor3_1
+sky130_fd_sc_hd__xnor3_2
+sky130_fd_sc_hd__xnor3_4
 sky130_fd_sc_hd__xor2_1
-sky130_fd_sc_hd__buf_16
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
+sky130_fd_sc_hd__xor3_1
+sky130_fd_sc_hd__xor3_2
+sky130_fd_sc_hd__xor3_4
diff --git a/sky130/openlane/sky130_fd_sc_hdll/config.tcl b/sky130/openlane/sky130_fd_sc_hdll/config.tcl
index ed4aeb3..e3a6213 100755
--- a/sky130/openlane/sky130_fd_sc_hdll/config.tcl
+++ b/sky130/openlane/sky130_fd_sc_hdll/config.tcl
@@ -11,7 +11,6 @@
 set ::env(LIB_SLOWEST) "$::env(PDK_ROOT)/$::env(PDK)/libs.ref/$::env(STD_CELL_LIBRARY)/lib/sky130_fd_sc_hdll__ss_100C_1v60.lib"
 #endif (!EF_FORMAT)
 
-
 set ::env(LIB_TYPICAL) $::env(LIB_SYNTH)
 
 # Placement site for core cells
@@ -20,8 +19,6 @@
 set ::env(PLACE_SITE_WIDTH) 0.460
 set ::env(PLACE_SITE_HEIGHT) 2.720
 
-
-
 # welltap and endcap cells
 #set ::env(FP_WELLTAP_CELL) "sky130_fd_sc_hd__tapvpwrvgnd_1"
 set ::env(FP_ENDCAP_CELL) "sky130_fd_sc_hdll__decap_3"
@@ -48,14 +45,13 @@
 set ::env(DECAP_CELL) "sky130_fd_sc_hdll__decap_"
 set ::env(RE_BUFFER_CELL) "sky130_fd_sc_hdll__buf_4"
 
-
 # Diode insertaion
 set ::env(DIODE_CELL) "sky130_fd_sc_hdll__diode_2"
 set ::env(FAKEDIODE_CELL) "sky130_fd_sc_hdll__fakediode_2"
 set ::env(DIODE_CELL_PIN) "DIODE"
 
 set ::env(CELL_PAD) 8
-set ::env(CELL_PAD_EXECLUDE) "$::env(STD_CELL_LIBRARY)__tap* $::env(STD_CELL_LIBRARY)__decap* $::env(STD_CELL_LIBRARY)__fill*"
+set ::env(CELL_PAD_EXCLUDE) "$::env(STD_CELL_LIBRARY)__tap* $::env(STD_CELL_LIBRARY)__decap* $::env(STD_CELL_LIBRARY)__fill*"
 
 # Clk Buffers info CTS data
 set ::env(ROOT_CLK_BUFFER) $::env(STD_CELL_LIBRARY)__clkbuf_16
@@ -63,7 +59,5 @@
 set ::env(CLK_BUFFER_INPUT) A
 set ::env(CLK_BUFFER_OUTPUT) X
 set ::env(CTS_CLK_BUFFER_LIST) "sky130_fd_sc_hdll__clkbuf_1 sky130_fd_sc_hdll__clkbuf_2 sky130_fd_sc_hdll__clkbuf_4 sky130_fd_sc_hdll__clkbuf_8"
-set ::env(CTS_SQR_CAP) 0.258e-3
-set ::env(CTS_SQR_RES) 0.125
 set ::env(CTS_MAX_CAP) 1.53169
-set ::env(PDN_RAIL_WIDTH) 0.48
+set ::env(FP_PDN_RAIL_WIDTH) 0.48
diff --git a/sky130/openlane/sky130_fd_sc_hdll/no_synth.cells b/sky130/openlane/sky130_fd_sc_hdll/no_synth.cells
index b3fd884..169b533 100644
--- a/sky130/openlane/sky130_fd_sc_hdll/no_synth.cells
+++ b/sky130/openlane/sky130_fd_sc_hdll/no_synth.cells
@@ -1,177 +1,49 @@
-sky130_fd_sc_hdll__clkbuf_6
-sky130_fd_sc_hdll__clkbuf_12
-sky130_fd_sc_hdll__inputiso0n_1
-sky130_fd_sc_hdll__inputiso1p_1
-sky130_fd_sc_hdll__clkinv_12
-sky130_fd_sc_hdll__muxb16to1_4
-sky130_fd_sc_hdll__probe_p_8
-sky130_fd_sc_hdll__probec_p_8
-sky130_fd_sc_hdll__dfstp_2
-sky130_fd_sc_hdll__xor3_4
-sky130_fd_sc_hdll__or2b_2
-sky130_fd_sc_hdll__xnor3_2
-sky130_fd_sc_hdll__sdfbbn_2
-sky130_fd_sc_hdll__sdfxtp_2
-sky130_fd_sc_hdll__dfxtp_2
-sky130_fd_sc_hdll__xor2_2
-sky130_fd_sc_hdll__o311ai_2
-sky130_fd_sc_hdll__nand2_2
-sky130_fd_sc_hdll__sdfrtp_2
-sky130_fd_sc_hdll__and4_2
-sky130_fd_sc_hdll__dfsbp_2
-sky130_fd_sc_hdll__or4_2
-sky130_fd_sc_hdll__inv_2
-sky130_fd_sc_hdll__dlymetal6s4s_1
-sky130_fd_sc_hdll__o31ai_2
-sky130_fd_sc_hdll__bufbuf_16
-sky130_fd_sc_hdll__dlygate4sd3_1
-sky130_fd_sc_hdll__o22ai_2
-sky130_fd_sc_hdll__o32ai_2
-sky130_fd_sc_hdll__and3_2
-sky130_fd_sc_hdll__o2111ai_2
-sky130_fd_sc_hdll__dlrbp_2
-sky130_fd_sc_hdll__and4bb_2
-sky130_fd_sc_hdll__nand3b_2
-sky130_fd_sc_hdll__buf_6
-sky130_fd_sc_hdll__and4b_2
-sky130_fd_sc_hdll__a2bb2oi_2
-sky130_fd_sc_hdll__buf_12
-sky130_fd_sc_hdll__and2_2
-sky130_fd_sc_hdll__dlxbn_2
-sky130_fd_sc_hdll__dlrtp_2
-sky130_fd_sc_hdll__xor3_1
-sky130_fd_sc_hdll__a21oi_2
-sky130_fd_sc_hdll__inv_12
-sky130_fd_sc_hdll__o21ai_2
-sky130_fd_sc_hdll__a311oi_2
-sky130_fd_sc_hdll__o21bai_2
-sky130_fd_sc_hdll__nand3_2
-sky130_fd_sc_hdll__dlygate4sd2_1
-sky130_fd_sc_hdll__o211ai_2
-sky130_fd_sc_hdll__or4b_2
-sky130_fd_sc_hdll__and3b_2
-sky130_fd_sc_hdll__or4bb_2
-sky130_fd_sc_hdll__sdfrbp_2
-sky130_fd_sc_hdll__o2bb2ai_2
-sky130_fd_sc_hdll__bufinv_16
-sky130_fd_sc_hdll__xor3_2
-sky130_fd_sc_hdll__o41ai_2
-sky130_fd_sc_hdll__or3b_2
-sky130_fd_sc_hdll__or2_2
-sky130_fd_sc_hdll__dfrtp_2
-sky130_fd_sc_hdll__bufbuf_8
-sky130_fd_sc_hdll__bufinv_8
-sky130_fd_sc_hdll__buf_2
-sky130_fd_sc_hdll__inv_6
-sky130_fd_sc_hdll__xnor3_4
-sky130_fd_sc_hdll__and2b_2
-sky130_fd_sc_hdll__a2111oi_2
-sky130_fd_sc_hdll__xnor3_1
-sky130_fd_sc_hdll__dlymetal6s6s_1
-sky130_fd_sc_hdll__o221ai_2
-sky130_fd_sc_hdll__sdfstp_2
-sky130_fd_sc_hdll__a31oi_2
-sky130_fd_sc_hdll__a211oi_2
-sky130_fd_sc_hdll__nand2b_2
-sky130_fd_sc_hdll__a22oi_2
-sky130_fd_sc_hdll__dlymetal6s2s_1
-sky130_fd_sc_hdll__dlxtn_2
-sky130_fd_sc_hdll__a21boi_2
-sky130_fd_sc_hdll__dlrtn_2
-sky130_fd_sc_hdll__a221oi_2
-sky130_fd_sc_hdll__or3_2
-sky130_fd_sc_hdll__sdfsbp_2
-sky130_fd_sc_hdll__xnor2_2
-sky130_fd_sc_hdll__sdfxbp_2
-sky130_fd_sc_hdll__clkbuf_1
-sky130_fd_sc_hdll__clkbuf_2
-sky130_fd_sc_hdll__clkbuf_4
-sky130_fd_sc_hdll__clkbuf_8
-sky130_fd_sc_hdll__clkbuf_16
-sky130_fd_sc_hdll__o22a_1
-sky130_fd_sc_hdll__o22ai_1
-sky130_fd_sc_hdll__o21a_1
-sky130_fd_sc_hdll__o21ai_1
-sky130_fd_sc_hdll__a211o_1
-sky130_fd_sc_hdll__a211oi_2
-sky130_fd_sc_hdll__a21oi_2
-sky130_fd_sc_hdll__a22oi_2
-sky130_fd_sc_hdll__a311oi_2
-sky130_fd_sc_hdll__and2_2
-sky130_fd_sc_hdll__and3_2
-sky130_fd_sc_hdll__and4_2
-sky130_fd_sc_hdll__and4bb_2
-sky130_fd_sc_hdll__buf_6
-sky130_fd_sc_hdll__bufbuf_8
-sky130_fd_sc_hdll__bufinv_8
-sky130_fd_sc_hdll__clkbuf_16
-sky130_fd_sc_hdll__clkbuf_4
-sky130_fd_sc_hdll__dfrtp_2
-sky130_fd_sc_hdll__dfstp_2
-sky130_fd_sc_hdll__dlrbp_2
-sky130_fd_sc_hdll__dlrtp_2
-sky130_fd_sc_hdll__dlxtn_2
-sky130_fd_sc_hdll__dlygate4sd3_1
-sky130_fd_sc_hdll__dlymetal6s4s_1
-sky130_fd_sc_hdll__inv_12
-sky130_fd_sc_hdll__inv_6
-sky130_fd_sc_hdll__nand2b_2
-sky130_fd_sc_hdll__nand3b_2
-sky130_fd_sc_hdll__o211ai_2
-sky130_fd_sc_hdll__o21ai_1
-sky130_fd_sc_hdll__o21bai_2
-sky130_fd_sc_hdll__o22a_1
-sky130_fd_sc_hdll__o22ai_2
-sky130_fd_sc_hdll__o311ai_2
-sky130_fd_sc_hdll__o32ai_2
-sky130_fd_sc_hdll__or2_2
-sky130_fd_sc_hdll__or3_2
-sky130_fd_sc_hdll__or4_2
-sky130_fd_sc_hdll__or4bb_2
-sky130_fd_sc_hdll__sdfrbp_2
-sky130_fd_sc_hdll__sdfsbp_2
-sky130_fd_sc_hdll__sdfxbp_2
-sky130_fd_sc_hdll__xnor2_2
-sky130_fd_sc_hdll__xnor3_2
-sky130_fd_sc_hdll__xor2_2
-sky130_fd_sc_hdll__xor3_2
-sky130_fd_sc_hdll__buf_12
 sky130_fd_sc_hdll__a2111o_1
 sky130_fd_sc_hdll__a2111o_2
 sky130_fd_sc_hdll__a2111oi_0
 sky130_fd_sc_hdll__a2111oi_1
+sky130_fd_sc_hdll__a2111oi_2
+sky130_fd_sc_hdll__a211o_1
 sky130_fd_sc_hdll__a211o_2
 sky130_fd_sc_hdll__a211oi_1
+sky130_fd_sc_hdll__a211oi_2
 sky130_fd_sc_hdll__a211oi_4
 sky130_fd_sc_hdll__a21bo_1
 sky130_fd_sc_hdll__a21bo_2
 sky130_fd_sc_hdll__a21boi_0
 sky130_fd_sc_hdll__a21boi_1
+sky130_fd_sc_hdll__a21boi_2
 sky130_fd_sc_hdll__a21o_1
 sky130_fd_sc_hdll__a21o_2
 sky130_fd_sc_hdll__a21oi_1
+sky130_fd_sc_hdll__a21oi_2
 sky130_fd_sc_hdll__a221o_1
 sky130_fd_sc_hdll__a221o_2
 sky130_fd_sc_hdll__a221o_4
 sky130_fd_sc_hdll__a221oi_1
+sky130_fd_sc_hdll__a221oi_2
 sky130_fd_sc_hdll__a221oi_4
 sky130_fd_sc_hdll__a222oi_1
 sky130_fd_sc_hdll__a22o_1
 sky130_fd_sc_hdll__a22o_2
 sky130_fd_sc_hdll__a22o_4
 sky130_fd_sc_hdll__a22oi_1
+sky130_fd_sc_hdll__a22oi_2
 sky130_fd_sc_hdll__a2bb2o_1
 sky130_fd_sc_hdll__a2bb2o_2
 sky130_fd_sc_hdll__a2bb2oi_1
+sky130_fd_sc_hdll__a2bb2oi_2
 sky130_fd_sc_hdll__a311o_1
 sky130_fd_sc_hdll__a311o_2
 sky130_fd_sc_hdll__a311o_4
 sky130_fd_sc_hdll__a311oi_1
+sky130_fd_sc_hdll__a311oi_2
 sky130_fd_sc_hdll__a311oi_4
 sky130_fd_sc_hdll__a31o_1
 sky130_fd_sc_hdll__a31o_2
 sky130_fd_sc_hdll__a31o_4
 sky130_fd_sc_hdll__a31oi_1
+sky130_fd_sc_hdll__a31oi_2
 sky130_fd_sc_hdll__a31oi_4
 sky130_fd_sc_hdll__a32o_1
 sky130_fd_sc_hdll__a32o_2
@@ -184,15 +56,30 @@
 sky130_fd_sc_hdll__and2_0
 sky130_fd_sc_hdll__and2_1
 sky130_fd_sc_hdll__and2b_1
+sky130_fd_sc_hdll__and2b_2
 sky130_fd_sc_hdll__and2b_4
 sky130_fd_sc_hdll__and3_1
 sky130_fd_sc_hdll__and3b_1
+sky130_fd_sc_hdll__and3b_2
 sky130_fd_sc_hdll__and3b_4
 sky130_fd_sc_hdll__and4_1
 sky130_fd_sc_hdll__and4b_1
+sky130_fd_sc_hdll__and4b_2
 sky130_fd_sc_hdll__and4b_4
 sky130_fd_sc_hdll__and4bb_1
+sky130_fd_sc_hdll__and4bb_2
 sky130_fd_sc_hdll__and4bb_4
+sky130_fd_sc_hdll__bufbuf_16
+sky130_fd_sc_hdll__bufbuf_8
+sky130_fd_sc_hdll__bufinv_16
+sky130_fd_sc_hdll__bufinv_8
+sky130_fd_sc_hdll__clkbuf_1
+sky130_fd_sc_hdll__clkbuf_12
+sky130_fd_sc_hdll__clkbuf_16
+sky130_fd_sc_hdll__clkbuf_2
+sky130_fd_sc_hdll__clkbuf_4
+sky130_fd_sc_hdll__clkbuf_6
+sky130_fd_sc_hdll__clkbuf_8
 sky130_fd_sc_hdll__clkdlybuf4s15_1
 sky130_fd_sc_hdll__clkdlybuf4s15_2
 sky130_fd_sc_hdll__clkdlybuf4s18_1
@@ -202,6 +89,7 @@
 sky130_fd_sc_hdll__clkdlybuf4s50_1
 sky130_fd_sc_hdll__clkdlybuf4s50_2
 sky130_fd_sc_hdll__clkinv_1
+sky130_fd_sc_hdll__clkinv_12
 sky130_fd_sc_hdll__clkinv_16
 sky130_fd_sc_hdll__clkinv_2
 sky130_fd_sc_hdll__clkinv_4
@@ -218,10 +106,14 @@
 sky130_fd_sc_hdll__dfrbp_1
 sky130_fd_sc_hdll__dfrtn_1
 sky130_fd_sc_hdll__dfrtp_1
+sky130_fd_sc_hdll__dfrtp_2
 sky130_fd_sc_hdll__dfsbp_1
+sky130_fd_sc_hdll__dfsbp_2
 sky130_fd_sc_hdll__dfstp_1
+sky130_fd_sc_hdll__dfstp_2
 sky130_fd_sc_hdll__dfxbp_1
 sky130_fd_sc_hdll__dfxtp_1
+sky130_fd_sc_hdll__dfxtp_2
 sky130_fd_sc_hdll__diode_2
 sky130_fd_sc_hdll__dlclkp_1
 sky130_fd_sc_hdll__dlclkp_2
@@ -229,16 +121,24 @@
 sky130_fd_sc_hdll__dlrbn_1
 sky130_fd_sc_hdll__dlrbn_2
 sky130_fd_sc_hdll__dlrbp_1
+sky130_fd_sc_hdll__dlrbp_2
 sky130_fd_sc_hdll__dlrtn_1
+sky130_fd_sc_hdll__dlrtn_2
 sky130_fd_sc_hdll__dlrtn_4
 sky130_fd_sc_hdll__dlrtp_1
+sky130_fd_sc_hdll__dlrtp_2
 sky130_fd_sc_hdll__dlrtp_4
-sky130_fd_sc_hdll__dlxbn_1
+sky130_fd_sc_hdll__dlxbn_2
 sky130_fd_sc_hdll__dlxbp_1
 sky130_fd_sc_hdll__dlxtn_1
+sky130_fd_sc_hdll__dlxtn_2
 sky130_fd_sc_hdll__dlxtn_4
-sky130_fd_sc_hdll__dlxtp_1
 sky130_fd_sc_hdll__dlygate4sd1_1
+sky130_fd_sc_hdll__dlygate4sd2_1
+sky130_fd_sc_hdll__dlygate4sd3_1
+sky130_fd_sc_hdll__dlymetal6s2s_1
+sky130_fd_sc_hdll__dlymetal6s4s_1
+sky130_fd_sc_hdll__dlymetal6s6s_1
 sky130_fd_sc_hdll__ebufn_1
 sky130_fd_sc_hdll__ebufn_2
 sky130_fd_sc_hdll__ebufn_4
@@ -263,8 +163,13 @@
 sky130_fd_sc_hdll__ha_1
 sky130_fd_sc_hdll__ha_2
 sky130_fd_sc_hdll__ha_4
+sky130_fd_sc_hdll__inputiso0n_1
+sky130_fd_sc_hdll__inputiso1p_1
 sky130_fd_sc_hdll__inv_1
+sky130_fd_sc_hdll__inv_12
+sky130_fd_sc_hdll__inv_2
 sky130_fd_sc_hdll__inv_4
+sky130_fd_sc_hdll__inv_6
 sky130_fd_sc_hdll__lpflow_bleeder_1
 sky130_fd_sc_hdll__lpflow_clkbufkapwr_1
 sky130_fd_sc_hdll__lpflow_clkbufkapwr_16
@@ -292,6 +197,9 @@
 sky130_fd_sc_hdll__lpflow_isobufsrc_4
 sky130_fd_sc_hdll__lpflow_isobufsrc_8
 sky130_fd_sc_hdll__lpflow_isobufsrckapwr_16
+sky130_fd_sc_hdll__lpflow_lsbuf_lh_hl_isowell_tap_1
+sky130_fd_sc_hdll__lpflow_lsbuf_lh_hl_isowell_tap_2
+sky130_fd_sc_hdll__lpflow_lsbuf_lh_hl_isowell_tap_4
 sky130_fd_sc_hdll__lpflow_lsbuf_lh_isowell_4
 sky130_fd_sc_hdll__lpflow_lsbuf_lh_isowell_tap_1
 sky130_fd_sc_hdll__lpflow_lsbuf_lh_isowell_tap_2
@@ -308,15 +216,17 @@
 sky130_fd_sc_hdll__mux2i_4
 sky130_fd_sc_hdll__mux4_1
 sky130_fd_sc_hdll__mux4_2
+sky130_fd_sc_hdll__muxb16to1_4
 sky130_fd_sc_hdll__nand2_1
 sky130_fd_sc_hdll__nand2_8
 sky130_fd_sc_hdll__nand2b_1
+sky130_fd_sc_hdll__nand2b_2
 sky130_fd_sc_hdll__nand2b_4
 sky130_fd_sc_hdll__nand3_1
 sky130_fd_sc_hdll__nand3b_1
+sky130_fd_sc_hdll__nand3b_2
 sky130_fd_sc_hdll__nand3b_4
 sky130_fd_sc_hdll__nand4_1
-sky130_fd_sc_hdll__nand4_2
 sky130_fd_sc_hdll__nand4b_1
 sky130_fd_sc_hdll__nand4b_2
 sky130_fd_sc_hdll__nand4b_4
@@ -324,18 +234,15 @@
 sky130_fd_sc_hdll__nand4bb_2
 sky130_fd_sc_hdll__nand4bb_4
 sky130_fd_sc_hdll__nor2_1
-sky130_fd_sc_hdll__nor2_2
 sky130_fd_sc_hdll__nor2_8
 sky130_fd_sc_hdll__nor2b_1
 sky130_fd_sc_hdll__nor2b_2
 sky130_fd_sc_hdll__nor2b_4
 sky130_fd_sc_hdll__nor3_1
-sky130_fd_sc_hdll__nor3_2
 sky130_fd_sc_hdll__nor3b_1
 sky130_fd_sc_hdll__nor3b_2
 sky130_fd_sc_hdll__nor3b_4
 sky130_fd_sc_hdll__nor4_1
-sky130_fd_sc_hdll__nor4_2
 sky130_fd_sc_hdll__nor4b_1
 sky130_fd_sc_hdll__nor4b_2
 sky130_fd_sc_hdll__nor4b_4
@@ -346,73 +253,99 @@
 sky130_fd_sc_hdll__o2111a_2
 sky130_fd_sc_hdll__o2111a_4
 sky130_fd_sc_hdll__o2111ai_1
+sky130_fd_sc_hdll__o2111ai_2
 sky130_fd_sc_hdll__o2111ai_4
 sky130_fd_sc_hdll__o211a_1
 sky130_fd_sc_hdll__o211a_2
 sky130_fd_sc_hdll__o211a_4
 sky130_fd_sc_hdll__o211ai_1
+sky130_fd_sc_hdll__o211ai_2
 sky130_fd_sc_hdll__o211ai_4
+sky130_fd_sc_hdll__o21a_1
 sky130_fd_sc_hdll__o21a_2
 sky130_fd_sc_hdll__o21ai_0
+sky130_fd_sc_hdll__o21ai_1
+sky130_fd_sc_hdll__o21ai_2
 sky130_fd_sc_hdll__o21ba_1
 sky130_fd_sc_hdll__o21ba_2
 sky130_fd_sc_hdll__o21ba_4
 sky130_fd_sc_hdll__o21bai_1
+sky130_fd_sc_hdll__o21bai_2
 sky130_fd_sc_hdll__o21bai_4
 sky130_fd_sc_hdll__o221a_1
 sky130_fd_sc_hdll__o221a_2
 sky130_fd_sc_hdll__o221a_4
 sky130_fd_sc_hdll__o221ai_1
+sky130_fd_sc_hdll__o221ai_2
 sky130_fd_sc_hdll__o221ai_4
+sky130_fd_sc_hdll__o22a_1
 sky130_fd_sc_hdll__o22a_2
+sky130_fd_sc_hdll__o22ai_1
+sky130_fd_sc_hdll__o22ai_2
 sky130_fd_sc_hdll__o22ai_4
 sky130_fd_sc_hdll__o2bb2a_1
 sky130_fd_sc_hdll__o2bb2a_2
 sky130_fd_sc_hdll__o2bb2a_4
 sky130_fd_sc_hdll__o2bb2ai_1
+sky130_fd_sc_hdll__o2bb2ai_2
 sky130_fd_sc_hdll__o2bb2ai_4
 sky130_fd_sc_hdll__o311a_1
 sky130_fd_sc_hdll__o311a_2
 sky130_fd_sc_hdll__o311a_4
 sky130_fd_sc_hdll__o311ai_0
 sky130_fd_sc_hdll__o311ai_1
+sky130_fd_sc_hdll__o311ai_2
 sky130_fd_sc_hdll__o311ai_4
 sky130_fd_sc_hdll__o31a_1
 sky130_fd_sc_hdll__o31a_2
 sky130_fd_sc_hdll__o31a_4
 sky130_fd_sc_hdll__o31ai_1
+sky130_fd_sc_hdll__o31ai_2
 sky130_fd_sc_hdll__o31ai_4
 sky130_fd_sc_hdll__o32a_1
 sky130_fd_sc_hdll__o32a_2
 sky130_fd_sc_hdll__o32ai_1
+sky130_fd_sc_hdll__o32ai_2
 sky130_fd_sc_hdll__o41a_1
 sky130_fd_sc_hdll__o41a_2
 sky130_fd_sc_hdll__o41ai_1
+sky130_fd_sc_hdll__o41ai_2
 sky130_fd_sc_hdll__or2_0
 sky130_fd_sc_hdll__or2_1
 sky130_fd_sc_hdll__or2b_1
+sky130_fd_sc_hdll__or2b_2
 sky130_fd_sc_hdll__or2b_4
 sky130_fd_sc_hdll__or3_1
 sky130_fd_sc_hdll__or3b_1
+sky130_fd_sc_hdll__or3b_2
 sky130_fd_sc_hdll__or3b_4
 sky130_fd_sc_hdll__or4_1
 sky130_fd_sc_hdll__or4b_1
+sky130_fd_sc_hdll__or4b_2
 sky130_fd_sc_hdll__or4b_4
 sky130_fd_sc_hdll__or4bb_1
+sky130_fd_sc_hdll__or4bb_2
 sky130_fd_sc_hdll__or4bb_4
-sky130_fd_sc_hdll__probe_s8p_8
-sky130_fd_sc_hdll__probec_s8p_8
+sky130_fd_sc_hdll__probe_p_8
+sky130_fd_sc_hdll__probec_p_8
 sky130_fd_sc_hdll__sdfbbn_1
+sky130_fd_sc_hdll__sdfbbn_2
 sky130_fd_sc_hdll__sdfbbp_1
 sky130_fd_sc_hdll__sdfrbp_1
+sky130_fd_sc_hdll__sdfrbp_2
 sky130_fd_sc_hdll__sdfrtn_1
 sky130_fd_sc_hdll__sdfrtp_1
+sky130_fd_sc_hdll__sdfrtp_2
 sky130_fd_sc_hdll__sdfrtp_4
 sky130_fd_sc_hdll__sdfsbp_1
+sky130_fd_sc_hdll__sdfsbp_2
 sky130_fd_sc_hdll__sdfstp_1
+sky130_fd_sc_hdll__sdfstp_2
 sky130_fd_sc_hdll__sdfstp_4
 sky130_fd_sc_hdll__sdfxbp_1
+sky130_fd_sc_hdll__sdfxbp_2
 sky130_fd_sc_hdll__sdfxtp_1
+sky130_fd_sc_hdll__sdfxtp_2
 sky130_fd_sc_hdll__sdfxtp_4
 sky130_fd_sc_hdll__sdlclkp_1
 sky130_fd_sc_hdll__sdlclkp_2
@@ -423,8 +356,10 @@
 sky130_fd_sc_hdll__sedfxtp_2
 sky130_fd_sc_hdll__sedfxtp_4
 sky130_fd_sc_hdll__xnor2_1
+sky130_fd_sc_hdll__xnor3_1
+sky130_fd_sc_hdll__xnor3_2
+sky130_fd_sc_hdll__xnor3_4
 sky130_fd_sc_hdll__xor2_1
-sky130_fd_sc_hdll__buf_16
-sky130_fd_sc_hdll__lpflow_lsbuf_lh_hl_isowell_tap_1
-sky130_fd_sc_hdll__lpflow_lsbuf_lh_hl_isowell_tap_2
-sky130_fd_sc_hdll__lpflow_lsbuf_lh_hl_isowell_tap_4
+sky130_fd_sc_hdll__xor3_1
+sky130_fd_sc_hdll__xor3_2
+sky130_fd_sc_hdll__xor3_4
diff --git a/sky130/openlane/sky130_fd_sc_hs/config.tcl b/sky130/openlane/sky130_fd_sc_hs/config.tcl
index 2410086..cbf48b3 100755
--- a/sky130/openlane/sky130_fd_sc_hs/config.tcl
+++ b/sky130/openlane/sky130_fd_sc_hs/config.tcl
@@ -19,7 +19,6 @@
 set ::env(PLACE_SITE_WIDTH) 0.480
 set ::env(PLACE_SITE_HEIGHT) 3.330
 
-
 # welltap and endcap cells
 set ::env(FP_WELLTAP_CELL) "sky130_fd_sc_hs__tapvpwrvgnd_1"
 set ::env(FP_ENDCAP_CELL) "sky130_fd_sc_hs__decap_4"
@@ -52,15 +51,12 @@
 set ::env(DIODE_INSERTION_STRATEGY) 0
 
 set ::env(CELL_PAD) 8
-set ::env(CELL_PAD_EXECLUDE) "sky130_fd_sc_hs__tap* sky130_fd_sc_hs__decap* sky130_fd_sc_hs__fill*"
+set ::env(CELL_PAD_EXCLUDE) "sky130_fd_sc_hs__tap* sky130_fd_sc_hs__decap* sky130_fd_sc_hs__fill*"
 
 set ::env(ROOT_CLK_BUFFER) sky130_fd_sc_hs__clkbuf_16
 set ::env(CLK_BUFFER) sky130_fd_sc_hs__clkbuf_4
 set ::env(CLK_BUFFER_INPUT) A
 set ::env(CLK_BUFFER_OUTPUT) X
 set ::env(CTS_CLK_BUFFER_LIST) "sky130_fd_sc_hs__clkbuf_2 sky130_fd_sc_hs__clkbuf_4 sky130_fd_sc_hs__clkbuf_8"
-set ::env(CTS_SQR_CAP) 0.469e-3
-set ::env(CTS_SQR_RES) 0.125
 set ::env(CTS_MAX_CAP) 1.8894300000
-
-set ::env(PDN_RAIL_WIDTH) 0.48
+set ::env(FP_PDN_RAIL_WIDTH) 0.48
diff --git a/sky130/openlane/sky130_fd_sc_hs/no_synth.cells b/sky130/openlane/sky130_fd_sc_hs/no_synth.cells
index 61dccae..9865b02 100644
--- a/sky130/openlane/sky130_fd_sc_hs/no_synth.cells
+++ b/sky130/openlane/sky130_fd_sc_hs/no_synth.cells
@@ -1,175 +1,49 @@
-sky130_fd_sc_hs__nand4bb_1
-sky130_fd_sc_hs__clkdlyinv3sd3_1
-sky130_fd_sc_hs__clkdlyinv3sd1_1
-sky130_fd_sc_hs__clkdlyinv3sd2_1
-sky130_fd_sc_hs__probe_p_8
-sky130_fd_sc_hs__probec_p_8
-sky130_fd_sc_hs__dfstp_2
-sky130_fd_sc_hs__xor3_4
-sky130_fd_sc_hs__or2b_2
-sky130_fd_sc_hs__xnor3_2
-sky130_fd_sc_hs__sdfbbn_2
-sky130_fd_sc_hs__sdfxtp_2
-sky130_fd_sc_hs__dfxtp_2
-sky130_fd_sc_hs__xor2_2
-sky130_fd_sc_hs__o311ai_2
-sky130_fd_sc_hs__nand2_2
-sky130_fd_sc_hs__sdfrtp_2
-sky130_fd_sc_hs__and4_2
-sky130_fd_sc_hs__dfsbp_2
-sky130_fd_sc_hs__or4_2
-sky130_fd_sc_hs__inv_2
-sky130_fd_sc_hs__dlymetal6s4s_1
-sky130_fd_sc_hs__o31ai_2
-sky130_fd_sc_hs__bufbuf_16
-sky130_fd_sc_hs__dlygate4sd3_1
-sky130_fd_sc_hs__o22ai_2
-sky130_fd_sc_hs__o32ai_2
-sky130_fd_sc_hs__and3_2
-sky130_fd_sc_hs__o2111ai_2
-sky130_fd_sc_hs__dlrbp_2
-sky130_fd_sc_hs__and4bb_2
-sky130_fd_sc_hs__nand3b_2
-sky130_fd_sc_hs__buf_6
-sky130_fd_sc_hs__and4b_2
-sky130_fd_sc_hs__a2bb2oi_2
-sky130_fd_sc_hs__buf_12
-sky130_fd_sc_hs__and2_2
-sky130_fd_sc_hs__dlxbn_2
-sky130_fd_sc_hs__dlrtp_2
-sky130_fd_sc_hs__xor3_1
-sky130_fd_sc_hs__a21oi_2
-sky130_fd_sc_hs__inv_12
-sky130_fd_sc_hs__o21ai_2
-sky130_fd_sc_hs__a311oi_2
-sky130_fd_sc_hs__o21bai_2
-sky130_fd_sc_hs__nand3_2
-sky130_fd_sc_hs__dlygate4sd2_1
-sky130_fd_sc_hs__o211ai_2
-sky130_fd_sc_hs__or4b_2
-sky130_fd_sc_hs__and3b_2
-sky130_fd_sc_hs__or4bb_2
-sky130_fd_sc_hs__sdfrbp_2
-sky130_fd_sc_hs__o2bb2ai_2
-sky130_fd_sc_hs__bufinv_16
-sky130_fd_sc_hs__xor3_2
-sky130_fd_sc_hs__o41ai_2
-sky130_fd_sc_hs__or3b_2
-sky130_fd_sc_hs__or2_2
-sky130_fd_sc_hs__dfrtp_2
-sky130_fd_sc_hs__bufbuf_8
-sky130_fd_sc_hs__bufinv_8
-sky130_fd_sc_hs__buf_2
-sky130_fd_sc_hs__inv_6
-sky130_fd_sc_hs__xnor3_4
-sky130_fd_sc_hs__and2b_2
-sky130_fd_sc_hs__a2111oi_2
-sky130_fd_sc_hs__xnor3_1
-sky130_fd_sc_hs__dlymetal6s6s_1
-sky130_fd_sc_hs__o221ai_2
-sky130_fd_sc_hs__sdfstp_2
-sky130_fd_sc_hs__a31oi_2
-sky130_fd_sc_hs__a211oi_2
-sky130_fd_sc_hs__nand2b_2
-sky130_fd_sc_hs__a22oi_2
-sky130_fd_sc_hs__dlymetal6s2s_1
-sky130_fd_sc_hs__dlxtn_2
-sky130_fd_sc_hs__a21boi_2
-sky130_fd_sc_hs__dlrtn_2
-sky130_fd_sc_hs__a221oi_2
-sky130_fd_sc_hs__or3_2
-sky130_fd_sc_hs__sdfsbp_2
-sky130_fd_sc_hs__xnor2_2
-sky130_fd_sc_hs__sdfxbp_2
-sky130_fd_sc_hs__clkbuf_1
-sky130_fd_sc_hs__clkbuf_2
-sky130_fd_sc_hs__clkbuf_4
-sky130_fd_sc_hs__clkbuf_8
-sky130_fd_sc_hs__clkbuf_16
-sky130_fd_sc_hs__o22a_1
-sky130_fd_sc_hs__o22ai_1
-sky130_fd_sc_hs__o21a_1
-sky130_fd_sc_hs__o21ai_1
-sky130_fd_sc_hs__a211o_1
-sky130_fd_sc_hs__a211oi_2
-sky130_fd_sc_hs__a21oi_2
-sky130_fd_sc_hs__a22oi_2
-sky130_fd_sc_hs__a311oi_2
-sky130_fd_sc_hs__and2_2
-sky130_fd_sc_hs__and3_2
-sky130_fd_sc_hs__and4_2
-sky130_fd_sc_hs__and4bb_2
-sky130_fd_sc_hs__buf_6
-sky130_fd_sc_hs__bufbuf_8
-sky130_fd_sc_hs__bufinv_8
-sky130_fd_sc_hs__clkbuf_16
-sky130_fd_sc_hs__clkbuf_4
-sky130_fd_sc_hs__dfrtp_2
-sky130_fd_sc_hs__dfstp_2
-sky130_fd_sc_hs__dlrbp_2
-sky130_fd_sc_hs__dlrtp_2
-sky130_fd_sc_hs__dlxtn_2
-sky130_fd_sc_hs__dlygate4sd3_1
-sky130_fd_sc_hs__dlymetal6s4s_1
-sky130_fd_sc_hs__inv_12
-sky130_fd_sc_hs__inv_6
-sky130_fd_sc_hs__nand2b_2
-sky130_fd_sc_hs__nand3b_2
-sky130_fd_sc_hs__o211ai_2
-sky130_fd_sc_hs__o21ai_1
-sky130_fd_sc_hs__o21bai_2
-sky130_fd_sc_hs__o22a_1
-sky130_fd_sc_hs__o22ai_2
-sky130_fd_sc_hs__o311ai_2
-sky130_fd_sc_hs__o32ai_2
-sky130_fd_sc_hs__or2_2
-sky130_fd_sc_hs__or3_2
-sky130_fd_sc_hs__or4_2
-sky130_fd_sc_hs__or4bb_2
-sky130_fd_sc_hs__sdfrbp_2
-sky130_fd_sc_hs__sdfsbp_2
-sky130_fd_sc_hs__sdfxbp_2
-sky130_fd_sc_hs__xnor2_2
-sky130_fd_sc_hs__xnor3_2
-sky130_fd_sc_hs__xor2_2
-sky130_fd_sc_hs__xor3_2
-sky130_fd_sc_hs__buf_12
 sky130_fd_sc_hs__a2111o_1
 sky130_fd_sc_hs__a2111o_2
 sky130_fd_sc_hs__a2111oi_0
 sky130_fd_sc_hs__a2111oi_1
+sky130_fd_sc_hs__a2111oi_2
+sky130_fd_sc_hs__a211o_1
 sky130_fd_sc_hs__a211o_2
 sky130_fd_sc_hs__a211oi_1
+sky130_fd_sc_hs__a211oi_2
 sky130_fd_sc_hs__a211oi_4
 sky130_fd_sc_hs__a21bo_1
 sky130_fd_sc_hs__a21bo_2
 sky130_fd_sc_hs__a21boi_0
 sky130_fd_sc_hs__a21boi_1
+sky130_fd_sc_hs__a21boi_2
 sky130_fd_sc_hs__a21o_1
 sky130_fd_sc_hs__a21o_2
 sky130_fd_sc_hs__a21oi_1
+sky130_fd_sc_hs__a21oi_2
 sky130_fd_sc_hs__a221o_1
 sky130_fd_sc_hs__a221o_2
 sky130_fd_sc_hs__a221o_4
 sky130_fd_sc_hs__a221oi_1
+sky130_fd_sc_hs__a221oi_2
 sky130_fd_sc_hs__a221oi_4
 sky130_fd_sc_hs__a222oi_1
 sky130_fd_sc_hs__a22o_1
 sky130_fd_sc_hs__a22o_2
 sky130_fd_sc_hs__a22o_4
 sky130_fd_sc_hs__a22oi_1
+sky130_fd_sc_hs__a22oi_2
 sky130_fd_sc_hs__a2bb2o_1
 sky130_fd_sc_hs__a2bb2o_2
 sky130_fd_sc_hs__a2bb2oi_1
+sky130_fd_sc_hs__a2bb2oi_2
 sky130_fd_sc_hs__a311o_1
 sky130_fd_sc_hs__a311o_2
 sky130_fd_sc_hs__a311o_4
 sky130_fd_sc_hs__a311oi_1
+sky130_fd_sc_hs__a311oi_2
 sky130_fd_sc_hs__a311oi_4
 sky130_fd_sc_hs__a31o_1
 sky130_fd_sc_hs__a31o_2
 sky130_fd_sc_hs__a31o_4
 sky130_fd_sc_hs__a31oi_1
+sky130_fd_sc_hs__a31oi_2
 sky130_fd_sc_hs__a31oi_4
 sky130_fd_sc_hs__a32o_1
 sky130_fd_sc_hs__a32o_2
@@ -182,15 +56,28 @@
 sky130_fd_sc_hs__and2_0
 sky130_fd_sc_hs__and2_1
 sky130_fd_sc_hs__and2b_1
+sky130_fd_sc_hs__and2b_2
 sky130_fd_sc_hs__and2b_4
 sky130_fd_sc_hs__and3_1
 sky130_fd_sc_hs__and3b_1
+sky130_fd_sc_hs__and3b_2
 sky130_fd_sc_hs__and3b_4
 sky130_fd_sc_hs__and4_1
 sky130_fd_sc_hs__and4b_1
+sky130_fd_sc_hs__and4b_2
 sky130_fd_sc_hs__and4b_4
 sky130_fd_sc_hs__and4bb_1
+sky130_fd_sc_hs__and4bb_2
 sky130_fd_sc_hs__and4bb_4
+sky130_fd_sc_hs__bufbuf_16
+sky130_fd_sc_hs__bufbuf_8
+sky130_fd_sc_hs__bufinv_16
+sky130_fd_sc_hs__bufinv_8
+sky130_fd_sc_hs__clkbuf_1
+sky130_fd_sc_hs__clkbuf_16
+sky130_fd_sc_hs__clkbuf_2
+sky130_fd_sc_hs__clkbuf_4
+sky130_fd_sc_hs__clkbuf_8
 sky130_fd_sc_hs__clkdlybuf4s15_1
 sky130_fd_sc_hs__clkdlybuf4s15_2
 sky130_fd_sc_hs__clkdlybuf4s18_1
@@ -199,6 +86,9 @@
 sky130_fd_sc_hs__clkdlybuf4s25_2
 sky130_fd_sc_hs__clkdlybuf4s50_1
 sky130_fd_sc_hs__clkdlybuf4s50_2
+sky130_fd_sc_hs__clkdlyinv3sd1_1
+sky130_fd_sc_hs__clkdlyinv3sd2_1
+sky130_fd_sc_hs__clkdlyinv3sd3_1
 sky130_fd_sc_hs__clkinv_1
 sky130_fd_sc_hs__clkinv_16
 sky130_fd_sc_hs__clkinv_2
@@ -216,10 +106,14 @@
 sky130_fd_sc_hs__dfrbp_1
 sky130_fd_sc_hs__dfrtn_1
 sky130_fd_sc_hs__dfrtp_1
+sky130_fd_sc_hs__dfrtp_2
 sky130_fd_sc_hs__dfsbp_1
+sky130_fd_sc_hs__dfsbp_2
 sky130_fd_sc_hs__dfstp_1
+sky130_fd_sc_hs__dfstp_2
 sky130_fd_sc_hs__dfxbp_1
 sky130_fd_sc_hs__dfxtp_1
+sky130_fd_sc_hs__dfxtp_2
 sky130_fd_sc_hs__diode_2
 sky130_fd_sc_hs__dlclkp_1
 sky130_fd_sc_hs__dlclkp_2
@@ -227,16 +121,24 @@
 sky130_fd_sc_hs__dlrbn_1
 sky130_fd_sc_hs__dlrbn_2
 sky130_fd_sc_hs__dlrbp_1
+sky130_fd_sc_hs__dlrbp_2
 sky130_fd_sc_hs__dlrtn_1
+sky130_fd_sc_hs__dlrtn_2
 sky130_fd_sc_hs__dlrtn_4
 sky130_fd_sc_hs__dlrtp_1
+sky130_fd_sc_hs__dlrtp_2
 sky130_fd_sc_hs__dlrtp_4
-sky130_fd_sc_hs__dlxbn_1
+sky130_fd_sc_hs__dlxbn_2
 sky130_fd_sc_hs__dlxbp_1
 sky130_fd_sc_hs__dlxtn_1
+sky130_fd_sc_hs__dlxtn_2
 sky130_fd_sc_hs__dlxtn_4
-sky130_fd_sc_hs__dlxtp_1
 sky130_fd_sc_hs__dlygate4sd1_1
+sky130_fd_sc_hs__dlygate4sd2_1
+sky130_fd_sc_hs__dlygate4sd3_1
+sky130_fd_sc_hs__dlymetal6s2s_1
+sky130_fd_sc_hs__dlymetal6s4s_1
+sky130_fd_sc_hs__dlymetal6s6s_1
 sky130_fd_sc_hs__ebufn_1
 sky130_fd_sc_hs__ebufn_2
 sky130_fd_sc_hs__ebufn_4
@@ -262,7 +164,10 @@
 sky130_fd_sc_hs__ha_2
 sky130_fd_sc_hs__ha_4
 sky130_fd_sc_hs__inv_1
+sky130_fd_sc_hs__inv_12
+sky130_fd_sc_hs__inv_2
 sky130_fd_sc_hs__inv_4
+sky130_fd_sc_hs__inv_6
 sky130_fd_sc_hs__lpflow_bleeder_1
 sky130_fd_sc_hs__lpflow_clkbufkapwr_1
 sky130_fd_sc_hs__lpflow_clkbufkapwr_16
@@ -290,6 +195,9 @@
 sky130_fd_sc_hs__lpflow_isobufsrc_4
 sky130_fd_sc_hs__lpflow_isobufsrc_8
 sky130_fd_sc_hs__lpflow_isobufsrckapwr_16
+sky130_fd_sc_hs__lpflow_lsbuf_lh_hl_isowell_tap_1
+sky130_fd_sc_hs__lpflow_lsbuf_lh_hl_isowell_tap_2
+sky130_fd_sc_hs__lpflow_lsbuf_lh_hl_isowell_tap_4
 sky130_fd_sc_hs__lpflow_lsbuf_lh_isowell_4
 sky130_fd_sc_hs__lpflow_lsbuf_lh_isowell_tap_1
 sky130_fd_sc_hs__lpflow_lsbuf_lh_isowell_tap_2
@@ -309,12 +217,13 @@
 sky130_fd_sc_hs__nand2_1
 sky130_fd_sc_hs__nand2_8
 sky130_fd_sc_hs__nand2b_1
+sky130_fd_sc_hs__nand2b_2
 sky130_fd_sc_hs__nand2b_4
 sky130_fd_sc_hs__nand3_1
 sky130_fd_sc_hs__nand3b_1
+sky130_fd_sc_hs__nand3b_2
 sky130_fd_sc_hs__nand3b_4
 sky130_fd_sc_hs__nand4_1
-sky130_fd_sc_hs__nand4_2
 sky130_fd_sc_hs__nand4b_1
 sky130_fd_sc_hs__nand4b_2
 sky130_fd_sc_hs__nand4b_4
@@ -322,18 +231,15 @@
 sky130_fd_sc_hs__nand4bb_2
 sky130_fd_sc_hs__nand4bb_4
 sky130_fd_sc_hs__nor2_1
-sky130_fd_sc_hs__nor2_2
 sky130_fd_sc_hs__nor2_8
 sky130_fd_sc_hs__nor2b_1
 sky130_fd_sc_hs__nor2b_2
 sky130_fd_sc_hs__nor2b_4
 sky130_fd_sc_hs__nor3_1
-sky130_fd_sc_hs__nor3_2
 sky130_fd_sc_hs__nor3b_1
 sky130_fd_sc_hs__nor3b_2
 sky130_fd_sc_hs__nor3b_4
 sky130_fd_sc_hs__nor4_1
-sky130_fd_sc_hs__nor4_2
 sky130_fd_sc_hs__nor4b_1
 sky130_fd_sc_hs__nor4b_2
 sky130_fd_sc_hs__nor4b_4
@@ -344,73 +250,97 @@
 sky130_fd_sc_hs__o2111a_2
 sky130_fd_sc_hs__o2111a_4
 sky130_fd_sc_hs__o2111ai_1
+sky130_fd_sc_hs__o2111ai_2
 sky130_fd_sc_hs__o2111ai_4
 sky130_fd_sc_hs__o211a_1
 sky130_fd_sc_hs__o211a_2
 sky130_fd_sc_hs__o211a_4
 sky130_fd_sc_hs__o211ai_1
+sky130_fd_sc_hs__o211ai_2
 sky130_fd_sc_hs__o211ai_4
+sky130_fd_sc_hs__o21a_1
 sky130_fd_sc_hs__o21a_2
 sky130_fd_sc_hs__o21ai_0
+sky130_fd_sc_hs__o21ai_1
+sky130_fd_sc_hs__o21ai_2
 sky130_fd_sc_hs__o21ba_1
 sky130_fd_sc_hs__o21ba_2
 sky130_fd_sc_hs__o21ba_4
 sky130_fd_sc_hs__o21bai_1
+sky130_fd_sc_hs__o21bai_2
 sky130_fd_sc_hs__o21bai_4
 sky130_fd_sc_hs__o221a_1
 sky130_fd_sc_hs__o221a_2
 sky130_fd_sc_hs__o221a_4
 sky130_fd_sc_hs__o221ai_1
+sky130_fd_sc_hs__o221ai_2
 sky130_fd_sc_hs__o221ai_4
+sky130_fd_sc_hs__o22a_1
 sky130_fd_sc_hs__o22a_2
+sky130_fd_sc_hs__o22ai_1
+sky130_fd_sc_hs__o22ai_2
 sky130_fd_sc_hs__o22ai_4
 sky130_fd_sc_hs__o2bb2a_1
 sky130_fd_sc_hs__o2bb2a_2
 sky130_fd_sc_hs__o2bb2a_4
 sky130_fd_sc_hs__o2bb2ai_1
+sky130_fd_sc_hs__o2bb2ai_2
 sky130_fd_sc_hs__o2bb2ai_4
 sky130_fd_sc_hs__o311a_1
 sky130_fd_sc_hs__o311a_2
 sky130_fd_sc_hs__o311a_4
 sky130_fd_sc_hs__o311ai_0
 sky130_fd_sc_hs__o311ai_1
+sky130_fd_sc_hs__o311ai_2
 sky130_fd_sc_hs__o311ai_4
 sky130_fd_sc_hs__o31a_1
 sky130_fd_sc_hs__o31a_2
 sky130_fd_sc_hs__o31a_4
 sky130_fd_sc_hs__o31ai_1
+sky130_fd_sc_hs__o31ai_2
 sky130_fd_sc_hs__o31ai_4
 sky130_fd_sc_hs__o32a_1
 sky130_fd_sc_hs__o32a_2
 sky130_fd_sc_hs__o32ai_1
+sky130_fd_sc_hs__o32ai_2
 sky130_fd_sc_hs__o41a_1
 sky130_fd_sc_hs__o41a_2
 sky130_fd_sc_hs__o41ai_1
+sky130_fd_sc_hs__o41ai_2
 sky130_fd_sc_hs__or2_0
 sky130_fd_sc_hs__or2_1
 sky130_fd_sc_hs__or2b_1
+sky130_fd_sc_hs__or2b_2
 sky130_fd_sc_hs__or2b_4
 sky130_fd_sc_hs__or3_1
 sky130_fd_sc_hs__or3b_1
+sky130_fd_sc_hs__or3b_2
 sky130_fd_sc_hs__or3b_4
 sky130_fd_sc_hs__or4_1
 sky130_fd_sc_hs__or4b_1
+sky130_fd_sc_hs__or4b_2
 sky130_fd_sc_hs__or4b_4
 sky130_fd_sc_hs__or4bb_1
+sky130_fd_sc_hs__or4bb_2
 sky130_fd_sc_hs__or4bb_4
-sky130_fd_sc_hs__probe_s8p_8
-sky130_fd_sc_hs__probec_s8p_8
 sky130_fd_sc_hs__sdfbbn_1
+sky130_fd_sc_hs__sdfbbn_2
 sky130_fd_sc_hs__sdfbbp_1
 sky130_fd_sc_hs__sdfrbp_1
+sky130_fd_sc_hs__sdfrbp_2
 sky130_fd_sc_hs__sdfrtn_1
 sky130_fd_sc_hs__sdfrtp_1
+sky130_fd_sc_hs__sdfrtp_2
 sky130_fd_sc_hs__sdfrtp_4
 sky130_fd_sc_hs__sdfsbp_1
+sky130_fd_sc_hs__sdfsbp_2
 sky130_fd_sc_hs__sdfstp_1
+sky130_fd_sc_hs__sdfstp_2
 sky130_fd_sc_hs__sdfstp_4
 sky130_fd_sc_hs__sdfxbp_1
+sky130_fd_sc_hs__sdfxbp_2
 sky130_fd_sc_hs__sdfxtp_1
+sky130_fd_sc_hs__sdfxtp_2
 sky130_fd_sc_hs__sdfxtp_4
 sky130_fd_sc_hs__sdlclkp_1
 sky130_fd_sc_hs__sdlclkp_2
@@ -421,8 +351,10 @@
 sky130_fd_sc_hs__sedfxtp_2
 sky130_fd_sc_hs__sedfxtp_4
 sky130_fd_sc_hs__xnor2_1
+sky130_fd_sc_hs__xnor3_1
+sky130_fd_sc_hs__xnor3_2
+sky130_fd_sc_hs__xnor3_4
 sky130_fd_sc_hs__xor2_1
-sky130_fd_sc_hs__buf_16
-sky130_fd_sc_hs__lpflow_lsbuf_lh_hl_isowell_tap_1
-sky130_fd_sc_hs__lpflow_lsbuf_lh_hl_isowell_tap_2
-sky130_fd_sc_hs__lpflow_lsbuf_lh_hl_isowell_tap_4
+sky130_fd_sc_hs__xor3_1
+sky130_fd_sc_hs__xor3_2
+sky130_fd_sc_hs__xor3_4
diff --git a/sky130/openlane/sky130_fd_sc_hvl/config.tcl b/sky130/openlane/sky130_fd_sc_hvl/config.tcl
index b8e18ff..336ac4e 100644
--- a/sky130/openlane/sky130_fd_sc_hvl/config.tcl
+++ b/sky130/openlane/sky130_fd_sc_hvl/config.tcl
@@ -11,12 +11,8 @@
 set ::env(LIB_SLOWEST) "$::env(PDK_ROOT)/$::env(PDK)/libs.ref/$::env(STD_CELL_LIBRARY)/lib/sky130_fd_sc_hvl__ss_150C_1v65.lib"
 #endif (!EF_FORMAT)
 
-
-
 set ::env(LIB_TYPICAL) $::env(LIB_SYNTH)
 
-
-
 # Placement site for core cells
 # This can be found in the technology lef
 set ::env(PLACE_SITE) "unithv"
@@ -49,21 +45,18 @@
 set ::env(DECAP_CELL) "sky130_fd_sc_hvl__decap_"
 set ::env(RE_BUFFER_CELL) "sky130_fd_sc_hvl__buf_1"
 
-
 # Diode insertaion
 set ::env(DIODE_CELL) "sky130_fd_sc_hvl__diode_2"
 set ::env(DIODE_CELL_PIN) "DIODE"
 
 set ::env(CELL_PAD) 8
-set ::env(CELL_PAD_EXECLUDE) "sky130_fd_sc_hvl__tap* sky130_fd_sc_hvl__decap* sky130_fd_sc_hvl__fill*"
+set ::env(CELL_PAD_EXCLUDE) "sky130_fd_sc_hvl__tap* sky130_fd_sc_hvl__decap* sky130_fd_sc_hvl__fill*"
 
 # Clk Buffers info CTS data
 set ::env(ROOT_CLK_BUFFER) sky130_fd_sc_hvl__buf_16
 set ::env(CLK_BUFFER) sky130_fd_sc_hvl__buf_4
 set ::env(CLK_BUFFER_INPUT) A
 set ::env(CLK_BUFFER_OUTPUT) X
-
 set ::env(CTS_CLK_BUFFER_LIST) "sky130_fd_sc_hvl__buf_1 sky130_fd_sc_hvl__buf_2 sky130_fd_sc_hvl__buf_4 sky130_fd_sc_hvl__buf_8"
 set ::env(CTS_MAX_CAP) 5.57100
-
-set ::env(PDN_RAIL_WIDTH) 0.51
+set ::env(FP_PDN_RAIL_WIDTH) 0.51
diff --git a/sky130/openlane/sky130_fd_sc_ls/config.tcl b/sky130/openlane/sky130_fd_sc_ls/config.tcl
index 59f17f5..0c3a101 100755
--- a/sky130/openlane/sky130_fd_sc_ls/config.tcl
+++ b/sky130/openlane/sky130_fd_sc_ls/config.tcl
@@ -19,8 +19,6 @@
 set ::env(PLACE_SITE_WIDTH) 0.480
 set ::env(PLACE_SITE_HEIGHT) 3.330
 
-
-
 # welltap and endcap cells
 #set ::env(FP_WELLTAP_CELL) "sky130_fd_sc_ls__tapvpwrvgnd_1"
 set ::env(FP_ENDCAP_CELL) "sky130_fd_sc_ls__decap_4"
@@ -47,14 +45,13 @@
 set ::env(DECAP_CELL) "sky130_fd_sc_ls__decap_"
 set ::env(RE_BUFFER_CELL) "sky130_fd_sc_ls__buf_4"
 
-
 # Diode insertaion
 set ::env(DIODE_CELL) "sky130_fd_sc_ls__diode_2"
 set ::env(FAKEDIODE_CELL) "sky130_fd_sc_ls__fakediode_2"
 set ::env(DIODE_CELL_PIN) "DIODE"
 
 set ::env(CELL_PAD) 8
-set ::env(CELL_PAD_EXECLUDE) "$::env(STD_CELL_LIBRARY)__tap* $::env(STD_CELL_LIBRARY)__decap* $::env(STD_CELL_LIBRARY)__fill*"
+set ::env(CELL_PAD_EXCLUDE) "$::env(STD_CELL_LIBRARY)__tap* $::env(STD_CELL_LIBRARY)__decap* $::env(STD_CELL_LIBRARY)__fill*"
 
 # Clk Buffers info CTS data
 set ::env(ROOT_CLK_BUFFER) $::env(STD_CELL_LIBRARY)__clkbuf_16
@@ -62,8 +59,5 @@
 set ::env(CLK_BUFFER_INPUT) A
 set ::env(CLK_BUFFER_OUTPUT) X
 set ::env(CTS_CLK_BUFFER_LIST) "sky130_fd_sc_ls__clkbuf_1 sky130_fd_sc_ls__clkbuf_2 sky130_fd_sc_ls__clkbuf_4 sky130_fd_sc_ls__clkbuf_8"
-set ::env(CTS_SQR_CAP) 0.258e-3
-set ::env(CTS_SQR_RES) 0.125
 set ::env(CTS_MAX_CAP) 1.53169
-
-set ::env(PDN_RAIL_WIDTH) 0.48
+set ::env(FP_PDN_RAIL_WIDTH) 0.48
diff --git a/sky130/openlane/sky130_fd_sc_ls/no_synth.cells b/sky130/openlane/sky130_fd_sc_ls/no_synth.cells
index 3220076..74a94a3 100644
--- a/sky130/openlane/sky130_fd_sc_ls/no_synth.cells
+++ b/sky130/openlane/sky130_fd_sc_ls/no_synth.cells
@@ -1,180 +1,49 @@
-sky130_fd_sc_ls__clkdlyinv3sd1_1
-sky130_fd_sc_ls__clkdlyinv3sd2_1
-sky130_fd_sc_ls__clkdlyinv3sd3_1
-sky130_fd_sc_ls__clkbuf_6
-sky130_fd_sc_ls__clkbuf_12
-sky130_fd_sc_ls__inputiso0n_1
-sky130_fd_sc_ls__inputiso1p_1
-sky130_fd_sc_ls__clkinv_12
-sky130_fd_sc_ls__muxb16to1_4
-sky130_fd_sc_ls__probe_p_8
-sky130_fd_sc_ls__probec_p_8
-sky130_fd_sc_ls__dfstp_2
-sky130_fd_sc_ls__xor3_4
-sky130_fd_sc_ls__or2b_2
-sky130_fd_sc_ls__xnor3_2
-sky130_fd_sc_ls__sdfbbn_2
-sky130_fd_sc_ls__sdfxtp_2
-sky130_fd_sc_ls__dfxtp_2
-sky130_fd_sc_ls__xor2_2
-sky130_fd_sc_ls__o311ai_2
-sky130_fd_sc_ls__nand2_2
-sky130_fd_sc_ls__sdfrtp_2
-sky130_fd_sc_ls__and4_2
-sky130_fd_sc_ls__dfsbp_2
-sky130_fd_sc_ls__or4_2
-sky130_fd_sc_ls__inv_2
-sky130_fd_sc_ls__dlymetal6s4s_1
-sky130_fd_sc_ls__o31ai_2
-sky130_fd_sc_ls__bufbuf_16
-sky130_fd_sc_ls__dlygate4sd3_1
-sky130_fd_sc_ls__o22ai_2
-sky130_fd_sc_ls__o32ai_2
-sky130_fd_sc_ls__and3_2
-sky130_fd_sc_ls__o2111ai_2
-sky130_fd_sc_ls__dlrbp_2
-sky130_fd_sc_ls__and4bb_2
-sky130_fd_sc_ls__nand3b_2
-sky130_fd_sc_ls__buf_6
-sky130_fd_sc_ls__and4b_2
-sky130_fd_sc_ls__a2bb2oi_2
-sky130_fd_sc_ls__buf_12
-sky130_fd_sc_ls__and2_2
-sky130_fd_sc_ls__dlxbn_2
-sky130_fd_sc_ls__dlrtp_2
-sky130_fd_sc_ls__xor3_1
-sky130_fd_sc_ls__a21oi_2
-sky130_fd_sc_ls__inv_12
-sky130_fd_sc_ls__o21ai_2
-sky130_fd_sc_ls__a311oi_2
-sky130_fd_sc_ls__o21bai_2
-sky130_fd_sc_ls__nand3_2
-sky130_fd_sc_ls__dlygate4sd2_1
-sky130_fd_sc_ls__o211ai_2
-sky130_fd_sc_ls__or4b_2
-sky130_fd_sc_ls__and3b_2
-sky130_fd_sc_ls__or4bb_2
-sky130_fd_sc_ls__sdfrbp_2
-sky130_fd_sc_ls__o2bb2ai_2
-sky130_fd_sc_ls__bufinv_16
-sky130_fd_sc_ls__xor3_2
-sky130_fd_sc_ls__o41ai_2
-sky130_fd_sc_ls__or3b_2
-sky130_fd_sc_ls__or2_2
-sky130_fd_sc_ls__dfrtp_2
-sky130_fd_sc_ls__bufbuf_8
-sky130_fd_sc_ls__bufinv_8
-sky130_fd_sc_ls__buf_2
-sky130_fd_sc_ls__inv_6
-sky130_fd_sc_ls__xnor3_4
-sky130_fd_sc_ls__and2b_2
-sky130_fd_sc_ls__a2111oi_2
-sky130_fd_sc_ls__xnor3_1
-sky130_fd_sc_ls__dlymetal6s6s_1
-sky130_fd_sc_ls__o221ai_2
-sky130_fd_sc_ls__sdfstp_2
-sky130_fd_sc_ls__a31oi_2
-sky130_fd_sc_ls__a211oi_2
-sky130_fd_sc_ls__nand2b_2
-sky130_fd_sc_ls__a22oi_2
-sky130_fd_sc_ls__dlymetal6s2s_1
-sky130_fd_sc_ls__dlxtn_2
-sky130_fd_sc_ls__a21boi_2
-sky130_fd_sc_ls__dlrtn_2
-sky130_fd_sc_ls__a221oi_2
-sky130_fd_sc_ls__or3_2
-sky130_fd_sc_ls__sdfsbp_2
-sky130_fd_sc_ls__xnor2_2
-sky130_fd_sc_ls__sdfxbp_2
-sky130_fd_sc_ls__clkbuf_1
-sky130_fd_sc_ls__clkbuf_2
-sky130_fd_sc_ls__clkbuf_4
-sky130_fd_sc_ls__clkbuf_8
-sky130_fd_sc_ls__clkbuf_16
-sky130_fd_sc_ls__o22a_1
-sky130_fd_sc_ls__o22ai_1
-sky130_fd_sc_ls__o21a_1
-sky130_fd_sc_ls__o21ai_1
-sky130_fd_sc_ls__a211o_1
-sky130_fd_sc_ls__a211oi_2
-sky130_fd_sc_ls__a21oi_2
-sky130_fd_sc_ls__a22oi_2
-sky130_fd_sc_ls__a311oi_2
-sky130_fd_sc_ls__and2_2
-sky130_fd_sc_ls__and3_2
-sky130_fd_sc_ls__and4_2
-sky130_fd_sc_ls__and4bb_2
-sky130_fd_sc_ls__buf_6
-sky130_fd_sc_ls__bufbuf_8
-sky130_fd_sc_ls__bufinv_8
-sky130_fd_sc_ls__clkbuf_16
-sky130_fd_sc_ls__clkbuf_4
-sky130_fd_sc_ls__dfrtp_2
-sky130_fd_sc_ls__dfstp_2
-sky130_fd_sc_ls__dlrbp_2
-sky130_fd_sc_ls__dlrtp_2
-sky130_fd_sc_ls__dlxtn_2
-sky130_fd_sc_ls__dlygate4sd3_1
-sky130_fd_sc_ls__dlymetal6s4s_1
-sky130_fd_sc_ls__inv_12
-sky130_fd_sc_ls__inv_6
-sky130_fd_sc_ls__nand2b_2
-sky130_fd_sc_ls__nand3b_2
-sky130_fd_sc_ls__o211ai_2
-sky130_fd_sc_ls__o21ai_1
-sky130_fd_sc_ls__o21bai_2
-sky130_fd_sc_ls__o22a_1
-sky130_fd_sc_ls__o22ai_2
-sky130_fd_sc_ls__o311ai_2
-sky130_fd_sc_ls__o32ai_2
-sky130_fd_sc_ls__or2_2
-sky130_fd_sc_ls__or3_2
-sky130_fd_sc_ls__or4_2
-sky130_fd_sc_ls__or4bb_2
-sky130_fd_sc_ls__sdfrbp_2
-sky130_fd_sc_ls__sdfsbp_2
-sky130_fd_sc_ls__sdfxbp_2
-sky130_fd_sc_ls__xnor2_2
-sky130_fd_sc_ls__xnor3_2
-sky130_fd_sc_ls__xor2_2
-sky130_fd_sc_ls__xor3_2
-sky130_fd_sc_ls__buf_12
 sky130_fd_sc_ls__a2111o_1
 sky130_fd_sc_ls__a2111o_2
 sky130_fd_sc_ls__a2111oi_0
 sky130_fd_sc_ls__a2111oi_1
+sky130_fd_sc_ls__a2111oi_2
+sky130_fd_sc_ls__a211o_1
 sky130_fd_sc_ls__a211o_2
 sky130_fd_sc_ls__a211oi_1
+sky130_fd_sc_ls__a211oi_2
 sky130_fd_sc_ls__a211oi_4
 sky130_fd_sc_ls__a21bo_1
 sky130_fd_sc_ls__a21bo_2
 sky130_fd_sc_ls__a21boi_0
 sky130_fd_sc_ls__a21boi_1
+sky130_fd_sc_ls__a21boi_2
 sky130_fd_sc_ls__a21o_1
 sky130_fd_sc_ls__a21o_2
 sky130_fd_sc_ls__a21oi_1
+sky130_fd_sc_ls__a21oi_2
 sky130_fd_sc_ls__a221o_1
 sky130_fd_sc_ls__a221o_2
 sky130_fd_sc_ls__a221o_4
 sky130_fd_sc_ls__a221oi_1
+sky130_fd_sc_ls__a221oi_2
 sky130_fd_sc_ls__a221oi_4
 sky130_fd_sc_ls__a222oi_1
 sky130_fd_sc_ls__a22o_1
 sky130_fd_sc_ls__a22o_2
 sky130_fd_sc_ls__a22o_4
 sky130_fd_sc_ls__a22oi_1
+sky130_fd_sc_ls__a22oi_2
 sky130_fd_sc_ls__a2bb2o_1
 sky130_fd_sc_ls__a2bb2o_2
 sky130_fd_sc_ls__a2bb2oi_1
+sky130_fd_sc_ls__a2bb2oi_2
 sky130_fd_sc_ls__a311o_1
 sky130_fd_sc_ls__a311o_2
 sky130_fd_sc_ls__a311o_4
 sky130_fd_sc_ls__a311oi_1
+sky130_fd_sc_ls__a311oi_2
 sky130_fd_sc_ls__a311oi_4
 sky130_fd_sc_ls__a31o_1
 sky130_fd_sc_ls__a31o_2
 sky130_fd_sc_ls__a31o_4
 sky130_fd_sc_ls__a31oi_1
+sky130_fd_sc_ls__a31oi_2
 sky130_fd_sc_ls__a31oi_4
 sky130_fd_sc_ls__a32o_1
 sky130_fd_sc_ls__a32o_2
@@ -187,15 +56,30 @@
 sky130_fd_sc_ls__and2_0
 sky130_fd_sc_ls__and2_1
 sky130_fd_sc_ls__and2b_1
+sky130_fd_sc_ls__and2b_2
 sky130_fd_sc_ls__and2b_4
 sky130_fd_sc_ls__and3_1
 sky130_fd_sc_ls__and3b_1
+sky130_fd_sc_ls__and3b_2
 sky130_fd_sc_ls__and3b_4
 sky130_fd_sc_ls__and4_1
 sky130_fd_sc_ls__and4b_1
+sky130_fd_sc_ls__and4b_2
 sky130_fd_sc_ls__and4b_4
 sky130_fd_sc_ls__and4bb_1
+sky130_fd_sc_ls__and4bb_2
 sky130_fd_sc_ls__and4bb_4
+sky130_fd_sc_ls__bufbuf_16
+sky130_fd_sc_ls__bufbuf_8
+sky130_fd_sc_ls__bufinv_16
+sky130_fd_sc_ls__bufinv_8
+sky130_fd_sc_ls__clkbuf_1
+sky130_fd_sc_ls__clkbuf_12
+sky130_fd_sc_ls__clkbuf_16
+sky130_fd_sc_ls__clkbuf_2
+sky130_fd_sc_ls__clkbuf_4
+sky130_fd_sc_ls__clkbuf_6
+sky130_fd_sc_ls__clkbuf_8
 sky130_fd_sc_ls__clkdlybuf4s15_1
 sky130_fd_sc_ls__clkdlybuf4s15_2
 sky130_fd_sc_ls__clkdlybuf4s18_1
@@ -204,7 +88,11 @@
 sky130_fd_sc_ls__clkdlybuf4s25_2
 sky130_fd_sc_ls__clkdlybuf4s50_1
 sky130_fd_sc_ls__clkdlybuf4s50_2
+sky130_fd_sc_ls__clkdlyinv3sd1_1
+sky130_fd_sc_ls__clkdlyinv3sd2_1
+sky130_fd_sc_ls__clkdlyinv3sd3_1
 sky130_fd_sc_ls__clkinv_1
+sky130_fd_sc_ls__clkinv_12
 sky130_fd_sc_ls__clkinv_16
 sky130_fd_sc_ls__clkinv_2
 sky130_fd_sc_ls__clkinv_4
@@ -221,10 +109,14 @@
 sky130_fd_sc_ls__dfrbp_1
 sky130_fd_sc_ls__dfrtn_1
 sky130_fd_sc_ls__dfrtp_1
+sky130_fd_sc_ls__dfrtp_2
 sky130_fd_sc_ls__dfsbp_1
+sky130_fd_sc_ls__dfsbp_2
 sky130_fd_sc_ls__dfstp_1
+sky130_fd_sc_ls__dfstp_2
 sky130_fd_sc_ls__dfxbp_1
 sky130_fd_sc_ls__dfxtp_1
+sky130_fd_sc_ls__dfxtp_2
 sky130_fd_sc_ls__diode_2
 sky130_fd_sc_ls__dlclkp_1
 sky130_fd_sc_ls__dlclkp_2
@@ -232,16 +124,24 @@
 sky130_fd_sc_ls__dlrbn_1
 sky130_fd_sc_ls__dlrbn_2
 sky130_fd_sc_ls__dlrbp_1
+sky130_fd_sc_ls__dlrbp_2
 sky130_fd_sc_ls__dlrtn_1
+sky130_fd_sc_ls__dlrtn_2
 sky130_fd_sc_ls__dlrtn_4
 sky130_fd_sc_ls__dlrtp_1
+sky130_fd_sc_ls__dlrtp_2
 sky130_fd_sc_ls__dlrtp_4
-sky130_fd_sc_ls__dlxbn_1
+sky130_fd_sc_ls__dlxbn_2
 sky130_fd_sc_ls__dlxbp_1
 sky130_fd_sc_ls__dlxtn_1
+sky130_fd_sc_ls__dlxtn_2
 sky130_fd_sc_ls__dlxtn_4
-sky130_fd_sc_ls__dlxtp_1
 sky130_fd_sc_ls__dlygate4sd1_1
+sky130_fd_sc_ls__dlygate4sd2_1
+sky130_fd_sc_ls__dlygate4sd3_1
+sky130_fd_sc_ls__dlymetal6s2s_1
+sky130_fd_sc_ls__dlymetal6s4s_1
+sky130_fd_sc_ls__dlymetal6s6s_1
 sky130_fd_sc_ls__ebufn_1
 sky130_fd_sc_ls__ebufn_2
 sky130_fd_sc_ls__ebufn_4
@@ -266,8 +166,13 @@
 sky130_fd_sc_ls__ha_1
 sky130_fd_sc_ls__ha_2
 sky130_fd_sc_ls__ha_4
+sky130_fd_sc_ls__inputiso0n_1
+sky130_fd_sc_ls__inputiso1p_1
 sky130_fd_sc_ls__inv_1
+sky130_fd_sc_ls__inv_12
+sky130_fd_sc_ls__inv_2
 sky130_fd_sc_ls__inv_4
+sky130_fd_sc_ls__inv_6
 sky130_fd_sc_ls__lpflow_bleeder_1
 sky130_fd_sc_ls__lpflow_clkbufkapwr_1
 sky130_fd_sc_ls__lpflow_clkbufkapwr_16
@@ -295,6 +200,9 @@
 sky130_fd_sc_ls__lpflow_isobufsrc_4
 sky130_fd_sc_ls__lpflow_isobufsrc_8
 sky130_fd_sc_ls__lpflow_isobufsrckapwr_16
+sky130_fd_sc_ls__lpflow_lsbuf_lh_hl_isowell_tap_1
+sky130_fd_sc_ls__lpflow_lsbuf_lh_hl_isowell_tap_2
+sky130_fd_sc_ls__lpflow_lsbuf_lh_hl_isowell_tap_4
 sky130_fd_sc_ls__lpflow_lsbuf_lh_isowell_4
 sky130_fd_sc_ls__lpflow_lsbuf_lh_isowell_tap_1
 sky130_fd_sc_ls__lpflow_lsbuf_lh_isowell_tap_2
@@ -311,15 +219,17 @@
 sky130_fd_sc_ls__mux2i_4
 sky130_fd_sc_ls__mux4_1
 sky130_fd_sc_ls__mux4_2
+sky130_fd_sc_ls__muxb16to1_4
 sky130_fd_sc_ls__nand2_1
 sky130_fd_sc_ls__nand2_8
 sky130_fd_sc_ls__nand2b_1
+sky130_fd_sc_ls__nand2b_2
 sky130_fd_sc_ls__nand2b_4
 sky130_fd_sc_ls__nand3_1
 sky130_fd_sc_ls__nand3b_1
+sky130_fd_sc_ls__nand3b_2
 sky130_fd_sc_ls__nand3b_4
 sky130_fd_sc_ls__nand4_1
-sky130_fd_sc_ls__nand4_2
 sky130_fd_sc_ls__nand4b_1
 sky130_fd_sc_ls__nand4b_2
 sky130_fd_sc_ls__nand4b_4
@@ -327,18 +237,15 @@
 sky130_fd_sc_ls__nand4bb_2
 sky130_fd_sc_ls__nand4bb_4
 sky130_fd_sc_ls__nor2_1
-sky130_fd_sc_ls__nor2_2
 sky130_fd_sc_ls__nor2_8
 sky130_fd_sc_ls__nor2b_1
 sky130_fd_sc_ls__nor2b_2
 sky130_fd_sc_ls__nor2b_4
 sky130_fd_sc_ls__nor3_1
-sky130_fd_sc_ls__nor3_2
 sky130_fd_sc_ls__nor3b_1
 sky130_fd_sc_ls__nor3b_2
 sky130_fd_sc_ls__nor3b_4
 sky130_fd_sc_ls__nor4_1
-sky130_fd_sc_ls__nor4_2
 sky130_fd_sc_ls__nor4b_1
 sky130_fd_sc_ls__nor4b_2
 sky130_fd_sc_ls__nor4b_4
@@ -349,73 +256,97 @@
 sky130_fd_sc_ls__o2111a_2
 sky130_fd_sc_ls__o2111a_4
 sky130_fd_sc_ls__o2111ai_1
+sky130_fd_sc_ls__o2111ai_2
 sky130_fd_sc_ls__o2111ai_4
 sky130_fd_sc_ls__o211a_1
 sky130_fd_sc_ls__o211a_2
 sky130_fd_sc_ls__o211a_4
 sky130_fd_sc_ls__o211ai_1
+sky130_fd_sc_ls__o211ai_2
 sky130_fd_sc_ls__o211ai_4
+sky130_fd_sc_ls__o21a_1
 sky130_fd_sc_ls__o21a_2
 sky130_fd_sc_ls__o21ai_0
+sky130_fd_sc_ls__o21ai_1
+sky130_fd_sc_ls__o21ai_2
 sky130_fd_sc_ls__o21ba_1
 sky130_fd_sc_ls__o21ba_2
 sky130_fd_sc_ls__o21ba_4
 sky130_fd_sc_ls__o21bai_1
+sky130_fd_sc_ls__o21bai_2
 sky130_fd_sc_ls__o21bai_4
 sky130_fd_sc_ls__o221a_1
 sky130_fd_sc_ls__o221a_2
 sky130_fd_sc_ls__o221a_4
 sky130_fd_sc_ls__o221ai_1
+sky130_fd_sc_ls__o221ai_2
 sky130_fd_sc_ls__o221ai_4
+sky130_fd_sc_ls__o22a_1
 sky130_fd_sc_ls__o22a_2
+sky130_fd_sc_ls__o22ai_1
+sky130_fd_sc_ls__o22ai_2
 sky130_fd_sc_ls__o22ai_4
 sky130_fd_sc_ls__o2bb2a_1
 sky130_fd_sc_ls__o2bb2a_2
 sky130_fd_sc_ls__o2bb2a_4
 sky130_fd_sc_ls__o2bb2ai_1
+sky130_fd_sc_ls__o2bb2ai_2
 sky130_fd_sc_ls__o2bb2ai_4
 sky130_fd_sc_ls__o311a_1
 sky130_fd_sc_ls__o311a_2
 sky130_fd_sc_ls__o311a_4
 sky130_fd_sc_ls__o311ai_0
 sky130_fd_sc_ls__o311ai_1
+sky130_fd_sc_ls__o311ai_2
 sky130_fd_sc_ls__o311ai_4
 sky130_fd_sc_ls__o31a_1
 sky130_fd_sc_ls__o31a_2
 sky130_fd_sc_ls__o31a_4
 sky130_fd_sc_ls__o31ai_1
+sky130_fd_sc_ls__o31ai_2
 sky130_fd_sc_ls__o31ai_4
 sky130_fd_sc_ls__o32a_1
 sky130_fd_sc_ls__o32a_2
 sky130_fd_sc_ls__o32ai_1
+sky130_fd_sc_ls__o32ai_2
 sky130_fd_sc_ls__o41a_1
 sky130_fd_sc_ls__o41a_2
 sky130_fd_sc_ls__o41ai_1
+sky130_fd_sc_ls__o41ai_2
 sky130_fd_sc_ls__or2_0
 sky130_fd_sc_ls__or2_1
 sky130_fd_sc_ls__or2b_1
+sky130_fd_sc_ls__or2b_2
 sky130_fd_sc_ls__or2b_4
 sky130_fd_sc_ls__or3_1
 sky130_fd_sc_ls__or3b_1
+sky130_fd_sc_ls__or3b_2
 sky130_fd_sc_ls__or3b_4
 sky130_fd_sc_ls__or4_1
 sky130_fd_sc_ls__or4b_1
+sky130_fd_sc_ls__or4b_2
 sky130_fd_sc_ls__or4b_4
 sky130_fd_sc_ls__or4bb_1
+sky130_fd_sc_ls__or4bb_2
 sky130_fd_sc_ls__or4bb_4
-sky130_fd_sc_ls__probe_s8p_8
-sky130_fd_sc_ls__probec_s8p_8
 sky130_fd_sc_ls__sdfbbn_1
+sky130_fd_sc_ls__sdfbbn_2
 sky130_fd_sc_ls__sdfbbp_1
 sky130_fd_sc_ls__sdfrbp_1
+sky130_fd_sc_ls__sdfrbp_2
 sky130_fd_sc_ls__sdfrtn_1
 sky130_fd_sc_ls__sdfrtp_1
+sky130_fd_sc_ls__sdfrtp_2
 sky130_fd_sc_ls__sdfrtp_4
 sky130_fd_sc_ls__sdfsbp_1
+sky130_fd_sc_ls__sdfsbp_2
 sky130_fd_sc_ls__sdfstp_1
+sky130_fd_sc_ls__sdfstp_2
 sky130_fd_sc_ls__sdfstp_4
 sky130_fd_sc_ls__sdfxbp_1
+sky130_fd_sc_ls__sdfxbp_2
 sky130_fd_sc_ls__sdfxtp_1
+sky130_fd_sc_ls__sdfxtp_2
 sky130_fd_sc_ls__sdfxtp_4
 sky130_fd_sc_ls__sdlclkp_1
 sky130_fd_sc_ls__sdlclkp_2
@@ -426,8 +357,10 @@
 sky130_fd_sc_ls__sedfxtp_2
 sky130_fd_sc_ls__sedfxtp_4
 sky130_fd_sc_ls__xnor2_1
+sky130_fd_sc_ls__xnor3_1
+sky130_fd_sc_ls__xnor3_2
+sky130_fd_sc_ls__xnor3_4
 sky130_fd_sc_ls__xor2_1
-sky130_fd_sc_ls__buf_16
-sky130_fd_sc_ls__lpflow_lsbuf_lh_hl_isowell_tap_1
-sky130_fd_sc_ls__lpflow_lsbuf_lh_hl_isowell_tap_2
-sky130_fd_sc_ls__lpflow_lsbuf_lh_hl_isowell_tap_4
+sky130_fd_sc_ls__xor3_1
+sky130_fd_sc_ls__xor3_2
+sky130_fd_sc_ls__xor3_4
diff --git a/sky130/openlane/sky130_fd_sc_ms/config.tcl b/sky130/openlane/sky130_fd_sc_ms/config.tcl
index 5a37229..a41b28d 100755
--- a/sky130/openlane/sky130_fd_sc_ms/config.tcl
+++ b/sky130/openlane/sky130_fd_sc_ms/config.tcl
@@ -19,8 +19,6 @@
 set ::env(PLACE_SITE_WIDTH) 0.480
 set ::env(PLACE_SITE_HEIGHT) 3.330
 
-
-
 # welltap and endcap cells
 set ::env(FP_WELLTAP_CELL) "sky130_fd_sc_ms__tapvpwrvgnd_1"
 set ::env(FP_ENDCAP_CELL) "sky130_fd_sc_ms__decap_4"
@@ -47,7 +45,6 @@
 set ::env(DECAP_CELL) "sky130_fd_sc_ms__decap_"
 set ::env(RE_BUFFER_CELL) "sky130_fd_sc_ms__buf_4"
 
-
 # Diode insertaion
 set ::env(DIODE_CELL) ""
 set ::env(FAKEDIODE_CELL) ""
@@ -55,7 +52,7 @@
 set ::env(DIODE_INSERTION_STRATEGY) 0 
 
 set ::env(CELL_PAD) 8
-set ::env(CELL_PAD_EXECLUDE) "$::env(STD_CELL_LIBRARY)__tap* $::env(STD_CELL_LIBRARY)__decap* $::env(STD_CELL_LIBRARY)__fill*"
+set ::env(CELL_PAD_EXCLUDE) "$::env(STD_CELL_LIBRARY)__tap* $::env(STD_CELL_LIBRARY)__decap* $::env(STD_CELL_LIBRARY)__fill*"
 
 # Clk Buffers info CTS data
 set ::env(ROOT_CLK_BUFFER) $::env(STD_CELL_LIBRARY)__clkbuf_16
@@ -63,8 +60,5 @@
 set ::env(CLK_BUFFER_INPUT) A
 set ::env(CLK_BUFFER_OUTPUT) X
 set ::env(CTS_CLK_BUFFER_LIST) "sky130_fd_sc_ms__clkbuf_2 sky130_fd_sc_ms__clkbuf_4 sky130_fd_sc_ms__clkbuf_8"
-set ::env(CTS_SQR_CAP) 0.258e-3
-set ::env(CTS_SQR_RES) 0.125
 set ::env(CTS_MAX_CAP) 1.53169
-
-set ::env(PDN_RAIL_WIDTH) 0.48
+set ::env(FP_PDN_RAIL_WIDTH) 0.48
diff --git a/sky130/openlane/sky130_fd_sc_ms/no_synth.cells b/sky130/openlane/sky130_fd_sc_ms/no_synth.cells
index 5094f22..eaca2f5 100644
--- a/sky130/openlane/sky130_fd_sc_ms/no_synth.cells
+++ b/sky130/openlane/sky130_fd_sc_ms/no_synth.cells
@@ -1,172 +1,49 @@
-sky130_fd_sc_ms__clkdlyinv3sd1_1
-sky130_fd_sc_ms__clkdlyinv3sd2_1
-sky130_fd_sc_ms__clkdlyinv3sd3_1
-sky130_fd_sc_ms__dfstp_2
-sky130_fd_sc_ms__xor3_4
-sky130_fd_sc_ms__or2b_2
-sky130_fd_sc_ms__xnor3_2
-sky130_fd_sc_ms__sdfbbn_2
-sky130_fd_sc_ms__sdfxtp_2
-sky130_fd_sc_ms__dfxtp_2
-sky130_fd_sc_ms__xor2_2
-sky130_fd_sc_ms__o311ai_2
-sky130_fd_sc_ms__nand2_2
-sky130_fd_sc_ms__sdfrtp_2
-sky130_fd_sc_ms__and4_2
-sky130_fd_sc_ms__dfsbp_2
-sky130_fd_sc_ms__or4_2
-sky130_fd_sc_ms__inv_2
-sky130_fd_sc_ms__dlymetal6s4s_1
-sky130_fd_sc_ms__o31ai_2
-sky130_fd_sc_ms__bufbuf_16
-sky130_fd_sc_ms__dlygate4sd3_1
-sky130_fd_sc_ms__o22ai_2
-sky130_fd_sc_ms__o32ai_2
-sky130_fd_sc_ms__and3_2
-sky130_fd_sc_ms__o2111ai_2
-sky130_fd_sc_ms__dlrbp_2
-sky130_fd_sc_ms__and4bb_2
-sky130_fd_sc_ms__nand3b_2
-sky130_fd_sc_ms__buf_6
-sky130_fd_sc_ms__and4b_2
-sky130_fd_sc_ms__a2bb2oi_2
-sky130_fd_sc_ms__buf_12
-sky130_fd_sc_ms__and2_2
-sky130_fd_sc_ms__dlxbn_2
-sky130_fd_sc_ms__dlrtp_2
-sky130_fd_sc_ms__xor3_1
-sky130_fd_sc_ms__a21oi_2
-sky130_fd_sc_ms__inv_12
-sky130_fd_sc_ms__o21ai_2
-sky130_fd_sc_ms__a311oi_2
-sky130_fd_sc_ms__o21bai_2
-sky130_fd_sc_ms__nand3_2
-sky130_fd_sc_ms__dlygate4sd2_1
-sky130_fd_sc_ms__o211ai_2
-sky130_fd_sc_ms__or4b_2
-sky130_fd_sc_ms__and3b_2
-sky130_fd_sc_ms__or4bb_2
-sky130_fd_sc_ms__sdfrbp_2
-sky130_fd_sc_ms__o2bb2ai_2
-sky130_fd_sc_ms__bufinv_16
-sky130_fd_sc_ms__xor3_2
-sky130_fd_sc_ms__o41ai_2
-sky130_fd_sc_ms__or3b_2
-sky130_fd_sc_ms__or2_2
-sky130_fd_sc_ms__dfrtp_2
-sky130_fd_sc_ms__bufbuf_8
-sky130_fd_sc_ms__bufinv_8
-sky130_fd_sc_ms__buf_2
-sky130_fd_sc_ms__inv_6
-sky130_fd_sc_ms__xnor3_4
-sky130_fd_sc_ms__and2b_2
-sky130_fd_sc_ms__a2111oi_2
-sky130_fd_sc_ms__xnor3_1
-sky130_fd_sc_ms__dlymetal6s6s_1
-sky130_fd_sc_ms__o221ai_2
-sky130_fd_sc_ms__sdfstp_2
-sky130_fd_sc_ms__a31oi_2
-sky130_fd_sc_ms__a211oi_2
-sky130_fd_sc_ms__nand2b_2
-sky130_fd_sc_ms__a22oi_2
-sky130_fd_sc_ms__dlymetal6s2s_1
-sky130_fd_sc_ms__dlxtn_2
-sky130_fd_sc_ms__a21boi_2
-sky130_fd_sc_ms__dlrtn_2
-sky130_fd_sc_ms__a221oi_2
-sky130_fd_sc_ms__or3_2
-sky130_fd_sc_ms__sdfsbp_2
-sky130_fd_sc_ms__xnor2_2
-sky130_fd_sc_ms__sdfxbp_2
-sky130_fd_sc_ms__clkbuf_1
-sky130_fd_sc_ms__clkbuf_2
-sky130_fd_sc_ms__clkbuf_4
-sky130_fd_sc_ms__clkbuf_8
-sky130_fd_sc_ms__clkbuf_16
-sky130_fd_sc_ms__o22a_1
-sky130_fd_sc_ms__o22ai_1
-sky130_fd_sc_ms__o21a_1
-sky130_fd_sc_ms__o21ai_1
-sky130_fd_sc_ms__a211o_1
-sky130_fd_sc_ms__a211oi_2
-sky130_fd_sc_ms__a21oi_2
-sky130_fd_sc_ms__a22oi_2
-sky130_fd_sc_ms__a311oi_2
-sky130_fd_sc_ms__and2_2
-sky130_fd_sc_ms__and3_2
-sky130_fd_sc_ms__and4_2
-sky130_fd_sc_ms__and4bb_2
-sky130_fd_sc_ms__buf_6
-sky130_fd_sc_ms__bufbuf_8
-sky130_fd_sc_ms__bufinv_8
-sky130_fd_sc_ms__clkbuf_16
-sky130_fd_sc_ms__clkbuf_4
-sky130_fd_sc_ms__dfrtp_2
-sky130_fd_sc_ms__dfstp_2
-sky130_fd_sc_ms__dlrbp_2
-sky130_fd_sc_ms__dlrtp_2
-sky130_fd_sc_ms__dlxtn_2
-sky130_fd_sc_ms__dlygate4sd3_1
-sky130_fd_sc_ms__dlymetal6s4s_1
-sky130_fd_sc_ms__inv_12
-sky130_fd_sc_ms__inv_6
-sky130_fd_sc_ms__nand2b_2
-sky130_fd_sc_ms__nand3b_2
-sky130_fd_sc_ms__o211ai_2
-sky130_fd_sc_ms__o21ai_1
-sky130_fd_sc_ms__o21bai_2
-sky130_fd_sc_ms__o22a_1
-sky130_fd_sc_ms__o22ai_2
-sky130_fd_sc_ms__o311ai_2
-sky130_fd_sc_ms__o32ai_2
-sky130_fd_sc_ms__or2_2
-sky130_fd_sc_ms__or3_2
-sky130_fd_sc_ms__or4_2
-sky130_fd_sc_ms__or4bb_2
-sky130_fd_sc_ms__sdfrbp_2
-sky130_fd_sc_ms__sdfsbp_2
-sky130_fd_sc_ms__sdfxbp_2
-sky130_fd_sc_ms__xnor2_2
-sky130_fd_sc_ms__xnor3_2
-sky130_fd_sc_ms__xor2_2
-sky130_fd_sc_ms__xor3_2
-sky130_fd_sc_ms__buf_12
 sky130_fd_sc_ms__a2111o_1
 sky130_fd_sc_ms__a2111o_2
 sky130_fd_sc_ms__a2111oi_0
 sky130_fd_sc_ms__a2111oi_1
+sky130_fd_sc_ms__a2111oi_2
+sky130_fd_sc_ms__a211o_1
 sky130_fd_sc_ms__a211o_2
 sky130_fd_sc_ms__a211oi_1
+sky130_fd_sc_ms__a211oi_2
 sky130_fd_sc_ms__a211oi_4
 sky130_fd_sc_ms__a21bo_1
 sky130_fd_sc_ms__a21bo_2
 sky130_fd_sc_ms__a21boi_0
 sky130_fd_sc_ms__a21boi_1
+sky130_fd_sc_ms__a21boi_2
 sky130_fd_sc_ms__a21o_1
 sky130_fd_sc_ms__a21o_2
 sky130_fd_sc_ms__a21oi_1
+sky130_fd_sc_ms__a21oi_2
 sky130_fd_sc_ms__a221o_1
 sky130_fd_sc_ms__a221o_2
 sky130_fd_sc_ms__a221o_4
 sky130_fd_sc_ms__a221oi_1
+sky130_fd_sc_ms__a221oi_2
 sky130_fd_sc_ms__a221oi_4
 sky130_fd_sc_ms__a222oi_1
 sky130_fd_sc_ms__a22o_1
 sky130_fd_sc_ms__a22o_2
 sky130_fd_sc_ms__a22o_4
 sky130_fd_sc_ms__a22oi_1
+sky130_fd_sc_ms__a22oi_2
 sky130_fd_sc_ms__a2bb2o_1
 sky130_fd_sc_ms__a2bb2o_2
 sky130_fd_sc_ms__a2bb2oi_1
+sky130_fd_sc_ms__a2bb2oi_2
 sky130_fd_sc_ms__a311o_1
 sky130_fd_sc_ms__a311o_2
 sky130_fd_sc_ms__a311o_4
 sky130_fd_sc_ms__a311oi_1
+sky130_fd_sc_ms__a311oi_2
 sky130_fd_sc_ms__a311oi_4
 sky130_fd_sc_ms__a31o_1
 sky130_fd_sc_ms__a31o_2
 sky130_fd_sc_ms__a31o_4
 sky130_fd_sc_ms__a31oi_1
+sky130_fd_sc_ms__a31oi_2
 sky130_fd_sc_ms__a31oi_4
 sky130_fd_sc_ms__a32o_1
 sky130_fd_sc_ms__a32o_2
@@ -179,15 +56,28 @@
 sky130_fd_sc_ms__and2_0
 sky130_fd_sc_ms__and2_1
 sky130_fd_sc_ms__and2b_1
+sky130_fd_sc_ms__and2b_2
 sky130_fd_sc_ms__and2b_4
 sky130_fd_sc_ms__and3_1
 sky130_fd_sc_ms__and3b_1
+sky130_fd_sc_ms__and3b_2
 sky130_fd_sc_ms__and3b_4
 sky130_fd_sc_ms__and4_1
 sky130_fd_sc_ms__and4b_1
+sky130_fd_sc_ms__and4b_2
 sky130_fd_sc_ms__and4b_4
 sky130_fd_sc_ms__and4bb_1
+sky130_fd_sc_ms__and4bb_2
 sky130_fd_sc_ms__and4bb_4
+sky130_fd_sc_ms__bufbuf_16
+sky130_fd_sc_ms__bufbuf_8
+sky130_fd_sc_ms__bufinv_16
+sky130_fd_sc_ms__bufinv_8
+sky130_fd_sc_ms__clkbuf_1
+sky130_fd_sc_ms__clkbuf_16
+sky130_fd_sc_ms__clkbuf_2
+sky130_fd_sc_ms__clkbuf_4
+sky130_fd_sc_ms__clkbuf_8
 sky130_fd_sc_ms__clkdlybuf4s15_1
 sky130_fd_sc_ms__clkdlybuf4s15_2
 sky130_fd_sc_ms__clkdlybuf4s18_1
@@ -196,6 +86,9 @@
 sky130_fd_sc_ms__clkdlybuf4s25_2
 sky130_fd_sc_ms__clkdlybuf4s50_1
 sky130_fd_sc_ms__clkdlybuf4s50_2
+sky130_fd_sc_ms__clkdlyinv3sd1_1
+sky130_fd_sc_ms__clkdlyinv3sd2_1
+sky130_fd_sc_ms__clkdlyinv3sd3_1
 sky130_fd_sc_ms__clkinv_1
 sky130_fd_sc_ms__clkinv_16
 sky130_fd_sc_ms__clkinv_2
@@ -213,10 +106,14 @@
 sky130_fd_sc_ms__dfrbp_1
 sky130_fd_sc_ms__dfrtn_1
 sky130_fd_sc_ms__dfrtp_1
+sky130_fd_sc_ms__dfrtp_2
 sky130_fd_sc_ms__dfsbp_1
+sky130_fd_sc_ms__dfsbp_2
 sky130_fd_sc_ms__dfstp_1
+sky130_fd_sc_ms__dfstp_2
 sky130_fd_sc_ms__dfxbp_1
 sky130_fd_sc_ms__dfxtp_1
+sky130_fd_sc_ms__dfxtp_2
 sky130_fd_sc_ms__diode_2
 sky130_fd_sc_ms__dlclkp_1
 sky130_fd_sc_ms__dlclkp_2
@@ -224,16 +121,24 @@
 sky130_fd_sc_ms__dlrbn_1
 sky130_fd_sc_ms__dlrbn_2
 sky130_fd_sc_ms__dlrbp_1
+sky130_fd_sc_ms__dlrbp_2
 sky130_fd_sc_ms__dlrtn_1
+sky130_fd_sc_ms__dlrtn_2
 sky130_fd_sc_ms__dlrtn_4
 sky130_fd_sc_ms__dlrtp_1
+sky130_fd_sc_ms__dlrtp_2
 sky130_fd_sc_ms__dlrtp_4
-sky130_fd_sc_ms__dlxbn_1
+sky130_fd_sc_ms__dlxbn_2
 sky130_fd_sc_ms__dlxbp_1
 sky130_fd_sc_ms__dlxtn_1
+sky130_fd_sc_ms__dlxtn_2
 sky130_fd_sc_ms__dlxtn_4
-sky130_fd_sc_ms__dlxtp_1
 sky130_fd_sc_ms__dlygate4sd1_1
+sky130_fd_sc_ms__dlygate4sd2_1
+sky130_fd_sc_ms__dlygate4sd3_1
+sky130_fd_sc_ms__dlymetal6s2s_1
+sky130_fd_sc_ms__dlymetal6s4s_1
+sky130_fd_sc_ms__dlymetal6s6s_1
 sky130_fd_sc_ms__ebufn_1
 sky130_fd_sc_ms__ebufn_2
 sky130_fd_sc_ms__ebufn_4
@@ -259,7 +164,10 @@
 sky130_fd_sc_ms__ha_2
 sky130_fd_sc_ms__ha_4
 sky130_fd_sc_ms__inv_1
+sky130_fd_sc_ms__inv_12
+sky130_fd_sc_ms__inv_2
 sky130_fd_sc_ms__inv_4
+sky130_fd_sc_ms__inv_6
 sky130_fd_sc_ms__lpflow_bleeder_1
 sky130_fd_sc_ms__lpflow_clkbufkapwr_1
 sky130_fd_sc_ms__lpflow_clkbufkapwr_16
@@ -287,6 +195,9 @@
 sky130_fd_sc_ms__lpflow_isobufsrc_4
 sky130_fd_sc_ms__lpflow_isobufsrc_8
 sky130_fd_sc_ms__lpflow_isobufsrckapwr_16
+sky130_fd_sc_ms__lpflow_lsbuf_lh_hl_isowell_tap_1
+sky130_fd_sc_ms__lpflow_lsbuf_lh_hl_isowell_tap_2
+sky130_fd_sc_ms__lpflow_lsbuf_lh_hl_isowell_tap_4
 sky130_fd_sc_ms__lpflow_lsbuf_lh_isowell_4
 sky130_fd_sc_ms__lpflow_lsbuf_lh_isowell_tap_1
 sky130_fd_sc_ms__lpflow_lsbuf_lh_isowell_tap_2
@@ -306,12 +217,13 @@
 sky130_fd_sc_ms__nand2_1
 sky130_fd_sc_ms__nand2_8
 sky130_fd_sc_ms__nand2b_1
+sky130_fd_sc_ms__nand2b_2
 sky130_fd_sc_ms__nand2b_4
 sky130_fd_sc_ms__nand3_1
 sky130_fd_sc_ms__nand3b_1
+sky130_fd_sc_ms__nand3b_2
 sky130_fd_sc_ms__nand3b_4
 sky130_fd_sc_ms__nand4_1
-sky130_fd_sc_ms__nand4_2
 sky130_fd_sc_ms__nand4b_1
 sky130_fd_sc_ms__nand4b_2
 sky130_fd_sc_ms__nand4b_4
@@ -319,18 +231,15 @@
 sky130_fd_sc_ms__nand4bb_2
 sky130_fd_sc_ms__nand4bb_4
 sky130_fd_sc_ms__nor2_1
-sky130_fd_sc_ms__nor2_2
 sky130_fd_sc_ms__nor2_8
 sky130_fd_sc_ms__nor2b_1
 sky130_fd_sc_ms__nor2b_2
 sky130_fd_sc_ms__nor2b_4
 sky130_fd_sc_ms__nor3_1
-sky130_fd_sc_ms__nor3_2
 sky130_fd_sc_ms__nor3b_1
 sky130_fd_sc_ms__nor3b_2
 sky130_fd_sc_ms__nor3b_4
 sky130_fd_sc_ms__nor4_1
-sky130_fd_sc_ms__nor4_2
 sky130_fd_sc_ms__nor4b_1
 sky130_fd_sc_ms__nor4b_2
 sky130_fd_sc_ms__nor4b_4
@@ -341,73 +250,97 @@
 sky130_fd_sc_ms__o2111a_2
 sky130_fd_sc_ms__o2111a_4
 sky130_fd_sc_ms__o2111ai_1
+sky130_fd_sc_ms__o2111ai_2
 sky130_fd_sc_ms__o2111ai_4
 sky130_fd_sc_ms__o211a_1
 sky130_fd_sc_ms__o211a_2
 sky130_fd_sc_ms__o211a_4
 sky130_fd_sc_ms__o211ai_1
+sky130_fd_sc_ms__o211ai_2
 sky130_fd_sc_ms__o211ai_4
+sky130_fd_sc_ms__o21a_1
 sky130_fd_sc_ms__o21a_2
 sky130_fd_sc_ms__o21ai_0
+sky130_fd_sc_ms__o21ai_1
+sky130_fd_sc_ms__o21ai_2
 sky130_fd_sc_ms__o21ba_1
 sky130_fd_sc_ms__o21ba_2
 sky130_fd_sc_ms__o21ba_4
 sky130_fd_sc_ms__o21bai_1
+sky130_fd_sc_ms__o21bai_2
 sky130_fd_sc_ms__o21bai_4
 sky130_fd_sc_ms__o221a_1
 sky130_fd_sc_ms__o221a_2
 sky130_fd_sc_ms__o221a_4
 sky130_fd_sc_ms__o221ai_1
+sky130_fd_sc_ms__o221ai_2
 sky130_fd_sc_ms__o221ai_4
+sky130_fd_sc_ms__o22a_1
 sky130_fd_sc_ms__o22a_2
+sky130_fd_sc_ms__o22ai_1
+sky130_fd_sc_ms__o22ai_2
 sky130_fd_sc_ms__o22ai_4
 sky130_fd_sc_ms__o2bb2a_1
 sky130_fd_sc_ms__o2bb2a_2
 sky130_fd_sc_ms__o2bb2a_4
 sky130_fd_sc_ms__o2bb2ai_1
+sky130_fd_sc_ms__o2bb2ai_2
 sky130_fd_sc_ms__o2bb2ai_4
 sky130_fd_sc_ms__o311a_1
 sky130_fd_sc_ms__o311a_2
 sky130_fd_sc_ms__o311a_4
 sky130_fd_sc_ms__o311ai_0
 sky130_fd_sc_ms__o311ai_1
+sky130_fd_sc_ms__o311ai_2
 sky130_fd_sc_ms__o311ai_4
 sky130_fd_sc_ms__o31a_1
 sky130_fd_sc_ms__o31a_2
 sky130_fd_sc_ms__o31a_4
 sky130_fd_sc_ms__o31ai_1
+sky130_fd_sc_ms__o31ai_2
 sky130_fd_sc_ms__o31ai_4
 sky130_fd_sc_ms__o32a_1
 sky130_fd_sc_ms__o32a_2
 sky130_fd_sc_ms__o32ai_1
+sky130_fd_sc_ms__o32ai_2
 sky130_fd_sc_ms__o41a_1
 sky130_fd_sc_ms__o41a_2
 sky130_fd_sc_ms__o41ai_1
+sky130_fd_sc_ms__o41ai_2
 sky130_fd_sc_ms__or2_0
 sky130_fd_sc_ms__or2_1
 sky130_fd_sc_ms__or2b_1
+sky130_fd_sc_ms__or2b_2
 sky130_fd_sc_ms__or2b_4
 sky130_fd_sc_ms__or3_1
 sky130_fd_sc_ms__or3b_1
+sky130_fd_sc_ms__or3b_2
 sky130_fd_sc_ms__or3b_4
 sky130_fd_sc_ms__or4_1
 sky130_fd_sc_ms__or4b_1
+sky130_fd_sc_ms__or4b_2
 sky130_fd_sc_ms__or4b_4
 sky130_fd_sc_ms__or4bb_1
+sky130_fd_sc_ms__or4bb_2
 sky130_fd_sc_ms__or4bb_4
-sky130_fd_sc_ms__probe_s8p_8
-sky130_fd_sc_ms__probec_s8p_8
 sky130_fd_sc_ms__sdfbbn_1
+sky130_fd_sc_ms__sdfbbn_2
 sky130_fd_sc_ms__sdfbbp_1
 sky130_fd_sc_ms__sdfrbp_1
+sky130_fd_sc_ms__sdfrbp_2
 sky130_fd_sc_ms__sdfrtn_1
 sky130_fd_sc_ms__sdfrtp_1
+sky130_fd_sc_ms__sdfrtp_2
 sky130_fd_sc_ms__sdfrtp_4
 sky130_fd_sc_ms__sdfsbp_1
+sky130_fd_sc_ms__sdfsbp_2
 sky130_fd_sc_ms__sdfstp_1
+sky130_fd_sc_ms__sdfstp_2
 sky130_fd_sc_ms__sdfstp_4
 sky130_fd_sc_ms__sdfxbp_1
+sky130_fd_sc_ms__sdfxbp_2
 sky130_fd_sc_ms__sdfxtp_1
+sky130_fd_sc_ms__sdfxtp_2
 sky130_fd_sc_ms__sdfxtp_4
 sky130_fd_sc_ms__sdlclkp_1
 sky130_fd_sc_ms__sdlclkp_2
@@ -418,8 +351,10 @@
 sky130_fd_sc_ms__sedfxtp_2
 sky130_fd_sc_ms__sedfxtp_4
 sky130_fd_sc_ms__xnor2_1
+sky130_fd_sc_ms__xnor3_1
+sky130_fd_sc_ms__xnor3_2
+sky130_fd_sc_ms__xnor3_4
 sky130_fd_sc_ms__xor2_1
-sky130_fd_sc_ms__buf_16
-sky130_fd_sc_ms__lpflow_lsbuf_lh_hl_isowell_tap_1
-sky130_fd_sc_ms__lpflow_lsbuf_lh_hl_isowell_tap_2
-sky130_fd_sc_ms__lpflow_lsbuf_lh_hl_isowell_tap_4
+sky130_fd_sc_ms__xor3_1
+sky130_fd_sc_ms__xor3_2
+sky130_fd_sc_ms__xor3_4