diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addf_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_1.gds
index 5903eaa..109b31d 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__addf_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addf_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_l.gds
index 2d6ea32..afe40b2 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__addf_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addf_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addh_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_1.gds
index 35c7ea2..60449a6 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__addh_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__addh_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_l.gds
index 4faf491..30faf80 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__addh_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__addh_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_1.gds
index d54df1e..1010c90 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_2.gds
index 197837f..a2ff36f 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_2.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_4.gds
index b9923f5..2ebfaad 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_4.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_6.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_6.gds
index 617b0bc..5c4d7d1 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_6.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_6.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_8.gds
index a6d189f..b3b0a02 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_8.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_l.gds
index 7abaf25..817a6bd 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__and2_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__and2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__ant.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__ant.gds
index b9bbc5a..e986a16 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__ant.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__ant.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__antfill.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__antfill.gds
index b9ffc19..6e1b109 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__antfill.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__antfill.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__aoi21_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi21_l.gds
index 700db18..a3547a1 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__aoi21_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi21_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__aoi22_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi22_l.gds
index 5148667..30335be 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__aoi22_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__aoi22_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_1.gds
index bd25e03..c89ff6d 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_2.gds
index a5e768f..a64e36c 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_2.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_4.gds
index a3d54b7..c440848 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_4.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_6.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_6.gds
index 54108ac..4c69b1b 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_6.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_6.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_8.gds
index 10991d2..ce6e374 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_8.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_l.gds
index 50c06c1..0d92aa3 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__buf_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__buf_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__decap_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_1.gds
index f78ff22..4081739 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__decap_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__decap_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_l.gds
index ec67d6b..74f3b64 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__decap_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__decap_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dff_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_1.gds
index c06761b..68a5294 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dff_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dff_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_l.gds
index 4bebcf7..2d9e2e7 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dff_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dff_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_1.gds
index 8ee77cb..90db7d2 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_l.gds
index 361d3e6..309b02f 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffr_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_1.gds
index 6074444..ca406a1 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_l.gds
index 71c27ef..fff924b 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffs_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_1.gds
index f7f6f1b..b891611 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_l.gds
index 47cc53c..d877935 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__dffsr_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_1.gds
index 7bf3910..d30aacf 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_16.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_16.gds
index c319090..8af248f 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_16.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_16.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_2.gds
index a4b3ad5..97bbdd2 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_2.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_32.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_32.gds
index e09dd08..dcdb15a 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_32.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_32.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_4.gds
index 101d87f..2d27241 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_4.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_8.gds
index 0deeb13..50b14cc 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__fill_8.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__fill_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_1.gds
index 275f710..47a5259 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_10.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_10.gds
index 2527611..8af28c4 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_10.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_10.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_2.gds
index a259a7d..cf0b565 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_2.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_3.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_3.gds
index dc243a9..005edff 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_3.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_3.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_4.gds
index a7b3224..e43ca33 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_4.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_6.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_6.gds
index a845722..572884e 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_6.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_6.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_8.gds
index 24d03d7..e3702f4 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_8.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_l.gds
index fa2b4ee..c6c9da9 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__inv_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__inv_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__mux2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__mux2_1.gds
index 3fb3951..7a8539f 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__mux2_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__mux2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_1.gds
index 0334b2d..250bd12 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_l.gds
index a6c5f84..8708fc2 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nand2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_1.gds
index 296f314..db35b5d 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_l.gds
index e038ecc..5226a28 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__nor2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__oai21_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__oai21_l.gds
index e79b74e..aff08bb 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__oai21_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__oai21_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__oai22_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__oai22_l.gds
index 276e7ca..d580273 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__oai22_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__oai22_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_1.gds
index eebfd2f..df717f2 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_2.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_2.gds
index d307d27..642ffee 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_2.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_2.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_4.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_4.gds
index 7b52b0b..513fc2f 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_4.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_4.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_8.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_8.gds
index bd90893..068dfa1 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_8.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_8.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_l.gds
index 53bc42c..3867cfc 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__or2_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__or2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_1.gds
index 42f989a..076b3a5 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_l.gds
index 6b9e9f7..efc00e0 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tbufi_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tiehi.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tiehi.gds
index 8a03e99..b918b10 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__tiehi.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tiehi.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tielo.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tielo.gds
index 432068c..0822134 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__tielo.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tielo.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_1.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_1.gds
index 1b04972..01bba5e 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_1.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_1.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_l.gds
index f7599db..723e846 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__tnbufi_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__xnor2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__xnor2_l.gds
index 1c3017f..41ad7d3 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__xnor2_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__xnor2_l.gds
Binary files differ
diff --git a/15T_hs/gds/sky130_osu_sc_15T_hs__xor2_l.gds b/15T_hs/gds/sky130_osu_sc_15T_hs__xor2_l.gds
index b82b86e..4ea5d93 100644
--- a/15T_hs/gds/sky130_osu_sc_15T_hs__xor2_l.gds
+++ b/15T_hs/gds/sky130_osu_sc_15T_hs__xor2_l.gds
Binary files differ
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addf_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_1.mag
index 38e0bec..57b9cce 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__addf_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_1.mag
@@ -1,26 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007747
+timestamp 1606864573
 << checkpaint >>
 rect -1269 -242 2695 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1435 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 410 115 440 263
-rect 496 115 526 263
-rect 582 115 612 263
-rect 668 115 698 263
-rect 754 115 784 263
-rect 840 115 870 263
-rect 922 115 952 263
-rect 1004 115 1034 263
-rect 1102 115 1132 263
-rect 1292 115 1322 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -36,6 +22,21 @@
 rect 1004 565 1034 965
 rect 1102 565 1132 965
 rect 1292 565 1322 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 410 115 440 263
+rect 496 115 526 263
+rect 582 115 612 263
+rect 668 115 698 263
+rect 754 115 784 263
+rect 840 115 870 263
+rect 922 115 952 263
+rect 1004 115 1034 263
+rect 1102 115 1132 263
+rect 1292 115 1322 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -369,18 +370,18 @@
 rect 1265 479 1299 513
 rect 1014 301 1048 335
 << locali >>
-rect 0 1093 1408 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1408 1093
+rect 0 1089 1408 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1408 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -483,39 +484,39 @@
 rect 1247 165 1281 181
 rect 1247 61 1281 131
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 80 449 114 483
 rect 248 375 282 409
 rect 80 301 114 335
@@ -532,40 +533,40 @@
 rect 1014 301 1048 335
 rect 1211 227 1245 261
 rect 1333 523 1367 557
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1408 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1408 1093
-rect 0 1049 1408 1059
+rect 0 1089 1408 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1408 1089
+rect 0 1049 1408 1055
 rect 1131 632 1189 638
 rect 1109 598 1143 632
 rect 1177 598 1189 632
@@ -619,19 +620,19 @@
 rect 281 221 339 227
 rect 765 221 823 227
 rect 1199 221 1257 227
-rect 0 51 1408 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1408 51
-rect 0 0 1408 17
+rect 0 55 1408 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1408 55
+rect 0 0 1408 21
 << labels >>
 rlabel viali 97 318 97 318 1 A
 port 1 n
@@ -645,6 +646,6 @@
 port 5 n
 rlabel viali 1350 540 1350 540 1 CO
 port 6 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addf_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_l.mag
index d92f310..5546bfa 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__addf_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addf_l.mag
@@ -1,26 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864573
 << checkpaint >>
 rect -1269 -242 2695 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1435 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 410 115 440 263
-rect 496 115 526 263
-rect 582 115 612 263
-rect 668 115 698 263
-rect 754 115 784 263
-rect 840 115 870 263
-rect 922 115 952 263
-rect 1004 115 1034 263
-rect 1102 115 1132 219
-rect 1292 115 1322 219
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -36,6 +22,21 @@
 rect 1004 565 1034 965
 rect 1102 713 1132 965
 rect 1292 713 1322 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 410 115 440 263
+rect 496 115 526 263
+rect 582 115 612 263
+rect 668 115 698 263
+rect 754 115 784 263
+rect 840 115 870 263
+rect 922 115 952 263
+rect 1004 115 1034 263
+rect 1102 115 1132 219
+rect 1292 115 1322 219
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -371,18 +372,18 @@
 rect 1265 479 1299 513
 rect 1014 301 1048 335
 << locali >>
-rect 0 1093 1408 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1408 1093
+rect 0 1089 1408 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1408 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -485,39 +486,39 @@
 rect 1247 61 1281 131
 rect 1333 165 1367 523
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 80 449 114 483
 rect 248 375 282 409
 rect 80 301 114 335
@@ -534,40 +535,40 @@
 rect 1014 301 1048 335
 rect 1211 227 1245 261
 rect 1333 523 1367 557
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1408 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1408 1093
-rect 0 1049 1408 1059
+rect 0 1089 1408 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1408 1089
+rect 0 1049 1408 1055
 rect 1131 638 1189 644
 rect 1109 604 1143 638
 rect 1177 604 1189 638
@@ -621,19 +622,19 @@
 rect 281 221 339 227
 rect 765 221 823 227
 rect 1199 221 1257 227
-rect 0 51 1408 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1408 51
-rect 0 0 1408 17
+rect 0 55 1408 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1408 55
+rect 0 0 1408 21
 << labels >>
 rlabel viali 97 318 97 318 1 A
 port 1 n
@@ -645,8 +646,8 @@
 port 5 n
 rlabel viali 1160 621 1160 621 1 S
 port 6 n
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 1228 244 1228 244 1 CON
 port 4 n
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addh_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_1.mag
index 99d1cdf..63b9f64 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__addh_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_1.mag
@@ -1,19 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864573
 << checkpaint >>
 rect -1269 -242 2097 2379
+rect -1209 -1243 2025 -242
 << nwell >>
 rect -9 529 837 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 178 115 208 263
-rect 250 115 280 263
-rect 442 115 472 263
-rect 540 115 570 263
-rect 626 115 656 263
-rect 712 115 742 263
 << pmos >>
 rect 80 565 110 965
 rect 178 565 208 965
@@ -22,6 +15,14 @@
 rect 552 565 582 965
 rect 638 565 668 965
 rect 710 565 740 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 178 115 208 263
+rect 250 115 280 263
+rect 442 115 472 263
+rect 540 115 570 263
+rect 626 115 656 263
+rect 712 115 742 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -212,14 +213,14 @@
 rect 624 375 658 409
 rect 348 322 382 356
 << locali >>
-rect 0 1093 836 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 836 1093
+rect 0 1089 836 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 836 1089
 rect 35 949 69 965
 rect 35 575 69 597
 rect 133 949 167 1049
@@ -273,27 +274,27 @@
 rect 581 129 615 131
 rect 753 129 787 131
 rect 581 95 787 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 836 61
-rect 0 0 836 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 836 61
+rect 0 0 836 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 35 609 69 631
 rect 35 597 69 609
 rect 260 449 294 483
@@ -306,28 +307,28 @@
 rect 624 375 658 409
 rect 507 301 541 335
 rect 667 301 701 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 836 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 836 1093
-rect 0 1049 836 1059
+rect 0 1089 836 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 836 1089
+rect 0 1049 836 1055
 rect 23 631 81 637
 rect 23 597 35 631
 rect 69 597 81 631
@@ -368,15 +369,15 @@
 rect 23 226 35 260
 rect 69 226 81 260
 rect 23 220 81 226
-rect 0 51 836 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 836 51
-rect 0 0 836 17
+rect 0 55 836 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 836 55
+rect 0 0 836 21
 << labels >>
 rlabel metal1 50 425 50 425 1 S
 port 1 n
@@ -388,6 +389,6 @@
 port 4 n
 rlabel viali 684 318 684 318 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__addh_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_l.mag
index 099e933..8c1055b 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__addh_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__addh_l.mag
@@ -1,19 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864574
 << checkpaint >>
 rect -1269 -242 2097 2379
+rect -1209 -1243 2025 -242
 << nwell >>
 rect -9 529 837 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 178 115 208 263
-rect 250 115 280 263
-rect 442 115 472 237
-rect 540 115 570 263
-rect 626 115 656 263
-rect 712 115 742 263
 << pmos >>
 rect 80 713 110 965
 rect 178 565 208 965
@@ -22,6 +15,14 @@
 rect 552 565 582 965
 rect 638 565 668 965
 rect 710 565 740 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 178 115 208 263
+rect 250 115 280 263
+rect 442 115 472 237
+rect 540 115 570 263
+rect 626 115 656 263
+rect 712 115 742 263
 << ndiff >>
 rect 125 233 178 263
 rect 125 219 133 233
@@ -216,14 +217,14 @@
 rect 624 375 658 409
 rect 348 322 382 356
 << locali >>
-rect 0 1093 836 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 836 1093
+rect 0 1089 836 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 836 1089
 rect 35 949 69 965
 rect 35 631 69 745
 rect 133 949 167 1049
@@ -279,27 +280,27 @@
 rect 581 129 615 131
 rect 753 129 787 131
 rect 581 95 787 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 836 61
-rect 0 0 836 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 836 61
+rect 0 0 836 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 35 597 69 631
 rect 260 449 294 483
 rect 164 375 198 409
@@ -310,28 +311,28 @@
 rect 624 375 658 409
 rect 507 301 541 335
 rect 667 301 701 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 836 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 836 1093
-rect 0 1049 836 1059
+rect 0 1089 836 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 836 1089
+rect 0 1049 836 1055
 rect 23 631 81 637
 rect 23 597 35 631
 rect 69 597 81 631
@@ -372,15 +373,15 @@
 rect 23 226 35 260
 rect 69 226 81 260
 rect 23 220 81 226
-rect 0 51 836 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 836 51
-rect 0 0 836 17
+rect 0 55 836 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 836 55
+rect 0 0 836 21
 << labels >>
 rlabel metal1 50 425 50 425 1 S
 port 1 n
@@ -392,6 +393,6 @@
 port 4 n
 rlabel viali 684 318 684 318 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_1.mag
index fcd0f27..47bb731 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_1.mag
@@ -1,19 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864574
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -103,10 +104,10 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -128,30 +129,30 @@
 rect 193 233 227 249
 rect 193 61 227 131
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 233 327 261
 rect 293 227 327 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_2.mag
index cc937e8..0c2abbe 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_2.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_2.mag
@@ -1,21 +1,22 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864574
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
 rect 338 565 368 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -126,11 +127,11 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -156,36 +157,36 @@
 rect 293 115 327 131
 rect 379 233 413 249
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 233 327 261
 rect 293 227 327 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -203,12 +204,12 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 191 540 191 540 1 B
 port 1 n
@@ -216,6 +217,6 @@
 port 2 n
 rlabel metal1 311 392 311 392 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_4.mag
index f2ac623..3342006 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_4.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_4.mag
@@ -1,18 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864574
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -20,6 +14,13 @@
 rect 338 565 368 965
 rect 424 565 454 965
 rect 510 565 540 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -164,12 +165,12 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -202,21 +203,21 @@
 rect 465 115 499 131
 rect 551 233 585 249
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
@@ -225,22 +226,22 @@
 rect 293 227 327 233
 rect 465 233 499 261
 rect 465 227 499 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -265,13 +266,13 @@
 rect 499 227 511 261
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -279,6 +280,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_6.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_6.mag
index 4dd735a..8813271 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_6.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_6.mag
@@ -4,17 +4,9 @@
 timestamp 1604007749
 << checkpaint >>
 rect -1269 -242 2074 2379
+rect -1260 -1260 1261 -242
 << nwell >>
 rect -9 529 814 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -24,6 +16,15 @@
 rect 510 565 540 965
 rect 596 565 626 965
 rect 682 565 712 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_8.mag
index f4b752e..b7b5ef1 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_8.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_8.mag
@@ -1,22 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864575
 << checkpaint >>
 rect -1269 -242 2250 2379
+rect -1209 -1243 2161 -242
 << nwell >>
 rect -9 529 990 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
-rect 854 115 884 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -28,6 +18,17 @@
 rect 682 565 712 965
 rect 768 565 798 965
 rect 854 565 884 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
+rect 854 115 884 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -247,15 +248,15 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -302,30 +303,30 @@
 rect 809 115 843 131
 rect 895 233 929 249
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
@@ -340,31 +341,31 @@
 rect 637 227 671 233
 rect 809 233 843 261
 rect 809 227 843 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -404,16 +405,16 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel viali 191 540 191 540 1 B
 port 1 n
@@ -421,6 +422,6 @@
 port 2 n
 rlabel metal1 311 392 311 392 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_l.mag
index 589ad0a..2635e76 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__and2_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__and2_l.mag
@@ -1,19 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864575
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 252 115 282 219
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
 rect 252 713 282 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
+rect 252 115 282 219
 << ndiff >>
 rect 27 199 80 219
 rect 27 131 35 199
@@ -103,10 +104,10 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 121 949 155 965
 rect 35 797 69 813
@@ -129,29 +130,29 @@
 rect 193 61 227 131
 rect 293 199 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__ant.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__ant.mag
index bb494cb..82698b7 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__ant.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__ant.mag
@@ -1,15 +1,16 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864575
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
-<< nmoslvt >>
-rect 80 115 110 263
 << pmos >>
 rect 80 565 110 965
+<< nmoslvt >>
+rect 80 115 110 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -56,9 +57,9 @@
 << polycont >>
 rect 47 449 81 483
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 965
 rect 35 483 69 605
 rect 121 949 155 1049
@@ -71,31 +72,31 @@
 rect 35 115 69 131
 rect 121 215 155 331
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 449 81 483
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 483 108 489
 rect 35 449 47 483
 rect 81 449 108 483
 rect 35 443 108 449
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 466 64 466 1 A
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__antfill.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__antfill.mag
index ffd9206..24eee20 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__antfill.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__antfill.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864575
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << psubdiff >>
@@ -17,9 +18,9 @@
 << nsubdiffcont >>
 rect 51 1049 85 1083
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 483 69 965
 rect 121 589 155 1049
 rect 31 449 47 483
@@ -28,31 +29,31 @@
 rect 35 331 155 365
 rect 35 115 69 331
 rect 121 115 155 331
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 449 81 483
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 483 108 489
 rect 35 449 47 483
 rect 81 449 108 483
 rect 35 443 108 449
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 466 64 466 1 A
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__aoi21_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi21_l.mag
index 703c600..2aec0a3 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__aoi21_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi21_l.mag
@@ -1,19 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864575
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 250 115 280 219
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 250 115 280 219
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -106,10 +107,10 @@
 rect 146 382 180 416
 rect 289 303 323 337
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 797 155 813
@@ -132,31 +133,31 @@
 rect 193 115 227 131
 rect 291 165 325 181
 rect 291 61 325 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 60 597 94 631
 rect 128 523 162 557
 rect 216 449 250 483
 rect 293 375 327 409
 rect 193 233 227 261
 rect 193 227 227 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 48 631 106 637
 rect 48 597 60 631
 rect 94 597 128 631
@@ -178,11 +179,11 @@
 rect 181 227 193 261
 rect 227 227 327 261
 rect 181 221 239 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 77 614 77 614 1 A0
 port 1 n
@@ -192,6 +193,6 @@
 port 3 n
 rlabel viali 145 540 145 540 1 A1
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__aoi22_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi22_l.mag
index 0377ffb..8a9c027 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__aoi22_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__aoi22_l.mag
@@ -1,21 +1,22 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864576
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
-rect 252 115 282 263
-rect 324 115 354 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
 rect 338 565 368 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
+rect 252 115 282 263
+rect 324 115 354 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -128,11 +129,11 @@
 rect 234 311 268 345
 rect 370 376 404 410
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 763 155 779
@@ -161,18 +162,18 @@
 rect 200 115 234 131
 rect 365 233 399 249
 rect 365 61 399 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 60 597 94 631
 rect 128 523 162 557
 rect 216 449 250 483
@@ -180,19 +181,19 @@
 rect 302 301 336 335
 rect 200 233 234 261
 rect 200 227 234 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 48 631 106 637
 rect 48 597 60 631
 rect 94 597 128 631
@@ -218,12 +219,12 @@
 rect 188 227 200 261
 rect 234 227 338 261
 rect 188 221 246 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 77 614 77 614 1 A0
 port 1 n
@@ -234,6 +235,6 @@
 rlabel viali 387 393 387 393 1 B1
 rlabel metal1 321 288 321 288 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_1.mag
index fd83fda..5b887c2 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_1.mag
@@ -1,17 +1,18 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864576
 << checkpaint >>
 rect -1269 -242 1548 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 288 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
 << ndiff >>
 rect 27 233 80 263
 rect 27 131 35 233
@@ -85,10 +86,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -105,29 +106,29 @@
 rect 121 233 155 249
 rect 121 61 155 131
 rect 207 115 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 233 241 261
 rect 207 227 241 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -141,16 +142,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 213 403 213 403 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 127 614 127 614 1 A
 port 1 n
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_2.mag
index b72a53f..f13438c 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_2.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_2.mag
@@ -1,21 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864576
 << checkpaint >>
 rect -1269 2461 1636 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1636 -1129
 << nwell >>
 rect -9 529 376 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -104,10 +104,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -129,28 +129,28 @@
 rect 207 115 241 131
 rect 293 215 327 231
 rect 293 61 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 227 241 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -164,16 +164,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_4.mag
index d085e37..b4c508e 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_4.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_4.mag
@@ -1,25 +1,25 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864576
 << checkpaint >>
 rect -1269 2461 1812 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1812 -1129
 << nwell >>
 rect -9 529 552 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
 rect 338 565 368 965
 rect 424 565 454 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -142,11 +142,11 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 550 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 550 1093
+rect 0 1089 550 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 550 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -178,36 +178,36 @@
 rect 379 115 413 131
 rect 465 215 499 231
 rect 465 61 499 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 550 61
-rect 0 0 550 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 550 61
+rect 0 0 550 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 379 523 413 557
 rect 207 227 241 261
 rect 379 227 413 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 550 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 550 1093
-rect 0 1049 550 1059
+rect 0 1089 550 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 550 1089
+rect 0 1049 550 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -228,17 +228,17 @@
 rect 413 227 425 261
 rect 195 221 253 227
 rect 367 221 425 227
-rect 0 51 550 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 550 51
-rect 0 0 550 17
+rect 0 55 550 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 550 55
+rect 0 0 550 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_6.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_6.mag
index 7108f30..de9735e 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_6.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_6.mag
@@ -8,14 +8,6 @@
 rect -1269 -1260 1988 -1129
 << nwell >>
 rect -9 529 728 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -24,6 +16,14 @@
 rect 424 565 454 965
 rect 510 565 540 965
 rect 596 565 626 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_8.mag
index 7987901..268f973 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_8.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_8.mag
@@ -1,23 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864576
 << checkpaint >>
 rect -1269 2461 2164 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 2164 -1129
 << nwell >>
 rect -9 529 904 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -28,6 +18,16 @@
 rect 596 565 626 965
 rect 682 565 712 965
 rect 768 565 798 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -225,14 +225,14 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 902 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 902 1093
+rect 0 1089 902 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 902 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -278,27 +278,27 @@
 rect 723 115 757 131
 rect 809 215 843 231
 rect 809 61 843 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 902 61
-rect 0 0 902 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 902 61
+rect 0 0 902 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 379 523 413 557
@@ -308,28 +308,28 @@
 rect 379 227 413 261
 rect 551 227 585 261
 rect 723 227 757 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 902 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 902 1093
-rect 0 1049 902 1059
+rect 0 1089 902 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 902 1089
+rect 0 1049 902 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -364,20 +364,20 @@
 rect 367 221 425 227
 rect 539 221 597 227
 rect 711 221 769 227
-rect 0 51 902 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 902 51
-rect 0 0 902 17
+rect 0 55 902 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 902 55
+rect 0 0 902 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_l.mag
index 5471d0b..d69d530 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__buf_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__buf_l.mag
@@ -1,17 +1,18 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864577
 << checkpaint >>
 rect -1269 -242 1548 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 288 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -85,10 +86,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 35 352 69 831
 rect 121 949 155 1049
@@ -106,28 +107,28 @@
 rect 121 61 155 131
 rect 207 165 241 227
 rect 207 115 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 227 241 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -141,16 +142,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 214 400 214 400 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__decap_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_1.mag
index ec0c702..f7561be 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__decap_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_1.mag
@@ -1,15 +1,16 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864577
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
-<< nmoslvt >>
-rect 80 115 110 367
 << pmos >>
 rect 80 713 110 965
+<< nmoslvt >>
+rect 80 115 110 367
 << ndiff >>
 rect 27 335 80 367
 rect 27 131 35 335
@@ -49,9 +50,9 @@
 rect 80 367 110 713
 rect 80 80 110 115
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 1049
@@ -60,24 +61,24 @@
 rect 35 61 69 131
 rect 121 335 155 351
 rect 121 61 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__decap_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_l.mag
index 1878c42..cbb6f9c 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__decap_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__decap_l.mag
@@ -1,15 +1,16 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864577
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
-<< nmoslvt >>
-rect 80 115 110 243
 << pmos >>
 rect 80 837 110 965
+<< nmoslvt >>
+rect 80 115 110 243
 << ndiff >>
 rect 27 215 80 243
 rect 27 131 35 215
@@ -49,9 +50,9 @@
 rect 80 243 110 837
 rect 80 80 110 115
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 849 69 865
 rect 121 949 155 1049
@@ -60,24 +61,24 @@
 rect 35 61 69 131
 rect 121 215 155 231
 rect 121 61 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dff_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_1.mag
index 8108b64..7dfb21c 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dff_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_1.mag
@@ -1,25 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864577
 << checkpaint >>
 rect -1269 -242 2716 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1456 1119
-<< nmoslvt >>
-rect 85 115 115 263
-rect 171 115 201 263
-rect 243 115 273 263
-rect 363 115 393 263
-rect 435 115 465 263
-rect 521 115 551 263
-rect 593 115 623 263
-rect 713 115 743 263
-rect 785 115 815 263
-rect 871 115 901 263
-rect 1061 115 1091 263
-rect 1251 115 1281 263
-rect 1337 115 1367 263
 << pmos >>
 rect 85 565 115 965
 rect 171 565 201 965
@@ -34,6 +21,20 @@
 rect 1061 565 1091 965
 rect 1251 565 1281 965
 rect 1337 565 1367 965
+<< nmoslvt >>
+rect 85 115 115 263
+rect 171 115 201 263
+rect 243 115 273 263
+rect 363 115 393 263
+rect 435 115 465 263
+rect 521 115 551 263
+rect 593 115 623 263
+rect 713 115 743 263
+rect 785 115 815 263
+rect 871 115 901 263
+rect 1061 115 1091 263
+rect 1251 115 1281 263
+rect 1337 115 1367 263
 << ndiff >>
 rect 32 215 85 263
 rect 32 131 40 215
@@ -368,18 +369,18 @@
 rect 1323 410 1357 444
 rect 1018 301 1052 335
 << locali >>
-rect 0 1093 1452 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1452 1093
+rect 0 1089 1452 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1452 1089
 rect 40 949 74 965
 rect 17 605 40 617
 rect 126 949 160 1049
@@ -483,39 +484,39 @@
 rect 1292 61 1326 131
 rect 1378 215 1412 234
 rect 1378 115 1412 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1452 61
-rect 0 0 1452 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1452 61
+rect 0 0 1452 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 40 301 74 335
 rect 253 449 287 483
 rect 181 375 215 409
@@ -530,40 +531,40 @@
 rect 1206 523 1240 557
 rect 1226 369 1260 403
 rect 1018 301 1052 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1452 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1452 1093
-rect 0 1049 1452 1059
+rect 0 1089 1452 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1452 1089
+rect 0 1049 1452 1055
 rect 1366 631 1424 637
 rect 1343 597 1378 631
 rect 1412 597 1424 631
@@ -607,19 +608,19 @@
 rect 1052 301 1064 335
 rect 523 295 581 301
 rect 1006 295 1064 301
-rect 0 51 1452 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1452 51
-rect 0 0 1452 17
+rect 0 55 1452 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1452 55
+rect 0 0 1452 21
 << labels >>
 rlabel viali 198 392 198 392 1 D
 port 1 n
@@ -629,6 +630,6 @@
 port 4 n
 rlabel viali 1224 540 1224 540 1 QN
 port 2 n
-rlabel viali 68 45 68 45 1 gnd
-rlabel viali 68 1067 68 1067 1 vdd
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1063 68 1063 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dff_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_l.mag
index 23f7484..a7c9b8a 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dff_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dff_l.mag
@@ -1,25 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864577
 << checkpaint >>
 rect -1269 -242 2716 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1456 1119
-<< nmoslvt >>
-rect 85 115 115 263
-rect 171 115 201 263
-rect 243 115 273 263
-rect 363 115 393 263
-rect 435 115 465 263
-rect 521 115 551 263
-rect 593 115 623 263
-rect 713 115 743 263
-rect 785 115 815 263
-rect 871 115 901 263
-rect 1061 115 1091 263
-rect 1251 115 1281 219
-rect 1337 115 1367 219
 << pmos >>
 rect 85 565 115 965
 rect 171 565 201 965
@@ -34,6 +21,20 @@
 rect 1061 565 1091 965
 rect 1251 713 1281 965
 rect 1337 713 1367 965
+<< nmoslvt >>
+rect 85 115 115 263
+rect 171 115 201 263
+rect 243 115 273 263
+rect 363 115 393 263
+rect 435 115 465 263
+rect 521 115 551 263
+rect 593 115 623 263
+rect 713 115 743 263
+rect 785 115 815 263
+rect 871 115 901 263
+rect 1061 115 1091 263
+rect 1251 115 1281 219
+rect 1337 115 1367 219
 << ndiff >>
 rect 32 215 85 263
 rect 32 131 40 215
@@ -368,18 +369,18 @@
 rect 1323 410 1357 444
 rect 1018 301 1052 335
 << locali >>
-rect 0 1093 1452 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1452 1093
+rect 0 1089 1452 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1452 1089
 rect 40 949 74 965
 rect 17 605 40 617
 rect 126 949 160 1049
@@ -485,39 +486,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 234
 rect 1378 115 1412 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1452 61
-rect 0 0 1452 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1452 61
+rect 0 0 1452 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 40 301 74 335
 rect 253 449 287 483
 rect 181 375 215 409
@@ -531,40 +532,40 @@
 rect 1206 523 1240 557
 rect 1226 369 1260 403
 rect 1018 301 1052 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1452 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1452 1093
-rect 0 1049 1452 1059
+rect 0 1089 1452 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1452 1089
+rect 0 1049 1452 1055
 rect 1365 631 1423 637
 rect 1343 597 1377 631
 rect 1411 597 1423 631
@@ -608,19 +609,19 @@
 rect 1052 301 1064 335
 rect 523 295 581 301
 rect 1006 295 1064 301
-rect 0 51 1452 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1452 51
-rect 0 0 1452 17
+rect 0 55 1452 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1452 55
+rect 0 0 1452 21
 << labels >>
 rlabel viali 198 392 198 392 1 D
 port 1 n
@@ -630,6 +631,6 @@
 port 3 n
 rlabel viali 915 466 915 466 1 CK
 port 4 n
-rlabel viali 68 45 68 45 1 gnd
-rlabel viali 68 1067 68 1067 1 vdd
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1063 68 1063 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_1.mag
index 8f4b908..71c0daa 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_1.mag
@@ -1,28 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864578
 << checkpaint >>
 rect -1270 -242 3177 2379
+rect -1210 -1243 3112 -242
 << nwell >>
 rect -10 529 1917 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 270 115 300 219
-rect 356 115 386 219
-rect 546 115 576 263
-rect 618 115 648 263
-rect 738 115 768 263
-rect 810 115 840 263
-rect 896 115 926 263
-rect 968 115 998 263
-rect 1088 115 1118 263
-rect 1160 115 1190 263
-rect 1246 115 1276 263
-rect 1436 115 1466 219
-rect 1522 115 1552 219
-rect 1712 115 1742 263
-rect 1798 115 1828 263
 << pmos >>
 rect 80 565 110 965
 rect 270 713 300 965
@@ -40,6 +24,23 @@
 rect 1508 713 1538 965
 rect 1712 565 1742 965
 rect 1798 565 1828 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 270 115 300 219
+rect 356 115 386 219
+rect 546 115 576 263
+rect 618 115 648 263
+rect 738 115 768 263
+rect 810 115 840 263
+rect 896 115 926 263
+rect 968 115 998 263
+rect 1088 115 1118 263
+rect 1160 115 1190 263
+rect 1246 115 1276 263
+rect 1436 115 1466 219
+rect 1522 115 1552 219
+rect 1712 115 1742 263
+rect 1798 115 1828 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -467,22 +468,22 @@
 rect 1784 410 1818 444
 rect 1545 257 1579 291
 << locali >>
-rect 0 1093 1914 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1914 1093
+rect 0 1089 1914 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1914 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -612,51 +613,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 234
 rect 1839 115 1873 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1914 61
-rect 0 0 1914 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1914 61
+rect 0 0 1914 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
 rect 47 597 81 631
 rect 229 257 263 261
 rect 229 227 263 257
@@ -675,52 +676,52 @@
 rect 1409 301 1443 335
 rect 1545 257 1579 261
 rect 1545 227 1579 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
 << metal1 >>
-rect 0 1093 1914 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1914 1093
-rect 0 1049 1914 1059
+rect 0 1089 1914 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1914 1089
+rect 0 1049 1914 1055
 rect 35 631 93 637
 rect 1826 631 1884 637
 rect 35 597 47 631
@@ -775,23 +776,23 @@
 rect 1579 227 1591 261
 rect 217 221 275 227
 rect 1533 221 1591 227
-rect 0 51 1914 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1914 51
-rect 0 0 1914 17
+rect 0 55 1914 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1914 55
+rect 0 0 1914 21
 << labels >>
 rlabel viali 65 614 65 614 1 RN
 port 1 n
@@ -803,6 +804,6 @@
 port 4 n
 rlabel viali 1685 540 1685 540 1 QN
 port 5 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_l.mag
index d88c5d6..3cc86ec 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffr_l.mag
@@ -1,28 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864578
 << checkpaint >>
 rect -1270 -242 3177 2379
+rect -1210 -1243 3112 -242
 << nwell >>
 rect -10 529 1917 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 270 115 300 219
-rect 356 115 386 219
-rect 546 115 576 263
-rect 618 115 648 263
-rect 738 115 768 263
-rect 810 115 840 263
-rect 896 115 926 263
-rect 968 115 998 263
-rect 1088 115 1118 263
-rect 1160 115 1190 263
-rect 1246 115 1276 263
-rect 1436 115 1466 219
-rect 1522 115 1552 219
-rect 1712 115 1742 219
-rect 1798 115 1828 219
 << pmos >>
 rect 80 565 110 965
 rect 270 713 300 965
@@ -40,6 +24,23 @@
 rect 1508 713 1538 965
 rect 1712 713 1742 965
 rect 1798 713 1828 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 270 115 300 219
+rect 356 115 386 219
+rect 546 115 576 263
+rect 618 115 648 263
+rect 738 115 768 263
+rect 810 115 840 263
+rect 896 115 926 263
+rect 968 115 998 263
+rect 1088 115 1118 263
+rect 1160 115 1190 263
+rect 1246 115 1276 263
+rect 1436 115 1466 219
+rect 1522 115 1552 219
+rect 1712 115 1742 219
+rect 1798 115 1828 219
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -467,22 +468,22 @@
 rect 1784 410 1818 444
 rect 1545 257 1579 291
 << locali >>
-rect 0 1093 1914 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1914 1093
+rect 0 1089 1914 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1914 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -612,51 +613,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 234
 rect 1839 115 1873 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1914 61
-rect 0 0 1914 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1914 61
+rect 0 0 1914 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
 rect 47 597 81 631
 rect 229 257 263 261
 rect 229 227 263 257
@@ -675,52 +676,52 @@
 rect 1409 301 1443 335
 rect 1545 257 1579 261
 rect 1545 227 1579 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
 << metal1 >>
-rect 0 1093 1914 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1914 1093
-rect 0 1049 1914 1059
+rect 0 1089 1914 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1914 1089
+rect 0 1049 1914 1055
 rect 35 631 93 637
 rect 1826 631 1884 637
 rect 35 597 47 631
@@ -775,23 +776,23 @@
 rect 1579 227 1591 261
 rect 217 221 275 227
 rect 1533 221 1591 227
-rect 0 51 1914 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1914 51
-rect 0 0 1914 17
+rect 0 55 1914 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1914 55
+rect 0 0 1914 21
 << labels >>
 rlabel viali 65 614 65 614 1 RN
 port 1 n
@@ -803,6 +804,6 @@
 port 4 n
 rlabel viali 1685 540 1685 540 1 QN
 port 5 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_1.mag
index a224e18..87a3fe0 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_1.mag
@@ -1,27 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864578
 << checkpaint >>
 rect -1270 -242 3001 2379
+rect -1210 -1243 2840 -242
 << nwell >>
 rect -10 529 1741 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 356 115 386 263
-rect 428 115 458 263
-rect 548 115 578 263
-rect 620 115 650 263
-rect 706 115 736 263
-rect 778 115 808 263
-rect 898 115 928 263
-rect 970 115 1000 263
-rect 1056 115 1086 263
-rect 1246 115 1276 219
-rect 1318 115 1348 219
-rect 1522 115 1552 263
-rect 1608 115 1638 263
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
@@ -38,6 +23,22 @@
 rect 1332 713 1362 965
 rect 1522 565 1552 965
 rect 1608 565 1638 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
+rect 356 115 386 263
+rect 428 115 458 263
+rect 548 115 578 263
+rect 620 115 650 263
+rect 706 115 736 263
+rect 778 115 808 263
+rect 898 115 928 263
+rect 970 115 1000 263
+rect 1056 115 1086 263
+rect 1246 115 1276 219
+rect 1318 115 1348 219
+rect 1522 115 1552 263
+rect 1608 115 1638 263
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -423,20 +424,20 @@
 rect 1594 410 1628 444
 rect 1355 257 1389 291
 << locali >>
-rect 0 1093 1738 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1738 1093
+rect 0 1089 1738 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1738 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -548,45 +549,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 234
 rect 1649 115 1683 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1738 61
-rect 0 0 1738 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1738 61
+rect 0 0 1738 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
 rect 47 227 81 261
 rect 121 301 155 335
 rect 438 449 472 483
@@ -603,46 +604,46 @@
 rect 1203 301 1237 335
 rect 1355 257 1389 261
 rect 1355 227 1389 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
 << metal1 >>
-rect 0 1093 1738 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1738 1093
-rect 0 1049 1738 1059
+rect 0 1089 1738 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1738 1089
+rect 0 1049 1738 1055
 rect 1636 631 1694 637
 rect 1614 597 1648 631
 rect 1682 597 1694 631
@@ -693,21 +694,21 @@
 rect 1389 227 1401 261
 rect 35 221 93 227
 rect 1343 221 1401 227
-rect 0 51 1738 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1738 51
-rect 0 0 1738 17
+rect 0 55 1738 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1738 55
+rect 0 0 1738 21
 << labels >>
 rlabel viali 383 392 383 392 1 D
 port 1 n
@@ -718,6 +719,6 @@
 rlabel viali 1495 540 1495 540 1 QN
 port 3 n
 rlabel viali 64 244 64 244 1 SN
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_l.mag
index 36f7992..6ac3be5 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffs_l.mag
@@ -1,27 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864578
 << checkpaint >>
 rect -1270 -242 3001 2379
+rect -1210 -1243 2840 -242
 << nwell >>
 rect -10 529 1741 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
-rect 356 115 386 263
-rect 428 115 458 263
-rect 548 115 578 263
-rect 620 115 650 263
-rect 706 115 736 263
-rect 778 115 808 263
-rect 898 115 928 263
-rect 970 115 1000 263
-rect 1056 115 1086 263
-rect 1246 115 1276 219
-rect 1318 115 1348 219
-rect 1522 115 1552 219
-rect 1608 115 1638 219
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
@@ -38,6 +23,22 @@
 rect 1332 713 1362 965
 rect 1522 713 1552 965
 rect 1608 713 1638 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
+rect 356 115 386 263
+rect 428 115 458 263
+rect 548 115 578 263
+rect 620 115 650 263
+rect 706 115 736 263
+rect 778 115 808 263
+rect 898 115 928 263
+rect 970 115 1000 263
+rect 1056 115 1086 263
+rect 1246 115 1276 219
+rect 1318 115 1348 219
+rect 1522 115 1552 219
+rect 1608 115 1638 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -423,20 +424,20 @@
 rect 1594 410 1628 444
 rect 1355 257 1389 291
 << locali >>
-rect 0 1093 1738 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1738 1093
+rect 0 1089 1738 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1738 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -548,45 +549,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 234
 rect 1649 115 1683 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1738 61
-rect 0 0 1738 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1738 61
+rect 0 0 1738 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
 rect 47 227 81 261
 rect 121 301 155 335
 rect 438 449 472 483
@@ -603,46 +604,46 @@
 rect 1203 301 1237 335
 rect 1355 257 1389 261
 rect 1355 227 1389 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
 << metal1 >>
-rect 0 1093 1738 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1738 1093
-rect 0 1049 1738 1059
+rect 0 1089 1738 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1738 1089
+rect 0 1049 1738 1055
 rect 1636 631 1694 637
 rect 1614 597 1648 631
 rect 1682 597 1694 631
@@ -693,21 +694,21 @@
 rect 1389 227 1401 261
 rect 35 221 93 227
 rect 1343 221 1401 227
-rect 0 51 1738 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1738 51
-rect 0 0 1738 17
+rect 0 55 1738 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1738 55
+rect 0 0 1738 21
 << labels >>
 rlabel viali 383 392 383 392 1 D
 port 1 n
@@ -718,6 +719,6 @@
 rlabel viali 1495 540 1495 540 1 QN
 port 3 n
 rlabel viali 64 244 64 244 1 SN
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_1.mag
index 3847568..62fabf9 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_1.mag
@@ -1,30 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864578
 << checkpaint >>
 rect -1270 -242 3350 2379
+rect -1210 -1243 3248 -242
 << nwell >>
 rect -10 529 2090 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 272 115 302 219
-rect 370 115 400 263
-rect 442 115 472 263
-rect 632 115 662 263
-rect 704 115 734 263
-rect 824 115 854 263
-rect 896 115 926 263
-rect 982 115 1012 263
-rect 1054 115 1084 263
-rect 1174 115 1204 263
-rect 1246 115 1276 263
-rect 1332 115 1362 263
-rect 1522 115 1552 263
-rect 1594 115 1624 263
-rect 1692 115 1722 219
-rect 1884 115 1914 263
-rect 1970 115 2000 263
 << pmos >>
 rect 80 565 110 965
 rect 270 565 300 965
@@ -44,6 +26,25 @@
 rect 1694 565 1724 965
 rect 1884 565 1914 965
 rect 1970 565 2000 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 272 115 302 219
+rect 370 115 400 263
+rect 442 115 472 263
+rect 632 115 662 263
+rect 704 115 734 263
+rect 824 115 854 263
+rect 896 115 926 263
+rect 982 115 1012 263
+rect 1054 115 1084 263
+rect 1174 115 1204 263
+rect 1246 115 1276 263
+rect 1332 115 1362 263
+rect 1522 115 1552 263
+rect 1594 115 1624 263
+rect 1692 115 1722 219
+rect 1884 115 1914 263
+rect 1970 115 2000 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -528,23 +529,23 @@
 rect 1956 410 1990 444
 rect 1755 257 1789 291
 << locali >>
-rect 0 1093 2090 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1954 1093
-rect 1988 1049 2090 1093
+rect 0 1089 2090 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1954 1089
+rect 1988 1049 2090 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -685,54 +686,54 @@
 rect 1925 61 1959 131
 rect 2011 215 2045 234
 rect 2011 115 2045 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1954 61
-rect 1988 17 2090 61
-rect 0 0 2090 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1954 61
+rect 1988 21 2090 61
+rect 0 0 2090 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
-rect 1954 1083 1988 1093
-rect 1954 1059 1988 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
+rect 1954 1083 1988 1089
+rect 1954 1055 1988 1083
 rect 47 597 81 631
 rect 325 523 359 557
 rect 325 301 359 335
@@ -754,55 +755,55 @@
 rect 1502 301 1536 335
 rect 1755 257 1789 261
 rect 1755 227 1789 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
-rect 1954 27 1988 51
-rect 1954 17 1988 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
+rect 1954 27 1988 55
+rect 1954 21 1988 27
 << metal1 >>
-rect 0 1093 2090 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1954 1093
-rect 1988 1059 2090 1093
-rect 0 1049 2090 1059
+rect 0 1089 2090 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1954 1089
+rect 1988 1055 2090 1089
+rect 0 1049 2090 1055
 rect 35 631 93 637
 rect 1999 631 2057 637
 rect 35 597 47 631
@@ -864,24 +865,24 @@
 rect 1789 227 1801 261
 rect 217 221 275 227
 rect 1743 221 1801 227
-rect 0 51 2090 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1954 51
-rect 1988 17 2090 51
-rect 0 0 2090 17
+rect 0 55 2090 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1954 55
+rect 1988 21 2090 55
+rect 0 0 2090 21
 << labels >>
 rlabel viali 659 392 659 392 1 D
 port 1 n
@@ -895,6 +896,6 @@
 port 5 n
 rlabel viali 2028 614 2028 614 1 Q
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_l.mag
index 8fcb91e..df41591 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__dffsr_l.mag
@@ -1,30 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864579
 << checkpaint >>
 rect -1270 -242 3350 2379
+rect -1210 -1243 3248 -242
 << nwell >>
 rect -10 529 2090 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 272 115 302 219
-rect 370 115 400 263
-rect 442 115 472 263
-rect 632 115 662 263
-rect 704 115 734 263
-rect 824 115 854 263
-rect 896 115 926 263
-rect 982 115 1012 263
-rect 1054 115 1084 263
-rect 1174 115 1204 263
-rect 1246 115 1276 263
-rect 1332 115 1362 263
-rect 1522 115 1552 263
-rect 1594 115 1624 263
-rect 1692 115 1722 219
-rect 1884 115 1914 219
-rect 1970 115 2000 219
 << pmos >>
 rect 80 565 110 965
 rect 270 565 300 965
@@ -44,6 +26,25 @@
 rect 1694 565 1724 965
 rect 1884 713 1914 965
 rect 1970 713 2000 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 272 115 302 219
+rect 370 115 400 263
+rect 442 115 472 263
+rect 632 115 662 263
+rect 704 115 734 263
+rect 824 115 854 263
+rect 896 115 926 263
+rect 982 115 1012 263
+rect 1054 115 1084 263
+rect 1174 115 1204 263
+rect 1246 115 1276 263
+rect 1332 115 1362 263
+rect 1522 115 1552 263
+rect 1594 115 1624 263
+rect 1692 115 1722 219
+rect 1884 115 1914 219
+rect 1970 115 2000 219
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -526,23 +527,23 @@
 rect 1956 410 1990 444
 rect 1755 257 1789 291
 << locali >>
-rect 0 1093 2090 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1954 1093
-rect 1988 1049 2090 1093
+rect 0 1089 2090 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1954 1089
+rect 1988 1049 2090 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -685,54 +686,54 @@
 rect 1925 61 1959 131
 rect 2011 165 2045 234
 rect 2011 115 2045 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1954 61
-rect 1988 17 2090 61
-rect 0 0 2090 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1954 61
+rect 1988 21 2090 61
+rect 0 0 2090 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
-rect 1954 1083 1988 1093
-rect 1954 1059 1988 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
+rect 1954 1083 1988 1089
+rect 1954 1055 1988 1083
 rect 47 597 81 631
 rect 325 523 359 557
 rect 325 301 359 335
@@ -753,55 +754,55 @@
 rect 1502 301 1536 335
 rect 1755 257 1789 261
 rect 1755 227 1789 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
-rect 1954 27 1988 51
-rect 1954 17 1988 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
+rect 1954 27 1988 55
+rect 1954 21 1988 27
 << metal1 >>
-rect 0 1093 2090 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1954 1093
-rect 1988 1059 2090 1093
-rect 0 1049 2090 1059
+rect 0 1089 2090 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1954 1089
+rect 1988 1055 2090 1089
+rect 0 1049 2090 1055
 rect 35 631 93 637
 rect 1998 631 2056 637
 rect 35 597 47 631
@@ -863,24 +864,24 @@
 rect 1789 227 1801 261
 rect 217 221 275 227
 rect 1743 221 1801 227
-rect 0 51 2090 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1954 51
-rect 1988 17 2090 51
-rect 0 0 2090 17
+rect 0 55 2090 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1954 55
+rect 1988 21 2090 55
+rect 0 0 2090 21
 << labels >>
 rlabel viali 659 392 659 392 1 D
 port 1 n
@@ -894,6 +895,6 @@
 port 5 n
 rlabel viali 65 614 65 614 1 RN
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_1.mag
index a6305de..fd20f37 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_1.mag
@@ -1,17 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864580
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1459 -1129
 << nwell >>
 rect -9 529 199 1119
-<< nmoslvt >>
-rect 80 115 110 263
 << pmos >>
 rect 80 565 110 965
+<< nmoslvt >>
+rect 80 115 110 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -72,22 +72,22 @@
 rect 35 61 69 131
 rect 121 215 155 227
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -101,15 +101,15 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel metal1 151 389 151 389 1 Y
 port 1 n
 rlabel viali 64 614 64 614 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_10.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_10.mag
index c678cba..957c28e 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_10.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_10.mag
@@ -1,24 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007754
+timestamp 1606864580
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 2250 -1129
 << nwell >>
 rect -9 529 990 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
-rect 854 115 884 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -30,6 +19,17 @@
 rect 682 565 712 965
 rect 768 565 798 965
 rect 854 565 884 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
+rect 854 115 884 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -243,15 +243,15 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -299,30 +299,30 @@
 rect 809 115 843 131
 rect 895 215 929 231
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -334,31 +334,31 @@
 rect 465 227 499 261
 rect 637 227 671 261
 rect 809 227 843 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -400,21 +400,21 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_2.mag
index 8fcbcb3..f0f1d46 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_2.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_2.mag
@@ -1,19 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864580
 << checkpaint >>
 rect -1269 2461 1547 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1547 -1129
 << nwell >>
 rect -9 529 287 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -84,10 +84,10 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -103,28 +103,28 @@
 rect 121 115 155 131
 rect 207 215 241 231
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -138,16 +138,16 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_3.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_3.mag
index 98ea9e3..2ddf63e 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_3.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_3.mag
@@ -1,21 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864580
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1635 -1129
 << nwell >>
 rect -9 529 375 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -100,10 +100,10 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -123,30 +123,30 @@
 rect 207 61 241 131
 rect 293 215 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
 rect 121 227 155 261
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -167,16 +167,16 @@
 rect 327 227 339 261
 rect 109 221 167 227
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_4.mag
index 3445774..0c6c059 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_4.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_4.mag
@@ -1,23 +1,23 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864581
 << checkpaint >>
 rect -1269 2461 1723 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1723 -1129
 << nwell >>
 rect -9 529 463 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
 rect 338 565 368 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -122,11 +122,11 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -150,36 +150,36 @@
 rect 293 115 327 131
 rect 379 215 413 231
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
 rect 121 227 155 261
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -200,17 +200,17 @@
 rect 327 227 339 261
 rect 109 221 167 227
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 64 613 64 613 1 A
 port 1 n
 rlabel metal1 152 388 152 388 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_6.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_6.mag
index b7d0ba7..3090eaf 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_6.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_6.mag
@@ -1,20 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864581
 << checkpaint >>
 rect -1269 2461 1899 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1899 -1129
 << nwell >>
 rect -9 529 639 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -22,6 +15,13 @@
 rect 338 565 368 965
 rect 424 565 454 965
 rect 510 565 540 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -161,12 +161,12 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -198,21 +198,21 @@
 rect 465 115 499 131
 rect 551 215 585 231
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -220,22 +220,22 @@
 rect 121 227 155 261
 rect 293 227 327 261
 rect 465 227 499 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -263,18 +263,18 @@
 rect 109 221 167 227
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 64 613 64 613 1 A
 port 1 n
 rlabel metal1 152 388 152 388 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_8.mag
index 2f7dc6f..ff62dfd 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_8.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_8.mag
@@ -1,22 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864581
 << checkpaint >>
 rect -1269 2461 2074 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 2074 -1129
 << nwell >>
 rect -9 529 814 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -26,6 +17,15 @@
 rect 510 565 540 965
 rect 596 565 626 965
 rect 682 565 712 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -199,13 +199,13 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 814 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 814 1093
+rect 0 1089 814 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 814 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -245,24 +245,24 @@
 rect 637 115 671 131
 rect 723 215 757 231
 rect 723 61 757 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 814 61
-rect 0 0 814 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 814 61
+rect 0 0 814 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -272,25 +272,25 @@
 rect 293 227 327 261
 rect 465 227 499 261
 rect 637 227 671 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
 << metal1 >>
-rect 0 1093 814 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 814 1093
-rect 0 1049 814 1059
+rect 0 1089 814 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 814 1089
+rect 0 1049 814 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -325,19 +325,19 @@
 rect 281 221 339 227
 rect 453 221 511 227
 rect 625 221 683 227
-rect 0 51 814 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 814 51
-rect 0 0 814 17
+rect 0 55 814 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 814 55
+rect 0 0 814 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_l.mag
index b06fc97..11bc61a 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__inv_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__inv_l.mag
@@ -1,15 +1,16 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864581
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
-<< nmoslvt >>
-rect 80 115 110 219
 << pmos >>
 rect 80 713 110 965
+<< nmoslvt >>
+rect 80 115 110 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -56,9 +57,9 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -70,22 +71,22 @@
 rect 35 61 69 131
 rect 121 165 155 227
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -99,15 +100,15 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 614 64 614 1 A
 port 1 n
 rlabel metal1 151 389 151 389 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__mux2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__mux2_1.mag
index a1aed2c..56e5fb0 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__mux2_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__mux2_1.mag
@@ -1,21 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864581
 << checkpaint >>
 rect -1269 2461 1813 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1813 -1129
 << nwell >>
 rect -9 529 553 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 270 115 300 263
-rect 356 115 386 263
 << pmos >>
 rect 80 565 110 965
 rect 270 565 300 965
 rect 356 565 386 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 270 115 300 263
+rect 356 115 386 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -124,9 +124,9 @@
 rect 37 392 71 426
 rect 168 301 202 335
 << locali >>
-rect 0 1093 550 1110
-rect 0 1049 459 1093
-rect 493 1049 550 1093
+rect 0 1089 550 1110
+rect 0 1049 459 1089
+rect 493 1049 550 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -158,33 +158,33 @@
 rect 311 115 345 131
 rect 397 215 431 449
 rect 397 115 431 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 550 61
-rect 0 0 550 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 550 61
+rect 0 0 550 21
 << viali >>
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 597 71 631
 rect 236 523 270 557
 rect 311 375 345 409
 rect 397 449 431 483
 rect 311 227 345 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 550 1110
-rect 0 1059 459 1093
-rect 493 1059 550 1093
-rect 0 1049 550 1059
+rect 0 1089 550 1110
+rect 0 1055 459 1089
+rect 493 1055 550 1089
+rect 0 1049 550 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 117 631
@@ -206,13 +206,13 @@
 rect 299 227 311 261
 rect 345 227 357 261
 rect 299 221 357 227
-rect 0 51 550 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 550 51
-rect 0 0 550 17
+rect 0 55 550 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 550 55
+rect 0 0 550 21
 << labels >>
 rlabel viali 54 614 54 614 1 S0
 port 1 n
@@ -222,6 +222,6 @@
 port 3 n
 rlabel viali 414 466 414 466 1 A1
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 476 1066 476 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 1062 476 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_1.mag
index 00743d1..4d7ac16 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_1.mag
@@ -1,19 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864582
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1546 -1129
 << nwell >>
 rect -9 529 286 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 152 115 182 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 152 115 182 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -81,10 +81,10 @@
 rect 47 468 81 502
 rect 166 375 200 409
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -100,29 +100,29 @@
 rect 35 115 69 131
 rect 193 215 227 231
 rect 193 61 227 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 449 155 483
 rect 195 523 229 557
 rect 35 227 69 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 115 631
@@ -140,11 +140,11 @@
 rect 23 227 35 261
 rect 69 227 155 261
 rect 23 221 81 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 136 418 136 418 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 212 540 212 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_l.mag
index a6655e7..cc6ee27 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nand2_l.mag
@@ -1,17 +1,18 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864582
 << checkpaint >>
 rect -1269 -242 1546 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 286 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 152 115 182 219
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 152 115 182 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -79,10 +80,10 @@
 rect 47 468 81 502
 rect 166 318 200 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -98,29 +99,29 @@
 rect 35 115 69 131
 rect 193 165 227 181
 rect 193 61 227 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 449 155 483
 rect 195 523 229 557
 rect 35 227 69 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 115 631
@@ -138,11 +139,11 @@
 rect 23 227 35 261
 rect 69 227 155 261
 rect 23 221 81 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 136 418 136 418 1 Y
 port 1 n
@@ -150,6 +151,6 @@
 port 2 n
 rlabel viali 64 614 64 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_1.mag
index bc56f7a..dbe0c4b 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_1.mag
@@ -1,19 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864582
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1546 -1129
 << nwell >>
 rect -9 529 286 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
 << pmos >>
 rect 80 565 110 965
 rect 152 565 182 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -81,10 +81,10 @@
 rect 181 482 215 516
 rect 66 349 100 383
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 193 949 227 1049
 rect 193 725 227 741
@@ -100,29 +100,29 @@
 rect 121 115 155 131
 rect 207 215 241 231
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 181 597 215 631
 rect 35 449 69 483
 rect 113 523 147 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 169 631 227 637
 rect 148 597 181 631
 rect 215 597 227 631
@@ -140,11 +140,11 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 137 341 137 341 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 198 614 198 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_l.mag
index 3355adf..3044bd3 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__nor2_l.mag
@@ -1,17 +1,18 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864582
 << checkpaint >>
 rect -1269 -242 1546 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 286 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
 << pmos >>
 rect 80 713 110 965
 rect 152 713 182 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -79,10 +80,10 @@
 rect 181 482 215 516
 rect 66 349 100 383
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 35 483 69 809
 rect 193 949 227 1049
@@ -98,29 +99,29 @@
 rect 121 115 155 131
 rect 207 165 241 181
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 181 597 215 631
 rect 35 449 69 483
 rect 113 523 147 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 169 631 227 637
 rect 148 597 181 631
 rect 215 597 227 631
@@ -138,11 +139,11 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 137 341 137 341 1 Y
 port 1 n
@@ -150,6 +151,6 @@
 port 2 n
 rlabel viali 130 540 130 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__oai21_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__oai21_l.mag
index c4d2acc..0905f9b 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__oai21_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__oai21_l.mag
@@ -1,19 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864582
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
 << pmos >>
 rect 80 565 110 965
 rect 152 565 182 965
 rect 250 713 280 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -103,10 +104,10 @@
 rect 152 375 186 409
 rect 262 307 296 341
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 193 949 227 1049
 rect 193 793 227 809
@@ -130,30 +131,30 @@
 rect 207 115 241 131
 rect 293 214 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 66 597 100 631
 rect 162 523 196 557
 rect 223 449 257 483
 rect 291 375 325 409
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 54 631 112 637
 rect 54 597 66 631
 rect 100 597 134 631
@@ -175,11 +176,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 83 614 83 614 1 A0
 port 1 n
@@ -189,6 +190,6 @@
 port 3 n
 rlabel viali 240 466 240 466 1 B0
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__oai22_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__oai22_l.mag
index bcf7e26..75f7cb0 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__oai22_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__oai22_l.mag
@@ -1,21 +1,22 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864583
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
 << pmos >>
 rect 80 565 110 965
 rect 152 565 182 965
 rect 252 565 282 965
 rect 324 565 354 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -127,11 +128,11 @@
 rect 384 376 418 410
 rect 248 311 282 345
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 200 949 234 965
@@ -162,37 +163,37 @@
 rect 207 129 241 131
 rect 379 129 413 131
 rect 207 95 413 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 66 597 100 631
 rect 162 523 196 557
 rect 223 449 257 483
 rect 384 376 418 410
 rect 316 301 350 335
 rect 316 227 350 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 54 631 112 637
 rect 54 597 66 631
 rect 100 597 134 631
@@ -218,12 +219,12 @@
 rect 304 227 316 261
 rect 350 227 362 261
 rect 304 221 362 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 240 466 240 466 1 B0
 port 4 n
@@ -234,6 +235,6 @@
 rlabel viali 333 318 333 318 1 Y
 port 3 n
 rlabel viali 401 393 401 393 1 B1
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_1.mag
index e9f2134..dc3962c 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_1.mag
@@ -1,21 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864583
 << checkpaint >>
 rect -1269 2461 1634 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1634 -1129
 << nwell >>
 rect -9 529 374 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -105,10 +105,10 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -131,29 +131,29 @@
 rect 207 61 241 131
 rect 293 215 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -171,11 +171,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -183,6 +183,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_2.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_2.mag
index e1e52cc..05c4b0f 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_2.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_2.mag
@@ -1,23 +1,23 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864583
 << checkpaint >>
 rect -1269 2461 1722 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1722 -1129
 << nwell >>
 rect -9 529 462 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 252 565 282 965
 rect 338 565 368 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -128,11 +128,11 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -159,35 +159,35 @@
 rect 293 115 327 131
 rect 379 215 413 231
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -205,12 +205,12 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -218,6 +218,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_4.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_4.mag
index 0ef160d..1bf24da 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_4.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_4.mag
@@ -1,20 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864583
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1898 -1129
 << nwell >>
 rect -9 529 638 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -22,6 +15,13 @@
 rect 338 565 368 965
 rect 424 565 454 965
 rect 510 565 540 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -166,12 +166,12 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -206,43 +206,43 @@
 rect 465 115 499 131
 rect 551 215 585 231
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 465 449 499 483
 rect 293 227 327 261
 rect 465 227 499 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -267,13 +267,13 @@
 rect 499 227 511 261
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -281,6 +281,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_8.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_8.mag
index 28604cc..29ce0cc 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_8.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_8.mag
@@ -1,24 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864583
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 2250 -1129
 << nwell >>
 rect -9 529 990 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 252 115 282 263
-rect 338 115 368 263
-rect 424 115 454 263
-rect 510 115 540 263
-rect 596 115 626 263
-rect 682 115 712 263
-rect 768 115 798 263
-rect 854 115 884 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -30,6 +19,17 @@
 rect 682 565 712 965
 rect 768 565 798 965
 rect 854 565 884 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 252 115 282 263
+rect 338 115 368 263
+rect 424 115 454 263
+rect 510 115 540 263
+rect 596 115 626 263
+rect 682 115 712 263
+rect 768 115 798 263
+rect 854 115 884 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -249,15 +249,15 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -308,30 +308,30 @@
 rect 809 115 843 131
 rect 895 215 929 231
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
@@ -342,31 +342,31 @@
 rect 465 227 499 261
 rect 637 227 671 261
 rect 809 227 843 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -406,16 +406,16 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -423,6 +423,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_l.mag
index 90e21ba..6a6e35c 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__or2_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__or2_l.mag
@@ -1,19 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864583
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 252 115 282 219
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
 rect 252 713 282 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+rect 252 115 282 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -103,10 +104,10 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 691 69 877
 rect 207 949 241 1049
@@ -129,29 +130,29 @@
 rect 207 61 241 131
 rect 293 165 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 190 614 190 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_1.mag
index 520638c..b85767c 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_1.mag
@@ -1,21 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864584
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1635 -1129
 << nwell >>
 rect -9 529 375 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 238 565 268 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -102,10 +102,10 @@
 rect 121 301 155 335
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 657 155 673
@@ -126,29 +126,29 @@
 rect 121 61 155 131
 rect 279 215 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 279 449 313 483
 rect 121 301 155 335
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -170,11 +170,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -182,6 +182,6 @@
 port 2 n
 rlabel metal1 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_l.mag
index 2e77b1f..ed546be 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tbufi_l.mag
@@ -1,19 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864584
 << checkpaint >>
 rect -1269 -242 1635 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 375 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
 rect 238 713 268 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+rect 238 115 268 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -100,10 +101,10 @@
 rect 121 301 155 335
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 461 69 809
 rect 121 949 155 1049
@@ -124,29 +125,29 @@
 rect 121 61 155 131
 rect 279 165 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 279 449 313 483
 rect 121 301 155 335
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -168,11 +169,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -180,6 +181,6 @@
 port 2 n
 rlabel metal1 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tiehi.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tiehi.mag
index 8c7f803..454c7ca 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__tiehi.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tiehi.mag
@@ -1,15 +1,16 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864584
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
-<< nmoslvt >>
-rect 80 115 110 263
 << pmos >>
 rect 80 565 110 965
+<< nmoslvt >>
+rect 80 115 110 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -56,9 +57,9 @@
 << polycont >>
 rect 90 331 124 365
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 589 69 605
 rect 121 949 155 965
@@ -69,31 +70,31 @@
 rect 35 61 69 131
 rect 121 215 155 331
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 121 523 155 557
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 94 557 167 563
 rect 94 523 121 557
 rect 155 523 167 557
 rect 94 517 167 523
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 138 540 138 540 1 Y
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tielo.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tielo.mag
index 8efa078..c05dd92 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__tielo.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tielo.mag
@@ -1,17 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864584
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1459 -1129
 << nwell >>
 rect -9 529 199 1119
-<< nmoslvt >>
-rect 80 115 110 263
 << pmos >>
 rect 80 565 110 965
+<< nmoslvt >>
+rect 80 115 110 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 463 124 497
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 589 69 605
 rect 121 949 155 965
@@ -71,31 +71,31 @@
 rect 35 61 69 131
 rect 121 215 155 301
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 121 301 155 335
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 94 335 167 341
 rect 94 301 121 335
 rect 155 301 167 335
 rect 94 295 167 301
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 138 318 138 318 1 Y
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_1.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_1.mag
index 1facdb3..cd4b230 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_1.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_1.mag
@@ -1,21 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864584
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
 rect -1269 -1260 1635 -1129
 << nwell >>
 rect -9 529 375 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
 rect 238 565 268 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -101,10 +101,10 @@
 rect 121 366 155 400
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 657 155 673
@@ -125,29 +125,29 @@
 rect 121 61 155 131
 rect 279 215 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 121 523 155 557
 rect 279 449 313 483
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -165,11 +165,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -177,6 +177,6 @@
 port 2 n
 rlabel viali 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_l.mag
index 670de55..c3df65f 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__tnbufi_l.mag
@@ -1,19 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864585
 << checkpaint >>
 rect -1269 -242 1635 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 375 1119
-<< nmoslvt >>
-rect 80 115 110 219
-rect 166 115 196 219
-rect 238 115 268 219
 << pmos >>
 rect 80 713 110 965
 rect 166 713 196 965
 rect 238 713 268 965
+<< nmoslvt >>
+rect 80 115 110 219
+rect 166 115 196 219
+rect 238 115 268 219
 << ndiff >>
 rect 27 165 80 219
 rect 27 131 35 165
@@ -99,10 +100,10 @@
 rect 121 366 155 400
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 400 69 809
 rect 121 949 155 1049
@@ -123,29 +124,29 @@
 rect 121 61 155 131
 rect 279 165 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 121 523 155 557
 rect 279 449 313 483
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -163,11 +164,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -175,6 +176,6 @@
 port 2 n
 rlabel viali 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__xnor2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__xnor2_l.mag
index a2cab30..eb8167d 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__xnor2_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__xnor2_l.mag
@@ -1,18 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864585
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-rect 358 115 388 263
-rect 430 115 460 263
-rect 516 115 546 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -20,6 +14,13 @@
 rect 358 565 388 965
 rect 430 565 460 965
 rect 516 565 546 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
+rect 358 115 388 263
+rect 430 115 460 263
+rect 516 115 546 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -171,12 +172,12 @@
 rect 336 301 370 335
 rect 489 301 523 335
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 35 443 69 605
 rect 121 949 155 1049
@@ -214,21 +215,21 @@
 rect 471 165 505 181
 rect 471 61 505 131
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 268 605 279 631
 rect 279 605 302 631
 rect 268 597 302 605
@@ -236,22 +237,22 @@
 rect 268 301 302 335
 rect 489 301 523 335
 rect 412 227 446 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 256 631 314 637
 rect 256 597 268 631
 rect 302 597 314 631
@@ -272,13 +273,13 @@
 rect 446 227 458 261
 rect 140 221 198 227
 rect 400 221 458 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 170 244 170 244 1 A
 port 1 n
@@ -286,6 +287,6 @@
 port 2 n
 rlabel metal1 284 375 284 375 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_hs/magic/sky130_osu_sc_15T_hs__xor2_l.mag b/15T_hs/magic/sky130_osu_sc_15T_hs__xor2_l.mag
index ab6684b..18150f0 100644
--- a/15T_hs/magic/sky130_osu_sc_15T_hs__xor2_l.mag
+++ b/15T_hs/magic/sky130_osu_sc_15T_hs__xor2_l.mag
@@ -1,18 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007760
+timestamp 1606864585
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
-<< nmoslvt >>
-rect 80 115 110 263
-rect 166 115 196 263
-rect 238 115 268 263
-rect 358 115 388 263
-rect 430 115 460 263
-rect 516 115 546 263
 << pmos >>
 rect 80 565 110 965
 rect 166 565 196 965
@@ -20,6 +14,13 @@
 rect 358 565 388 965
 rect 430 565 460 965
 rect 516 565 546 965
+<< nmoslvt >>
+rect 80 115 110 263
+rect 166 115 196 263
+rect 238 115 268 263
+rect 358 115 388 263
+rect 430 115 460 263
+rect 516 115 546 263
 << ndiff >>
 rect 27 215 80 263
 rect 27 131 35 215
@@ -170,12 +171,12 @@
 rect 430 375 464 409
 rect 248 301 282 335
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -215,42 +216,42 @@
 rect 471 61 505 131
 rect 557 215 591 301
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 200 597 234 631
 rect 412 597 446 631
 rect 268 449 302 483
 rect 489 523 523 557
 rect 296 227 330 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 188 631 246 637
 rect 400 631 458 637
 rect 188 597 200 631
@@ -271,13 +272,13 @@
 rect 268 227 296 261
 rect 330 227 342 261
 rect 284 221 342 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 218 614 218 614 1 A
 port 1 n
@@ -285,6 +286,6 @@
 port 2 n
 rlabel viali 506 540 506 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__addf_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__addf_1.gds
index 959379e..53e0f92 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__addf_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__addf_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__addf_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__addf_l.gds
index a9df40d..a7d26c1 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__addf_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__addf_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__addh_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__addh_1.gds
index 8f6c48a..32af6f4 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__addh_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__addh_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__addh_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__addh_l.gds
index da7ae51..7981b88 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__addh_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__addh_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_1.gds
index c5cf948..4513504 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_2.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_2.gds
index d57b5b1..2349626 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_2.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_2.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_4.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_4.gds
index 848ac92..2a5d822 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_4.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_4.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_6.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_6.gds
index bf8edab..6d2be7d 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_6.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_6.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_8.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_8.gds
index 51fc8cc..9298b48 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_8.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_8.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_l.gds
index 140586b..10e5648 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__and2_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__and2_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__ant.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__ant.gds
index d84ac1c..7c7d0bf 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__ant.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__ant.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__antfill.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__antfill.gds
index 0b49a3f..4e99b75 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__antfill.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__antfill.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__aoi21_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__aoi21_l.gds
index de5d88f..29e7339 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__aoi21_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__aoi21_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__aoi22_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__aoi22_l.gds
index f867c0f..ebd0123 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__aoi22_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__aoi22_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_1.gds
index a85ba1a..e38c354 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_2.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_2.gds
index 65df078..2648007 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_2.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_2.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_4.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_4.gds
index d532ec8..085fa13 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_4.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_4.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_6.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_6.gds
index 709ca3b..8442620 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_6.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_6.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_8.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_8.gds
index 01d9804..a98f8f4 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_8.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_8.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_l.gds
index b17eea6..d95c106 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__buf_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__buf_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__decap_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__decap_1.gds
index b033016..75ab489 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__decap_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__decap_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__decap_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__decap_l.gds
index 8ab1b2c..5de4e8c 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__decap_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__decap_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dff_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dff_1.gds
index 7c48c43..bb8eb9e 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dff_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dff_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dff_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dff_l.gds
index 92d178d..3e67c72 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dff_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dff_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_1.gds
index 83d12b9..0fe83ef 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_l.gds
index 41b0624..f365dcf 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dffr_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_1.gds
index 5b6ffe9..f25b7f3 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_l.gds
index a12bb24..8ced518 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dffs_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_1.gds
index 758944b..cddeb54 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_l.gds
index 8b8ee54..cfc6fb7 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__dffsr_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_1.gds
index 7101d99..4fa4540 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_16.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_16.gds
index 1665780..cdf0b7d 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_16.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_16.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_2.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_2.gds
index 935db02..6c54176 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_2.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_2.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_32.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_32.gds
index 775b32b..8301831 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_32.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_32.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_4.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_4.gds
index 29aa4bf..439b6d0 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_4.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_4.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_8.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_8.gds
index ff3dacd..796a1ba 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__fill_8.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__fill_8.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_1.gds
index 714a38f..838ed5a 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_10.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_10.gds
index 1df9351..eee9777 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_10.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_10.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_2.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_2.gds
index 2a6bd7d..e5db965 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_2.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_2.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_3.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_3.gds
index f0c621b..c295aac 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_3.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_3.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_4.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_4.gds
index e559706..d86723e 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_4.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_4.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_6.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_6.gds
index ad4af96..85a3cdc 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_6.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_6.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_8.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_8.gds
index cd4ec88..6625e82 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_8.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_8.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_l.gds
index e4724ba..96cc8ec 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__inv_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__inv_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__mux2_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__mux2_1.gds
index 2ff418b..ef0b75c 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__mux2_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__mux2_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_1.gds
index efd1e7a..e207b89 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_l.gds
index 548c9f3..ac4196d 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__nand2_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_1.gds
index 575a255..cc1e3e6 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_l.gds
index 98d5578..363b49b 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__nor2_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__oai21_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__oai21_l.gds
index cdbdf9e..5a44bb3 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__oai21_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__oai21_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__oai22_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__oai22_l.gds
index 9acf30c..fcf9482 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__oai22_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__oai22_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_1.gds
index b9fffd3..8c59d3a 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_2.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_2.gds
index f92e72a..f310960 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_2.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_2.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_4.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_4.gds
index 2f3883b..9c5f1f3 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_4.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_4.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_8.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_8.gds
index 5b58f9b..083ef2b 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_8.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_8.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_l.gds
index 34ba6db..f2fdfd9 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__or2_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__or2_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_1.gds
index bee92bc..821cf6c 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_l.gds
index a1b21ae..8281252 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__tbufi_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__tiehi.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__tiehi.gds
index 3e3edc5..651e4b4 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__tiehi.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__tiehi.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__tielo.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__tielo.gds
index 7113f9e..42bd273 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__tielo.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__tielo.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_1.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_1.gds
index 709e05e..91a2d9b 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_1.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_1.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_l.gds
index f775306..9ce4fe3 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__tnbufi_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__xnor2_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__xnor2_l.gds
index 56ffdbb..11ce7b5 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__xnor2_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__xnor2_l.gds
Binary files differ
diff --git a/15T_ls/gds/sky130_osu_sc_15T_ls__xor2_l.gds b/15T_ls/gds/sky130_osu_sc_15T_ls__xor2_l.gds
index 6bfbda2..3046f92 100644
--- a/15T_ls/gds/sky130_osu_sc_15T_ls__xor2_l.gds
+++ b/15T_ls/gds/sky130_osu_sc_15T_ls__xor2_l.gds
Binary files differ
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__addf_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__addf_1.mag
index c36305a..f9a81d0 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__addf_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__addf_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007747
+timestamp 1606864544
 << checkpaint >>
 rect -1269 -242 2695 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1435 1119
 << nmos >>
@@ -369,18 +370,18 @@
 rect 1265 479 1299 513
 rect 1014 301 1048 335
 << locali >>
-rect 0 1093 1408 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1408 1093
+rect 0 1089 1408 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1408 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -483,39 +484,39 @@
 rect 1247 165 1281 181
 rect 1247 61 1281 131
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 80 449 114 483
 rect 248 375 282 409
 rect 80 301 114 335
@@ -532,40 +533,40 @@
 rect 1014 301 1048 335
 rect 1211 227 1245 261
 rect 1333 523 1367 557
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1408 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1408 1093
-rect 0 1049 1408 1059
+rect 0 1089 1408 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1408 1089
+rect 0 1049 1408 1055
 rect 1131 632 1189 638
 rect 1109 598 1143 632
 rect 1177 598 1189 632
@@ -619,19 +620,19 @@
 rect 281 221 339 227
 rect 765 221 823 227
 rect 1199 221 1257 227
-rect 0 51 1408 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1408 51
-rect 0 0 1408 17
+rect 0 55 1408 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1408 55
+rect 0 0 1408 21
 << labels >>
 rlabel viali 97 318 97 318 1 A
 port 1 n
@@ -645,6 +646,6 @@
 port 5 n
 rlabel viali 1350 540 1350 540 1 CO
 port 6 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__addf_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__addf_l.mag
index 4773b2a..a4b9578 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__addf_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__addf_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864544
 << checkpaint >>
 rect -1269 -242 2695 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1435 1119
 << nmos >>
@@ -371,18 +372,18 @@
 rect 1265 479 1299 513
 rect 1014 301 1048 335
 << locali >>
-rect 0 1093 1408 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1408 1093
+rect 0 1089 1408 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1408 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -485,39 +486,39 @@
 rect 1247 61 1281 131
 rect 1333 165 1367 523
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 80 449 114 483
 rect 248 375 282 409
 rect 80 301 114 335
@@ -534,40 +535,40 @@
 rect 1014 301 1048 335
 rect 1211 227 1245 261
 rect 1333 523 1367 557
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1408 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1408 1093
-rect 0 1049 1408 1059
+rect 0 1089 1408 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1408 1089
+rect 0 1049 1408 1055
 rect 1131 638 1189 644
 rect 1109 604 1143 638
 rect 1177 604 1189 638
@@ -621,19 +622,19 @@
 rect 281 221 339 227
 rect 765 221 823 227
 rect 1199 221 1257 227
-rect 0 51 1408 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1408 51
-rect 0 0 1408 17
+rect 0 55 1408 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1408 55
+rect 0 0 1408 21
 << labels >>
 rlabel viali 97 318 97 318 1 A
 port 1 n
@@ -645,8 +646,8 @@
 port 5 n
 rlabel viali 1160 621 1160 621 1 S
 port 6 n
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 1228 244 1228 244 1 CON
 port 4 n
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__addh_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__addh_1.mag
index 81f2aeb..55b89b8 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__addh_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__addh_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864545
 << checkpaint >>
 rect -1269 -242 2097 2379
+rect -1209 -1243 2025 -242
 << nwell >>
 rect -9 529 837 1119
 << nmos >>
@@ -212,14 +213,14 @@
 rect 624 375 658 409
 rect 348 322 382 356
 << locali >>
-rect 0 1093 836 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 836 1093
+rect 0 1089 836 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 836 1089
 rect 35 949 69 965
 rect 35 575 69 597
 rect 133 949 167 1049
@@ -273,27 +274,27 @@
 rect 581 129 615 131
 rect 753 129 787 131
 rect 581 95 787 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 836 61
-rect 0 0 836 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 836 61
+rect 0 0 836 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 35 609 69 631
 rect 35 597 69 609
 rect 260 449 294 483
@@ -306,28 +307,28 @@
 rect 624 375 658 409
 rect 507 301 541 335
 rect 667 301 701 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 836 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 836 1093
-rect 0 1049 836 1059
+rect 0 1089 836 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 836 1089
+rect 0 1049 836 1055
 rect 23 631 81 637
 rect 23 597 35 631
 rect 69 597 81 631
@@ -368,15 +369,15 @@
 rect 23 226 35 260
 rect 69 226 81 260
 rect 23 220 81 226
-rect 0 51 836 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 836 51
-rect 0 0 836 17
+rect 0 55 836 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 836 55
+rect 0 0 836 21
 << labels >>
 rlabel metal1 50 425 50 425 1 S
 port 1 n
@@ -388,6 +389,6 @@
 port 4 n
 rlabel viali 684 318 684 318 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__addh_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__addh_l.mag
index b74aa57..4386a18 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__addh_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__addh_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864545
 << checkpaint >>
 rect -1269 -242 2097 2379
+rect -1209 -1243 2025 -242
 << nwell >>
 rect -9 529 837 1119
 << nmos >>
@@ -216,14 +217,14 @@
 rect 624 375 658 409
 rect 348 322 382 356
 << locali >>
-rect 0 1093 836 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 836 1093
+rect 0 1089 836 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 836 1089
 rect 35 949 69 965
 rect 35 631 69 745
 rect 133 949 167 1049
@@ -279,27 +280,27 @@
 rect 581 129 615 131
 rect 753 129 787 131
 rect 581 95 787 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 836 61
-rect 0 0 836 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 836 61
+rect 0 0 836 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 35 597 69 631
 rect 260 449 294 483
 rect 164 375 198 409
@@ -310,28 +311,28 @@
 rect 624 375 658 409
 rect 507 301 541 335
 rect 667 301 701 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 836 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 836 1093
-rect 0 1049 836 1059
+rect 0 1089 836 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 836 1089
+rect 0 1049 836 1055
 rect 23 631 81 637
 rect 23 597 35 631
 rect 69 597 81 631
@@ -372,15 +373,15 @@
 rect 23 226 35 260
 rect 69 226 81 260
 rect 23 220 81 226
-rect 0 51 836 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 836 51
-rect 0 0 836 17
+rect 0 55 836 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 836 55
+rect 0 0 836 21
 << labels >>
 rlabel metal1 50 425 50 425 1 S
 port 1 n
@@ -392,6 +393,6 @@
 port 4 n
 rlabel viali 684 318 684 318 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_1.mag
index 6b2b7bf..57a61ae 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864545
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -128,30 +129,30 @@
 rect 193 233 227 249
 rect 193 61 227 131
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 233 327 261
 rect 293 227 327 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_2.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_2.mag
index 1cd4214..6e2bd12 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_2.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_2.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864545
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
 << nmos >>
@@ -126,11 +127,11 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -156,36 +157,36 @@
 rect 293 115 327 131
 rect 379 233 413 249
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 233 327 261
 rect 293 227 327 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -203,12 +204,12 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 191 540 191 540 1 B
 port 1 n
@@ -216,6 +217,6 @@
 port 2 n
 rlabel metal1 311 392 311 392 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_4.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_4.mag
index c5a1cd9..4bc77f8 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_4.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_4.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864545
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
 << nmos >>
@@ -164,12 +165,12 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -202,21 +203,21 @@
 rect 465 115 499 131
 rect 551 233 585 249
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
@@ -225,22 +226,22 @@
 rect 293 227 327 233
 rect 465 233 499 261
 rect 465 227 499 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -265,13 +266,13 @@
 rect 499 227 511 261
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -279,6 +280,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_6.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_6.mag
index eb3adb5..a465aed 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_6.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_6.mag
@@ -4,6 +4,7 @@
 timestamp 1604007749
 << checkpaint >>
 rect -1269 -242 2074 2379
+rect -1260 -1260 1261 -242
 << nwell >>
 rect -9 529 814 1119
 << nmos >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_8.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_8.mag
index b9d8cbe..a5e11b8 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_8.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_8.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864546
 << checkpaint >>
 rect -1269 -242 2250 2379
+rect -1209 -1243 2161 -242
 << nwell >>
 rect -9 529 990 1119
 << nmos >>
@@ -247,15 +248,15 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -302,30 +303,30 @@
 rect 809 115 843 131
 rect 895 233 929 249
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
@@ -340,31 +341,31 @@
 rect 637 227 671 233
 rect 809 233 843 261
 rect 809 227 843 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -404,16 +405,16 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel viali 191 540 191 540 1 B
 port 1 n
@@ -421,6 +422,6 @@
 port 2 n
 rlabel metal1 311 392 311 392 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_l.mag
index 86eaae2..6d46506 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__and2_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__and2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864546
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 121 949 155 965
 rect 35 797 69 813
@@ -129,29 +130,29 @@
 rect 193 61 227 131
 rect 293 199 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__ant.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__ant.mag
index db5a9d3..49e2533 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__ant.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__ant.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864546
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -56,9 +57,9 @@
 << polycont >>
 rect 47 449 81 483
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 965
 rect 35 483 69 605
 rect 121 949 155 1049
@@ -71,31 +72,31 @@
 rect 35 115 69 131
 rect 121 215 155 331
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 449 81 483
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 483 108 489
 rect 35 449 47 483
 rect 81 449 108 483
 rect 35 443 108 449
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 466 64 466 1 A
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__antfill.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__antfill.mag
index ffd9206..1f34f32 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__antfill.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__antfill.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864546
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << psubdiff >>
@@ -17,9 +18,9 @@
 << nsubdiffcont >>
 rect 51 1049 85 1083
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 483 69 965
 rect 121 589 155 1049
 rect 31 449 47 483
@@ -28,31 +29,31 @@
 rect 35 331 155 365
 rect 35 115 69 331
 rect 121 115 155 331
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 449 81 483
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 483 108 489
 rect 35 449 47 483
 rect 81 449 108 483
 rect 35 443 108 449
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 466 64 466 1 A
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__aoi21_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__aoi21_l.mag
index ecb1d7e..aa18df1 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__aoi21_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__aoi21_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864547
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -106,10 +107,10 @@
 rect 146 382 180 416
 rect 289 303 323 337
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 797 155 813
@@ -132,31 +133,31 @@
 rect 193 115 227 131
 rect 291 165 325 181
 rect 291 61 325 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 60 597 94 631
 rect 128 523 162 557
 rect 216 449 250 483
 rect 293 375 327 409
 rect 193 233 227 261
 rect 193 227 227 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 48 631 106 637
 rect 48 597 60 631
 rect 94 597 128 631
@@ -178,11 +179,11 @@
 rect 181 227 193 261
 rect 227 227 327 261
 rect 181 221 239 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 77 614 77 614 1 A0
 port 1 n
@@ -192,6 +193,6 @@
 port 3 n
 rlabel viali 145 540 145 540 1 A1
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__aoi22_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__aoi22_l.mag
index cb4cf03..8b609b9 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__aoi22_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__aoi22_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864547
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
 << nmos >>
@@ -128,11 +129,11 @@
 rect 234 311 268 345
 rect 370 376 404 410
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 763 155 779
@@ -161,18 +162,18 @@
 rect 200 115 234 131
 rect 365 233 399 249
 rect 365 61 399 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 60 597 94 631
 rect 128 523 162 557
 rect 216 449 250 483
@@ -180,19 +181,19 @@
 rect 302 301 336 335
 rect 200 233 234 261
 rect 200 227 234 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 48 631 106 637
 rect 48 597 60 631
 rect 94 597 128 631
@@ -218,12 +219,12 @@
 rect 188 227 200 261
 rect 234 227 338 261
 rect 188 221 246 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 77 614 77 614 1 A0
 port 1 n
@@ -234,6 +235,6 @@
 rlabel viali 387 393 387 393 1 B1
 rlabel metal1 321 288 321 288 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_1.mag
index 907a41a..9817cfc 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864547
 << checkpaint >>
 rect -1269 -242 1548 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 288 1119
 << nmos >>
@@ -85,10 +86,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -105,29 +106,29 @@
 rect 121 233 155 249
 rect 121 61 155 131
 rect 207 115 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 233 241 261
 rect 207 227 241 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -141,16 +142,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 213 403 213 403 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 127 614 127 614 1 A
 port 1 n
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_2.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_2.mag
index 347f21d..e8c0059 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_2.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864547
 << checkpaint >>
 rect -1269 2461 1636 2601
 rect -1760 -1129 6260 2461
@@ -104,10 +104,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -129,28 +129,28 @@
 rect 207 115 241 131
 rect 293 215 327 231
 rect 293 61 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 227 241 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -164,16 +164,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_4.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_4.mag
index 292c2d9..0e3cc6d 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_4.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864547
 << checkpaint >>
 rect -1269 2461 1812 2601
 rect -1760 -1129 6260 2461
@@ -142,11 +142,11 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 550 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 550 1093
+rect 0 1089 550 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 550 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -178,36 +178,36 @@
 rect 379 115 413 131
 rect 465 215 499 231
 rect 465 61 499 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 550 61
-rect 0 0 550 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 550 61
+rect 0 0 550 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 379 523 413 557
 rect 207 227 241 261
 rect 379 227 413 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 550 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 550 1093
-rect 0 1049 550 1059
+rect 0 1089 550 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 550 1089
+rect 0 1049 550 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -228,17 +228,17 @@
 rect 413 227 425 261
 rect 195 221 253 227
 rect 367 221 425 227
-rect 0 51 550 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 550 51
-rect 0 0 550 17
+rect 0 55 550 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 550 55
+rect 0 0 550 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_8.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_8.mag
index f0c2e9c..1482c49 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_8.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864548
 << checkpaint >>
 rect -1269 2461 2164 2601
 rect -1760 -1129 6260 2461
@@ -225,14 +225,14 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 902 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 902 1093
+rect 0 1089 902 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 902 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -278,27 +278,27 @@
 rect 723 115 757 131
 rect 809 215 843 231
 rect 809 61 843 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 902 61
-rect 0 0 902 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 902 61
+rect 0 0 902 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 379 523 413 557
@@ -308,28 +308,28 @@
 rect 379 227 413 261
 rect 551 227 585 261
 rect 723 227 757 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 902 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 902 1093
-rect 0 1049 902 1059
+rect 0 1089 902 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 902 1089
+rect 0 1049 902 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -364,20 +364,20 @@
 rect 367 221 425 227
 rect 539 221 597 227
 rect 711 221 769 227
-rect 0 51 902 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 902 51
-rect 0 0 902 17
+rect 0 55 902 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 902 55
+rect 0 0 902 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_l.mag
index f862249..eed675f 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__buf_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__buf_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864548
 << checkpaint >>
 rect -1269 -242 1548 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 288 1119
 << nmos >>
@@ -85,10 +86,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 35 352 69 831
 rect 121 949 155 1049
@@ -106,28 +107,28 @@
 rect 121 61 155 131
 rect 207 165 241 227
 rect 207 115 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 227 241 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -141,16 +142,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 214 400 214 400 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__decap_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__decap_1.mag
index 216145f..05abb9b 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__decap_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__decap_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864548
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -49,9 +50,9 @@
 rect 80 367 110 713
 rect 80 80 110 115
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 1049
@@ -60,24 +61,24 @@
 rect 35 61 69 131
 rect 121 335 155 351
 rect 121 61 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__decap_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__decap_l.mag
index 5a303b4..386cb37 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__decap_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__decap_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864548
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -49,9 +50,9 @@
 rect 80 243 110 837
 rect 80 80 110 115
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 849 69 865
 rect 121 949 155 1049
@@ -60,24 +61,24 @@
 rect 35 61 69 131
 rect 121 215 155 231
 rect 121 61 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dff_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dff_1.mag
index d22d92f..8ea0d62 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dff_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dff_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864548
 << checkpaint >>
 rect -1269 -242 2716 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1456 1119
 << nmos >>
@@ -368,18 +369,18 @@
 rect 1323 410 1357 444
 rect 1018 301 1052 335
 << locali >>
-rect 0 1093 1452 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1452 1093
+rect 0 1089 1452 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1452 1089
 rect 40 949 74 965
 rect 17 605 40 617
 rect 126 949 160 1049
@@ -483,39 +484,39 @@
 rect 1292 61 1326 131
 rect 1378 215 1412 234
 rect 1378 115 1412 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1452 61
-rect 0 0 1452 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1452 61
+rect 0 0 1452 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 40 301 74 335
 rect 253 449 287 483
 rect 181 375 215 409
@@ -530,40 +531,40 @@
 rect 1206 523 1240 557
 rect 1226 369 1260 403
 rect 1018 301 1052 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1452 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1452 1093
-rect 0 1049 1452 1059
+rect 0 1089 1452 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1452 1089
+rect 0 1049 1452 1055
 rect 1366 631 1424 637
 rect 1343 597 1378 631
 rect 1412 597 1424 631
@@ -607,19 +608,19 @@
 rect 1052 301 1064 335
 rect 523 295 581 301
 rect 1006 295 1064 301
-rect 0 51 1452 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1452 51
-rect 0 0 1452 17
+rect 0 55 1452 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1452 55
+rect 0 0 1452 21
 << labels >>
 rlabel viali 198 392 198 392 1 D
 port 1 n
@@ -629,6 +630,6 @@
 port 4 n
 rlabel viali 1224 540 1224 540 1 QN
 port 2 n
-rlabel viali 68 45 68 45 1 gnd
-rlabel viali 68 1067 68 1067 1 vdd
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1063 68 1063 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dff_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dff_l.mag
index ded6aef..1f6a58d 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dff_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dff_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864549
 << checkpaint >>
 rect -1269 -242 2716 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1456 1119
 << nmos >>
@@ -368,18 +369,18 @@
 rect 1323 410 1357 444
 rect 1018 301 1052 335
 << locali >>
-rect 0 1093 1452 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1452 1093
+rect 0 1089 1452 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1452 1089
 rect 40 949 74 965
 rect 17 605 40 617
 rect 126 949 160 1049
@@ -485,39 +486,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 234
 rect 1378 115 1412 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1452 61
-rect 0 0 1452 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1452 61
+rect 0 0 1452 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 40 301 74 335
 rect 253 449 287 483
 rect 181 375 215 409
@@ -531,40 +532,40 @@
 rect 1206 523 1240 557
 rect 1226 369 1260 403
 rect 1018 301 1052 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1452 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1452 1093
-rect 0 1049 1452 1059
+rect 0 1089 1452 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1452 1089
+rect 0 1049 1452 1055
 rect 1365 631 1423 637
 rect 1343 597 1377 631
 rect 1411 597 1423 631
@@ -608,19 +609,19 @@
 rect 1052 301 1064 335
 rect 523 295 581 301
 rect 1006 295 1064 301
-rect 0 51 1452 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1452 51
-rect 0 0 1452 17
+rect 0 55 1452 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1452 55
+rect 0 0 1452 21
 << labels >>
 rlabel viali 198 392 198 392 1 D
 port 1 n
@@ -630,6 +631,6 @@
 port 3 n
 rlabel viali 915 466 915 466 1 CK
 port 4 n
-rlabel viali 68 45 68 45 1 gnd
-rlabel viali 68 1067 68 1067 1 vdd
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1063 68 1063 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_1.mag
index a02515c..3a4e9b5 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864549
 << checkpaint >>
 rect -1270 -242 3177 2379
+rect -1210 -1243 3112 -242
 << nwell >>
 rect -10 529 1917 1119
 << nmos >>
@@ -467,22 +468,22 @@
 rect 1784 410 1818 444
 rect 1545 257 1579 291
 << locali >>
-rect 0 1093 1914 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1914 1093
+rect 0 1089 1914 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1914 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -612,51 +613,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 234
 rect 1839 115 1873 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1914 61
-rect 0 0 1914 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1914 61
+rect 0 0 1914 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
 rect 47 597 81 631
 rect 229 257 263 261
 rect 229 227 263 257
@@ -675,52 +676,52 @@
 rect 1409 301 1443 335
 rect 1545 257 1579 261
 rect 1545 227 1579 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
 << metal1 >>
-rect 0 1093 1914 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1914 1093
-rect 0 1049 1914 1059
+rect 0 1089 1914 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1914 1089
+rect 0 1049 1914 1055
 rect 35 631 93 637
 rect 1826 631 1884 637
 rect 35 597 47 631
@@ -775,23 +776,23 @@
 rect 1579 227 1591 261
 rect 217 221 275 227
 rect 1533 221 1591 227
-rect 0 51 1914 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1914 51
-rect 0 0 1914 17
+rect 0 55 1914 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1914 55
+rect 0 0 1914 21
 << labels >>
 rlabel viali 65 614 65 614 1 RN
 port 1 n
@@ -803,6 +804,6 @@
 port 4 n
 rlabel viali 1685 540 1685 540 1 QN
 port 5 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_l.mag
index eb3e9ad..f215f7a 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dffr_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864549
 << checkpaint >>
 rect -1270 -242 3177 2379
+rect -1210 -1243 3112 -242
 << nwell >>
 rect -10 529 1917 1119
 << nmos >>
@@ -467,22 +468,22 @@
 rect 1784 410 1818 444
 rect 1545 257 1579 291
 << locali >>
-rect 0 1093 1914 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1914 1093
+rect 0 1089 1914 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1914 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -612,51 +613,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 234
 rect 1839 115 1873 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1914 61
-rect 0 0 1914 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1914 61
+rect 0 0 1914 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
 rect 47 597 81 631
 rect 229 257 263 261
 rect 229 227 263 257
@@ -675,52 +676,52 @@
 rect 1409 301 1443 335
 rect 1545 257 1579 261
 rect 1545 227 1579 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
 << metal1 >>
-rect 0 1093 1914 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1914 1093
-rect 0 1049 1914 1059
+rect 0 1089 1914 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1914 1089
+rect 0 1049 1914 1055
 rect 35 631 93 637
 rect 1826 631 1884 637
 rect 35 597 47 631
@@ -775,23 +776,23 @@
 rect 1579 227 1591 261
 rect 217 221 275 227
 rect 1533 221 1591 227
-rect 0 51 1914 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1914 51
-rect 0 0 1914 17
+rect 0 55 1914 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1914 55
+rect 0 0 1914 21
 << labels >>
 rlabel viali 65 614 65 614 1 RN
 port 1 n
@@ -803,6 +804,6 @@
 port 4 n
 rlabel viali 1685 540 1685 540 1 QN
 port 5 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_1.mag
index adfaadb..cf3b5fd 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864549
 << checkpaint >>
 rect -1270 -242 3001 2379
+rect -1210 -1243 2840 -242
 << nwell >>
 rect -10 529 1741 1119
 << nmos >>
@@ -423,20 +424,20 @@
 rect 1594 410 1628 444
 rect 1355 257 1389 291
 << locali >>
-rect 0 1093 1738 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1738 1093
+rect 0 1089 1738 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1738 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -548,45 +549,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 234
 rect 1649 115 1683 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1738 61
-rect 0 0 1738 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1738 61
+rect 0 0 1738 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
 rect 47 227 81 261
 rect 121 301 155 335
 rect 438 449 472 483
@@ -603,46 +604,46 @@
 rect 1203 301 1237 335
 rect 1355 257 1389 261
 rect 1355 227 1389 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
 << metal1 >>
-rect 0 1093 1738 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1738 1093
-rect 0 1049 1738 1059
+rect 0 1089 1738 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1738 1089
+rect 0 1049 1738 1055
 rect 1636 631 1694 637
 rect 1614 597 1648 631
 rect 1682 597 1694 631
@@ -693,21 +694,21 @@
 rect 1389 227 1401 261
 rect 35 221 93 227
 rect 1343 221 1401 227
-rect 0 51 1738 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1738 51
-rect 0 0 1738 17
+rect 0 55 1738 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1738 55
+rect 0 0 1738 21
 << labels >>
 rlabel viali 383 392 383 392 1 D
 port 1 n
@@ -718,6 +719,6 @@
 rlabel viali 1495 540 1495 540 1 QN
 port 3 n
 rlabel viali 64 244 64 244 1 SN
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_l.mag
index 9e03921..aa37d4d 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dffs_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864549
 << checkpaint >>
 rect -1270 -242 3001 2379
+rect -1210 -1243 2840 -242
 << nwell >>
 rect -10 529 1741 1119
 << nmos >>
@@ -423,20 +424,20 @@
 rect 1594 410 1628 444
 rect 1355 257 1389 291
 << locali >>
-rect 0 1093 1738 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1738 1093
+rect 0 1089 1738 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1738 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -548,45 +549,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 234
 rect 1649 115 1683 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1738 61
-rect 0 0 1738 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1738 61
+rect 0 0 1738 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
 rect 47 227 81 261
 rect 121 301 155 335
 rect 438 449 472 483
@@ -603,46 +604,46 @@
 rect 1203 301 1237 335
 rect 1355 257 1389 261
 rect 1355 227 1389 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
 << metal1 >>
-rect 0 1093 1738 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1738 1093
-rect 0 1049 1738 1059
+rect 0 1089 1738 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1738 1089
+rect 0 1049 1738 1055
 rect 1636 631 1694 637
 rect 1614 597 1648 631
 rect 1682 597 1694 631
@@ -693,21 +694,21 @@
 rect 1389 227 1401 261
 rect 35 221 93 227
 rect 1343 221 1401 227
-rect 0 51 1738 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1738 51
-rect 0 0 1738 17
+rect 0 55 1738 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1738 55
+rect 0 0 1738 21
 << labels >>
 rlabel viali 383 392 383 392 1 D
 port 1 n
@@ -718,6 +719,6 @@
 rlabel viali 1495 540 1495 540 1 QN
 port 3 n
 rlabel viali 64 244 64 244 1 SN
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_1.mag
index 7ad6a70..3a747e6 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864550
 << checkpaint >>
 rect -1270 -242 3350 2379
+rect -1210 -1243 3248 -242
 << nwell >>
 rect -10 529 2090 1119
 << nmos >>
@@ -528,23 +529,23 @@
 rect 1956 410 1990 444
 rect 1755 257 1789 291
 << locali >>
-rect 0 1093 2090 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1954 1093
-rect 1988 1049 2090 1093
+rect 0 1089 2090 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1954 1089
+rect 1988 1049 2090 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -685,54 +686,54 @@
 rect 1925 61 1959 131
 rect 2011 215 2045 234
 rect 2011 115 2045 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1954 61
-rect 1988 17 2090 61
-rect 0 0 2090 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1954 61
+rect 1988 21 2090 61
+rect 0 0 2090 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
-rect 1954 1083 1988 1093
-rect 1954 1059 1988 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
+rect 1954 1083 1988 1089
+rect 1954 1055 1988 1083
 rect 47 597 81 631
 rect 325 523 359 557
 rect 325 301 359 335
@@ -754,55 +755,55 @@
 rect 1502 301 1536 335
 rect 1755 257 1789 261
 rect 1755 227 1789 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
-rect 1954 27 1988 51
-rect 1954 17 1988 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
+rect 1954 27 1988 55
+rect 1954 21 1988 27
 << metal1 >>
-rect 0 1093 2090 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1954 1093
-rect 1988 1059 2090 1093
-rect 0 1049 2090 1059
+rect 0 1089 2090 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1954 1089
+rect 1988 1055 2090 1089
+rect 0 1049 2090 1055
 rect 35 631 93 637
 rect 1999 631 2057 637
 rect 35 597 47 631
@@ -864,24 +865,24 @@
 rect 1789 227 1801 261
 rect 217 221 275 227
 rect 1743 221 1801 227
-rect 0 51 2090 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1954 51
-rect 1988 17 2090 51
-rect 0 0 2090 17
+rect 0 55 2090 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1954 55
+rect 1988 21 2090 55
+rect 0 0 2090 21
 << labels >>
 rlabel viali 659 392 659 392 1 D
 port 1 n
@@ -895,6 +896,6 @@
 port 5 n
 rlabel viali 2028 614 2028 614 1 Q
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_l.mag
index 8d418cf..acf3f24 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__dffsr_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864550
 << checkpaint >>
 rect -1270 -242 3350 2379
+rect -1210 -1243 3248 -242
 << nwell >>
 rect -10 529 2090 1119
 << nmos >>
@@ -526,23 +527,23 @@
 rect 1956 410 1990 444
 rect 1755 257 1789 291
 << locali >>
-rect 0 1093 2090 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1954 1093
-rect 1988 1049 2090 1093
+rect 0 1089 2090 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1954 1089
+rect 1988 1049 2090 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -685,54 +686,54 @@
 rect 1925 61 1959 131
 rect 2011 165 2045 234
 rect 2011 115 2045 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1954 61
-rect 1988 17 2090 61
-rect 0 0 2090 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1954 61
+rect 1988 21 2090 61
+rect 0 0 2090 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
-rect 1954 1083 1988 1093
-rect 1954 1059 1988 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
+rect 1954 1083 1988 1089
+rect 1954 1055 1988 1083
 rect 47 597 81 631
 rect 325 523 359 557
 rect 325 301 359 335
@@ -753,55 +754,55 @@
 rect 1502 301 1536 335
 rect 1755 257 1789 261
 rect 1755 227 1789 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
-rect 1954 27 1988 51
-rect 1954 17 1988 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
+rect 1954 27 1988 55
+rect 1954 21 1988 27
 << metal1 >>
-rect 0 1093 2090 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1954 1093
-rect 1988 1059 2090 1093
-rect 0 1049 2090 1059
+rect 0 1089 2090 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1954 1089
+rect 1988 1055 2090 1089
+rect 0 1049 2090 1055
 rect 35 631 93 637
 rect 1998 631 2056 637
 rect 35 597 47 631
@@ -863,24 +864,24 @@
 rect 1789 227 1801 261
 rect 217 221 275 227
 rect 1743 221 1801 227
-rect 0 51 2090 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1954 51
-rect 1988 17 2090 51
-rect 0 0 2090 17
+rect 0 55 2090 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1954 55
+rect 1988 21 2090 55
+rect 0 0 2090 21
 << labels >>
 rlabel viali 659 392 659 392 1 D
 port 1 n
@@ -894,6 +895,6 @@
 port 5 n
 rlabel viali 65 614 65 614 1 RN
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_1.mag
index 866213b..f6e552e 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864551
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -72,22 +72,22 @@
 rect 35 61 69 131
 rect 121 215 155 227
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -101,15 +101,15 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel metal1 151 389 151 389 1 Y
 port 1 n
 rlabel viali 64 614 64 614 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_10.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_10.mag
index 5ccfa2b..26acad6 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_10.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_10.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007754
+timestamp 1606864551
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -243,15 +243,15 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -299,30 +299,30 @@
 rect 809 115 843 131
 rect 895 215 929 231
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -334,31 +334,31 @@
 rect 465 227 499 261
 rect 637 227 671 261
 rect 809 227 843 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -400,21 +400,21 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_2.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_2.mag
index 22f0e55..9639bd9 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_2.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864551
 << checkpaint >>
 rect -1269 2461 1547 2601
 rect -1760 -1129 6260 2461
@@ -84,10 +84,10 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -103,28 +103,28 @@
 rect 121 115 155 131
 rect 207 215 241 231
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -138,16 +138,16 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_3.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_3.mag
index c9b0c28..ee4c0a2 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_3.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_3.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864552
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -100,10 +100,10 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -123,30 +123,30 @@
 rect 207 61 241 131
 rect 293 215 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
 rect 121 227 155 261
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -167,16 +167,16 @@
 rect 327 227 339 261
 rect 109 221 167 227
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_4.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_4.mag
index bb43399..29d5255 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_4.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864552
 << checkpaint >>
 rect -1269 2461 1723 2601
 rect -1760 -1129 6260 2461
@@ -122,11 +122,11 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -150,36 +150,36 @@
 rect 293 115 327 131
 rect 379 215 413 231
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
 rect 121 227 155 261
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -200,17 +200,17 @@
 rect 327 227 339 261
 rect 109 221 167 227
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 64 613 64 613 1 A
 port 1 n
 rlabel metal1 152 388 152 388 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_6.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_6.mag
index da9034c..65269a0 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_6.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_6.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864552
 << checkpaint >>
 rect -1269 2461 1899 2601
 rect -1760 -1129 6260 2461
@@ -161,12 +161,12 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -198,21 +198,21 @@
 rect 465 115 499 131
 rect 551 215 585 231
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -220,22 +220,22 @@
 rect 121 227 155 261
 rect 293 227 327 261
 rect 465 227 499 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -263,18 +263,18 @@
 rect 109 221 167 227
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 64 613 64 613 1 A
 port 1 n
 rlabel metal1 152 388 152 388 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_8.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_8.mag
index b754f85..ff1bf0a 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_8.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864552
 << checkpaint >>
 rect -1269 2461 2074 2601
 rect -1760 -1129 6260 2461
@@ -199,13 +199,13 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 814 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 814 1093
+rect 0 1089 814 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 814 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -245,24 +245,24 @@
 rect 637 115 671 131
 rect 723 215 757 231
 rect 723 61 757 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 814 61
-rect 0 0 814 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 814 61
+rect 0 0 814 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -272,25 +272,25 @@
 rect 293 227 327 261
 rect 465 227 499 261
 rect 637 227 671 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
 << metal1 >>
-rect 0 1093 814 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 814 1093
-rect 0 1049 814 1059
+rect 0 1089 814 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 814 1089
+rect 0 1049 814 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -325,19 +325,19 @@
 rect 281 221 339 227
 rect 453 221 511 227
 rect 625 221 683 227
-rect 0 51 814 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 814 51
-rect 0 0 814 17
+rect 0 55 814 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 814 55
+rect 0 0 814 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_l.mag
index 86e549d..2d89936 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__inv_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__inv_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864552
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -56,9 +57,9 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -70,22 +71,22 @@
 rect 35 61 69 131
 rect 121 165 155 227
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -99,15 +100,15 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 614 64 614 1 A
 port 1 n
 rlabel metal1 151 389 151 389 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__mux2_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__mux2_1.mag
index c1e15e7..96a931b 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__mux2_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__mux2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864553
 << checkpaint >>
 rect -1269 2461 1813 2601
 rect -1760 -1129 6260 2461
@@ -124,9 +124,9 @@
 rect 37 392 71 426
 rect 168 301 202 335
 << locali >>
-rect 0 1093 550 1110
-rect 0 1049 459 1093
-rect 493 1049 550 1093
+rect 0 1089 550 1110
+rect 0 1049 459 1089
+rect 493 1049 550 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -158,33 +158,33 @@
 rect 311 115 345 131
 rect 397 215 431 449
 rect 397 115 431 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 550 61
-rect 0 0 550 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 550 61
+rect 0 0 550 21
 << viali >>
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 597 71 631
 rect 236 523 270 557
 rect 311 375 345 409
 rect 397 449 431 483
 rect 311 227 345 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 550 1110
-rect 0 1059 459 1093
-rect 493 1059 550 1093
-rect 0 1049 550 1059
+rect 0 1089 550 1110
+rect 0 1055 459 1089
+rect 493 1055 550 1089
+rect 0 1049 550 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 117 631
@@ -206,13 +206,13 @@
 rect 299 227 311 261
 rect 345 227 357 261
 rect 299 221 357 227
-rect 0 51 550 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 550 51
-rect 0 0 550 17
+rect 0 55 550 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 550 55
+rect 0 0 550 21
 << labels >>
 rlabel viali 54 614 54 614 1 S0
 port 1 n
@@ -222,6 +222,6 @@
 port 3 n
 rlabel viali 414 466 414 466 1 A1
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 476 1066 476 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 1062 476 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_1.mag
index e285c10..b9a5194 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864553
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 47 468 81 502
 rect 166 375 200 409
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -100,29 +100,29 @@
 rect 35 115 69 131
 rect 193 215 227 231
 rect 193 61 227 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 449 155 483
 rect 195 523 229 557
 rect 35 227 69 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 115 631
@@ -140,11 +140,11 @@
 rect 23 227 35 261
 rect 69 227 155 261
 rect 23 221 81 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 136 418 136 418 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 212 540 212 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_l.mag
index b883fd5..8eb6018 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__nand2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864553
 << checkpaint >>
 rect -1269 -242 1546 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 286 1119
 << nmos >>
@@ -79,10 +80,10 @@
 rect 47 468 81 502
 rect 166 318 200 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -98,29 +99,29 @@
 rect 35 115 69 131
 rect 193 165 227 181
 rect 193 61 227 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 449 155 483
 rect 195 523 229 557
 rect 35 227 69 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 115 631
@@ -138,11 +139,11 @@
 rect 23 227 35 261
 rect 69 227 155 261
 rect 23 221 81 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 136 418 136 418 1 Y
 port 1 n
@@ -150,6 +151,6 @@
 port 2 n
 rlabel viali 64 614 64 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_1.mag
index f703b88..b961123 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864553
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 181 482 215 516
 rect 66 349 100 383
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 193 949 227 1049
 rect 193 725 227 741
@@ -100,29 +100,29 @@
 rect 121 115 155 131
 rect 207 215 241 231
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 181 597 215 631
 rect 35 449 69 483
 rect 113 523 147 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 169 631 227 637
 rect 148 597 181 631
 rect 215 597 227 631
@@ -140,11 +140,11 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 137 341 137 341 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 198 614 198 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_l.mag
index 503e0c7..84a183b 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__nor2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864553
 << checkpaint >>
 rect -1269 -242 1546 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 286 1119
 << nmos >>
@@ -79,10 +80,10 @@
 rect 181 482 215 516
 rect 66 349 100 383
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 35 483 69 809
 rect 193 949 227 1049
@@ -98,29 +99,29 @@
 rect 121 115 155 131
 rect 207 165 241 181
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 181 597 215 631
 rect 35 449 69 483
 rect 113 523 147 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 169 631 227 637
 rect 148 597 181 631
 rect 215 597 227 631
@@ -138,11 +139,11 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 137 341 137 341 1 Y
 port 1 n
@@ -150,6 +151,6 @@
 port 2 n
 rlabel viali 130 540 130 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__oai21_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__oai21_l.mag
index a9c034e..10795d1 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__oai21_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__oai21_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864554
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 152 375 186 409
 rect 262 307 296 341
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 193 949 227 1049
 rect 193 793 227 809
@@ -130,30 +131,30 @@
 rect 207 115 241 131
 rect 293 214 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 66 597 100 631
 rect 162 523 196 557
 rect 223 449 257 483
 rect 291 375 325 409
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 54 631 112 637
 rect 54 597 66 631
 rect 100 597 134 631
@@ -175,11 +176,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 83 614 83 614 1 A0
 port 1 n
@@ -189,6 +190,6 @@
 port 3 n
 rlabel viali 240 466 240 466 1 B0
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__oai22_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__oai22_l.mag
index 6b69ebd..1320af1 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__oai22_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__oai22_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864554
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
 << nmos >>
@@ -127,11 +128,11 @@
 rect 384 376 418 410
 rect 248 311 282 345
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 200 949 234 965
@@ -162,37 +163,37 @@
 rect 207 129 241 131
 rect 379 129 413 131
 rect 207 95 413 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 66 597 100 631
 rect 162 523 196 557
 rect 223 449 257 483
 rect 384 376 418 410
 rect 316 301 350 335
 rect 316 227 350 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 54 631 112 637
 rect 54 597 66 631
 rect 100 597 134 631
@@ -218,12 +219,12 @@
 rect 304 227 316 261
 rect 350 227 362 261
 rect 304 221 362 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 240 466 240 466 1 B0
 port 4 n
@@ -234,6 +235,6 @@
 rlabel viali 333 318 333 318 1 Y
 port 3 n
 rlabel viali 401 393 401 393 1 B1
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_1.mag
index 8e627e6..30c4fc8 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864554
 << checkpaint >>
 rect -1269 2461 1634 2601
 rect -1760 -1129 6260 2461
@@ -105,10 +105,10 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -131,29 +131,29 @@
 rect 207 61 241 131
 rect 293 215 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -171,11 +171,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -183,6 +183,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_2.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_2.mag
index a35a0aa..9d47135 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_2.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864554
 << checkpaint >>
 rect -1269 2461 1722 2601
 rect -1760 -1129 6260 2461
@@ -128,11 +128,11 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -159,35 +159,35 @@
 rect 293 115 327 131
 rect 379 215 413 231
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -205,12 +205,12 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -218,6 +218,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_4.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_4.mag
index f2fd3dc..fe61887 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_4.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864554
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -166,12 +166,12 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -206,43 +206,43 @@
 rect 465 115 499 131
 rect 551 215 585 231
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 465 449 499 483
 rect 293 227 327 261
 rect 465 227 499 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -267,13 +267,13 @@
 rect 499 227 511 261
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -281,6 +281,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_8.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_8.mag
index 21b6a6f..2b1f2a0 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_8.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864554
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -249,15 +249,15 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -308,30 +308,30 @@
 rect 809 115 843 131
 rect 895 215 929 231
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
@@ -342,31 +342,31 @@
 rect 465 227 499 261
 rect 637 227 671 261
 rect 809 227 843 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -406,16 +406,16 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -423,6 +423,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_l.mag
index fa40c23..583463c 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__or2_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__or2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864555
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 691 69 877
 rect 207 949 241 1049
@@ -129,29 +130,29 @@
 rect 207 61 241 131
 rect 293 165 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 190 614 190 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_1.mag
index 5e338db..cee6512 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864555
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -102,10 +102,10 @@
 rect 121 301 155 335
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 657 155 673
@@ -126,29 +126,29 @@
 rect 121 61 155 131
 rect 279 215 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 279 449 313 483
 rect 121 301 155 335
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -170,11 +170,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -182,6 +182,6 @@
 port 2 n
 rlabel metal1 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_l.mag
index 926bda8..e7cc112 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__tbufi_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864555
 << checkpaint >>
 rect -1269 -242 1635 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 375 1119
 << nmos >>
@@ -100,10 +101,10 @@
 rect 121 301 155 335
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 461 69 809
 rect 121 949 155 1049
@@ -124,29 +125,29 @@
 rect 121 61 155 131
 rect 279 165 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 279 449 313 483
 rect 121 301 155 335
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -168,11 +169,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -180,6 +181,6 @@
 port 2 n
 rlabel metal1 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__tiehi.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__tiehi.mag
index 31343ad..e6e1b46 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__tiehi.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__tiehi.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864555
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -56,9 +57,9 @@
 << polycont >>
 rect 90 331 124 365
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 589 69 605
 rect 121 949 155 965
@@ -69,31 +70,31 @@
 rect 35 61 69 131
 rect 121 215 155 331
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 121 523 155 557
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 94 557 167 563
 rect 94 523 121 557
 rect 155 523 167 557
 rect 94 517 167 523
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 138 540 138 540 1 Y
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__tielo.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__tielo.mag
index cb358b8..6284f45 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__tielo.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__tielo.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864555
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 463 124 497
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 589 69 605
 rect 121 949 155 965
@@ -71,31 +71,31 @@
 rect 35 61 69 131
 rect 121 215 155 301
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 121 301 155 335
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 94 335 167 341
 rect 94 301 121 335
 rect 155 301 167 335
 rect 94 295 167 301
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 138 318 138 318 1 Y
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_1.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_1.mag
index 8e2a1a9..ff723d9 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_1.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864556
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -101,10 +101,10 @@
 rect 121 366 155 400
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 657 155 673
@@ -125,29 +125,29 @@
 rect 121 61 155 131
 rect 279 215 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 121 523 155 557
 rect 279 449 313 483
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -165,11 +165,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -177,6 +177,6 @@
 port 2 n
 rlabel viali 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_l.mag
index 500c6ce..e4a243c 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__tnbufi_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864556
 << checkpaint >>
 rect -1269 -242 1635 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 375 1119
 << nmos >>
@@ -99,10 +100,10 @@
 rect 121 366 155 400
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 400 69 809
 rect 121 949 155 1049
@@ -123,29 +124,29 @@
 rect 121 61 155 131
 rect 279 165 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 121 523 155 557
 rect 279 449 313 483
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -163,11 +164,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -175,6 +176,6 @@
 port 2 n
 rlabel viali 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__xnor2_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__xnor2_l.mag
index 08829fb..260bd7b 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__xnor2_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__xnor2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864556
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
 << nmos >>
@@ -171,12 +172,12 @@
 rect 336 301 370 335
 rect 489 301 523 335
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 35 443 69 605
 rect 121 949 155 1049
@@ -214,21 +215,21 @@
 rect 471 165 505 181
 rect 471 61 505 131
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 268 605 279 631
 rect 279 605 302 631
 rect 268 597 302 605
@@ -236,22 +237,22 @@
 rect 268 301 302 335
 rect 489 301 523 335
 rect 412 227 446 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 256 631 314 637
 rect 256 597 268 631
 rect 302 597 314 631
@@ -272,13 +273,13 @@
 rect 446 227 458 261
 rect 140 221 198 227
 rect 400 221 458 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 170 244 170 244 1 A
 port 1 n
@@ -286,6 +287,6 @@
 port 2 n
 rlabel metal1 284 375 284 375 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ls/magic/sky130_osu_sc_15T_ls__xor2_l.mag b/15T_ls/magic/sky130_osu_sc_15T_ls__xor2_l.mag
index b6812c5..6aff882 100644
--- a/15T_ls/magic/sky130_osu_sc_15T_ls__xor2_l.mag
+++ b/15T_ls/magic/sky130_osu_sc_15T_ls__xor2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007760
+timestamp 1606864556
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
 << nmos >>
@@ -170,12 +171,12 @@
 rect 430 375 464 409
 rect 248 301 282 335
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -215,42 +216,42 @@
 rect 471 61 505 131
 rect 557 215 591 301
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 200 597 234 631
 rect 412 597 446 631
 rect 268 449 302 483
 rect 489 523 523 557
 rect 296 227 330 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 188 631 246 637
 rect 400 631 458 637
 rect 188 597 200 631
@@ -271,13 +272,13 @@
 rect 268 227 296 261
 rect 330 227 342 261
 rect 284 221 342 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 218 614 218 614 1 A
 port 1 n
@@ -285,6 +286,6 @@
 port 2 n
 rlabel viali 506 540 506 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__addf_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__addf_1.gds
index e681485..a1f482f 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__addf_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__addf_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__addf_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__addf_l.gds
index dbb64cb..2c2e8c8 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__addf_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__addf_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__addh_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__addh_1.gds
index 1b23a4d..1cc0694 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__addh_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__addh_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__addh_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__addh_l.gds
index eaddf55..a79c4cf 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__addh_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__addh_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_1.gds
index 1ed1c85..7fb37a7 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_2.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_2.gds
index bcdf99a..075fbdd 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_2.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_2.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_4.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_4.gds
index 479c6b7..de9dc1f 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_4.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_4.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_6.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_6.gds
index 9c6a489..49c8c75 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_6.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_6.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_8.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_8.gds
index 076de42..84ba825 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_8.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_8.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_l.gds
index b26a234..471371a 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__and2_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__and2_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__ant.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__ant.gds
index 4ed6382..4bea213 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__ant.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__ant.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__antfill.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__antfill.gds
index 156e157..12b435e 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__antfill.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__antfill.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__aoi21_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__aoi21_l.gds
index daefd17..3fb60d4 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__aoi21_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__aoi21_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__aoi22_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__aoi22_l.gds
index 3616a43..a1a85a2 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__aoi22_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__aoi22_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_1.gds
index 46eaa62..15875a5 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_2.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_2.gds
index d79d809..150158a 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_2.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_2.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_4.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_4.gds
index c5d5256..374e4bd 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_4.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_4.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_6.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_6.gds
index d1ad50a..90eb945 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_6.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_6.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_8.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_8.gds
index 021db88..d192148 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_8.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_8.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_l.gds
index d693cae..f5756b0 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__buf_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__buf_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__decap_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__decap_1.gds
index b30d1d9..e8cc552 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__decap_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__decap_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__decap_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__decap_l.gds
index b7d4f1d..725536b 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__decap_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__decap_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dff_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dff_1.gds
index d46f7ec..2039568 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dff_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dff_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dff_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dff_l.gds
index 95a8fc4..3709fca 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dff_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dff_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_1.gds
index 91d11e6..41bbe02 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_l.gds
index 40ba1d3..91c8a29 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dffr_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_1.gds
index 895102d..09ca996 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_l.gds
index e0d038d..4a05043 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dffs_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_1.gds
index 64b95d9..f2eedb4 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_l.gds
index 7ade710..d60625d 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__dffsr_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_1.gds
index 6e0b9e7..12115d1 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_16.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_16.gds
index 43d7096..67bba26 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_16.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_16.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_2.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_2.gds
index 14cf103..5b85c4b 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_2.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_2.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_32.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_32.gds
index 211b4a0..aca0fcd 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_32.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_32.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_4.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_4.gds
index d3cdf5b..bd0b7f0 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_4.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_4.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_8.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_8.gds
index e6880d8..1c7420a 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__fill_8.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__fill_8.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_1.gds
index ae7dea2..be9f577 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_10.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_10.gds
index ba07be8..5c06bf4 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_10.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_10.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_2.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_2.gds
index 8770944..c808313 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_2.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_2.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_3.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_3.gds
index ec5e89c..5bc6896 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_3.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_3.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_4.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_4.gds
index 9105900..9d85bc3 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_4.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_4.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_6.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_6.gds
index 716c55c..08314b4 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_6.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_6.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_8.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_8.gds
index bbdcd24..d0aed20 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_8.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_8.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_l.gds
index 47034d3..dfd05fb 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__inv_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__inv_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__mux2_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__mux2_1.gds
index 3e43e5f..d41411f 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__mux2_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__mux2_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_1.gds
index 716a75b..25cb6cb 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_l.gds
index 8601840..8e1cf2a 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__nand2_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_1.gds
index a20f944..ad3c6e0 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_l.gds
index 5cddfe6..940b0d4 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__nor2_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__oai21_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__oai21_l.gds
index 8a22feb..530980d 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__oai21_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__oai21_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__oai22_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__oai22_l.gds
index 7ba652c..d29e382 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__oai22_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__oai22_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_1.gds
index 51b46e5..1fa43d3 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_2.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_2.gds
index bbce678..5a55685 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_2.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_2.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_4.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_4.gds
index 2927776..95a0d6e 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_4.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_4.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_8.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_8.gds
index ede00ef..b5fc3f3 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_8.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_8.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_l.gds
index 6f8745a..508c93c 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__or2_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__or2_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_1.gds
index 60c265f..c824b0b 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_l.gds
index 1ea880c..7f4740c 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__tbufi_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__tiehi.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__tiehi.gds
index 319b6a4..d9aa823 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__tiehi.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__tiehi.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__tielo.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__tielo.gds
index 3cbf260..21554b2 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__tielo.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__tielo.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_1.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_1.gds
index 6108a61..c3d3fd3 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_1.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_1.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_l.gds
index d4d4dbc..1186928 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__tnbufi_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__xnor2_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__xnor2_l.gds
index 7701de6..d2f51c7 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__xnor2_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__xnor2_l.gds
Binary files differ
diff --git a/15T_ms/gds/sky130_osu_sc_15T_ms__xor2_l.gds b/15T_ms/gds/sky130_osu_sc_15T_ms__xor2_l.gds
index f563d09..131bf55 100644
--- a/15T_ms/gds/sky130_osu_sc_15T_ms__xor2_l.gds
+++ b/15T_ms/gds/sky130_osu_sc_15T_ms__xor2_l.gds
Binary files differ
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__addf_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__addf_1.mag
index aeb6740..dbfbc0b 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__addf_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__addf_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007747
+timestamp 1606864560
 << checkpaint >>
 rect -1269 -242 2695 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1435 1119
 << nmos >>
@@ -369,18 +370,18 @@
 rect 1265 479 1299 513
 rect 1014 301 1048 335
 << locali >>
-rect 0 1093 1408 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1408 1093
+rect 0 1089 1408 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1408 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -483,39 +484,39 @@
 rect 1247 165 1281 181
 rect 1247 61 1281 131
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 80 449 114 483
 rect 248 375 282 409
 rect 80 301 114 335
@@ -532,40 +533,40 @@
 rect 1014 301 1048 335
 rect 1211 227 1245 261
 rect 1333 523 1367 557
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1408 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1408 1093
-rect 0 1049 1408 1059
+rect 0 1089 1408 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1408 1089
+rect 0 1049 1408 1055
 rect 1131 632 1189 638
 rect 1109 598 1143 632
 rect 1177 598 1189 632
@@ -619,19 +620,19 @@
 rect 281 221 339 227
 rect 765 221 823 227
 rect 1199 221 1257 227
-rect 0 51 1408 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1408 51
-rect 0 0 1408 17
+rect 0 55 1408 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1408 55
+rect 0 0 1408 21
 << labels >>
 rlabel viali 97 318 97 318 1 A
 port 1 n
@@ -645,6 +646,6 @@
 port 5 n
 rlabel viali 1350 540 1350 540 1 CO
 port 6 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__addf_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__addf_l.mag
index fa83f41..e3d3880 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__addf_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__addf_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864560
 << checkpaint >>
 rect -1269 -242 2695 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1435 1119
 << nmos >>
@@ -371,18 +372,18 @@
 rect 1265 479 1299 513
 rect 1014 301 1048 335
 << locali >>
-rect 0 1093 1408 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1408 1093
+rect 0 1089 1408 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1408 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -485,39 +486,39 @@
 rect 1247 61 1281 131
 rect 1333 165 1367 523
 rect 1333 115 1367 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1408 61
-rect 0 0 1408 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1408 61
+rect 0 0 1408 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 80 449 114 483
 rect 248 375 282 409
 rect 80 301 114 335
@@ -534,40 +535,40 @@
 rect 1014 301 1048 335
 rect 1211 227 1245 261
 rect 1333 523 1367 557
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1408 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1408 1093
-rect 0 1049 1408 1059
+rect 0 1089 1408 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1408 1089
+rect 0 1049 1408 1055
 rect 1131 638 1189 644
 rect 1109 604 1143 638
 rect 1177 604 1189 638
@@ -621,19 +622,19 @@
 rect 281 221 339 227
 rect 765 221 823 227
 rect 1199 221 1257 227
-rect 0 51 1408 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1408 51
-rect 0 0 1408 17
+rect 0 55 1408 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1408 55
+rect 0 0 1408 21
 << labels >>
 rlabel viali 97 318 97 318 1 A
 port 1 n
@@ -645,8 +646,8 @@
 port 5 n
 rlabel viali 1160 621 1160 621 1 S
 port 6 n
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 1228 244 1228 244 1 CON
 port 4 n
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__addh_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__addh_1.mag
index ce596c7..3b974a4 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__addh_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__addh_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864560
 << checkpaint >>
 rect -1269 -242 2097 2379
+rect -1209 -1243 2025 -242
 << nwell >>
 rect -9 529 837 1119
 << nmos >>
@@ -212,14 +213,14 @@
 rect 624 375 658 409
 rect 348 322 382 356
 << locali >>
-rect 0 1093 836 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 836 1093
+rect 0 1089 836 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 836 1089
 rect 35 949 69 965
 rect 35 575 69 597
 rect 133 949 167 1049
@@ -273,27 +274,27 @@
 rect 581 129 615 131
 rect 753 129 787 131
 rect 581 95 787 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 836 61
-rect 0 0 836 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 836 61
+rect 0 0 836 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 35 609 69 631
 rect 35 597 69 609
 rect 260 449 294 483
@@ -306,28 +307,28 @@
 rect 624 375 658 409
 rect 507 301 541 335
 rect 667 301 701 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 836 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 836 1093
-rect 0 1049 836 1059
+rect 0 1089 836 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 836 1089
+rect 0 1049 836 1055
 rect 23 631 81 637
 rect 23 597 35 631
 rect 69 597 81 631
@@ -368,15 +369,15 @@
 rect 23 226 35 260
 rect 69 226 81 260
 rect 23 220 81 226
-rect 0 51 836 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 836 51
-rect 0 0 836 17
+rect 0 55 836 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 836 55
+rect 0 0 836 21
 << labels >>
 rlabel metal1 50 425 50 425 1 S
 port 1 n
@@ -388,6 +389,6 @@
 port 4 n
 rlabel viali 684 318 684 318 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__addh_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__addh_l.mag
index 504963b..801f457 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__addh_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__addh_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864561
 << checkpaint >>
 rect -1269 -242 2097 2379
+rect -1209 -1243 2025 -242
 << nwell >>
 rect -9 529 837 1119
 << nmos >>
@@ -216,14 +217,14 @@
 rect 624 375 658 409
 rect 348 322 382 356
 << locali >>
-rect 0 1093 836 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 836 1093
+rect 0 1089 836 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 836 1089
 rect 35 949 69 965
 rect 35 631 69 745
 rect 133 949 167 1049
@@ -279,27 +280,27 @@
 rect 581 129 615 131
 rect 753 129 787 131
 rect 581 95 787 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 836 61
-rect 0 0 836 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 836 61
+rect 0 0 836 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 35 597 69 631
 rect 260 449 294 483
 rect 164 375 198 409
@@ -310,28 +311,28 @@
 rect 624 375 658 409
 rect 507 301 541 335
 rect 667 301 701 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 836 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 836 1093
-rect 0 1049 836 1059
+rect 0 1089 836 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 836 1089
+rect 0 1049 836 1055
 rect 23 631 81 637
 rect 23 597 35 631
 rect 69 597 81 631
@@ -372,15 +373,15 @@
 rect 23 226 35 260
 rect 69 226 81 260
 rect 23 220 81 226
-rect 0 51 836 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 836 51
-rect 0 0 836 17
+rect 0 55 836 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 836 55
+rect 0 0 836 21
 << labels >>
 rlabel metal1 50 425 50 425 1 S
 port 1 n
@@ -392,6 +393,6 @@
 port 4 n
 rlabel viali 684 318 684 318 1 CON
 port 5 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_1.mag
index 7486d35..72ff63e 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864561
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -128,30 +129,30 @@
 rect 193 233 227 249
 rect 193 61 227 131
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 233 327 261
 rect 293 227 327 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_2.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_2.mag
index f2faee3..5395a62 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_2.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_2.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007748
+timestamp 1606864561
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
 << nmos >>
@@ -126,11 +127,11 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -156,36 +157,36 @@
 rect 293 115 327 131
 rect 379 233 413 249
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 233 327 261
 rect 293 227 327 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -203,12 +204,12 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 191 540 191 540 1 B
 port 1 n
@@ -216,6 +217,6 @@
 port 2 n
 rlabel metal1 311 392 311 392 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_4.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_4.mag
index d952a12..b02dfa2 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_4.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_4.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864561
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
 << nmos >>
@@ -164,12 +165,12 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -202,21 +203,21 @@
 rect 465 115 499 131
 rect 551 233 585 249
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
@@ -225,22 +226,22 @@
 rect 293 227 327 233
 rect 465 233 499 261
 rect 465 227 499 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -265,13 +266,13 @@
 rect 499 227 511 261
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -279,6 +280,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_6.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_6.mag
index 3762bc0..e84e34c 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_6.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_6.mag
@@ -4,6 +4,7 @@
 timestamp 1604007749
 << checkpaint >>
 rect -1269 -242 2074 2379
+rect -1260 -1260 1261 -242
 << nwell >>
 rect -9 529 814 1119
 << nmos >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_8.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_8.mag
index 54982ac..d6fd48c 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_8.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_8.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864562
 << checkpaint >>
 rect -1269 -242 2250 2379
+rect -1209 -1243 2161 -242
 << nwell >>
 rect -9 529 990 1119
 << nmos >>
@@ -247,15 +248,15 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 965
@@ -302,30 +303,30 @@
 rect 809 115 843 131
 rect 895 233 929 249
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
@@ -340,31 +341,31 @@
 rect 637 227 671 233
 rect 809 233 843 261
 rect 809 227 843 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -404,16 +405,16 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel viali 191 540 191 540 1 B
 port 1 n
@@ -421,6 +422,6 @@
 port 2 n
 rlabel metal1 311 392 311 392 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_l.mag
index ce9597f..b55b6d1 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__and2_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__and2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864562
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 173 416 207 450
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 121 949 155 965
 rect 35 797 69 813
@@ -129,29 +130,29 @@
 rect 193 61 227 131
 rect 293 199 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 597 71 631
 rect 173 523 207 557
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 105 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 191 540 191 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__ant.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__ant.mag
index 458bbfb..0c47885 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__ant.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__ant.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864562
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -56,9 +57,9 @@
 << polycont >>
 rect 47 449 81 483
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 965
 rect 35 483 69 605
 rect 121 949 155 1049
@@ -71,31 +72,31 @@
 rect 35 115 69 131
 rect 121 215 155 331
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 449 81 483
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 483 108 489
 rect 35 449 47 483
 rect 81 449 108 483
 rect 35 443 108 449
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 466 64 466 1 A
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__antfill.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__antfill.mag
index ffd9206..ef89bff 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__antfill.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__antfill.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007749
+timestamp 1606864562
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << psubdiff >>
@@ -17,9 +18,9 @@
 << nsubdiffcont >>
 rect 51 1049 85 1083
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 483 69 965
 rect 121 589 155 1049
 rect 31 449 47 483
@@ -28,31 +29,31 @@
 rect 35 331 155 365
 rect 35 115 69 331
 rect 121 115 155 331
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 449 81 483
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 483 108 489
 rect 35 449 47 483
 rect 81 449 108 483
 rect 35 443 108 449
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 466 64 466 1 A
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__aoi21_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__aoi21_l.mag
index b844b92..8e921f1 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__aoi21_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__aoi21_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864562
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -106,10 +107,10 @@
 rect 146 382 180 416
 rect 289 303 323 337
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 797 155 813
@@ -132,31 +133,31 @@
 rect 193 115 227 131
 rect 291 165 325 181
 rect 291 61 325 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 60 597 94 631
 rect 128 523 162 557
 rect 216 449 250 483
 rect 293 375 327 409
 rect 193 233 227 261
 rect 193 227 227 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 48 631 106 637
 rect 48 597 60 631
 rect 94 597 128 631
@@ -178,11 +179,11 @@
 rect 181 227 193 261
 rect 227 227 327 261
 rect 181 221 239 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 77 614 77 614 1 A0
 port 1 n
@@ -192,6 +193,6 @@
 port 3 n
 rlabel viali 145 540 145 540 1 A1
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__aoi22_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__aoi22_l.mag
index c01b966..1e09611 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__aoi22_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__aoi22_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864562
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
 << nmos >>
@@ -128,11 +129,11 @@
 rect 234 311 268 345
 rect 370 376 404 410
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 763 155 779
@@ -161,18 +162,18 @@
 rect 200 115 234 131
 rect 365 233 399 249
 rect 365 61 399 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 60 597 94 631
 rect 128 523 162 557
 rect 216 449 250 483
@@ -180,19 +181,19 @@
 rect 302 301 336 335
 rect 200 233 234 261
 rect 200 227 234 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 48 631 106 637
 rect 48 597 60 631
 rect 94 597 128 631
@@ -218,12 +219,12 @@
 rect 188 227 200 261
 rect 234 227 338 261
 rect 188 221 246 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 77 614 77 614 1 A0
 port 1 n
@@ -234,6 +235,6 @@
 rlabel viali 387 393 387 393 1 B1
 rlabel metal1 321 288 321 288 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_1.mag
index 7e55a85..616e585 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864563
 << checkpaint >>
 rect -1269 -242 1548 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 288 1119
 << nmos >>
@@ -85,10 +86,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 729 155 745
@@ -105,29 +106,29 @@
 rect 121 233 155 249
 rect 121 61 155 131
 rect 207 115 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 233 241 261
 rect 207 227 241 233
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -141,16 +142,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 213 403 213 403 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 127 614 127 614 1 A
 port 1 n
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_2.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_2.mag
index 91c9c0f..e95fc11 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_2.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007750
+timestamp 1606864563
 << checkpaint >>
 rect -1269 2461 1636 2601
 rect -1760 -1129 6260 2461
@@ -104,10 +104,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -129,28 +129,28 @@
 rect 207 115 241 131
 rect 293 215 327 231
 rect 293 61 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 227 241 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -164,16 +164,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_4.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_4.mag
index 8659be9..d9ea366 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_4.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864563
 << checkpaint >>
 rect -1269 2461 1812 2601
 rect -1760 -1129 6260 2461
@@ -142,11 +142,11 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 550 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 550 1093
+rect 0 1089 550 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 550 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -178,36 +178,36 @@
 rect 379 115 413 131
 rect 465 215 499 231
 rect 465 61 499 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 550 61
-rect 0 0 550 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 550 61
+rect 0 0 550 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 379 523 413 557
 rect 207 227 241 261
 rect 379 227 413 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 550 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 550 1093
-rect 0 1049 550 1059
+rect 0 1089 550 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 550 1089
+rect 0 1049 550 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -228,17 +228,17 @@
 rect 413 227 425 261
 rect 195 221 253 227
 rect 367 221 425 227
-rect 0 51 550 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 550 51
-rect 0 0 550 17
+rect 0 55 550 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 550 55
+rect 0 0 550 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_8.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_8.mag
index dab0f12..517951d 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_8.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864563
 << checkpaint >>
 rect -1269 2461 2164 2601
 rect -1760 -1129 6260 2461
@@ -225,14 +225,14 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 902 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 902 1093
+rect 0 1089 902 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 902 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -278,27 +278,27 @@
 rect 723 115 757 131
 rect 809 215 843 231
 rect 809 61 843 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 902 61
-rect 0 0 902 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 902 61
+rect 0 0 902 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 379 523 413 557
@@ -308,28 +308,28 @@
 rect 379 227 413 261
 rect 551 227 585 261
 rect 723 227 757 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
 << metal1 >>
-rect 0 1093 902 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 902 1093
-rect 0 1049 902 1059
+rect 0 1089 902 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 902 1089
+rect 0 1049 902 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -364,20 +364,20 @@
 rect 367 221 425 227
 rect 539 221 597 227
 rect 711 221 769 227
-rect 0 51 902 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 902 51
-rect 0 0 902 17
+rect 0 55 902 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 902 55
+rect 0 0 902 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 211 402 211 402 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_l.mag
index d7bd850..4c99cfc 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__buf_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__buf_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864564
 << checkpaint >>
 rect -1269 -242 1548 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 288 1119
 << nmos >>
@@ -85,10 +86,10 @@
 rect 110 427 144 461
 rect 176 318 210 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 35 352 69 831
 rect 121 949 155 1049
@@ -106,28 +107,28 @@
 rect 121 61 155 131
 rect 207 165 241 227
 rect 207 115 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 110 597 144 631
 rect 207 523 241 557
 rect 207 227 241 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 98 631 156 637
 rect 64 597 110 631
 rect 144 597 156 631
@@ -141,16 +142,16 @@
 rect 195 227 207 261
 rect 241 227 253 261
 rect 195 221 253 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel viali 127 614 127 614 1 A
 port 1 n
 rlabel metal1 214 400 214 400 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__decap_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__decap_1.mag
index eb031ab..224a6a5 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__decap_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__decap_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864564
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -49,9 +50,9 @@
 rect 80 367 110 713
 rect 80 80 110 115
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 729 69 745
 rect 121 949 155 1049
@@ -60,24 +61,24 @@
 rect 35 61 69 131
 rect 121 335 155 351
 rect 121 61 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__decap_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__decap_l.mag
index b2944ae..4e66e21 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__decap_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__decap_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007751
+timestamp 1606864564
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -49,9 +50,9 @@
 rect 80 243 110 837
 rect 80 80 110 115
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 849 69 865
 rect 121 949 155 1049
@@ -60,24 +61,24 @@
 rect 35 61 69 131
 rect 121 215 155 231
 rect 121 61 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dff_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dff_1.mag
index 19f4786..bd12596 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dff_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dff_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864564
 << checkpaint >>
 rect -1269 -242 2716 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1456 1119
 << nmos >>
@@ -368,18 +369,18 @@
 rect 1323 410 1357 444
 rect 1018 301 1052 335
 << locali >>
-rect 0 1093 1452 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1452 1093
+rect 0 1089 1452 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1452 1089
 rect 40 949 74 965
 rect 17 605 40 617
 rect 126 949 160 1049
@@ -483,39 +484,39 @@
 rect 1292 61 1326 131
 rect 1378 215 1412 234
 rect 1378 115 1412 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1452 61
-rect 0 0 1452 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1452 61
+rect 0 0 1452 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 40 301 74 335
 rect 253 449 287 483
 rect 181 375 215 409
@@ -530,40 +531,40 @@
 rect 1206 523 1240 557
 rect 1226 369 1260 403
 rect 1018 301 1052 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1452 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1452 1093
-rect 0 1049 1452 1059
+rect 0 1089 1452 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1452 1089
+rect 0 1049 1452 1055
 rect 1366 631 1424 637
 rect 1343 597 1378 631
 rect 1412 597 1424 631
@@ -607,19 +608,19 @@
 rect 1052 301 1064 335
 rect 523 295 581 301
 rect 1006 295 1064 301
-rect 0 51 1452 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1452 51
-rect 0 0 1452 17
+rect 0 55 1452 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1452 55
+rect 0 0 1452 21
 << labels >>
 rlabel viali 198 392 198 392 1 D
 port 1 n
@@ -629,6 +630,6 @@
 port 4 n
 rlabel viali 1224 540 1224 540 1 QN
 port 2 n
-rlabel viali 68 45 68 45 1 gnd
-rlabel viali 68 1067 68 1067 1 vdd
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1063 68 1063 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dff_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dff_l.mag
index 0a7c470..6d86c98 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dff_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dff_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864564
 << checkpaint >>
 rect -1269 -242 2716 2379
+rect -1209 -1243 2569 -242
 << nwell >>
 rect -9 529 1456 1119
 << nmos >>
@@ -368,18 +369,18 @@
 rect 1323 410 1357 444
 rect 1018 301 1052 335
 << locali >>
-rect 0 1093 1452 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 1003 1093
-rect 1037 1049 1139 1093
-rect 1173 1049 1275 1093
-rect 1309 1049 1452 1093
+rect 0 1089 1452 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 1003 1089
+rect 1037 1049 1139 1089
+rect 1173 1049 1275 1089
+rect 1309 1049 1452 1089
 rect 40 949 74 965
 rect 17 605 40 617
 rect 126 949 160 1049
@@ -485,39 +486,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 234
 rect 1378 115 1412 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 1003 61
-rect 1037 17 1139 61
-rect 1173 17 1275 61
-rect 1309 17 1452 61
-rect 0 0 1452 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 1003 61
+rect 1037 21 1139 61
+rect 1173 21 1275 61
+rect 1309 21 1452 61
+rect 0 0 1452 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
-rect 1003 1083 1037 1093
-rect 1003 1059 1037 1083
-rect 1139 1083 1173 1093
-rect 1139 1059 1173 1083
-rect 1275 1083 1309 1093
-rect 1275 1059 1309 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
+rect 1003 1083 1037 1089
+rect 1003 1055 1037 1083
+rect 1139 1083 1173 1089
+rect 1139 1055 1173 1083
+rect 1275 1083 1309 1089
+rect 1275 1055 1309 1083
 rect 40 301 74 335
 rect 253 449 287 483
 rect 181 375 215 409
@@ -531,40 +532,40 @@
 rect 1206 523 1240 557
 rect 1226 369 1260 403
 rect 1018 301 1052 335
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
-rect 1003 27 1037 51
-rect 1003 17 1037 27
-rect 1139 27 1173 51
-rect 1139 17 1173 27
-rect 1275 27 1309 51
-rect 1275 17 1309 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
+rect 1003 27 1037 55
+rect 1003 21 1037 27
+rect 1139 27 1173 55
+rect 1139 21 1173 27
+rect 1275 27 1309 55
+rect 1275 21 1309 27
 << metal1 >>
-rect 0 1093 1452 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 1003 1093
-rect 1037 1059 1139 1093
-rect 1173 1059 1275 1093
-rect 1309 1059 1452 1093
-rect 0 1049 1452 1059
+rect 0 1089 1452 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 1003 1089
+rect 1037 1055 1139 1089
+rect 1173 1055 1275 1089
+rect 1309 1055 1452 1089
+rect 0 1049 1452 1055
 rect 1365 631 1423 637
 rect 1343 597 1377 631
 rect 1411 597 1423 631
@@ -608,19 +609,19 @@
 rect 1052 301 1064 335
 rect 523 295 581 301
 rect 1006 295 1064 301
-rect 0 51 1452 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 1003 51
-rect 1037 17 1139 51
-rect 1173 17 1275 51
-rect 1309 17 1452 51
-rect 0 0 1452 17
+rect 0 55 1452 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 1003 55
+rect 1037 21 1139 55
+rect 1173 21 1275 55
+rect 1309 21 1452 55
+rect 0 0 1452 21
 << labels >>
 rlabel viali 198 392 198 392 1 D
 port 1 n
@@ -630,6 +631,6 @@
 port 3 n
 rlabel viali 915 466 915 466 1 CK
 port 4 n
-rlabel viali 68 45 68 45 1 gnd
-rlabel viali 68 1067 68 1067 1 vdd
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 1063 68 1063 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_1.mag
index 3373539..e6bca9f 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864565
 << checkpaint >>
 rect -1270 -242 3177 2379
+rect -1210 -1243 3112 -242
 << nwell >>
 rect -10 529 1917 1119
 << nmos >>
@@ -467,22 +468,22 @@
 rect 1784 410 1818 444
 rect 1545 257 1579 291
 << locali >>
-rect 0 1093 1914 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1914 1093
+rect 0 1089 1914 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1914 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -612,51 +613,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 234
 rect 1839 115 1873 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1914 61
-rect 0 0 1914 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1914 61
+rect 0 0 1914 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
 rect 47 597 81 631
 rect 229 257 263 261
 rect 229 227 263 257
@@ -675,52 +676,52 @@
 rect 1409 301 1443 335
 rect 1545 257 1579 261
 rect 1545 227 1579 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
 << metal1 >>
-rect 0 1093 1914 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1914 1093
-rect 0 1049 1914 1059
+rect 0 1089 1914 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1914 1089
+rect 0 1049 1914 1055
 rect 35 631 93 637
 rect 1826 631 1884 637
 rect 35 597 47 631
@@ -775,23 +776,23 @@
 rect 1579 227 1591 261
 rect 217 221 275 227
 rect 1533 221 1591 227
-rect 0 51 1914 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1914 51
-rect 0 0 1914 17
+rect 0 55 1914 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1914 55
+rect 0 0 1914 21
 << labels >>
 rlabel viali 65 614 65 614 1 RN
 port 1 n
@@ -803,6 +804,6 @@
 port 4 n
 rlabel viali 1685 540 1685 540 1 QN
 port 5 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_l.mag
index 340ca41..9a6c296 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dffr_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864565
 << checkpaint >>
 rect -1270 -242 3177 2379
+rect -1210 -1243 3112 -242
 << nwell >>
 rect -10 529 1917 1119
 << nmos >>
@@ -467,22 +468,22 @@
 rect 1784 410 1818 444
 rect 1545 257 1579 291
 << locali >>
-rect 0 1093 1914 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1914 1093
+rect 0 1089 1914 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1914 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -612,51 +613,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 234
 rect 1839 115 1873 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1914 61
-rect 0 0 1914 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1914 61
+rect 0 0 1914 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
 rect 47 597 81 631
 rect 229 257 263 261
 rect 229 227 263 257
@@ -675,52 +676,52 @@
 rect 1409 301 1443 335
 rect 1545 257 1579 261
 rect 1545 227 1579 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
 << metal1 >>
-rect 0 1093 1914 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1914 1093
-rect 0 1049 1914 1059
+rect 0 1089 1914 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1914 1089
+rect 0 1049 1914 1055
 rect 35 631 93 637
 rect 1826 631 1884 637
 rect 35 597 47 631
@@ -775,23 +776,23 @@
 rect 1579 227 1591 261
 rect 217 221 275 227
 rect 1533 221 1591 227
-rect 0 51 1914 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1914 51
-rect 0 0 1914 17
+rect 0 55 1914 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1914 55
+rect 0 0 1914 21
 << labels >>
 rlabel viali 65 614 65 614 1 RN
 port 1 n
@@ -803,6 +804,6 @@
 port 4 n
 rlabel viali 1685 540 1685 540 1 QN
 port 5 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_1.mag
index 2de83db..a6b2464 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007752
+timestamp 1606864565
 << checkpaint >>
 rect -1270 -242 3001 2379
+rect -1210 -1243 2840 -242
 << nwell >>
 rect -10 529 1741 1119
 << nmos >>
@@ -423,20 +424,20 @@
 rect 1594 410 1628 444
 rect 1355 257 1389 291
 << locali >>
-rect 0 1093 1738 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1738 1093
+rect 0 1089 1738 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1738 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -548,45 +549,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 234
 rect 1649 115 1683 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1738 61
-rect 0 0 1738 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1738 61
+rect 0 0 1738 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
 rect 47 227 81 261
 rect 121 301 155 335
 rect 438 449 472 483
@@ -603,46 +604,46 @@
 rect 1203 301 1237 335
 rect 1355 257 1389 261
 rect 1355 227 1389 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
 << metal1 >>
-rect 0 1093 1738 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1738 1093
-rect 0 1049 1738 1059
+rect 0 1089 1738 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1738 1089
+rect 0 1049 1738 1055
 rect 1636 631 1694 637
 rect 1614 597 1648 631
 rect 1682 597 1694 631
@@ -693,21 +694,21 @@
 rect 1389 227 1401 261
 rect 35 221 93 227
 rect 1343 221 1401 227
-rect 0 51 1738 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1738 51
-rect 0 0 1738 17
+rect 0 55 1738 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1738 55
+rect 0 0 1738 21
 << labels >>
 rlabel viali 383 392 383 392 1 D
 port 1 n
@@ -718,6 +719,6 @@
 rlabel viali 1495 540 1495 540 1 QN
 port 3 n
 rlabel viali 64 244 64 244 1 SN
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_l.mag
index a84a32d..9efb9be 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dffs_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864565
 << checkpaint >>
 rect -1270 -242 3001 2379
+rect -1210 -1243 2840 -242
 << nwell >>
 rect -10 529 1741 1119
 << nmos >>
@@ -423,20 +424,20 @@
 rect 1594 410 1628 444
 rect 1355 257 1389 291
 << locali >>
-rect 0 1093 1738 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1738 1093
+rect 0 1089 1738 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1738 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -548,45 +549,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 234
 rect 1649 115 1683 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1738 61
-rect 0 0 1738 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1738 61
+rect 0 0 1738 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
 rect 47 227 81 261
 rect 121 301 155 335
 rect 438 449 472 483
@@ -603,46 +604,46 @@
 rect 1203 301 1237 335
 rect 1355 257 1389 261
 rect 1355 227 1389 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
 << metal1 >>
-rect 0 1093 1738 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1738 1093
-rect 0 1049 1738 1059
+rect 0 1089 1738 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1738 1089
+rect 0 1049 1738 1055
 rect 1636 631 1694 637
 rect 1614 597 1648 631
 rect 1682 597 1694 631
@@ -693,21 +694,21 @@
 rect 1389 227 1401 261
 rect 35 221 93 227
 rect 1343 221 1401 227
-rect 0 51 1738 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1738 51
-rect 0 0 1738 17
+rect 0 55 1738 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1738 55
+rect 0 0 1738 21
 << labels >>
 rlabel viali 383 392 383 392 1 D
 port 1 n
@@ -718,6 +719,6 @@
 rlabel viali 1495 540 1495 540 1 QN
 port 3 n
 rlabel viali 64 244 64 244 1 SN
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_1.mag
index 9f3dea1..aa98eef 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_1.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864565
 << checkpaint >>
 rect -1270 -242 3350 2379
+rect -1210 -1243 3248 -242
 << nwell >>
 rect -10 529 2090 1119
 << nmos >>
@@ -528,23 +529,23 @@
 rect 1956 410 1990 444
 rect 1755 257 1789 291
 << locali >>
-rect 0 1093 2090 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1954 1093
-rect 1988 1049 2090 1093
+rect 0 1089 2090 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1954 1089
+rect 1988 1049 2090 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -685,54 +686,54 @@
 rect 1925 61 1959 131
 rect 2011 215 2045 234
 rect 2011 115 2045 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1954 61
-rect 1988 17 2090 61
-rect 0 0 2090 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1954 61
+rect 1988 21 2090 61
+rect 0 0 2090 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
-rect 1954 1083 1988 1093
-rect 1954 1059 1988 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
+rect 1954 1083 1988 1089
+rect 1954 1055 1988 1083
 rect 47 597 81 631
 rect 325 523 359 557
 rect 325 301 359 335
@@ -754,55 +755,55 @@
 rect 1502 301 1536 335
 rect 1755 257 1789 261
 rect 1755 227 1789 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
-rect 1954 27 1988 51
-rect 1954 17 1988 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
+rect 1954 27 1988 55
+rect 1954 21 1988 27
 << metal1 >>
-rect 0 1093 2090 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1954 1093
-rect 1988 1059 2090 1093
-rect 0 1049 2090 1059
+rect 0 1089 2090 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1954 1089
+rect 1988 1055 2090 1089
+rect 0 1049 2090 1055
 rect 35 631 93 637
 rect 1999 631 2057 637
 rect 35 597 47 631
@@ -864,24 +865,24 @@
 rect 1789 227 1801 261
 rect 217 221 275 227
 rect 1743 221 1801 227
-rect 0 51 2090 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1954 51
-rect 1988 17 2090 51
-rect 0 0 2090 17
+rect 0 55 2090 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1954 55
+rect 1988 21 2090 55
+rect 0 0 2090 21
 << labels >>
 rlabel viali 659 392 659 392 1 D
 port 1 n
@@ -895,6 +896,6 @@
 port 5 n
 rlabel viali 2028 614 2028 614 1 Q
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_l.mag
index 2394672..a567953 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__dffsr_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007753
+timestamp 1606864566
 << checkpaint >>
 rect -1270 -242 3350 2379
+rect -1210 -1243 3248 -242
 << nwell >>
 rect -10 529 2090 1119
 << nmos >>
@@ -526,23 +527,23 @@
 rect 1956 410 1990 444
 rect 1755 257 1789 291
 << locali >>
-rect 0 1093 2090 1110
-rect 0 1049 50 1093
-rect 84 1049 186 1093
-rect 220 1049 322 1093
-rect 356 1049 458 1093
-rect 492 1049 594 1093
-rect 628 1049 730 1093
-rect 764 1049 866 1093
-rect 900 1049 1002 1093
-rect 1036 1049 1138 1093
-rect 1172 1049 1274 1093
-rect 1308 1049 1410 1093
-rect 1444 1049 1546 1093
-rect 1580 1049 1682 1093
-rect 1716 1049 1818 1093
-rect 1852 1049 1954 1093
-rect 1988 1049 2090 1093
+rect 0 1089 2090 1110
+rect 0 1049 50 1089
+rect 84 1049 186 1089
+rect 220 1049 322 1089
+rect 356 1049 458 1089
+rect 492 1049 594 1089
+rect 628 1049 730 1089
+rect 764 1049 866 1089
+rect 900 1049 1002 1089
+rect 1036 1049 1138 1089
+rect 1172 1049 1274 1089
+rect 1308 1049 1410 1089
+rect 1444 1049 1546 1089
+rect 1580 1049 1682 1089
+rect 1716 1049 1818 1089
+rect 1852 1049 1954 1089
+rect 1988 1049 2090 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -685,54 +686,54 @@
 rect 1925 61 1959 131
 rect 2011 165 2045 234
 rect 2011 115 2045 131
-rect 0 17 50 61
-rect 84 17 186 61
-rect 220 17 322 61
-rect 356 17 458 61
-rect 492 17 594 61
-rect 628 17 730 61
-rect 764 17 866 61
-rect 900 17 1002 61
-rect 1036 17 1138 61
-rect 1172 17 1274 61
-rect 1308 17 1410 61
-rect 1444 17 1546 61
-rect 1580 17 1682 61
-rect 1716 17 1818 61
-rect 1852 17 1954 61
-rect 1988 17 2090 61
-rect 0 0 2090 17
+rect 0 21 50 61
+rect 84 21 186 61
+rect 220 21 322 61
+rect 356 21 458 61
+rect 492 21 594 61
+rect 628 21 730 61
+rect 764 21 866 61
+rect 900 21 1002 61
+rect 1036 21 1138 61
+rect 1172 21 1274 61
+rect 1308 21 1410 61
+rect 1444 21 1546 61
+rect 1580 21 1682 61
+rect 1716 21 1818 61
+rect 1852 21 1954 61
+rect 1988 21 2090 61
+rect 0 0 2090 21
 << viali >>
-rect 50 1083 84 1093
-rect 50 1059 84 1083
-rect 186 1083 220 1093
-rect 186 1059 220 1083
-rect 322 1083 356 1093
-rect 322 1059 356 1083
-rect 458 1083 492 1093
-rect 458 1059 492 1083
-rect 594 1083 628 1093
-rect 594 1059 628 1083
-rect 730 1083 764 1093
-rect 730 1059 764 1083
-rect 866 1083 900 1093
-rect 866 1059 900 1083
-rect 1002 1083 1036 1093
-rect 1002 1059 1036 1083
-rect 1138 1083 1172 1093
-rect 1138 1059 1172 1083
-rect 1274 1083 1308 1093
-rect 1274 1059 1308 1083
-rect 1410 1083 1444 1093
-rect 1410 1059 1444 1083
-rect 1546 1083 1580 1093
-rect 1546 1059 1580 1083
-rect 1682 1083 1716 1093
-rect 1682 1059 1716 1083
-rect 1818 1083 1852 1093
-rect 1818 1059 1852 1083
-rect 1954 1083 1988 1093
-rect 1954 1059 1988 1083
+rect 50 1083 84 1089
+rect 50 1055 84 1083
+rect 186 1083 220 1089
+rect 186 1055 220 1083
+rect 322 1083 356 1089
+rect 322 1055 356 1083
+rect 458 1083 492 1089
+rect 458 1055 492 1083
+rect 594 1083 628 1089
+rect 594 1055 628 1083
+rect 730 1083 764 1089
+rect 730 1055 764 1083
+rect 866 1083 900 1089
+rect 866 1055 900 1083
+rect 1002 1083 1036 1089
+rect 1002 1055 1036 1083
+rect 1138 1083 1172 1089
+rect 1138 1055 1172 1083
+rect 1274 1083 1308 1089
+rect 1274 1055 1308 1083
+rect 1410 1083 1444 1089
+rect 1410 1055 1444 1083
+rect 1546 1083 1580 1089
+rect 1546 1055 1580 1083
+rect 1682 1083 1716 1089
+rect 1682 1055 1716 1083
+rect 1818 1083 1852 1089
+rect 1818 1055 1852 1083
+rect 1954 1083 1988 1089
+rect 1954 1055 1988 1083
 rect 47 597 81 631
 rect 325 523 359 557
 rect 325 301 359 335
@@ -753,55 +754,55 @@
 rect 1502 301 1536 335
 rect 1755 257 1789 261
 rect 1755 227 1789 257
-rect 50 27 84 51
-rect 50 17 84 27
-rect 186 27 220 51
-rect 186 17 220 27
-rect 322 27 356 51
-rect 322 17 356 27
-rect 458 27 492 51
-rect 458 17 492 27
-rect 594 27 628 51
-rect 594 17 628 27
-rect 730 27 764 51
-rect 730 17 764 27
-rect 866 27 900 51
-rect 866 17 900 27
-rect 1002 27 1036 51
-rect 1002 17 1036 27
-rect 1138 27 1172 51
-rect 1138 17 1172 27
-rect 1274 27 1308 51
-rect 1274 17 1308 27
-rect 1410 27 1444 51
-rect 1410 17 1444 27
-rect 1546 27 1580 51
-rect 1546 17 1580 27
-rect 1682 27 1716 51
-rect 1682 17 1716 27
-rect 1818 27 1852 51
-rect 1818 17 1852 27
-rect 1954 27 1988 51
-rect 1954 17 1988 27
+rect 50 27 84 55
+rect 50 21 84 27
+rect 186 27 220 55
+rect 186 21 220 27
+rect 322 27 356 55
+rect 322 21 356 27
+rect 458 27 492 55
+rect 458 21 492 27
+rect 594 27 628 55
+rect 594 21 628 27
+rect 730 27 764 55
+rect 730 21 764 27
+rect 866 27 900 55
+rect 866 21 900 27
+rect 1002 27 1036 55
+rect 1002 21 1036 27
+rect 1138 27 1172 55
+rect 1138 21 1172 27
+rect 1274 27 1308 55
+rect 1274 21 1308 27
+rect 1410 27 1444 55
+rect 1410 21 1444 27
+rect 1546 27 1580 55
+rect 1546 21 1580 27
+rect 1682 27 1716 55
+rect 1682 21 1716 27
+rect 1818 27 1852 55
+rect 1818 21 1852 27
+rect 1954 27 1988 55
+rect 1954 21 1988 27
 << metal1 >>
-rect 0 1093 2090 1110
-rect 0 1059 50 1093
-rect 84 1059 186 1093
-rect 220 1059 322 1093
-rect 356 1059 458 1093
-rect 492 1059 594 1093
-rect 628 1059 730 1093
-rect 764 1059 866 1093
-rect 900 1059 1002 1093
-rect 1036 1059 1138 1093
-rect 1172 1059 1274 1093
-rect 1308 1059 1410 1093
-rect 1444 1059 1546 1093
-rect 1580 1059 1682 1093
-rect 1716 1059 1818 1093
-rect 1852 1059 1954 1093
-rect 1988 1059 2090 1093
-rect 0 1049 2090 1059
+rect 0 1089 2090 1110
+rect 0 1055 50 1089
+rect 84 1055 186 1089
+rect 220 1055 322 1089
+rect 356 1055 458 1089
+rect 492 1055 594 1089
+rect 628 1055 730 1089
+rect 764 1055 866 1089
+rect 900 1055 1002 1089
+rect 1036 1055 1138 1089
+rect 1172 1055 1274 1089
+rect 1308 1055 1410 1089
+rect 1444 1055 1546 1089
+rect 1580 1055 1682 1089
+rect 1716 1055 1818 1089
+rect 1852 1055 1954 1089
+rect 1988 1055 2090 1089
+rect 0 1049 2090 1055
 rect 35 631 93 637
 rect 1998 631 2056 637
 rect 35 597 47 631
@@ -863,24 +864,24 @@
 rect 1789 227 1801 261
 rect 217 221 275 227
 rect 1743 221 1801 227
-rect 0 51 2090 61
-rect 0 17 50 51
-rect 84 17 186 51
-rect 220 17 322 51
-rect 356 17 458 51
-rect 492 17 594 51
-rect 628 17 730 51
-rect 764 17 866 51
-rect 900 17 1002 51
-rect 1036 17 1138 51
-rect 1172 17 1274 51
-rect 1308 17 1410 51
-rect 1444 17 1546 51
-rect 1580 17 1682 51
-rect 1716 17 1818 51
-rect 1852 17 1954 51
-rect 1988 17 2090 51
-rect 0 0 2090 17
+rect 0 55 2090 61
+rect 0 21 50 55
+rect 84 21 186 55
+rect 220 21 322 55
+rect 356 21 458 55
+rect 492 21 594 55
+rect 628 21 730 55
+rect 764 21 866 55
+rect 900 21 1002 55
+rect 1036 21 1138 55
+rect 1172 21 1274 55
+rect 1308 21 1410 55
+rect 1444 21 1546 55
+rect 1580 21 1682 55
+rect 1716 21 1818 55
+rect 1852 21 1954 55
+rect 1988 21 2090 55
+rect 0 0 2090 21
 << labels >>
 rlabel viali 659 392 659 392 1 D
 port 1 n
@@ -894,6 +895,6 @@
 port 5 n
 rlabel viali 65 614 65 614 1 RN
 port 6 n
-rlabel viali 67 44 67 44 1 gnd
-rlabel viali 67 1066 67 1066 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 1062 67 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_1.mag
index 4624f76..82e08bb 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864567
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -72,22 +72,22 @@
 rect 35 61 69 131
 rect 121 215 155 227
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -101,15 +101,15 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel metal1 151 389 151 389 1 Y
 port 1 n
 rlabel viali 64 614 64 614 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_10.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_10.mag
index b7a4a5e..f251965 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_10.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_10.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007754
+timestamp 1606864567
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -243,15 +243,15 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -299,30 +299,30 @@
 rect 809 115 843 131
 rect 895 215 929 231
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -334,31 +334,31 @@
 rect 465 227 499 261
 rect 637 227 671 261
 rect 809 227 843 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -400,21 +400,21 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_2.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_2.mag
index e8f43a3..f3af0d7 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_2.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864567
 << checkpaint >>
 rect -1269 2461 1547 2601
 rect -1760 -1129 6260 2461
@@ -84,10 +84,10 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -103,28 +103,28 @@
 rect 121 115 155 131
 rect 207 215 241 231
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -138,16 +138,16 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_3.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_3.mag
index 4bb78f5..813b08c 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_3.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_3.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864567
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -100,10 +100,10 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -123,30 +123,30 @@
 rect 207 61 241 131
 rect 293 215 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
 rect 121 227 155 261
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -167,16 +167,16 @@
 rect 327 227 339 261
 rect 109 221 167 227
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_4.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_4.mag
index 42f5e44..eff9300 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_4.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864568
 << checkpaint >>
 rect -1269 2461 1723 2601
 rect -1760 -1129 6260 2461
@@ -122,11 +122,11 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -150,36 +150,36 @@
 rect 293 115 327 131
 rect 379 215 413 231
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
 rect 121 227 155 261
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -200,17 +200,17 @@
 rect 327 227 339 261
 rect 109 221 167 227
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 64 613 64 613 1 A
 port 1 n
 rlabel metal1 152 388 152 388 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_6.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_6.mag
index 189b110..4a0bc0f 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_6.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_6.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007755
+timestamp 1606864568
 << checkpaint >>
 rect -1269 2461 1899 2601
 rect -1760 -1129 6260 2461
@@ -161,12 +161,12 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -198,21 +198,21 @@
 rect 465 115 499 131
 rect 551 215 585 231
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -220,22 +220,22 @@
 rect 121 227 155 261
 rect 293 227 327 261
 rect 465 227 499 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -263,18 +263,18 @@
 rect 109 221 167 227
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 64 613 64 613 1 A
 port 1 n
 rlabel metal1 152 388 152 388 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_8.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_8.mag
index b20af53..24cdc95 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_8.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864568
 << checkpaint >>
 rect -1269 2461 2074 2601
 rect -1760 -1129 6260 2461
@@ -199,13 +199,13 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 814 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 814 1093
+rect 0 1089 814 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 814 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -245,24 +245,24 @@
 rect 637 115 671 131
 rect 723 215 757 231
 rect 723 61 757 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 814 61
-rect 0 0 814 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 814 61
+rect 0 0 814 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 293 523 327 557
@@ -272,25 +272,25 @@
 rect 293 227 327 261
 rect 465 227 499 261
 rect 637 227 671 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
 << metal1 >>
-rect 0 1093 814 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 814 1093
-rect 0 1049 814 1059
+rect 0 1089 814 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 814 1089
+rect 0 1049 814 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -325,19 +325,19 @@
 rect 281 221 339 227
 rect 453 221 511 227
 rect 625 221 683 227
-rect 0 51 814 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 814 51
-rect 0 0 814 17
+rect 0 55 814 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 814 55
+rect 0 0 814 21
 << labels >>
 rlabel metal1 152 388 152 388 1 Y
 port 1 n
 rlabel viali 64 613 64 613 1 A
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_l.mag
index f19ac2b..471bbc4 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__inv_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__inv_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864568
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -56,9 +57,9 @@
 << polycont >>
 rect 90 392 124 426
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -70,22 +71,22 @@
 rect 35 61 69 131
 rect 121 165 155 227
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 47 597 81 631
 rect 121 523 155 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 127 631
@@ -99,15 +100,15 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 64 614 64 614 1 A
 port 1 n
 rlabel metal1 151 389 151 389 1 Y
 port 2 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__mux2_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__mux2_1.mag
index b9b1a93..a291e5d 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__mux2_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__mux2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864568
 << checkpaint >>
 rect -1269 2461 1813 2601
 rect -1760 -1129 6260 2461
@@ -124,9 +124,9 @@
 rect 37 392 71 426
 rect 168 301 202 335
 << locali >>
-rect 0 1093 550 1110
-rect 0 1049 459 1093
-rect 493 1049 550 1093
+rect 0 1089 550 1110
+rect 0 1049 459 1089
+rect 493 1049 550 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -158,33 +158,33 @@
 rect 311 115 345 131
 rect 397 215 431 449
 rect 397 115 431 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 550 61
-rect 0 0 550 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 550 61
+rect 0 0 550 21
 << viali >>
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 597 71 631
 rect 236 523 270 557
 rect 311 375 345 409
 rect 397 449 431 483
 rect 311 227 345 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 550 1110
-rect 0 1059 459 1093
-rect 493 1059 550 1093
-rect 0 1049 550 1059
+rect 0 1089 550 1110
+rect 0 1055 459 1089
+rect 493 1055 550 1089
+rect 0 1049 550 1055
 rect 25 631 83 637
 rect 25 597 37 631
 rect 71 597 117 631
@@ -206,13 +206,13 @@
 rect 299 227 311 261
 rect 345 227 357 261
 rect 299 221 357 227
-rect 0 51 550 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 550 51
-rect 0 0 550 17
+rect 0 55 550 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 550 55
+rect 0 0 550 21
 << labels >>
 rlabel viali 54 614 54 614 1 S0
 port 1 n
@@ -222,6 +222,6 @@
 port 3 n
 rlabel viali 414 466 414 466 1 A1
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 476 1066 476 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 1062 476 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_1.mag
index 2cd39aa..5ef206c 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864569
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 47 468 81 502
 rect 166 375 200 409
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 121 949 155 965
@@ -100,29 +100,29 @@
 rect 35 115 69 131
 rect 193 215 227 231
 rect 193 61 227 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 449 155 483
 rect 195 523 229 557
 rect 35 227 69 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 115 631
@@ -140,11 +140,11 @@
 rect 23 227 35 261
 rect 69 227 155 261
 rect 23 221 81 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 136 418 136 418 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 212 540 212 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_l.mag
index b712439..76d5b3d 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__nand2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007756
+timestamp 1606864569
 << checkpaint >>
 rect -1269 -242 1546 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 286 1119
 << nmos >>
@@ -79,10 +80,10 @@
 rect 47 468 81 502
 rect 166 318 200 352
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 1049
 rect 35 861 69 877
 rect 121 949 155 965
@@ -98,29 +99,29 @@
 rect 35 115 69 131
 rect 193 165 227 181
 rect 193 61 227 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 47 597 81 631
 rect 121 449 155 483
 rect 195 523 229 557
 rect 35 227 69 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 35 631 93 637
 rect 35 597 47 631
 rect 81 597 115 631
@@ -138,11 +139,11 @@
 rect 23 227 35 261
 rect 69 227 155 261
 rect 23 221 81 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 136 418 136 418 1 Y
 port 1 n
@@ -150,6 +151,6 @@
 port 2 n
 rlabel viali 64 614 64 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_1.mag
index 1e0dad9..9b1a712 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864569
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 181 482 215 516
 rect 66 349 100 383
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 193 949 227 1049
 rect 193 725 227 741
@@ -100,29 +100,29 @@
 rect 121 115 155 131
 rect 207 215 241 231
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 181 597 215 631
 rect 35 449 69 483
 rect 113 523 147 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 169 631 227 637
 rect 148 597 181 631
 rect 215 597 227 631
@@ -140,11 +140,11 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 137 341 137 341 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 198 614 198 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_l.mag
index 82e5998..960b63f 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__nor2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864569
 << checkpaint >>
 rect -1269 -242 1546 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 286 1119
 << nmos >>
@@ -79,10 +80,10 @@
 rect 181 482 215 516
 rect 66 349 100 383
 << locali >>
-rect 0 1093 286 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 286 1093
+rect 0 1089 286 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 286 1089
 rect 35 949 69 965
 rect 35 483 69 809
 rect 193 949 227 1049
@@ -98,29 +99,29 @@
 rect 121 115 155 131
 rect 207 165 241 181
 rect 207 61 241 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 286 61
-rect 0 0 286 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 286 61
+rect 0 0 286 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 181 597 215 631
 rect 35 449 69 483
 rect 113 523 147 557
 rect 121 227 155 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 286 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 286 1093
-rect 0 1049 286 1059
+rect 0 1089 286 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 286 1089
+rect 0 1049 286 1055
 rect 169 631 227 637
 rect 148 597 181 631
 rect 215 597 227 631
@@ -138,11 +139,11 @@
 rect 109 227 121 261
 rect 155 227 167 261
 rect 109 221 167 227
-rect 0 51 286 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 286 51
-rect 0 0 286 17
+rect 0 55 286 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 286 55
+rect 0 0 286 21
 << labels >>
 rlabel metal1 137 341 137 341 1 Y
 port 1 n
@@ -150,6 +151,6 @@
 port 2 n
 rlabel viali 130 540 130 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__oai21_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__oai21_l.mag
index 8ff2f94..6d25ae5 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__oai21_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__oai21_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864569
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 152 375 186 409
 rect 262 307 296 341
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 193 949 227 1049
 rect 193 793 227 809
@@ -130,30 +131,30 @@
 rect 207 115 241 131
 rect 293 214 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 66 597 100 631
 rect 162 523 196 557
 rect 223 449 257 483
 rect 291 375 325 409
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 54 631 112 637
 rect 54 597 66 631
 rect 100 597 134 631
@@ -175,11 +176,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel viali 83 614 83 614 1 A0
 port 1 n
@@ -189,6 +190,6 @@
 port 3 n
 rlabel viali 240 466 240 466 1 B0
 port 4 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__oai22_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__oai22_l.mag
index a06c2bb..ebd7ffc 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__oai22_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__oai22_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864570
 << checkpaint >>
 rect -1269 -242 1722 2379
+rect -1209 -1243 1617 -242
 << nwell >>
 rect -9 529 462 1119
 << nmos >>
@@ -127,11 +128,11 @@
 rect 384 376 418 410
 rect 248 311 282 345
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 1049
 rect 35 725 69 741
 rect 200 949 234 965
@@ -162,37 +163,37 @@
 rect 207 129 241 131
 rect 379 129 413 131
 rect 207 95 413 129
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 66 597 100 631
 rect 162 523 196 557
 rect 223 449 257 483
 rect 384 376 418 410
 rect 316 301 350 335
 rect 316 227 350 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 54 631 112 637
 rect 54 597 66 631
 rect 100 597 134 631
@@ -218,12 +219,12 @@
 rect 304 227 316 261
 rect 350 227 362 261
 rect 304 221 362 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel viali 240 466 240 466 1 B0
 port 4 n
@@ -234,6 +235,6 @@
 rlabel viali 333 318 333 318 1 Y
 port 3 n
 rlabel viali 401 393 401 393 1 B1
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_1.mag
index 395426c..38947ff 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007757
+timestamp 1606864570
 << checkpaint >>
 rect -1269 2461 1634 2601
 rect -1760 -1129 6260 2461
@@ -105,10 +105,10 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -131,29 +131,29 @@
 rect 207 61 241 131
 rect 293 215 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -171,11 +171,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -183,6 +183,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_2.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_2.mag
index 410cec8..722c637 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_2.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864570
 << checkpaint >>
 rect -1269 2461 1722 2601
 rect -1760 -1129 6260 2461
@@ -128,11 +128,11 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 462 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 462 1093
+rect 0 1089 462 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 462 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -159,35 +159,35 @@
 rect 293 115 327 131
 rect 379 215 413 231
 rect 379 61 413 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 462 61
-rect 0 0 462 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 462 61
+rect 0 0 462 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
 << metal1 >>
-rect 0 1093 462 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 462 1093
-rect 0 1049 462 1059
+rect 0 1089 462 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 462 1089
+rect 0 1049 462 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -205,12 +205,12 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 462 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 462 51
-rect 0 0 462 17
+rect 0 55 462 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 462 55
+rect 0 0 462 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -218,6 +218,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_4.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_4.mag
index ab268a6..d7d10c4 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_4.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864570
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -166,12 +166,12 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -206,43 +206,43 @@
 rect 465 115 499 131
 rect 551 215 585 231
 rect 551 61 585 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 465 449 499 483
 rect 293 227 327 261
 rect 465 227 499 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -267,13 +267,13 @@
 rect 499 227 511 261
 rect 281 221 339 227
 rect 453 221 511 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -281,6 +281,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_8.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_8.mag
index 4a0611b..0f3e3dd 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_8.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864570
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -249,15 +249,15 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 990 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 595 1093
-rect 629 1049 731 1093
-rect 765 1049 867 1093
-rect 901 1049 990 1093
+rect 0 1089 990 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 595 1089
+rect 629 1049 731 1089
+rect 765 1049 867 1089
+rect 901 1049 990 1089
 rect 35 949 69 965
 rect 207 949 241 1049
 rect 207 725 241 741
@@ -308,30 +308,30 @@
 rect 809 115 843 131
 rect 895 215 929 231
 rect 895 61 929 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 595 61
-rect 629 17 731 61
-rect 765 17 867 61
-rect 901 17 990 61
-rect 0 0 990 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 595 61
+rect 629 21 731 61
+rect 765 21 867 61
+rect 901 21 990 61
+rect 0 0 990 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
-rect 595 1083 629 1093
-rect 595 1059 629 1083
-rect 731 1083 765 1093
-rect 731 1059 765 1083
-rect 867 1083 901 1093
-rect 867 1059 901 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
+rect 595 1083 629 1089
+rect 595 1055 629 1083
+rect 731 1083 765 1089
+rect 731 1055 765 1083
+rect 867 1083 901 1089
+rect 867 1055 901 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
@@ -342,31 +342,31 @@
 rect 465 227 499 261
 rect 637 227 671 261
 rect 809 227 843 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
-rect 595 27 629 51
-rect 595 17 629 27
-rect 731 27 765 51
-rect 731 17 765 27
-rect 867 27 901 51
-rect 867 17 901 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
+rect 595 27 629 55
+rect 595 21 629 27
+rect 731 27 765 55
+rect 731 21 765 27
+rect 867 27 901 55
+rect 867 21 901 27
 << metal1 >>
-rect 0 1093 990 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 595 1093
-rect 629 1059 731 1093
-rect 765 1059 867 1093
-rect 901 1059 990 1093
-rect 0 1049 990 1059
+rect 0 1089 990 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 595 1089
+rect 629 1055 731 1089
+rect 765 1055 867 1089
+rect 901 1055 990 1089
+rect 0 1049 990 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -406,16 +406,16 @@
 rect 453 221 511 227
 rect 625 221 683 227
 rect 797 221 855 227
-rect 0 51 990 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 595 51
-rect 629 17 731 51
-rect 765 17 867 51
-rect 901 17 990 51
-rect 0 0 990 17
+rect 0 55 990 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 595 55
+rect 629 21 731 55
+rect 765 21 867 55
+rect 901 21 990 55
+rect 0 0 990 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -423,6 +423,6 @@
 port 2 n
 rlabel viali 54 540 54 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_l.mag
index bbbeb0d..1fd3951 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__or2_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__or2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864570
 << checkpaint >>
 rect -1269 -242 1634 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 374 1119
 << nmos >>
@@ -103,10 +104,10 @@
 rect 173 408 207 442
 rect 269 318 303 352
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 691 69 877
 rect 207 949 241 1049
@@ -129,29 +130,29 @@
 rect 207 61 241 131
 rect 293 165 327 227
 rect 293 115 327 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 37 523 71 557
 rect 173 597 207 631
 rect 293 449 327 483
 rect 293 227 327 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 161 631 219 637
 rect 140 597 173 631
 rect 207 597 219 631
@@ -169,11 +170,11 @@
 rect 281 227 293 261
 rect 327 227 339 261
 rect 281 221 339 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 311 392 311 392 1 Y
 port 1 n
@@ -181,6 +182,6 @@
 port 2 n
 rlabel viali 190 614 190 614 1 A
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_1.mag
index ff9eeef..5c0a39e 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007758
+timestamp 1606864571
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -102,10 +102,10 @@
 rect 121 301 155 335
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 657 155 673
@@ -126,29 +126,29 @@
 rect 121 61 155 131
 rect 279 215 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 279 449 313 483
 rect 121 301 155 335
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -170,11 +170,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -182,6 +182,6 @@
 port 2 n
 rlabel metal1 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_l.mag
index 02660c8..d91a162 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__tbufi_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864571
 << checkpaint >>
 rect -1269 -242 1635 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 375 1119
 << nmos >>
@@ -100,10 +101,10 @@
 rect 121 301 155 335
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 461 69 809
 rect 121 949 155 1049
@@ -124,29 +125,29 @@
 rect 121 61 155 131
 rect 279 165 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 279 449 313 483
 rect 121 301 155 335
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -168,11 +169,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -180,6 +181,6 @@
 port 2 n
 rlabel metal1 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__tiehi.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__tiehi.mag
index bb41ef9..296b753 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__tiehi.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__tiehi.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864571
 << checkpaint >>
 rect -1269 -242 1459 2379
+rect -1209 -1243 1345 -242
 << nwell >>
 rect -9 529 199 1119
 << nmos >>
@@ -56,9 +57,9 @@
 << polycont >>
 rect 90 331 124 365
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 589 69 605
 rect 121 949 155 965
@@ -69,31 +70,31 @@
 rect 35 61 69 131
 rect 121 215 155 331
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 121 523 155 557
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 94 557 167 563
 rect 94 523 121 557
 rect 155 523 167 557
 rect 94 517 167 523
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 138 540 138 540 1 Y
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__tielo.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__tielo.mag
index 74bcacb..4fc6155 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__tielo.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__tielo.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864571
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 463 124 497
 << locali >>
-rect 0 1093 198 1110
-rect 0 1049 51 1093
-rect 85 1049 198 1093
+rect 0 1089 198 1110
+rect 0 1049 51 1089
+rect 85 1049 198 1089
 rect 35 949 69 1049
 rect 35 589 69 605
 rect 121 949 155 965
@@ -71,31 +71,31 @@
 rect 35 61 69 131
 rect 121 215 155 301
 rect 121 115 155 131
-rect 0 17 51 61
-rect 85 17 198 61
-rect 0 0 198 17
+rect 0 21 51 61
+rect 85 21 198 61
+rect 0 0 198 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
 rect 121 301 155 335
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 1093 198 1110
-rect 0 1059 51 1093
-rect 85 1059 198 1093
-rect 0 1049 198 1059
+rect 0 1089 198 1110
+rect 0 1055 51 1089
+rect 85 1055 198 1089
+rect 0 1049 198 1055
 rect 94 335 167 341
 rect 94 301 121 335
 rect 155 301 167 335
 rect 94 295 167 301
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 55 198 61
+rect 0 21 51 55
+rect 85 21 198 55
+rect 0 0 198 21
 << labels >>
 rlabel viali 138 318 138 318 1 Y
 port 1 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_1.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_1.mag
index 54a1dca..f530156 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_1.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864571
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -101,10 +101,10 @@
 rect 121 366 155 400
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 657 155 673
@@ -125,29 +125,29 @@
 rect 121 61 155 131
 rect 279 215 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 121 523 155 557
 rect 279 449 313 483
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -165,11 +165,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -177,6 +177,6 @@
 port 2 n
 rlabel viali 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_l.mag
index d0771d7..5e62dda 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__tnbufi_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864572
 << checkpaint >>
 rect -1269 -242 1635 2379
+rect -1209 -1243 1481 -242
 << nwell >>
 rect -9 529 375 1119
 << nmos >>
@@ -99,10 +100,10 @@
 rect 121 366 155 400
 rect 248 349 282 383
 << locali >>
-rect 0 1093 374 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 374 1093
+rect 0 1089 374 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 374 1089
 rect 35 949 69 965
 rect 35 400 69 809
 rect 121 949 155 1049
@@ -123,29 +124,29 @@
 rect 121 61 155 131
 rect 279 165 313 227
 rect 279 115 313 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 374 61
-rect 0 0 374 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 374 61
+rect 0 0 374 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
 rect 211 597 245 631
 rect 121 523 155 557
 rect 279 449 313 483
 rect 279 227 313 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
 << metal1 >>
-rect 0 1093 374 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 374 1093
-rect 0 1049 374 1059
+rect 0 1089 374 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 374 1089
+rect 0 1049 374 1055
 rect 199 631 257 637
 rect 177 597 211 631
 rect 245 597 257 631
@@ -163,11 +164,11 @@
 rect 267 227 279 261
 rect 313 227 325 261
 rect 267 221 325 227
-rect 0 51 374 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 374 51
-rect 0 0 374 17
+rect 0 55 374 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 374 55
+rect 0 0 374 21
 << labels >>
 rlabel metal1 305 312 305 312 1 Y
 port 1 n
@@ -175,6 +176,6 @@
 port 2 n
 rlabel viali 138 540 138 540 1 OE
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__xnor2_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__xnor2_l.mag
index 9246946..1ec9f56 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__xnor2_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__xnor2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007759
+timestamp 1606864572
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
 << nmos >>
@@ -171,12 +172,12 @@
 rect 336 301 370 335
 rect 489 301 523 335
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 35 443 69 605
 rect 121 949 155 1049
@@ -214,21 +215,21 @@
 rect 471 165 505 181
 rect 471 61 505 131
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 268 605 279 631
 rect 279 605 302 631
 rect 268 597 302 605
@@ -236,22 +237,22 @@
 rect 268 301 302 335
 rect 489 301 523 335
 rect 412 227 446 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 256 631 314 637
 rect 256 597 268 631
 rect 302 597 314 631
@@ -272,13 +273,13 @@
 rect 446 227 458 261
 rect 140 221 198 227
 rect 400 221 458 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 170 244 170 244 1 A
 port 1 n
@@ -286,6 +287,6 @@
 port 2 n
 rlabel metal1 284 375 284 375 1 Y
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>
diff --git a/15T_ms/magic/sky130_osu_sc_15T_ms__xor2_l.mag b/15T_ms/magic/sky130_osu_sc_15T_ms__xor2_l.mag
index 2ebc29e..309cba3 100644
--- a/15T_ms/magic/sky130_osu_sc_15T_ms__xor2_l.mag
+++ b/15T_ms/magic/sky130_osu_sc_15T_ms__xor2_l.mag
@@ -1,9 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604007760
+timestamp 1606864572
 << checkpaint >>
 rect -1269 -242 1898 2379
+rect -1209 -1243 1753 -242
 << nwell >>
 rect -9 529 638 1119
 << nmos >>
@@ -170,12 +171,12 @@
 rect 430 375 464 409
 rect 248 301 282 335
 << locali >>
-rect 0 1093 638 1110
-rect 0 1049 51 1093
-rect 85 1049 187 1093
-rect 221 1049 323 1093
-rect 357 1049 459 1093
-rect 493 1049 638 1093
+rect 0 1089 638 1110
+rect 0 1049 51 1089
+rect 85 1049 187 1089
+rect 221 1049 323 1089
+rect 357 1049 459 1089
+rect 493 1049 638 1089
 rect 35 949 69 965
 rect 121 949 155 1049
 rect 121 725 155 741
@@ -215,42 +216,42 @@
 rect 471 61 505 131
 rect 557 215 591 301
 rect 557 115 591 131
-rect 0 17 51 61
-rect 85 17 187 61
-rect 221 17 323 61
-rect 357 17 459 61
-rect 493 17 638 61
-rect 0 0 638 17
+rect 0 21 51 61
+rect 85 21 187 61
+rect 221 21 323 61
+rect 357 21 459 61
+rect 493 21 638 61
+rect 0 0 638 21
 << viali >>
-rect 51 1083 85 1093
-rect 51 1059 85 1083
-rect 187 1083 221 1093
-rect 187 1059 221 1083
-rect 323 1083 357 1093
-rect 323 1059 357 1083
-rect 459 1083 493 1093
-rect 459 1059 493 1083
+rect 51 1083 85 1089
+rect 51 1055 85 1083
+rect 187 1083 221 1089
+rect 187 1055 221 1083
+rect 323 1083 357 1089
+rect 323 1055 357 1083
+rect 459 1083 493 1089
+rect 459 1055 493 1083
 rect 200 597 234 631
 rect 412 597 446 631
 rect 268 449 302 483
 rect 489 523 523 557
 rect 296 227 330 261
-rect 51 27 85 51
-rect 51 17 85 27
-rect 187 27 221 51
-rect 187 17 221 27
-rect 323 27 357 51
-rect 323 17 357 27
-rect 459 27 493 51
-rect 459 17 493 27
+rect 51 27 85 55
+rect 51 21 85 27
+rect 187 27 221 55
+rect 187 21 221 27
+rect 323 27 357 55
+rect 323 21 357 27
+rect 459 27 493 55
+rect 459 21 493 27
 << metal1 >>
-rect 0 1093 638 1110
-rect 0 1059 51 1093
-rect 85 1059 187 1093
-rect 221 1059 323 1093
-rect 357 1059 459 1093
-rect 493 1059 638 1093
-rect 0 1049 638 1059
+rect 0 1089 638 1110
+rect 0 1055 51 1089
+rect 85 1055 187 1089
+rect 221 1055 323 1089
+rect 357 1055 459 1089
+rect 493 1055 638 1089
+rect 0 1049 638 1055
 rect 188 631 246 637
 rect 400 631 458 637
 rect 188 597 200 631
@@ -271,13 +272,13 @@
 rect 268 227 296 261
 rect 330 227 342 261
 rect 284 221 342 227
-rect 0 51 638 61
-rect 0 17 51 51
-rect 85 17 187 51
-rect 221 17 323 51
-rect 357 17 459 51
-rect 493 17 638 51
-rect 0 0 638 17
+rect 0 55 638 61
+rect 0 21 51 55
+rect 85 21 187 55
+rect 221 21 323 55
+rect 357 21 459 55
+rect 493 21 638 55
+rect 0 0 638 21
 << labels >>
 rlabel viali 218 614 218 614 1 A
 port 1 n
@@ -285,6 +286,6 @@
 port 2 n
 rlabel viali 506 540 506 540 1 B
 port 3 n
-rlabel viali 68 44 68 44 1 gnd
-rlabel viali 68 1066 68 1066 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 1062 68 1062 1 vdd
 << end >>