diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__addf_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__addf_1.gds
index 5bbf19b..91dbcf5 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__addf_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__addf_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__addf_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__addf_l.gds
index c9ca0e5..619289d 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__addf_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__addf_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__addh_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__addh_1.gds
index 7468ef7..a67990f 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__addh_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__addh_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__addh_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__addh_l.gds
index 7f04691..a159cfd 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__addh_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__addh_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_1.gds
index 0fe100e..f8f7b5a 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_2.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_2.gds
index 0adef1a..e4bced6 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_2.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_2.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_4.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_4.gds
index c1f4d2b..637fc77 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_4.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_4.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_6.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_6.gds
index 9036a82..36b7931 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_6.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_6.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_8.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_8.gds
index bd7178e..ce24a1d 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_8.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_8.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_l.gds
index 38bdf4d..e7fa723 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__and2_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__and2_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__ant.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__ant.gds
index 64f2216..f8b4820 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__ant.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__ant.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__antfill.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__antfill.gds
index 01080f9..2be0e12 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__antfill.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__antfill.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__aoi21_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__aoi21_l.gds
index 096f8ac..2c6e86e 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__aoi21_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__aoi21_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__aoi22_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__aoi22_l.gds
index 602b5e0..993b15e 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__aoi22_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__aoi22_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_1.gds
index a478aa3..d47781a 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_2.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_2.gds
index 550c981..45b4fb7 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_2.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_2.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_4.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_4.gds
index 47199c2..185f8ca 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_4.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_4.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_6.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_6.gds
index f332818..73453d4 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_6.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_6.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_8.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_8.gds
index 2d66387..8cfaa6b 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_8.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_8.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_l.gds
index f1a47bc..b6284ae 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__buf_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__buf_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__decap_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__decap_1.gds
index 470f264..6c8caf4 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__decap_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__decap_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__decap_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__decap_l.gds
index 1a5605a..35b5bdd 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__decap_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__decap_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dff_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dff_1.gds
index f6eae2d..e698dc4 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dff_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dff_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dff_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dff_l.gds
index 0ea8bc4..2b7d40a 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dff_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dff_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_1.gds
index d348376..38a61eb 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_l.gds
index cd4e2bf..256cb40 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dffr_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_1.gds
index 1934fde..07ed064 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_l.gds
index 2526132..15c4d6f 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dffs_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_1.gds
index 38e97d4..da72090 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_l.gds
index 2e76a43..f7ca4f1 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__dffsr_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_1.gds
index 60981a3..cfa680d 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_16.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_16.gds
index 3752574..a292f3e 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_16.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_16.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_2.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_2.gds
index e75c710..4d8fb2c 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_2.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_2.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_32.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_32.gds
index 7b1a141..079ae80 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_32.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_32.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_4.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_4.gds
index c56a9aa..f8d6389 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_4.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_4.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_8.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_8.gds
index ca4d264..d685dcd 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__fill_8.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__fill_8.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_1.gds
index 67849a1..bc4548f 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_10.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_10.gds
index fe71664..93133f1 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_10.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_10.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_2.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_2.gds
index 0fc0786..4af1d22 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_2.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_2.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_3.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_3.gds
index 1ad43ff..1b7aaf6 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_3.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_3.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_4.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_4.gds
index c554657..227f005 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_4.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_4.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_6.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_6.gds
index b8c2d5d..d72f2d5 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_6.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_6.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_8.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_8.gds
index 71ada68..dccce00 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_8.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_8.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_l.gds
index ca4c311..e0461fb 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__inv_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__inv_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__mux2_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__mux2_1.gds
index d210ffe..1d05882 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__mux2_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__mux2_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_1.gds
index 1c67ae5..cc991f0 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_l.gds
index acda572..92384cb 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__nand2_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_1.gds
index 63790e8..7c4c95c 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_l.gds
index f49d8b2..9722a05 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__nor2_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__oai21_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__oai21_l.gds
index 91b09bc..c288d4d 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__oai21_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__oai21_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__oai22_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__oai22_l.gds
index f5c4791..b930652 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__oai22_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__oai22_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_1.gds
index a7d3cf6..c5b60f4 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_2.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_2.gds
index 7f4e57c..1cde9a6 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_2.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_2.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_4.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_4.gds
index 3ab38dd..1234f01 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_4.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_4.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_8.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_8.gds
index 517c4bd..fac0c62 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_8.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_8.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_l.gds
index ab91893..e410ce7 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__or2_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__or2_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_1.gds
index 573a53e..54a093c 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_l.gds
index 962e84f..6aad8ba 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__tbufi_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__tiehi.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__tiehi.gds
index d6c048a..48c900a 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__tiehi.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__tiehi.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__tielo.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__tielo.gds
index 9725bb5..54eef04 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__tielo.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__tielo.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_1.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_1.gds
index ff04e3d..cfdcd2e 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_1.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_1.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_l.gds
index f71fad2..a5d697f 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__tnbufi_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__xnor2_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__xnor2_l.gds
index c6f9b3a..e2e96ff 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__xnor2_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__xnor2_l.gds
Binary files differ
diff --git a/12T_hs/gds/sky130_osu_sc_12T_hs__xor2_l.gds b/12T_hs/gds/sky130_osu_sc_12T_hs__xor2_l.gds
index cbf68c8..515645d 100644
--- a/12T_hs/gds/sky130_osu_sc_12T_hs__xor2_l.gds
+++ b/12T_hs/gds/sky130_osu_sc_12T_hs__xor2_l.gds
Binary files differ
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__addf_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__addf_1.mag
index 57c098e..4d38949 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__addf_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__addf_1.mag
@@ -1,24 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556632
+timestamp 1606864445
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1435 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 410 115 440 225
-rect 496 115 526 225
-rect 582 115 612 225
-rect 668 115 698 225
-rect 754 115 784 225
-rect 840 115 870 225
-rect 922 115 952 225
-rect 1004 115 1034 225
-rect 1102 115 1132 225
-rect 1292 115 1322 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -34,6 +21,21 @@
 rect 1004 521 1034 773
 rect 1102 521 1132 773
 rect 1292 521 1322 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 410 115 440 225
+rect 496 115 526 225
+rect 582 115 612 225
+rect 668 115 698 225
+rect 754 115 784 225
+rect 840 115 870 225
+rect 922 115 952 225
+rect 1004 115 1034 225
+rect 1102 115 1132 225
+rect 1292 115 1322 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -367,18 +369,18 @@
 rect 1265 435 1299 469
 rect 1014 263 1048 297
 << locali >>
-rect 0 871 1408 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1408 871
+rect 0 867 1408 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1408 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -485,39 +487,39 @@
 rect 1247 61 1281 131
 rect 1333 171 1367 479
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 80 479 114 513
 rect 248 405 282 439
 rect 80 331 114 365
@@ -536,40 +538,40 @@
 rect 1014 331 1048 365
 rect 1211 257 1245 291
 rect 1333 479 1367 513
-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 871 1408 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1408 871
-rect 0 827 1408 837
+rect 0 867 1408 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1408 867
+rect 0 827 1408 833
 rect 1131 588 1189 594
 rect 1109 554 1143 588
 rect 1177 554 1189 588
@@ -621,29 +623,29 @@
 rect 304 251 362 257
 rect 771 251 820 257
 rect 1199 251 1257 257
-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 1160 571 1160 571 1 S
 port 5 n
 rlabel viali 1350 496 1350 496 1 CO
 port 6 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel metal1 129 496 129 496 1 B
 rlabel viali 265 422 265 422 1 CI
 rlabel viali 97 348 97 348 1 A
 port 1 n
 rlabel viali 1228 274 1228 274 1 CON
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__addf_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__addf_l.mag
index 57b636b..deb7c3e 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__addf_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__addf_l.mag
@@ -1,24 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556660
+timestamp 1606864445
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1435 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 410 115 440 225
-rect 496 115 526 225
-rect 582 115 612 225
-rect 668 115 698 225
-rect 754 115 784 225
-rect 840 115 870 225
-rect 922 115 952 225
-rect 1004 115 1034 225
-rect 1102 115 1132 225
-rect 1292 115 1322 199
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -34,6 +21,21 @@
 rect 1004 521 1034 773
 rect 1102 521 1132 773
 rect 1292 605 1322 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 410 115 440 225
+rect 496 115 526 225
+rect 582 115 612 225
+rect 668 115 698 225
+rect 754 115 784 225
+rect 840 115 870 225
+rect 922 115 952 225
+rect 1004 115 1034 225
+rect 1102 115 1132 225
+rect 1292 115 1322 199
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -367,18 +369,18 @@
 rect 1265 435 1299 469
 rect 1014 263 1048 297
 << locali >>
-rect 0 871 1408 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1408 871
+rect 0 867 1408 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1408 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -485,39 +487,39 @@
 rect 1247 61 1281 131
 rect 1333 171 1367 479
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 80 479 114 513
 rect 248 405 282 439
 rect 80 331 114 365
@@ -536,40 +538,40 @@
 rect 1014 331 1048 365
 rect 1211 257 1245 291
 rect 1333 479 1367 513
-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 871 1408 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1408 871
-rect 0 827 1408 837
+rect 0 867 1408 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1408 867
+rect 0 827 1408 833
 rect 1131 588 1189 594
 rect 1109 554 1143 588
 rect 1177 554 1189 588
@@ -621,29 +623,29 @@
 rect 304 251 362 257
 rect 771 251 820 257
 rect 1199 251 1257 257
-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 1160 571 1160 571 1 S
 port 5 n
 rlabel viali 1350 496 1350 496 1 CO
 port 6 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel metal1 129 496 129 496 1 B
 rlabel viali 265 422 265 422 1 CI
 rlabel viali 97 348 97 348 1 A
 port 1 n
 rlabel viali 1228 274 1228 274 1 CON
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__addh_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__addh_1.mag
index 650fff3..0269f52 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__addh_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__addh_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605580465
+timestamp 1606864445
+<< checkpaint >>
+rect -1209 -1243 2025 2131
 << nwell >>
 rect -9 485 837 897
 << nmos >>
@@ -210,14 +212,14 @@
 rect 624 331 658 365
 rect 348 278 382 312
 << locali >>
-rect 0 871 836 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 836 871
+rect 0 867 836 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 836 867
 rect 35 757 69 773
 rect 35 527 69 553
 rect 133 757 167 827
@@ -273,27 +275,27 @@
 rect 753 171 787 187
 rect 701 131 753 144
 rect 581 110 787 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 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 35 561 69 587
 rect 35 553 69 561
 rect 260 405 294 439
@@ -305,28 +307,28 @@
 rect 624 331 658 365
 rect 507 257 541 291
 rect 667 257 701 291
-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 871 836 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 836 871
-rect 0 827 836 837
+rect 0 867 836 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 836 867
+rect 0 827 836 833
 rect 23 587 81 593
 rect 23 553 35 587
 rect 69 553 81 587
@@ -367,15 +369,15 @@
 rect 23 182 35 216
 rect 69 182 81 216
 rect 23 176 81 182
-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 381 50 381 1 S
 port 1 n
@@ -387,6 +389,6 @@
 port 4 n
 rlabel viali 684 274 684 274 1 CON
 port 5 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__addh_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__addh_l.mag
index cb52e40..8facaeb 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__addh_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__addh_l.mag
@@ -1,17 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556727
+timestamp 1606864445
+<< checkpaint >>
+rect -1209 -1243 2025 2131
 << nwell >>
 rect -9 485 837 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 178 115 208 225
-rect 250 115 280 225
-rect 442 115 472 199
-rect 540 115 570 225
-rect 626 115 656 225
-rect 712 115 742 225
 << pmos >>
 rect 80 606 110 773
 rect 178 521 208 773
@@ -20,6 +14,14 @@
 rect 552 521 582 773
 rect 638 521 668 773
 rect 710 521 740 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 178 115 208 225
+rect 250 115 280 225
+rect 442 115 472 199
+rect 540 115 570 225
+rect 626 115 656 225
+rect 712 115 742 225
 << ndiff >>
 rect 125 199 178 225
 rect 27 165 80 199
@@ -214,14 +216,14 @@
 rect 624 331 658 365
 rect 348 278 382 312
 << locali >>
-rect 0 871 836 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 836 871
+rect 0 867 836 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 836 867
 rect 35 757 69 773
 rect 35 587 69 621
 rect 133 757 167 827
@@ -276,27 +278,27 @@
 rect 753 171 787 187
 rect 701 131 753 144
 rect 581 110 787 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 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 35 553 69 587
 rect 260 405 294 439
 rect 164 331 198 365
@@ -307,28 +309,28 @@
 rect 624 331 658 365
 rect 507 257 541 291
 rect 667 257 701 291
-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 871 836 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 836 871
-rect 0 827 836 837
+rect 0 867 836 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 836 867
+rect 0 827 836 833
 rect 23 587 81 593
 rect 23 553 35 587
 rect 69 553 81 587
@@ -369,15 +371,15 @@
 rect 23 182 35 216
 rect 69 182 81 216
 rect 23 176 81 182
-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 381 50 381 1 S
 port 1 n
@@ -389,6 +391,6 @@
 port 4 n
 rlabel viali 684 274 684 274 1 CON
 port 5 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_1.mag
index 94054c0..f1b9464 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556744
+timestamp 1606864446
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 374 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 152 115 182 225
+rect 252 115 282 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -101,10 +103,10 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -127,29 +129,29 @@
 rect 193 61 227 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -167,11 +169,11 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -179,6 +181,6 @@
 port 2 n
 rlabel viali 191 496 191 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_2.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_2.mag
index 5d5811b..dbefbe7 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_2.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_2.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556755
+timestamp 1606864446
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 485 462 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
 rect 338 521 368 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 152 115 182 225
+rect 252 115 282 225
+rect 338 115 368 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -124,11 +126,11 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -201,12 +203,12 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 496 191 496 1 B
 port 1 n
@@ -214,6 +216,6 @@
 port 2 n
 rlabel metal1 311 348 311 348 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_4.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_4.mag
index 5dc2aca..1aea9bc 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_4.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_4.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556764
+timestamp 1606864446
+<< checkpaint >>
+rect -1209 -1243 1753 2131
 << nwell >>
 rect -9 485 638 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -18,6 +13,13 @@
 rect 338 521 368 773
 rect 424 521 454 773
 rect 510 521 540 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 152 115 182 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -162,12 +164,12 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 465 405 499 439
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -263,13 +265,13 @@
 rect 499 183 511 217
 rect 281 177 339 183
 rect 453 177 511 183
-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 348 311 348 1 Y
 port 1 n
@@ -277,6 +279,6 @@
 port 2 n
 rlabel viali 191 496 191 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_6.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_6.mag
index a1e586b..78df3a3 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_6.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_6.mag
@@ -2,17 +2,10 @@
 tech sky130A
 magscale 1 2
 timestamp 1605556786
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 485 814 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -22,6 +15,15 @@
 rect 510 521 540 773
 rect 596 521 626 773
 rect 682 521 712 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 152 115 182 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
+rect 596 115 626 225
+rect 682 115 712 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_8.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_8.mag
index 5bb4c43..b44c598 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_8.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_8.mag
@@ -1,20 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556779
+timestamp 1606864446
+<< checkpaint >>
+rect -1209 -1243 2161 2131
 << nwell >>
 rect -9 485 990 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
-rect 854 115 884 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -26,6 +17,17 @@
 rect 682 521 712 773
 rect 768 521 798 773
 rect 854 521 884 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 152 115 182 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
+rect 596 115 626 225
+rect 682 115 712 225
+rect 768 115 798 225
+rect 854 115 884 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -245,15 +247,15 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
@@ -338,31 +340,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -402,16 +404,16 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 496 191 496 1 B
 port 1 n
@@ -419,6 +421,6 @@
 port 2 n
 rlabel metal1 311 348 311 348 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_l.mag
index 4c80ddd..0e3c9e2 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__and2_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__and2_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556796
+timestamp 1606864447
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 374 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 152 115 182 199
-rect 252 115 282 199
 << pmos >>
 rect 80 605 110 773
 rect 166 605 196 773
 rect 252 605 282 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 152 115 182 199
+rect 252 115 282 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -101,10 +103,10 @@
 rect 173 445 207 479
 rect 269 334 303 368
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 121 757 155 773
 rect 35 605 69 621
@@ -126,29 +128,29 @@
 rect 193 61 227 131
 rect 293 165 327 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 479 71 513
 rect 173 479 207 513
 rect 293 479 327 513
 rect 293 257 327 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 513 83 519
 rect 161 513 219 519
 rect 281 513 339 519
@@ -166,16 +168,16 @@
 rect 281 257 293 291
 rect 327 257 339 291
 rect 281 251 339 257
-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 68 44 68 44 1 gnd
 rlabel viali 54 497 54 497 1 A
 rlabel metal1 311 422 311 422 1 Y
 port 1 n
 rlabel viali 190 496 190 496 1 B
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__ant.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__ant.mag
index f9ecf31..445f58c 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__ant.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__ant.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556821
+timestamp 1606864447
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 485 199 897
-<< nmoslvt >>
-rect 80 115 110 225
 << pmos >>
 rect 80 521 110 773
+<< nmoslvt >>
+rect 80 115 110 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -54,9 +56,9 @@
 << polycont >>
 rect 47 405 81 439
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 773
 rect 35 439 69 561
 rect 121 757 155 827
@@ -69,31 +71,31 @@
 rect 35 115 69 131
 rect 121 171 155 287
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 405 81 439
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 439 108 445
 rect 35 405 47 439
 rect 81 405 108 439
 rect 35 399 108 405
-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 422 64 422 1 A
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__antfill.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__antfill.mag
index 33cc053..095dd68 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__antfill.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__antfill.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093352
+timestamp 1606864447
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -19,9 +19,9 @@
 << nsubdiffcont >>
 rect 51 827 85 861
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 439 69 773
 rect 121 545 155 827
 rect 31 405 47 439
@@ -30,31 +30,31 @@
 rect 35 287 155 321
 rect 35 115 69 287
 rect 121 115 155 287
-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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 405 81 439
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 439 108 445
 rect 35 405 47 439
 rect 81 405 108 439
 rect 35 399 108 405
-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 422 64 422 1 A
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__aoi21_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__aoi21_l.mag
index dc147c5..59a9f40 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__aoi21_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__aoi21_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556874
+timestamp 1606864447
+<< checkpaint >>
+rect -1209 -1244 1481 2131
 << nwell >>
 rect -10 485 374 897
-<< nmoslvt >>
-rect 80 114 110 224
-rect 152 114 182 224
-rect 250 114 280 198
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
+<< nmoslvt >>
+rect 80 114 110 224
+rect 152 114 182 224
+rect 250 114 280 198
 << ndiff >>
 rect 27 164 80 224
 rect 27 130 35 164
@@ -104,10 +106,10 @@
 rect 146 338 180 372
 rect 289 259 323 293
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 646 69 696
 rect 121 757 155 827
@@ -133,30 +135,30 @@
 rect 193 114 227 130
 rect 291 164 325 180
 rect 291 60 325 130
-rect 0 16 51 60
-rect 85 16 187 60
-rect 221 16 374 60
-rect 0 0 374 16
+rect 0 20 51 60
+rect 85 20 187 60
+rect 221 20 374 60
+rect 0 0 374 20
 << viali >>
-rect 51 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 60 405 94 439
 rect 128 479 162 513
 rect 216 405 250 439
 rect 293 331 327 365
 rect 193 183 227 217
-rect 51 26 85 50
-rect 51 16 85 26
-rect 187 26 221 50
-rect 187 16 221 26
+rect 51 26 85 54
+rect 51 20 85 26
+rect 187 26 221 54
+rect 187 20 221 26
 << metal1 >>
-rect 0 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 116 513 174 519
 rect 116 479 128 513
 rect 162 479 196 513
@@ -180,18 +182,18 @@
 rect 227 183 327 217
 rect 181 177 233 183
 rect 291 60 325 61
-rect 0 50 374 60
-rect 0 16 51 50
-rect 85 16 187 50
-rect 221 16 374 50
-rect 0 0 374 16
+rect 0 54 374 60
+rect 0 20 51 54
+rect 85 20 187 54
+rect 221 20 374 54
+rect 0 0 374 20
 << labels >>
-rlabel viali 68 43 68 43 1 gnd
 rlabel viali 145 496 145 496 1 A1
 port 4 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel metal1 310 318 310 318 1 Y
 port 3 n
 rlabel viali 77 422 77 422 1 A0
 rlabel viali 233 422 233 422 1 B0
+rlabel viali 68 47 68 47 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__aoi22_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__aoi22_l.mag
index 20cbd2f..c0541b5 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__aoi22_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__aoi22_l.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556890
+timestamp 1606864447
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 485 462 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
-rect 252 115 282 225
-rect 324 115 354 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
 rect 338 521 368 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 152 115 182 225
+rect 252 115 282 225
+rect 324 115 354 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -126,11 +128,11 @@
 rect 234 267 268 301
 rect 370 331 404 365
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 121 765 155 827
 rect 35 732 69 748
 rect 121 680 155 697
@@ -161,37 +163,37 @@
 rect 200 115 234 131
 rect 365 171 399 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 60 405 94 439
 rect 128 479 162 513
 rect 216 405 250 439
 rect 370 331 404 365
 rect 302 257 336 291
 rect 200 183 234 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 116 513 174 519
 rect 116 479 128 513
 rect 162 479 196 513
@@ -217,12 +219,12 @@
 rect 188 183 200 217
 rect 234 183 338 217
 rect 188 177 246 183
-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 233 422 233 422 1 B0
 port 2 n
@@ -230,8 +232,8 @@
 port 4 n
 rlabel metal1 321 244 321 244 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 77 422 77 422 1 A0
 rlabel viali 387 348 387 348 1 B1
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_1.mag
index ee2225c..d95be4a 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_1.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556903
+timestamp 1606864448
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 288 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -83,10 +85,10 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -104,28 +106,28 @@
 rect 121 61 155 131
 rect 207 171 241 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 207 183 241 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -139,16 +141,16 @@
 rect 195 183 207 217
 rect 241 183 253 217
 rect 195 177 253 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 213 359 213 359 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_2.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_2.mag
index f00b756..4631239 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_2.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_2.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556911
+timestamp 1606864448
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 376 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -100,10 +102,10 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -125,28 +127,28 @@
 rect 207 115 241 131
 rect 293 171 327 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 207 183 241 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -160,16 +162,16 @@
 rect 195 183 207 217
 rect 241 183 253 217
 rect 195 177 253 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_4.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_4.mag
index 260a3ca..a1a220a 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_4.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_4.mag
@@ -1,21 +1,23 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556918
+timestamp 1606864448
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 485 552 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
 rect 338 521 368 773
 rect 424 521 454 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -138,11 +140,11 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 550 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 550 871
+rect 0 867 550 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 550 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -174,36 +176,36 @@
 rect 379 115 413 131
 rect 465 171 499 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 379 479 413 513
 rect 207 183 241 217
 rect 379 183 413 217
-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 871 550 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 550 871
-rect 0 827 550 837
+rect 0 867 550 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 550 867
+rect 0 827 550 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -224,17 +226,17 @@
 rect 413 183 425 217
 rect 195 177 253 183
 rect 367 177 425 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_6.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_6.mag
index 2a9afc2..ade3f28 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_6.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_6.mag
@@ -2,16 +2,10 @@
 tech sky130A
 magscale 1 2
 timestamp 1605556927
+<< checkpaint >>
+rect -1260 -1260 1261 1261
 << nwell >>
 rect -9 485 728 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -20,6 +14,14 @@
 rect 424 521 454 773
 rect 510 521 540 773
 rect 596 521 626 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
+rect 596 115 626 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_8.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_8.mag
index 8d100ab..7efabdb 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_8.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_8.mag
@@ -1,19 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556935
+timestamp 1606864448
+<< checkpaint >>
+rect -1209 -1243 2025 2131
 << nwell >>
 rect -9 485 904 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -24,6 +16,16 @@
 rect 596 521 626 773
 rect 682 521 712 773
 rect 768 521 798 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
+rect 596 115 626 225
+rect 682 115 712 225
+rect 768 115 798 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -221,14 +223,14 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 902 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 902 871
+rect 0 867 902 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 902 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -274,27 +276,27 @@
 rect 723 115 757 131
 rect 809 171 843 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 379 479 413 513
@@ -304,28 +306,28 @@
 rect 379 183 413 217
 rect 551 183 585 217
 rect 723 183 757 217
-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 871 902 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 902 871
-rect 0 827 902 837
+rect 0 867 902 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 902 867
+rect 0 827 902 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -360,20 +362,20 @@
 rect 367 177 425 183
 rect 539 177 597 183
 rect 711 177 769 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_l.mag
index abec44a..9dbc45f 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__buf_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__buf_l.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556946
+timestamp 1606864448
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 288 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
 << pmos >>
 rect 80 605 110 773
 rect 166 605 196 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 166 115 196 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -83,10 +85,10 @@
 rect 110 457 144 491
 rect 176 348 210 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 35 382 69 621
 rect 121 757 155 827
@@ -103,29 +105,29 @@
 rect 121 61 155 131
 rect 207 165 241 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 207 553 241 587
 rect 110 491 144 513
 rect 110 479 144 491
 rect 207 257 241 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 195 587 253 593
 rect 195 553 207 587
 rect 241 553 253 587
@@ -139,15 +141,15 @@
 rect 195 257 207 291
 rect 241 257 253 291
 rect 195 251 253 257
-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 68 44 68 44 1 gnd
 rlabel metal1 214 430 214 430 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 127 496 127 496 1 A
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__decap_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__decap_1.mag
index c008356..19e4bb1 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__decap_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__decap_1.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604545867
+timestamp 1606864449
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 365 199 897
-<< nmoslvt >>
-rect 80 115 110 263
 << pmos >>
 rect 80 601 110 773
+<< nmoslvt >>
+rect 80 115 110 263
 << ndiff >>
 rect 27 200 80 263
 rect 27 131 35 200
@@ -47,9 +49,9 @@
 rect 80 263 110 601
 rect 80 80 110 115
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 605 69 621
 rect 121 757 155 827
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 200 155 216
 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 861 85 871
-rect 51 837 85 861
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 861 85 867
+rect 51 833 85 861
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
+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 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__decap_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__decap_l.mag
index 1c34b5d..326755d 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__decap_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__decap_l.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556977
+timestamp 1606864449
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 365 199 897
-<< nmoslvt >>
-rect 80 115 110 225
 << pmos >>
 rect 80 673 110 773
+<< nmoslvt >>
+rect 80 115 110 225
 << ndiff >>
 rect 27 191 80 225
 rect 27 131 35 191
@@ -47,9 +49,9 @@
 rect 80 225 110 673
 rect 80 80 110 115
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 827
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 191 155 207
 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 861 85 871
-rect 51 837 85 861
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 861 85 867
+rect 51 833 85 861
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
+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 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dff_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dff_1.mag
index 1bbaf2d..e6a216d 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dff_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dff_1.mag
@@ -1,23 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605557660
+timestamp 1606864449
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1456 897
-<< nmoslvt >>
-rect 85 115 115 225
-rect 171 115 201 225
-rect 243 115 273 225
-rect 363 115 393 225
-rect 435 115 465 225
-rect 521 115 551 225
-rect 593 115 623 225
-rect 713 115 743 225
-rect 785 115 815 225
-rect 871 115 901 225
-rect 1061 115 1091 225
-rect 1251 115 1281 225
-rect 1337 115 1367 225
 << pmos >>
 rect 85 521 115 773
 rect 171 521 201 773
@@ -32,6 +20,20 @@
 rect 1061 521 1091 773
 rect 1251 521 1281 773
 rect 1337 521 1367 773
+<< nmoslvt >>
+rect 85 115 115 225
+rect 171 115 201 225
+rect 243 115 273 225
+rect 363 115 393 225
+rect 435 115 465 225
+rect 521 115 551 225
+rect 593 115 623 225
+rect 713 115 743 225
+rect 785 115 815 225
+rect 871 115 901 225
+rect 1061 115 1091 225
+rect 1251 115 1281 225
+rect 1337 115 1367 225
 << ndiff >>
 rect 32 171 85 225
 rect 32 131 40 171
@@ -366,18 +368,18 @@
 rect 1226 331 1260 365
 rect 1018 263 1052 297
 << locali >>
-rect 0 871 1452 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1452 871
+rect 0 867 1452 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1452 867
 rect 40 757 74 773
 rect 17 561 40 573
 rect 126 757 160 827
@@ -486,39 +488,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 197
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 40 257 74 291
 rect 253 405 287 439
 rect 181 331 215 365
@@ -537,40 +539,40 @@
 rect 671 251 705 285
 rect 1018 263 1052 291
 rect 1018 257 1052 263
-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 871 1452 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1452 871
-rect 0 827 1452 837
+rect 0 867 1452 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1452 867
+rect 0 827 1452 833
 rect 783 513 841 519
 rect 1365 513 1424 519
 rect 783 479 795 513
@@ -632,26 +634,26 @@
 rect 705 251 717 257
 rect 1006 251 1064 257
 rect 665 245 711 251
-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 348 198 348 1 D
 port 1 n
 rlabel viali 915 422 915 422 1 CK
 port 4 n
-rlabel viali 68 845 68 845 1 vdd
-rlabel viali 68 45 68 45 1 gnd
 rlabel viali 1223 422 1223 422 1 ON
 rlabel viali 1394 496 1394 496 1 Q
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 841 68 841 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dff_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dff_l.mag
index fe46101..67e914d 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dff_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dff_l.mag
@@ -1,23 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605557984
+timestamp 1606864449
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1456 897
-<< nmoslvt >>
-rect 85 115 115 225
-rect 171 115 201 225
-rect 243 115 273 225
-rect 363 115 393 225
-rect 435 115 465 225
-rect 521 115 551 225
-rect 593 115 623 225
-rect 713 115 743 225
-rect 785 115 815 225
-rect 871 115 901 225
-rect 1061 115 1091 225
-rect 1251 115 1281 199
-rect 1337 115 1367 199
 << pmos >>
 rect 85 521 115 773
 rect 171 521 201 773
@@ -32,6 +20,20 @@
 rect 1061 521 1091 773
 rect 1251 605 1281 773
 rect 1337 605 1367 773
+<< nmoslvt >>
+rect 85 115 115 225
+rect 171 115 201 225
+rect 243 115 273 225
+rect 363 115 393 225
+rect 435 115 465 225
+rect 521 115 551 225
+rect 593 115 623 225
+rect 713 115 743 225
+rect 785 115 815 225
+rect 871 115 901 225
+rect 1061 115 1091 225
+rect 1251 115 1281 199
+rect 1337 115 1367 199
 << ndiff >>
 rect 32 171 85 225
 rect 32 131 40 171
@@ -366,18 +368,18 @@
 rect 1226 331 1260 365
 rect 1018 263 1052 297
 << locali >>
-rect 0 871 1452 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1452 871
+rect 0 867 1452 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1452 867
 rect 40 757 74 773
 rect 17 561 40 573
 rect 126 757 160 827
@@ -487,39 +489,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 197
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 40 257 74 291
 rect 253 405 287 439
 rect 181 331 215 365
@@ -538,40 +540,40 @@
 rect 671 251 705 285
 rect 1018 263 1052 291
 rect 1018 257 1052 263
-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 871 1452 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1452 871
-rect 0 827 1452 837
+rect 0 867 1452 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1452 867
+rect 0 827 1452 833
 rect 783 513 841 519
 rect 1365 513 1424 519
 rect 783 479 795 513
@@ -633,26 +635,26 @@
 rect 705 251 717 257
 rect 1006 251 1064 257
 rect 665 245 711 251
-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 348 198 348 1 D
 port 1 n
 rlabel viali 915 422 915 422 1 CK
 port 4 n
-rlabel viali 68 845 68 845 1 vdd
-rlabel viali 68 45 68 45 1 gnd
 rlabel viali 1223 422 1223 422 1 ON
 rlabel viali 1394 496 1394 496 1 Q
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 841 68 841 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_1.mag
index 04b6aa5..4d49f7f 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570288
+timestamp 1606864449
+<< checkpaint >>
+rect -1210 -1243 3112 2131
 << nwell >>
 rect -10 485 1917 897
 << pmos >>
@@ -469,22 +471,22 @@
 rect 1784 366 1818 400
 rect 1561 237 1595 271
 << locali >>
-rect 0 871 1914 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1914 871
+rect 0 867 1914 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1914 867
 rect 35 758 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -624,51 +626,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
 rect 47 553 81 587
 rect 227 271 261 291
 rect 227 257 261 271
@@ -691,52 +693,52 @@
 rect 1409 257 1443 291
 rect 1561 271 1595 291
 rect 1561 257 1595 271
-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 871 1914 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1914 871
-rect 0 827 1914 837
+rect 0 867 1914 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1914 867
+rect 0 827 1914 833
 rect 35 587 93 593
 rect 1826 587 1884 593
 rect 35 553 47 587
@@ -809,28 +811,26 @@
 rect 1549 251 1607 257
 rect 1561 217 1595 251
 rect 227 183 1595 217
-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 570 65 570 1 RN
 port 1 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1855 570 1855 570 1 Q
 port 4 n
 rlabel viali 1685 496 1685 496 1 QN
@@ -839,4 +839,6 @@
 port 2 n
 rlabel viali 1290 422 1290 422 1 CK
 port 3 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_l.mag
index cf72464..30b43a7 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dffr_l.mag
@@ -1,26 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605558454
+timestamp 1606864450
+<< checkpaint >>
+rect -1210 -1243 3112 2131
 << nwell >>
 rect -10 485 1917 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 270 115 300 199
-rect 356 115 386 199
-rect 546 115 576 225
-rect 618 115 648 225
-rect 738 115 768 225
-rect 810 115 840 225
-rect 896 115 926 225
-rect 968 115 998 225
-rect 1088 115 1118 225
-rect 1160 115 1190 225
-rect 1246 115 1276 225
-rect 1436 115 1466 199
-rect 1522 115 1552 199
-rect 1712 115 1742 199
-rect 1798 115 1828 199
 << pmos >>
 rect 80 521 110 773
 rect 270 605 300 773
@@ -38,6 +23,23 @@
 rect 1508 605 1538 773
 rect 1712 605 1742 773
 rect 1798 605 1828 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 270 115 300 199
+rect 356 115 386 199
+rect 546 115 576 225
+rect 618 115 648 225
+rect 738 115 768 225
+rect 810 115 840 225
+rect 896 115 926 225
+rect 968 115 998 225
+rect 1088 115 1118 225
+rect 1160 115 1190 225
+rect 1246 115 1276 225
+rect 1436 115 1466 199
+rect 1522 115 1552 199
+rect 1712 115 1742 199
+rect 1798 115 1828 199
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -469,22 +471,22 @@
 rect 1784 366 1818 400
 rect 1561 237 1595 271
 << locali >>
-rect 0 871 1914 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1914 871
+rect 0 867 1914 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1914 867
 rect 35 758 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -621,51 +623,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
 rect 47 553 81 587
 rect 227 271 261 291
 rect 227 257 261 271
@@ -688,52 +690,52 @@
 rect 1409 257 1443 291
 rect 1561 271 1595 291
 rect 1561 257 1595 271
-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 871 1914 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1914 871
-rect 0 827 1914 837
+rect 0 867 1914 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1914 867
+rect 0 827 1914 833
 rect 35 587 93 593
 rect 1826 587 1884 593
 rect 35 553 47 587
@@ -806,28 +808,26 @@
 rect 1549 251 1607 257
 rect 1561 217 1595 251
 rect 227 183 1595 217
-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 570 65 570 1 RN
 port 1 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1855 570 1855 570 1 Q
 port 4 n
 rlabel viali 1685 496 1685 496 1 QN
@@ -836,4 +836,6 @@
 port 2 n
 rlabel viali 1290 422 1290 422 1 CK
 port 3 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_1.mag
index 13eaff1..655a260 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570310
+timestamp 1606864450
+<< checkpaint >>
+rect -1210 -1243 2840 2131
 << nwell >>
 rect -10 789 1741 897
 rect -11 563 1741 789
@@ -421,20 +423,20 @@
 rect 1594 366 1628 400
 rect 1371 237 1405 271
 << locali >>
-rect 0 871 1738 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1738 871
+rect 0 867 1738 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1738 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -549,45 +551,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
 rect 121 364 155 398
 rect 47 311 81 324
 rect 47 290 81 311
@@ -609,46 +611,46 @@
 rect 1203 257 1237 291
 rect 1371 237 1405 250
 rect 1371 216 1405 237
-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 871 1738 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1738 871
-rect 0 827 1738 837
+rect 0 867 1738 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1738 867
+rect 0 827 1738 833
 rect 1636 587 1694 593
 rect 1614 553 1648 587
 rect 1682 553 1694 587
@@ -719,31 +721,31 @@
 rect 281 211 1417 212
 rect 47 210 1417 211
 rect 47 183 1405 210
-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 348 383 348 1 D
 port 1 n
 rlabel viali 1100 422 1100 422 1 CK
 port 2 n
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1665 570 1665 570 1 Q
 port 4 n
 rlabel viali 1495 496 1495 496 1 QN
 port 3 n
 rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 844 67 844 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_l.mag
index eb51249..cd723fd 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dffs_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570321
+timestamp 1606864450
+<< checkpaint >>
+rect -1210 -1243 2840 2131
 << nwell >>
 rect -10 789 1741 897
 rect -11 563 1741 789
@@ -421,20 +423,20 @@
 rect 1594 366 1628 400
 rect 1371 237 1405 271
 << locali >>
-rect 0 871 1738 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1738 871
+rect 0 867 1738 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1738 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -550,45 +552,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
 rect 121 364 155 398
 rect 47 311 81 324
 rect 47 290 81 311
@@ -610,46 +612,46 @@
 rect 1203 257 1237 291
 rect 1371 237 1405 250
 rect 1371 216 1405 237
-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 871 1738 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1738 871
-rect 0 827 1738 837
+rect 0 867 1738 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1738 867
+rect 0 827 1738 833
 rect 1636 587 1694 593
 rect 1614 553 1648 587
 rect 1682 553 1694 587
@@ -720,31 +722,31 @@
 rect 281 211 1417 212
 rect 47 210 1417 211
 rect 47 183 1405 210
-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 348 383 348 1 D
 port 1 n
 rlabel viali 1100 422 1100 422 1 CK
 port 2 n
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1665 570 1665 570 1 Q
 port 4 n
 rlabel viali 1495 496 1495 496 1 QN
 port 3 n
 rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 844 67 844 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_1.mag
index 5efdaf1..224222b 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_1.mag
@@ -1,28 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605580547
+timestamp 1606864450
+<< checkpaint >>
+rect -1210 -1243 3248 2131
 << nwell >>
 rect -10 485 2090 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 272 115 302 199
-rect 370 115 400 225
-rect 442 115 472 225
-rect 632 115 662 225
-rect 704 115 734 225
-rect 824 115 854 225
-rect 896 115 926 225
-rect 982 115 1012 225
-rect 1054 115 1084 225
-rect 1174 115 1204 225
-rect 1246 115 1276 225
-rect 1332 115 1362 225
-rect 1522 115 1552 225
-rect 1594 115 1624 225
-rect 1692 115 1722 199
-rect 1884 115 1914 225
-rect 1970 115 2000 225
 << pmos >>
 rect 80 521 110 773
 rect 270 521 300 773
@@ -42,6 +25,25 @@
 rect 1694 521 1724 773
 rect 1884 521 1914 773
 rect 1970 521 2000 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 272 115 302 199
+rect 370 115 400 225
+rect 442 115 472 225
+rect 632 115 662 225
+rect 704 115 734 225
+rect 824 115 854 225
+rect 896 115 926 225
+rect 982 115 1012 225
+rect 1054 115 1084 225
+rect 1174 115 1204 225
+rect 1246 115 1276 225
+rect 1332 115 1362 225
+rect 1522 115 1552 225
+rect 1594 115 1624 225
+rect 1692 115 1722 199
+rect 1884 115 1914 225
+rect 1970 115 2000 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -525,23 +527,23 @@
 rect 1956 366 1990 400
 rect 1755 237 1789 271
 << locali >>
-rect 0 871 2090 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1954 871
-rect 1988 827 2090 871
+rect 0 867 2090 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1954 867
+rect 1988 827 2090 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -697,54 +699,54 @@
 rect 1925 61 1959 131
 rect 2011 171 2045 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
-rect 1954 861 1988 871
-rect 1954 837 1988 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
+rect 1954 861 1988 867
+rect 1954 833 1988 861
 rect 47 553 81 587
 rect 394 553 428 587
 rect 157 257 191 291
@@ -769,55 +771,55 @@
 rect 1502 257 1536 291
 rect 1755 271 1789 291
 rect 1755 257 1789 271
-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 871 2090 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1954 871
-rect 1988 837 2090 871
-rect 0 827 2090 837
+rect 0 867 2090 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1954 867
+rect 1988 833 2090 867
+rect 0 827 2090 833
 rect 35 587 93 593
 rect 380 587 439 593
 rect 1558 587 1617 592
@@ -902,24 +904,24 @@
 rect 1126 245 1172 251
 rect 1755 217 1789 251
 rect 157 183 1789 217
-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 348 659 348 1 D
 port 1 n
@@ -931,7 +933,7 @@
 port 5 n
 rlabel viali 2028 570 2028 570 1 Q
 port 6 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1588 569 1588 569 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_l.mag
index fb267b0..b121d88 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__dffsr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605574427
+timestamp 1606864450
+<< checkpaint >>
+rect -1210 -1243 3248 2131
 << nwell >>
 rect -10 485 2090 897
 << pmos >>
@@ -525,23 +527,23 @@
 rect 1956 366 1990 400
 rect 1755 237 1789 271
 << locali >>
-rect 0 871 2090 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1954 871
-rect 1988 827 2090 871
+rect 0 867 2090 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1954 867
+rect 1988 827 2090 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -700,54 +702,54 @@
 rect 1925 61 1959 131
 rect 2011 171 2045 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
-rect 1954 861 1988 871
-rect 1954 837 1988 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
+rect 1954 861 1988 867
+rect 1954 833 1988 861
 rect 47 553 81 587
 rect 394 553 428 587
 rect 157 257 191 291
@@ -771,55 +773,55 @@
 rect 1755 271 1789 291
 rect 1755 257 1789 271
 rect 2034 405 2068 439
-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 871 2090 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1954 871
-rect 1988 837 2090 871
-rect 0 827 2090 837
+rect 0 867 2090 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1954 867
+rect 1988 833 2090 867
+rect 0 827 2090 833
 rect 35 587 93 593
 rect 380 587 439 593
 rect 1558 587 1617 592
@@ -906,24 +908,24 @@
 rect 1126 245 1172 251
 rect 1755 217 1789 251
 rect 157 183 1789 217
-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 348 659 348 1 D
 port 1 n
@@ -933,8 +935,8 @@
 port 3 n
 rlabel viali 65 570 65 570 1 RN
 port 5 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 2051 422 2051 422 1 Q
 rlabel viali 1588 570 1588 570 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_1.mag
index 79e7957..df79ac7 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_1.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555737
+timestamp 1606864452
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 485 199 897
-<< nmoslvt >>
-rect 80 115 110 225
 << pmos >>
 rect 80 521 110 773
+<< nmoslvt >>
+rect 80 115 110 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 171 155 183
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 183 155 217
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -97,15 +99,15 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 345 151 345 1 Y
 port 1 n
 rlabel viali 64 570 64 570 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_10.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_10.mag
index 5388d6f..8c807e6 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_10.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_10.mag
@@ -1,20 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555819
+timestamp 1606864452
+<< checkpaint >>
+rect -1209 -1243 2161 2131
 << nwell >>
 rect -9 485 990 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
-rect 854 115 884 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -26,6 +17,17 @@
 rect 682 521 712 773
 rect 768 521 798 773
 rect 854 521 884 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
+rect 596 115 626 225
+rect 682 115 712 225
+rect 768 115 798 225
+rect 854 115 884 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -239,15 +241,15 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -295,30 +297,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -330,31 +332,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -396,21 +398,21 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_2.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_2.mag
index d673e80..8120a84 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_2.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_2.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555759
+timestamp 1606864452
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 287 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -80,10 +82,10 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -99,28 +101,28 @@
 rect 121 115 155 131
 rect 207 171 241 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 183 155 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -134,16 +136,16 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_3.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_3.mag
index 1f7a2e9..b3cbdbc 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_3.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_3.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555768
+timestamp 1606864452
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 375 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -96,10 +98,10 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -119,30 +121,30 @@
 rect 207 61 241 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
 rect 121 183 155 217
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -163,16 +165,16 @@
 rect 327 183 339 217
 rect 109 177 167 183
 rect 281 177 339 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_4.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_4.mag
index b913dfc..cbe9f33 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_4.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_4.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555779
+timestamp 1606864452
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 485 463 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
 rect 338 521 368 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -118,11 +120,11 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -146,36 +148,36 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
 rect 121 183 155 217
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -196,17 +198,17 @@
 rect 327 183 339 217
 rect 109 177 167 183
 rect 281 177 339 183
-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 569 64 569 1 A
 port 1 n
 rlabel metal1 152 344 152 344 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_6.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_6.mag
index 3e72c3a..b898977 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_6.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_6.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555788
+timestamp 1606864453
+<< checkpaint >>
+rect -1209 -1243 1753 2131
 << nwell >>
 rect -9 485 639 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -18,6 +13,13 @@
 rect 338 521 368 773
 rect 424 521 454 773
 rect 510 521 540 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -157,12 +159,12 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -194,21 +196,21 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -216,22 +218,22 @@
 rect 121 183 155 217
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -259,18 +261,18 @@
 rect 109 177 167 183
 rect 281 177 339 183
 rect 453 177 511 183
-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 569 64 569 1 A
 port 1 n
 rlabel metal1 152 344 152 344 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_8.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_8.mag
index 4331e9d..cb952e6 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_8.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_8.mag
@@ -1,18 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555808
+timestamp 1606864453
+<< checkpaint >>
+rect -1209 -1243 1889 2131
 << nwell >>
 rect -9 485 814 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -22,6 +15,15 @@
 rect 510 521 540 773
 rect 596 521 626 773
 rect 682 521 712 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
+rect 596 115 626 225
+rect 682 115 712 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -195,13 +197,13 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 814 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 814 871
+rect 0 867 814 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 814 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -241,24 +243,24 @@
 rect 637 115 671 131
 rect 723 171 757 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -268,25 +270,25 @@
 rect 293 183 327 217
 rect 465 183 499 217
 rect 637 183 671 217
-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 871 814 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 814 871
-rect 0 827 814 837
+rect 0 867 814 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 814 867
+rect 0 827 814 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -321,19 +323,19 @@
 rect 281 177 339 183
 rect 453 177 511 183
 rect 625 177 683 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_l.mag
index e02c2a0..3e739be 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__inv_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__inv_l.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555746
+timestamp 1606864453
+<< checkpaint >>
+rect -1209 -1243 1345 2129
 << nwell >>
 rect -9 485 199 895
-<< nmoslvt >>
-rect 80 115 110 199
 << pmos >>
 rect 80 603 110 771
+<< nmoslvt >>
+rect 80 115 110 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 869 198 886
-rect 0 825 51 869
-rect 85 825 198 869
+rect 0 865 198 886
+rect 0 825 51 865
+rect 85 825 198 865
 rect 35 755 69 825
 rect 35 671 69 687
 rect 121 755 155 771
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 165 155 257
 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 859 85 869
-rect 51 835 85 859
+rect 51 859 85 865
+rect 51 831 85 859
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 257 155 291
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 869 198 886
-rect 0 835 51 869
-rect 85 835 198 869
-rect 0 825 198 835
+rect 0 865 198 886
+rect 0 831 51 865
+rect 85 831 198 865
+rect 0 825 198 831
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -97,15 +99,15 @@
 rect 109 257 121 291
 rect 155 257 167 291
 rect 109 251 167 257
-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 68 44 68 44 1 gnd
 rlabel viali 64 570 64 570 1 A
 port 1 n
 rlabel metal1 151 345 151 345 1 Y
 port 2 n
-rlabel viali 68 842 68 842 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 838 68 838 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__mux2_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__mux2_1.mag
index 4a97cc2..0056052 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__mux2_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__mux2_1.mag
@@ -1,17 +1,20 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555859
+timestamp 1606864453
+<< checkpaint >>
+rect -801 1315 1753 2131
+rect -1209 -1243 1753 1315
 << nwell >>
 rect -9 485 553 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 270 115 300 225
-rect 356 115 386 225
 << pmos >>
 rect 80 521 110 773
 rect 270 521 300 773
 rect 356 521 386 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 270 115 300 225
+rect 356 115 386 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -120,9 +123,9 @@
 rect 37 348 71 382
 rect 168 263 202 297
 << locali >>
-rect 0 871 550 888
-rect 0 827 459 871
-rect 493 827 550 871
+rect 0 867 550 888
+rect 0 827 459 867
+rect 493 827 550 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -154,33 +157,33 @@
 rect 311 115 345 131
 rect 397 171 431 405
 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 861 493 871
-rect 459 837 493 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 553 71 587
 rect 236 479 270 513
 rect 311 331 345 365
 rect 397 405 431 439
 rect 311 183 345 217
-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 871 550 888
-rect 0 837 459 871
-rect 493 837 550 871
-rect 0 827 550 837
+rect 0 867 550 888
+rect 0 833 459 867
+rect 493 833 550 867
+rect 0 827 550 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 117 587
@@ -202,13 +205,13 @@
 rect 299 183 311 217
 rect 345 183 357 217
 rect 299 177 357 183
-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 570 54 570 1 S0
 port 1 n
@@ -218,6 +221,6 @@
 port 3 n
 rlabel viali 414 422 414 422 1 A1
 port 4 n
-rlabel viali 476 844 476 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 840 476 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_1.mag
index 3355b4a..99ccf49 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_1.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555873
+timestamp 1606864453
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 286 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 152 115 182 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 152 115 182 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -77,10 +79,10 @@
 rect 47 424 81 458
 rect 166 331 200 365
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -96,29 +98,29 @@
 rect 35 115 69 131
 rect 193 171 227 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 405 155 439
 rect 195 479 229 513
 rect 35 183 69 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 115 587
@@ -136,11 +138,11 @@
 rect 23 183 35 217
 rect 69 183 155 217
 rect 23 177 81 183
-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 374 136 374 1 Y
 port 1 n
@@ -148,6 +150,6 @@
 port 2 n
 rlabel viali 212 496 212 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_l.mag
index 0d83938..2a834d5 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__nand2_l.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555894
+timestamp 1606864454
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 286 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 152 115 182 199
 << pmos >>
 rect 80 605 110 773
 rect 166 605 196 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 152 115 182 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -77,10 +79,10 @@
 rect 47 498 81 532
 rect 166 348 200 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -96,29 +98,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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 195 553 229 587
 rect 35 257 69 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 183 587 241 593
 rect 35 553 47 587
@@ -136,17 +138,17 @@
 rect 23 257 35 291
 rect 69 257 155 291
 rect 23 251 81 257
-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 68 44 68 44 1 gnd
 rlabel metal1 136 448 136 448 1 Y
 port 1 n
 rlabel viali 212 570 212 570 1 B
 port 2 n
 rlabel viali 64 570 64 570 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_1.mag
index 2522850..09408ed 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_1.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555909
+timestamp 1606864454
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 286 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
 << pmos >>
 rect 80 521 110 773
 rect 152 521 182 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -77,10 +79,10 @@
 rect 181 438 215 472
 rect 66 305 100 339
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 193 757 227 827
 rect 193 681 227 697
@@ -96,29 +98,29 @@
 rect 121 115 155 131
 rect 207 171 241 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 181 553 215 587
 rect 35 405 69 439
 rect 113 479 147 513
 rect 121 183 155 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 169 587 227 593
 rect 148 553 181 587
 rect 215 553 227 587
@@ -136,11 +138,11 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 297 137 297 1 Y
 port 1 n
@@ -148,6 +150,6 @@
 port 2 n
 rlabel viali 198 570 198 570 1 A
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_l.mag
index 1334b4a..d5d3c54 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__nor2_l.mag
@@ -1,15 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555922
+timestamp 1606864454
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 286 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
 << pmos >>
 rect 80 605 110 773
 rect 152 605 182 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 166 115 196 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -77,10 +79,10 @@
 rect 181 512 215 546
 rect 66 379 100 413
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 35 513 69 621
 rect 193 757 227 827
@@ -95,30 +97,30 @@
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 35 479 69 513
 rect 113 553 147 587
 rect 181 512 215 513
 rect 181 479 215 512
 rect 121 257 155 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 101 587 159 593
 rect 79 553 113 587
 rect 147 553 159 587
@@ -137,16 +139,16 @@
 rect 155 257 167 291
 rect 34 256 167 257
 rect 109 251 167 256
-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 68 44 68 44 1 gnd
 rlabel viali 130 570 130 570 1 B
 port 3 n
 rlabel metal1 48 337 48 337 1 Y
 rlabel viali 198 496 198 496 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__oai21_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__oai21_l.mag
index 3e42e5b..91bd407 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__oai21_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__oai21_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555935
+timestamp 1606864454
+<< checkpaint >>
+rect -1209 -1244 1481 2131
 << nwell >>
 rect -9 485 374 897
-<< nmoslvt >>
-rect 80 114 110 224
-rect 166 114 196 224
-rect 252 114 282 224
 << pmos >>
 rect 80 521 110 773
 rect 152 521 182 773
 rect 250 605 280 773
+<< nmoslvt >>
+rect 80 114 110 224
+rect 166 114 196 224
+rect 252 114 282 224
 << ndiff >>
 rect 27 170 80 224
 rect 27 130 35 170
@@ -101,10 +103,10 @@
 rect 152 331 186 365
 rect 262 283 296 317
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 655 69 696
 rect 193 757 227 827
@@ -128,31 +130,31 @@
 rect 207 170 241 214
 rect 207 114 241 130
 rect 293 114 327 130
-rect 0 16 51 60
-rect 85 16 187 60
-rect 221 16 374 60
-rect 0 0 374 16
+rect 0 20 51 60
+rect 85 20 187 60
+rect 221 20 374 60
+rect 0 0 374 20
 << viali >>
-rect 51 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 66 553 100 587
 rect 162 479 196 513
 rect 291 479 325 513
 rect 223 405 257 439
 rect 293 189 327 217
 rect 293 183 327 189
-rect 51 26 85 50
-rect 51 16 85 26
-rect 187 26 221 50
-rect 187 16 221 26
+rect 51 26 85 54
+rect 51 20 85 26
+rect 187 26 221 54
+rect 187 20 221 26
 << metal1 >>
-rect 0 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 54 587 112 593
 rect 54 553 66 587
 rect 100 553 134 587
@@ -174,19 +176,19 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-rect 0 50 374 60
-rect 0 16 51 50
-rect 85 16 187 50
-rect 221 16 374 50
-rect 0 0 374 16
+rect 0 54 374 60
+rect 0 20 51 54
+rect 85 20 187 54
+rect 221 20 374 54
+rect 0 0 374 20
 << labels >>
-rlabel viali 68 43 68 43 1 gnd
 rlabel viali 83 570 83 570 1 A0
 port 1 n
 rlabel viali 179 496 179 496 1 A1
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 240 422 240 422 1 B0
 port 4 n
 rlabel viali 308 496 308 496 1 Y
+rlabel viali 68 47 68 47 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__oai22_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__oai22_l.mag
index 188b5f9..2908903 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__oai22_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__oai22_l.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555960
+timestamp 1606864454
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 483 462 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
 << pmos >>
 rect 80 521 110 773
 rect 152 521 182 773
 rect 252 521 282 773
 rect 324 521 354 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
 << ndiff >>
 rect 27 199 80 225
 rect 27 131 35 199
@@ -126,11 +128,11 @@
 rect 146 331 180 365
 rect 248 353 282 387
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 635 69 651
 rect 200 757 234 773
@@ -162,37 +164,37 @@
 rect 379 165 413 181
 rect 241 131 379 143
 rect 207 109 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 52 438 86 439
 rect 52 405 86 438
 rect 223 479 257 513
 rect 146 331 180 365
 rect 384 406 418 440
 rect 316 331 350 365
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 211 513 269 519
 rect 189 479 223 513
 rect 257 479 269 513
@@ -213,14 +215,13 @@
 rect 350 331 362 365
 rect 134 325 192 331
 rect 304 325 362 331
-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 68 44 68 44 1 gnd
 rlabel viali 240 496 240 496 1 B0
 port 4 n
 rlabel viali 333 348 333 348 1 Y
@@ -228,5 +229,6 @@
 rlabel viali 401 423 401 423 1 B1
 rlabel viali 163 348 163 348 1 A1
 rlabel viali 69 422 69 422 1 A0
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_1.mag
index 372f021..ca939f9 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605555987
+timestamp 1606864455
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 374 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -101,10 +103,10 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -127,29 +129,29 @@
 rect 207 61 241 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -167,11 +169,11 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -179,6 +181,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_2.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_2.mag
index 491e05f..346b5a9 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_2.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_2.mag
@@ -1,19 +1,21 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556001
+timestamp 1606864455
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 485 462 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 252 521 282 773
 rect 338 521 368 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -124,11 +126,11 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -155,35 +157,35 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -201,12 +203,12 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -214,6 +216,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_4.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_4.mag
index fa3c2f9..e48c486 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_4.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_4.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556010
+timestamp 1606864455
+<< checkpaint >>
+rect -1209 -1243 1753 2131
 << nwell >>
 rect -9 485 638 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -18,6 +13,13 @@
 rect 338 521 368 773
 rect 424 521 454 773
 rect 510 521 540 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -162,12 +164,12 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -202,43 +204,43 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 465 405 499 439
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -263,13 +265,13 @@
 rect 499 183 511 217
 rect 281 177 339 183
 rect 453 177 511 183
-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 348 311 348 1 Y
 port 1 n
@@ -277,6 +279,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_8.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_8.mag
index 9e7af7e..11e3bb5 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_8.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_8.mag
@@ -1,20 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556020
+timestamp 1606864455
+<< checkpaint >>
+rect -1209 -1243 2161 2131
 << nwell >>
 rect -9 485 990 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 252 115 282 225
-rect 338 115 368 225
-rect 424 115 454 225
-rect 510 115 540 225
-rect 596 115 626 225
-rect 682 115 712 225
-rect 768 115 798 225
-rect 854 115 884 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -26,6 +17,17 @@
 rect 682 521 712 773
 rect 768 521 798 773
 rect 854 521 884 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 252 115 282 225
+rect 338 115 368 225
+rect 424 115 454 225
+rect 510 115 540 225
+rect 596 115 626 225
+rect 682 115 712 225
+rect 768 115 798 225
+rect 854 115 884 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -245,15 +247,15 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -304,30 +306,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
@@ -338,31 +340,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -402,16 +404,16 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 348 311 348 1 Y
 port 1 n
@@ -419,6 +421,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_l.mag
index 61d80ea..97fb07c 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__or2_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__or2_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556029
+timestamp 1606864455
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 374 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-rect 252 115 282 199
 << pmos >>
 rect 80 605 110 773
 rect 166 605 196 773
 rect 252 605 282 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 166 115 196 199
+rect 252 115 282 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -101,10 +103,10 @@
 rect 173 438 207 472
 rect 269 348 303 382
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 621 69 689
 rect 207 757 241 827
@@ -126,30 +128,30 @@
 rect 207 61 241 131
 rect 293 165 327 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 496 71 513
 rect 37 479 71 496
 rect 173 479 207 513
 rect 293 479 327 513
 rect 293 257 327 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 513 83 519
 rect 161 513 219 519
 rect 281 513 339 519
@@ -167,16 +169,16 @@
 rect 281 257 293 291
 rect 327 257 339 291
 rect 281 251 339 257
-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 68 44 68 44 1 gnd
 rlabel metal1 311 422 311 422 1 Y
 port 1 n
 rlabel viali 190 496 190 496 1 A
 rlabel viali 54 496 54 496 1 B
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_1.mag
index fbe63fa..3a765d2 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556425
+timestamp 1606864456
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 375 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 238 521 268 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 238 115 268 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -98,10 +100,10 @@
 rect 121 263 155 297
 rect 248 305 282 339
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 613 155 629
@@ -122,30 +124,30 @@
 rect 121 61 155 131
 rect 279 171 313 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 279 405 313 439
 rect 121 263 155 291
 rect 121 257 155 263
 rect 279 183 313 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -167,11 +169,11 @@
 rect 267 183 279 217
 rect 313 183 325 217
 rect 267 177 325 183
-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 268 305 268 1 Y
 port 1 n
@@ -179,6 +181,6 @@
 port 2 n
 rlabel metal1 138 496 138 496 1 OE
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_l.mag
index 05fbc40..0cab9c3 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__tbufi_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556066
+timestamp 1606864456
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 375 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-rect 238 115 268 199
 << pmos >>
 rect 80 605 110 773
 rect 166 605 196 773
 rect 238 605 268 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 166 115 196 199
+rect 238 115 268 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -98,10 +100,10 @@
 rect 121 331 155 365
 rect 248 379 282 413
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 491 69 621
 rect 121 757 155 827
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 165 313 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 279 479 313 513
 rect 121 331 155 365
 rect 279 257 313 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -166,16 +168,16 @@
 rect 267 257 279 291
 rect 313 257 325 291
 rect 267 251 325 257
-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 68 44 68 44 1 gnd
 rlabel metal1 305 342 305 342 1 Y
 port 1 n
 rlabel metal1 138 496 138 496 1 OE
 rlabel viali 228 570 228 570 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__tiehi.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__tiehi.mag
index 766ce37..35ad16b 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__tiehi.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__tiehi.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556145
+timestamp 1606864456
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 485 199 897
-<< nmoslvt >>
-rect 80 115 110 225
 << pmos >>
 rect 80 521 110 773
+<< nmoslvt >>
+rect 80 115 110 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 287 124 321
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 545 69 561
 rect 121 757 155 773
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 171 155 287
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 121 479 155 513
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 94 513 167 519
 rect 94 479 121 513
 rect 155 479 167 513
 rect 94 473 167 479
-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 496 138 496 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__tielo.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__tielo.mag
index f431535..8584fe8 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__tielo.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__tielo.mag
@@ -1,13 +1,15 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556160
+timestamp 1606864456
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 485 199 897
-<< nmoslvt >>
-rect 80 115 110 225
 << pmos >>
 rect 80 521 110 773
+<< nmoslvt >>
+rect 80 115 110 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 419 124 453
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 545 69 561
 rect 121 757 155 773
@@ -67,31 +69,31 @@
 rect 35 61 69 131
 rect 121 171 155 257
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 121 257 155 291
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 94 291 167 297
 rect 94 257 121 291
 rect 155 257 167 291
 rect 94 251 167 257
-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 274 138 274 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_1.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_1.mag
index a726a39..002c16a 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_1.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_1.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556183
+timestamp 1606864456
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 485 375 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
 rect 238 521 268 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 238 115 268 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -97,10 +99,10 @@
 rect 121 328 155 362
 rect 248 305 282 339
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 613 155 629
@@ -121,29 +123,29 @@
 rect 121 61 155 131
 rect 279 171 313 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 121 479 155 513
 rect 279 405 313 439
 rect 279 183 313 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -161,11 +163,11 @@
 rect 267 183 279 217
 rect 313 183 325 217
 rect 267 177 325 183
-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 268 305 268 1 Y
 port 1 n
@@ -173,6 +175,6 @@
 port 2 n
 rlabel viali 138 496 138 496 1 OE
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_l.mag
index 269039a..b3a9a0e 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__tnbufi_l.mag
@@ -1,17 +1,19 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556196
+timestamp 1606864457
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 375 897
-<< nmoslvt >>
-rect 80 115 110 199
-rect 166 115 196 199
-rect 238 115 268 199
 << pmos >>
 rect 80 605 110 773
 rect 166 605 196 773
 rect 238 605 268 773
+<< nmoslvt >>
+rect 80 115 110 199
+rect 166 115 196 199
+rect 238 115 268 199
 << ndiff >>
 rect 27 165 80 199
 rect 27 131 35 165
@@ -98,10 +100,10 @@
 rect 121 395 155 429
 rect 248 379 282 413
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 430 69 621
 rect 121 757 155 827
@@ -123,29 +125,29 @@
 rect 121 61 155 131
 rect 279 165 313 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 279 553 313 587
 rect 121 479 155 513
 rect 211 405 245 439
 rect 279 257 313 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 266 587 325 593
 rect 266 553 279 587
 rect 313 553 325 587
@@ -165,16 +167,16 @@
 rect 267 257 279 291
 rect 313 257 325 291
 rect 267 251 325 257
-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 68 44 68 44 1 gnd
 rlabel metal1 305 342 305 342 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 228 423 228 423 1 A
 rlabel viali 138 497 138 497 1 OE
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__xnor2_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__xnor2_l.mag
index e0bf240..d55ec42 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__xnor2_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__xnor2_l.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556339
+timestamp 1606864457
+<< checkpaint >>
+rect -1209 -1243 1753 2131
 << nwell >>
 rect -9 485 638 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
-rect 358 115 388 225
-rect 430 115 460 225
-rect 516 115 546 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -18,6 +13,13 @@
 rect 358 521 388 773
 rect 430 521 460 773
 rect 516 521 546 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 238 115 268 225
+rect 358 115 388 225
+rect 430 115 460 225
+rect 516 115 546 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -169,12 +171,12 @@
 rect 336 263 370 297
 rect 489 263 523 297
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 35 405 69 561
 rect 121 757 155 827
@@ -212,21 +214,21 @@
 rect 471 61 505 131
 rect 557 171 591 440
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 268 561 279 587
 rect 279 561 302 587
 rect 268 553 302 561
@@ -236,22 +238,22 @@
 rect 268 257 302 291
 rect 489 263 523 291
 rect 489 257 523 263
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 256 587 314 593
 rect 256 553 268 587
 rect 302 553 314 587
@@ -276,19 +278,19 @@
 rect 523 257 557 291
 rect 477 251 535 257
 rect 152 183 438 217
-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 284 331 284 331 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 169 274 169 274 1 A
 rlabel viali 506 280 506 280 1 B
 port 2 n
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_hs/magic/sky130_osu_sc_12T_hs__xor2_l.mag b/12T_hs/magic/sky130_osu_sc_12T_hs__xor2_l.mag
index eca1086..6df589d 100644
--- a/12T_hs/magic/sky130_osu_sc_12T_hs__xor2_l.mag
+++ b/12T_hs/magic/sky130_osu_sc_12T_hs__xor2_l.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605556585
+timestamp 1606864457
+<< checkpaint >>
+rect -1209 -1243 1753 2131
 << nwell >>
 rect -9 485 638 897
-<< nmoslvt >>
-rect 80 115 110 225
-rect 166 115 196 225
-rect 238 115 268 225
-rect 358 115 388 225
-rect 430 115 460 225
-rect 516 115 546 225
 << pmos >>
 rect 80 521 110 773
 rect 166 521 196 773
@@ -18,6 +13,13 @@
 rect 358 521 388 773
 rect 430 521 460 773
 rect 516 521 546 773
+<< nmoslvt >>
+rect 80 115 110 225
+rect 166 115 196 225
+rect 238 115 268 225
+rect 358 115 388 225
+rect 430 115 460 225
+rect 516 115 546 225
 << ndiff >>
 rect 27 171 80 225
 rect 27 131 35 171
@@ -168,12 +170,12 @@
 rect 430 331 464 365
 rect 248 263 282 297
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -213,42 +215,42 @@
 rect 471 61 505 131
 rect 557 171 591 263
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 200 553 234 587
 rect 412 553 446 587
 rect 268 405 302 439
 rect 489 479 523 513
 rect 296 183 330 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 188 587 246 593
 rect 400 587 458 593
 rect 188 553 200 587
@@ -269,13 +271,13 @@
 rect 268 183 296 217
 rect 330 183 342 217
 rect 284 177 342 183
-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 570 218 570 1 A
 port 1 n
@@ -283,6 +285,6 @@
 port 2 n
 rlabel viali 506 496 506 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__addf_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__addf_1.gds
index 8274826..10d072a 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__addf_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__addf_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__addf_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__addf_l.gds
index 9e385d1..b5ae2d4 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__addf_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__addf_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__addh_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__addh_1.gds
index 9a76f2e..e734183 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__addh_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__addh_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__addh_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__addh_l.gds
index 8b70ecb..83d0c4a 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__addh_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__addh_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_1.gds
index e5a8572..04142a4 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_2.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_2.gds
index 0ee1634..cd59831 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_2.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_2.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_4.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_4.gds
index ee64b0d..70f4bac 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_4.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_4.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_6.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_6.gds
index c20e6c9..3f979ff 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_6.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_6.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_8.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_8.gds
index 9bb36b4..7e97e2c 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_8.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_8.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_l.gds
index b9db189..7028fc8 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__and2_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__and2_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__ant.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__ant.gds
index 97dc5d2..35c6a06 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__ant.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__ant.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__antfill.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__antfill.gds
index d8d179c..44e6673 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__antfill.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__antfill.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__aoi21_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__aoi21_l.gds
index ba55500..cf748a0 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__aoi21_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__aoi21_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__aoi22_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__aoi22_l.gds
index e77d673..e9680c8 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__aoi22_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__aoi22_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_1.gds
index 4887abc..52c3ab2 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_2.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_2.gds
index 6df3420..396d67c 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_2.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_2.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_4.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_4.gds
index d21999a..f9b26fd 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_4.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_4.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_6.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_6.gds
index 162df0c..23c4135 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_6.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_6.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_8.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_8.gds
index b20d74c..4f1869e 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_8.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_8.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_l.gds
index 9367e87..d5f4949 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__buf_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__buf_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__decap_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__decap_1.gds
index a6bf5c6..98e3db8 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__decap_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__decap_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__decap_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__decap_l.gds
index 5acd06a..fc88435 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__decap_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__decap_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dff_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dff_1.gds
index d409c36..ce3c225 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dff_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dff_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dff_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dff_l.gds
index 9342680..43ff178 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dff_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dff_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_1.gds
index 31d5288..33a211e 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_l.gds
index ad265b7..4272cce 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dffr_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_1.gds
index 4c51a1d..670717f 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_l.gds
index 742d5e5..abb6b69 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dffs_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_1.gds
index f83d482..8ea8e42 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_l.gds
index c3a4b02..923bc14 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__dffsr_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_1.gds
index 3352dec..e700474 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_16.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_16.gds
index 75e6ce2..dbd9423 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_16.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_16.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_2.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_2.gds
index b4a862e..5341b2e 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_2.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_2.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_32.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_32.gds
index 3f100df..3d09c09 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_32.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_32.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_4.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_4.gds
index 5cb51f5..e5f5af2 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_4.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_4.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_8.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_8.gds
index 874a338..c97c71b 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__fill_8.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__fill_8.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_1.gds
index 9050a2e..e86d7da 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_10.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_10.gds
index 4d91ad7..f29ce15 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_10.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_10.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_2.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_2.gds
index 8b616ff..f705d37 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_2.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_2.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_3.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_3.gds
index e9733cd..c2eb6d9 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_3.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_3.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_4.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_4.gds
index f46bf65..ac458fa 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_4.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_4.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_6.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_6.gds
index c081af6..0500da7 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_6.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_6.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_8.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_8.gds
index 92a304f..3a7fdbf 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_8.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_8.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_l.gds
index 4822a94..81e24b7 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__inv_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__inv_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__mux2_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__mux2_1.gds
index 11f1c90..8256525 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__mux2_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__mux2_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_1.gds
index a73e696..28415c8 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_l.gds
index 06f8188..b17af6b 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__nand2_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_1.gds
index ade0376..cd33bbd 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_l.gds
index 64fdd24..3c39819 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__nor2_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__oai21_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__oai21_l.gds
index 2938f8e..2275d91 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__oai21_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__oai21_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__oai22_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__oai22_l.gds
index fd08980..d47b284 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__oai22_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__oai22_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_1.gds
index 304700e..dcf6b74 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_2.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_2.gds
index 87fc07a..c35796d 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_2.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_2.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_4.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_4.gds
index f1e2755..991891b 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_4.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_4.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_8.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_8.gds
index 7d43ab7..3cf5496 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_8.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_8.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_l.gds
index 8872502..e6038e9 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__or2_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__or2_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_1.gds
index 09fabd4..e28f651 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_l.gds
index cf772b3..cd0b9bb 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__tbufi_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__tiehi.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__tiehi.gds
index 1aa5009..c783d2a 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__tiehi.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__tiehi.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__tielo.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__tielo.gds
index 83fad31..30d643d 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__tielo.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__tielo.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_1.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_1.gds
index 594458c..79b74ae 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_1.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_1.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_l.gds
index f9843f4..78edb8f 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__tnbufi_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__xnor2_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__xnor2_l.gds
index f967746..1e01257 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__xnor2_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__xnor2_l.gds
Binary files differ
diff --git a/12T_ls/gds/sky130_osu_sc_12T_ls__xor2_l.gds b/12T_ls/gds/sky130_osu_sc_12T_ls__xor2_l.gds
index 8833e4c..d5a3ed3 100644
--- a/12T_ls/gds/sky130_osu_sc_12T_ls__xor2_l.gds
+++ b/12T_ls/gds/sky130_osu_sc_12T_ls__xor2_l.gds
Binary files differ
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__addf_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__addf_1.mag
index c71464d..1b1811f 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__addf_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__addf_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605314603
+timestamp 1606864413
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1435 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1265 435 1299 469
 rect 1014 257 1048 291
 << locali >>
-rect 0 871 1408 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1408 871
+rect 0 867 1408 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1408 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -485,39 +487,39 @@
 rect 1247 61 1281 131
 rect 1333 171 1367 479
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 80 479 114 513
 rect 248 405 282 439
 rect 80 331 114 365
@@ -536,40 +538,40 @@
 rect 1014 331 1048 365
 rect 1211 257 1245 291
 rect 1333 479 1367 513
-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 871 1408 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1408 871
-rect 0 827 1408 837
+rect 0 867 1408 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1408 867
+rect 0 827 1408 833
 rect 1131 588 1189 594
 rect 1109 554 1143 588
 rect 1177 554 1189 588
@@ -621,29 +623,29 @@
 rect 304 251 362 257
 rect 771 251 820 257
 rect 1199 251 1257 257
-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 1160 571 1160 571 1 S
 port 5 n
 rlabel viali 1350 496 1350 496 1 CO
 port 6 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel metal1 129 496 129 496 1 B
 rlabel viali 265 422 265 422 1 CI
 rlabel viali 97 348 97 348 1 A
 port 1 n
 rlabel viali 1228 274 1228 274 1 CON
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__addf_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__addf_l.mag
index baf4204..fea3086 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__addf_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__addf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605314583
+timestamp 1606864413
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1435 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1265 435 1299 469
 rect 1014 257 1048 291
 << locali >>
-rect 0 871 1408 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1408 871
+rect 0 867 1408 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1408 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -485,39 +487,39 @@
 rect 1247 61 1281 131
 rect 1333 171 1367 479
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 80 479 114 513
 rect 248 405 282 439
 rect 80 331 114 365
@@ -536,40 +538,40 @@
 rect 1014 331 1048 365
 rect 1211 257 1245 291
 rect 1333 479 1367 513
-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 871 1408 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1408 871
-rect 0 827 1408 837
+rect 0 867 1408 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1408 867
+rect 0 827 1408 833
 rect 1131 588 1189 594
 rect 1109 554 1143 588
 rect 1177 554 1189 588
@@ -621,29 +623,29 @@
 rect 304 251 362 257
 rect 771 251 820 257
 rect 1199 251 1257 257
-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 1160 571 1160 571 1 S
 port 5 n
 rlabel viali 1350 496 1350 496 1 CO
 port 6 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel metal1 129 496 129 496 1 B
 rlabel viali 265 422 265 422 1 CI
 rlabel viali 97 348 97 348 1 A
 port 1 n
 rlabel viali 1228 274 1228 274 1 CON
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__addh_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__addh_1.mag
index 499c4cd..a2b3f47 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__addh_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__addh_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604458220
+timestamp 1606864413
+<< checkpaint >>
+rect -1209 -1243 2025 2131
 << nwell >>
 rect -9 485 837 897
 << nmos >>
@@ -210,14 +212,14 @@
 rect 624 331 658 365
 rect 348 278 382 312
 << locali >>
-rect 0 871 836 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 836 871
+rect 0 867 836 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 836 867
 rect 35 757 69 773
 rect 35 527 69 553
 rect 133 757 167 827
@@ -272,27 +274,27 @@
 rect 753 171 787 187
 rect 701 131 753 144
 rect 581 110 787 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 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 35 561 69 587
 rect 35 553 69 561
 rect 260 405 294 439
@@ -304,28 +306,28 @@
 rect 624 331 658 365
 rect 507 257 541 291
 rect 667 257 701 291
-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 871 836 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 836 871
-rect 0 827 836 837
+rect 0 867 836 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 836 867
+rect 0 827 836 833
 rect 23 587 81 593
 rect 23 553 35 587
 rect 69 553 81 587
@@ -366,15 +368,15 @@
 rect 23 182 35 216
 rect 69 182 81 216
 rect 23 176 81 182
-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 381 50 381 1 S
 port 1 n
@@ -386,6 +388,6 @@
 port 4 n
 rlabel viali 684 274 684 274 1 CON
 port 5 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__addh_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__addh_l.mag
index 8ed0fba..6bd8dd5 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__addh_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__addh_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605310136
+timestamp 1606864414
+<< checkpaint >>
+rect -1209 -1243 2025 2131
 << nwell >>
 rect -9 485 837 897
 << nmos >>
@@ -214,14 +216,14 @@
 rect 624 331 658 365
 rect 348 278 382 312
 << locali >>
-rect 0 871 836 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 836 871
+rect 0 867 836 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 836 867
 rect 35 757 69 773
 rect 35 587 69 621
 rect 133 757 167 827
@@ -276,27 +278,27 @@
 rect 753 171 787 187
 rect 701 131 753 144
 rect 581 110 787 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 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 35 553 69 587
 rect 260 405 294 439
 rect 164 331 198 365
@@ -307,28 +309,28 @@
 rect 624 331 658 365
 rect 507 257 541 291
 rect 667 257 701 291
-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 871 836 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 836 871
-rect 0 827 836 837
+rect 0 867 836 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 836 867
+rect 0 827 836 833
 rect 23 587 81 593
 rect 23 553 35 587
 rect 69 553 81 587
@@ -369,15 +371,15 @@
 rect 23 182 35 216
 rect 69 182 81 216
 rect 23 176 81 182
-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 381 50 381 1 S
 port 1 n
@@ -389,6 +391,6 @@
 port 4 n
 rlabel viali 684 274 684 274 1 CON
 port 5 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_1.mag
index 3b9ae07..cbd75ff 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092445
+timestamp 1606864414
 << checkpaint >>
 rect -1269 2461 1634 2601
 rect -1760 -1129 6260 2461
@@ -105,10 +105,10 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -131,29 +131,29 @@
 rect 193 61 227 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -171,11 +171,11 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -183,6 +183,6 @@
 port 2 n
 rlabel viali 191 496 191 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_2.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_2.mag
index 17f361d..c218102 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_2.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092937
+timestamp 1606864414
 << checkpaint >>
 rect -1269 2461 1722 2601
 rect -1760 -1129 6260 2461
@@ -128,11 +128,11 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -159,35 +159,35 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -205,12 +205,12 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 496 191 496 1 B
 port 1 n
@@ -218,6 +218,6 @@
 port 2 n
 rlabel metal1 311 348 311 348 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_4.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_4.mag
index 2660b3d..f65fb05 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_4.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092955
+timestamp 1606864414
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -166,12 +166,12 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -206,43 +206,43 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 465 405 499 439
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -267,13 +267,13 @@
 rect 499 183 511 217
 rect 281 177 339 183
 rect 453 177 511 183
-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 348 311 348 1 Y
 port 1 n
@@ -281,6 +281,6 @@
 port 2 n
 rlabel viali 191 496 191 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_8.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_8.mag
index 86413f5..8c04b12 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_8.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092975
+timestamp 1606864414
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -249,15 +249,15 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -308,30 +308,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
@@ -342,31 +342,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -406,16 +406,16 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 496 191 496 1 B
 port 1 n
@@ -423,6 +423,6 @@
 port 2 n
 rlabel metal1 311 348 311 348 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_l.mag
index e13841f..5b4a134 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__and2_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__and2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309070
+timestamp 1606864415
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 374 897
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 445 207 479
 rect 269 334 303 368
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 121 757 155 773
 rect 35 605 69 621
@@ -126,29 +128,29 @@
 rect 193 61 227 131
 rect 293 165 327 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 479 71 513
 rect 173 479 207 513
 rect 293 479 327 513
 rect 293 257 327 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 513 83 519
 rect 161 513 219 519
 rect 281 513 339 519
@@ -166,16 +168,16 @@
 rect 281 257 293 291
 rect 327 257 339 291
 rect 281 251 339 257
-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 68 44 68 44 1 gnd
 rlabel viali 54 497 54 497 1 A
 rlabel metal1 311 422 311 422 1 Y
 port 1 n
 rlabel viali 190 496 190 496 1 B
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__ant.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__ant.mag
index a674f6a..25d866a 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__ant.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__ant.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093319
+timestamp 1606864415
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 47 405 81 439
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 773
 rect 35 439 69 561
 rect 121 757 155 827
@@ -73,31 +73,31 @@
 rect 35 115 69 131
 rect 121 171 155 287
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 405 81 439
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 439 108 445
 rect 35 405 47 439
 rect 81 405 108 439
 rect 35 399 108 405
-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 422 64 422 1 A
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__antfill.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__antfill.mag
index 33cc053..79e05e9 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__antfill.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__antfill.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093352
+timestamp 1606864415
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -19,9 +19,9 @@
 << nsubdiffcont >>
 rect 51 827 85 861
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 439 69 773
 rect 121 545 155 827
 rect 31 405 47 439
@@ -30,31 +30,31 @@
 rect 35 287 155 321
 rect 35 115 69 287
 rect 121 115 155 287
-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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 405 81 439
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 439 108 445
 rect 35 405 47 439
 rect 81 405 108 439
 rect 35 399 108 405
-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 422 64 422 1 A
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__aoi21_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__aoi21_l.mag
index 3cb1ba1..dc66352 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__aoi21_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__aoi21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605299867
+timestamp 1606864415
+<< checkpaint >>
+rect -1209 -1244 1481 2131
 << nwell >>
 rect -10 485 374 897
 << nmos >>
@@ -104,10 +106,10 @@
 rect 146 338 180 372
 rect 289 259 323 293
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 646 69 696
 rect 121 757 155 827
@@ -133,30 +135,30 @@
 rect 193 114 227 130
 rect 291 164 325 180
 rect 291 60 325 130
-rect 0 16 51 60
-rect 85 16 187 60
-rect 221 16 374 60
-rect 0 0 374 16
+rect 0 20 51 60
+rect 85 20 187 60
+rect 221 20 374 60
+rect 0 0 374 20
 << viali >>
-rect 51 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 60 405 94 439
 rect 128 479 162 513
 rect 216 405 250 439
 rect 293 331 327 365
 rect 193 183 227 217
-rect 51 26 85 50
-rect 51 16 85 26
-rect 187 26 221 50
-rect 187 16 221 26
+rect 51 26 85 54
+rect 51 20 85 26
+rect 187 26 221 54
+rect 187 20 221 26
 << metal1 >>
-rect 0 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 116 513 174 519
 rect 116 479 128 513
 rect 162 479 196 513
@@ -180,18 +182,18 @@
 rect 227 183 327 217
 rect 181 177 233 183
 rect 291 60 325 61
-rect 0 50 374 60
-rect 0 16 51 50
-rect 85 16 187 50
-rect 221 16 374 50
-rect 0 0 374 16
+rect 0 54 374 60
+rect 0 20 51 54
+rect 85 20 187 54
+rect 221 20 374 54
+rect 0 0 374 20
 << labels >>
-rlabel viali 68 43 68 43 1 gnd
 rlabel viali 145 496 145 496 1 A1
 port 4 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel metal1 310 318 310 318 1 Y
 port 3 n
 rlabel viali 77 422 77 422 1 A0
 rlabel viali 233 422 233 422 1 B0
+rlabel viali 68 47 68 47 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__aoi22_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__aoi22_l.mag
index 4b6a3ec..4925e03 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__aoi22_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__aoi22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604531859
+timestamp 1606864415
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 485 462 897
 << nmos >>
@@ -126,11 +128,11 @@
 rect 234 267 268 301
 rect 370 331 404 365
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 121 765 155 827
 rect 35 732 69 748
 rect 121 680 155 697
@@ -161,37 +163,37 @@
 rect 200 115 234 131
 rect 365 171 399 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 60 405 94 439
 rect 128 479 162 513
 rect 216 405 250 439
 rect 370 331 404 365
 rect 302 257 336 291
 rect 200 183 234 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 116 513 174 519
 rect 116 479 128 513
 rect 162 479 196 513
@@ -217,12 +219,12 @@
 rect 188 183 200 217
 rect 234 183 338 217
 rect 188 177 246 183
-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 233 422 233 422 1 B0
 port 2 n
@@ -230,8 +232,8 @@
 port 4 n
 rlabel metal1 321 244 321 244 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 77 422 77 422 1 A0
 rlabel viali 387 348 387 348 1 B1
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_1.mag
index 509942e..4cd1b5e 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093941
+timestamp 1606864416
 << checkpaint >>
 rect -1269 2461 1548 2601
 rect -1760 -1129 6260 2461
@@ -87,10 +87,10 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -108,28 +108,28 @@
 rect 121 61 155 131
 rect 207 171 241 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 207 183 241 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -143,16 +143,16 @@
 rect 195 183 207 217
 rect 241 183 253 217
 rect 195 177 253 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 213 359 213 359 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_2.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_2.mag
index b548e04..edde3fc 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_2.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093979
+timestamp 1606864416
 << checkpaint >>
 rect -1269 2461 1636 2601
 rect -1760 -1129 6260 2461
@@ -104,10 +104,10 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -129,28 +129,28 @@
 rect 207 115 241 131
 rect 293 171 327 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 207 183 241 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -164,16 +164,16 @@
 rect 195 183 207 217
 rect 241 183 253 217
 rect 195 177 253 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_4.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_4.mag
index 5491bc1..426db1c 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_4.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093982
+timestamp 1606864416
 << checkpaint >>
 rect -1269 2461 1812 2601
 rect -1760 -1129 6260 2461
@@ -142,11 +142,11 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 550 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 550 871
+rect 0 867 550 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 550 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -178,36 +178,36 @@
 rect 379 115 413 131
 rect 465 171 499 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 379 479 413 513
 rect 207 183 241 217
 rect 379 183 413 217
-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 871 550 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 550 871
-rect 0 827 550 837
+rect 0 867 550 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 550 867
+rect 0 827 550 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -228,17 +228,17 @@
 rect 413 183 425 217
 rect 195 177 253 183
 rect 367 177 425 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_8.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_8.mag
index 7829d56..aab4de1 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_8.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093986
+timestamp 1606864416
 << checkpaint >>
 rect -1269 2461 2164 2601
 rect -1760 -1129 6260 2461
@@ -225,14 +225,14 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 902 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 902 871
+rect 0 867 902 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 902 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -278,27 +278,27 @@
 rect 723 115 757 131
 rect 809 171 843 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 379 479 413 513
@@ -308,28 +308,28 @@
 rect 379 183 413 217
 rect 551 183 585 217
 rect 723 183 757 217
-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 871 902 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 902 871
-rect 0 827 902 837
+rect 0 867 902 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 902 867
+rect 0 827 902 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -364,20 +364,20 @@
 rect 367 177 425 183
 rect 539 177 597 183
 rect 711 177 769 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_l.mag
index f8aaeba..a7b795c 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__buf_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__buf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309142
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 288 897
 << nmos >>
@@ -83,10 +85,10 @@
 rect 110 457 144 491
 rect 176 348 210 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 35 382 69 621
 rect 121 757 155 827
@@ -103,29 +105,29 @@
 rect 121 61 155 131
 rect 207 165 241 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 207 553 241 587
 rect 110 491 144 513
 rect 110 479 144 491
 rect 207 257 241 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 195 587 253 593
 rect 195 553 207 587
 rect 241 553 253 587
@@ -139,15 +141,15 @@
 rect 195 257 207 291
 rect 241 257 253 291
 rect 195 251 253 257
-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 68 44 68 44 1 gnd
 rlabel metal1 214 430 214 430 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 127 496 127 496 1 A
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__decap_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__decap_1.mag
index 1ee52d2..66fd776 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__decap_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__decap_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604545867
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 365 199 897
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 263 110 601
 rect 80 80 110 115
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 605 69 621
 rect 121 757 155 827
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 200 155 216
 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 861 85 871
-rect 51 837 85 861
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 861 85 867
+rect 51 833 85 861
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
+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 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__decap_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__decap_l.mag
index fa0e8cb..9a0d9e2 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__decap_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__decap_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604545987
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 365 199 897
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 217 110 673
 rect 80 80 110 115
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 827
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 191 155 207
 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 861 85 871
-rect 51 837 85 861
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 861 85 867
+rect 51 833 85 861
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
+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 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dff_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dff_1.mag
index e0f9ff1..0034723 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dff_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dff_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605308955
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1456 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1226 331 1260 365
 rect 1018 257 1052 291
 << locali >>
-rect 0 871 1452 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1452 871
+rect 0 867 1452 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1452 867
 rect 40 757 74 773
 rect 17 561 40 573
 rect 126 757 160 827
@@ -487,39 +489,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 197
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 40 257 74 291
 rect 253 405 287 439
 rect 181 331 215 365
@@ -536,40 +538,40 @@
 rect 1226 331 1260 365
 rect 671 251 705 285
 rect 1018 257 1052 291
-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 871 1452 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1452 871
-rect 0 827 1452 837
+rect 0 867 1452 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1452 867
+rect 0 827 1452 833
 rect 783 513 841 519
 rect 1365 513 1424 519
 rect 783 479 795 513
@@ -631,26 +633,26 @@
 rect 705 251 717 257
 rect 1006 251 1064 257
 rect 665 245 711 251
-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 348 198 348 1 D
 port 1 n
 rlabel viali 915 422 915 422 1 CK
 port 4 n
-rlabel viali 68 845 68 845 1 vdd
-rlabel viali 68 45 68 45 1 gnd
 rlabel viali 1223 422 1223 422 1 ON
 rlabel viali 1394 496 1394 496 1 Q
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 841 68 841 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dff_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dff_l.mag
index 82bf4bd..646975d 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dff_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dff_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309008
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1456 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1226 331 1260 365
 rect 1018 257 1052 291
 << locali >>
-rect 0 871 1452 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1452 871
+rect 0 867 1452 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1452 867
 rect 40 757 74 773
 rect 17 561 40 573
 rect 126 757 160 827
@@ -487,39 +489,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 197
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 40 257 74 291
 rect 253 405 287 439
 rect 181 331 215 365
@@ -536,40 +538,40 @@
 rect 1226 331 1260 365
 rect 671 251 705 285
 rect 1018 257 1052 291
-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 871 1452 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1452 871
-rect 0 827 1452 837
+rect 0 867 1452 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1452 867
+rect 0 827 1452 833
 rect 783 513 841 519
 rect 1365 513 1424 519
 rect 783 479 795 513
@@ -631,26 +633,26 @@
 rect 705 251 717 257
 rect 1006 251 1064 257
 rect 665 245 711 251
-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 348 198 348 1 D
 port 1 n
 rlabel viali 915 422 915 422 1 CK
 port 4 n
-rlabel viali 68 845 68 845 1 vdd
-rlabel viali 68 45 68 45 1 gnd
 rlabel viali 1223 422 1223 422 1 ON
 rlabel viali 1394 496 1394 496 1 Q
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 841 68 841 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_1.mag
index 52e1dd3..30fa099 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570192
+timestamp 1606864418
+<< checkpaint >>
+rect -1210 -1243 3112 2131
 << nwell >>
 rect -10 485 1917 897
 << nmos >>
@@ -468,22 +470,22 @@
 rect 1784 366 1818 400
 rect 1561 225 1595 259
 << locali >>
-rect 0 871 1914 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1914 871
+rect 0 867 1914 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1914 867
 rect 35 758 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -619,51 +621,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
 rect 47 553 81 587
 rect 227 259 261 291
 rect 227 257 261 259
@@ -685,52 +687,52 @@
 rect 1409 257 1443 291
 rect 1561 259 1595 291
 rect 1561 257 1595 259
-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 871 1914 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1914 871
-rect 0 827 1914 837
+rect 0 867 1914 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1914 867
+rect 0 827 1914 833
 rect 35 587 93 593
 rect 1826 587 1884 593
 rect 35 553 47 587
@@ -803,28 +805,26 @@
 rect 1549 251 1607 257
 rect 1561 217 1595 251
 rect 227 183 1595 217
-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 570 65 570 1 RN
 port 1 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1855 570 1855 570 1 Q
 port 4 n
 rlabel viali 1685 496 1685 496 1 QN
@@ -833,4 +833,6 @@
 port 2 n
 rlabel viali 1290 422 1290 422 1 CK
 port 3 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_l.mag
index 633408e..a8f1f72 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dffr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309207
+timestamp 1606864418
+<< checkpaint >>
+rect -1210 -1243 3112 2131
 << nwell >>
 rect -10 485 1917 897
 << nmos >>
@@ -468,22 +470,22 @@
 rect 1784 366 1818 400
 rect 1561 225 1595 259
 << locali >>
-rect 0 871 1914 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1914 871
+rect 0 867 1914 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1914 867
 rect 35 758 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -619,51 +621,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
 rect 47 553 81 587
 rect 227 259 261 291
 rect 227 257 261 259
@@ -685,52 +687,52 @@
 rect 1409 257 1443 291
 rect 1561 259 1595 291
 rect 1561 257 1595 259
-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 871 1914 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1914 871
-rect 0 827 1914 837
+rect 0 867 1914 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1914 867
+rect 0 827 1914 833
 rect 35 587 93 593
 rect 1826 587 1884 593
 rect 35 553 47 587
@@ -803,28 +805,26 @@
 rect 1549 251 1607 257
 rect 1561 217 1595 251
 rect 227 183 1595 217
-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 570 65 570 1 RN
 port 1 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1855 570 1855 570 1 Q
 port 4 n
 rlabel viali 1685 496 1685 496 1 QN
@@ -833,4 +833,6 @@
 port 2 n
 rlabel viali 1290 422 1290 422 1 CK
 port 3 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_1.mag
index eeaad2e..a40955e 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570225
+timestamp 1606864418
+<< checkpaint >>
+rect -1210 -1243 2840 2131
 << nwell >>
 rect -10 789 1741 897
 rect -11 563 1741 789
@@ -423,20 +425,20 @@
 rect 1594 366 1628 400
 rect 1371 225 1405 259
 << locali >>
-rect 0 871 1738 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1738 871
+rect 0 867 1738 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1738 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -552,45 +554,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
 rect 121 364 155 398
 rect 47 311 81 324
 rect 47 290 81 311
@@ -611,46 +613,46 @@
 rect 1203 257 1237 291
 rect 1371 225 1405 250
 rect 1371 216 1405 225
-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 871 1738 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1738 871
-rect 0 827 1738 837
+rect 0 867 1738 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1738 867
+rect 0 827 1738 833
 rect 1636 587 1694 593
 rect 1614 553 1648 587
 rect 1682 553 1694 587
@@ -721,31 +723,31 @@
 rect 281 211 1417 212
 rect 47 210 1417 211
 rect 47 183 1405 210
-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 348 383 348 1 D
 port 1 n
 rlabel viali 1100 422 1100 422 1 CK
 port 2 n
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1665 570 1665 570 1 Q
 port 4 n
 rlabel viali 1495 496 1495 496 1 QN
 port 3 n
 rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 844 67 844 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_l.mag
index 6e0634a..9c90af0 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dffs_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570239
+timestamp 1606864418
+<< checkpaint >>
+rect -1210 -1243 2840 2131
 << nwell >>
 rect -10 789 1741 897
 rect -11 563 1741 789
@@ -424,20 +426,20 @@
 rect 1594 366 1628 400
 rect 1371 225 1405 259
 << locali >>
-rect 0 871 1738 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1738 871
+rect 0 867 1738 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1738 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -553,45 +555,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
 rect 121 364 155 398
 rect 47 311 81 324
 rect 47 290 81 311
@@ -612,46 +614,46 @@
 rect 1203 257 1237 291
 rect 1371 225 1405 250
 rect 1371 216 1405 225
-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 871 1738 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1738 871
-rect 0 827 1738 837
+rect 0 867 1738 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1738 867
+rect 0 827 1738 833
 rect 1636 587 1694 593
 rect 1614 553 1648 587
 rect 1682 553 1694 587
@@ -722,31 +724,31 @@
 rect 281 211 1417 212
 rect 47 210 1417 211
 rect 47 183 1405 210
-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 348 383 348 1 D
 port 1 n
 rlabel viali 1100 422 1100 422 1 CK
 port 2 n
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1665 570 1665 570 1 Q
 port 4 n
 rlabel viali 1495 496 1495 496 1 QN
 port 3 n
 rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 844 67 844 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_1.mag
index 427c352..43593c6 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605303565
+timestamp 1606864418
+<< checkpaint >>
+rect -1210 -1243 3248 2131
 << nwell >>
 rect -10 485 2090 897
 << nmos >>
@@ -525,23 +527,23 @@
 rect 1956 366 1990 400
 rect 1755 225 1789 259
 << locali >>
-rect 0 871 2090 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1954 871
-rect 1988 827 2090 871
+rect 0 867 2090 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1954 867
+rect 1988 827 2090 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -697,54 +699,54 @@
 rect 1925 61 1959 131
 rect 2011 171 2045 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
-rect 1954 861 1988 871
-rect 1954 837 1988 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
+rect 1954 861 1988 867
+rect 1954 833 1988 861
 rect 47 553 81 587
 rect 394 553 428 587
 rect 157 257 191 291
@@ -768,55 +770,55 @@
 rect 1502 257 1536 291
 rect 1755 259 1789 291
 rect 1755 257 1789 259
-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 871 2090 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1954 871
-rect 1988 837 2090 871
-rect 0 827 2090 837
+rect 0 867 2090 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1954 867
+rect 1988 833 2090 867
+rect 0 827 2090 833
 rect 35 587 93 593
 rect 380 587 439 593
 rect 1558 587 1617 592
@@ -901,24 +903,24 @@
 rect 1126 245 1172 251
 rect 1755 217 1789 251
 rect 157 183 1789 217
-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 348 659 348 1 D
 port 1 n
@@ -930,7 +932,7 @@
 port 5 n
 rlabel viali 2028 570 2028 570 1 Q
 port 6 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1588 569 1588 569 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_l.mag
index 4892d9f..6ce138d 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__dffsr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605574442
+timestamp 1606864419
+<< checkpaint >>
+rect -1210 -1243 3248 2131
 << nwell >>
 rect -10 485 2090 897
 << nmos >>
@@ -525,23 +527,23 @@
 rect 1956 366 1990 400
 rect 1755 225 1789 259
 << locali >>
-rect 0 871 2090 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1954 871
-rect 1988 827 2090 871
+rect 0 867 2090 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1954 867
+rect 1988 827 2090 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -700,54 +702,54 @@
 rect 1925 61 1959 131
 rect 2011 171 2045 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
-rect 1954 861 1988 871
-rect 1954 837 1988 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
+rect 1954 861 1988 867
+rect 1954 833 1988 861
 rect 47 553 81 587
 rect 394 553 428 587
 rect 157 257 191 291
@@ -770,55 +772,55 @@
 rect 1755 259 1789 291
 rect 1755 257 1789 259
 rect 2034 405 2068 439
-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 871 2090 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1954 871
-rect 1988 837 2090 871
-rect 0 827 2090 837
+rect 0 867 2090 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1954 867
+rect 1988 833 2090 867
+rect 0 827 2090 833
 rect 35 587 93 593
 rect 380 587 439 593
 rect 1558 587 1617 592
@@ -905,24 +907,24 @@
 rect 1126 245 1172 251
 rect 1755 217 1789 251
 rect 157 183 1789 217
-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 348 659 348 1 D
 port 1 n
@@ -932,8 +934,8 @@
 port 3 n
 rlabel viali 65 570 65 570 1 RN
 port 5 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 2051 422 2051 422 1 Q
 rlabel viali 1588 570 1588 570 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_1.mag
index 2228bc9..74c771f 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604091897
+timestamp 1606864420
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -72,22 +72,22 @@
 rect 35 61 69 131
 rect 121 171 155 183
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 183 155 217
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -101,15 +101,15 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 345 151 345 1 Y
 port 1 n
 rlabel viali 64 570 64 570 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_10.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_10.mag
index 344ae42..ed4cc3b 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_10.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_10.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092186
+timestamp 1606864420
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -243,15 +243,15 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -299,30 +299,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -334,31 +334,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -400,21 +400,21 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_2.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_2.mag
index 2747162..1539148 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_2.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092159
+timestamp 1606864420
 << checkpaint >>
 rect -1269 2461 1547 2601
 rect -1760 -1129 6260 2461
@@ -84,10 +84,10 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -103,28 +103,28 @@
 rect 121 115 155 131
 rect 207 171 241 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 183 155 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -138,16 +138,16 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_3.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_3.mag
index 1f07483..6776742 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_3.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_3.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092164
+timestamp 1606864420
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -100,10 +100,10 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -123,30 +123,30 @@
 rect 207 61 241 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
 rect 121 183 155 217
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -167,16 +167,16 @@
 rect 327 183 339 217
 rect 109 177 167 183
 rect 281 177 339 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_4.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_4.mag
index 634f5a0..95528d6 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_4.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092169
+timestamp 1606864421
 << checkpaint >>
 rect -1269 2461 1723 2601
 rect -1760 -1129 6260 2461
@@ -122,11 +122,11 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -150,36 +150,36 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
 rect 121 183 155 217
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -200,17 +200,17 @@
 rect 327 183 339 217
 rect 109 177 167 183
 rect 281 177 339 183
-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 569 64 569 1 A
 port 1 n
 rlabel metal1 152 344 152 344 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_6.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_6.mag
index c690dc6..81851e8 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_6.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_6.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092174
+timestamp 1606864421
 << checkpaint >>
 rect -1269 2461 1899 2601
 rect -1760 -1129 6260 2461
@@ -161,12 +161,12 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -198,21 +198,21 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -220,22 +220,22 @@
 rect 121 183 155 217
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -263,18 +263,18 @@
 rect 109 177 167 183
 rect 281 177 339 183
 rect 453 177 511 183
-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 569 64 569 1 A
 port 1 n
 rlabel metal1 152 344 152 344 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_8.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_8.mag
index 542bc4d..30e1b56 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_8.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092183
+timestamp 1606864421
 << checkpaint >>
 rect -1269 2461 2074 2601
 rect -1760 -1129 6260 2461
@@ -199,13 +199,13 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 814 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 814 871
+rect 0 867 814 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 814 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -245,24 +245,24 @@
 rect 637 115 671 131
 rect 723 171 757 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -272,25 +272,25 @@
 rect 293 183 327 217
 rect 465 183 499 217
 rect 637 183 671 217
-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 871 814 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 814 871
-rect 0 827 814 837
+rect 0 867 814 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 814 867
+rect 0 827 814 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -325,19 +325,19 @@
 rect 281 177 339 183
 rect 453 177 511 183
 rect 625 177 683 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_l.mag
index 3c89cd3..752c86e 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__inv_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__inv_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309040
+timestamp 1606864421
+<< checkpaint >>
+rect -1209 -1243 1345 2129
 << nwell >>
 rect -9 485 199 895
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 869 198 886
-rect 0 825 51 869
-rect 85 825 198 869
+rect 0 865 198 886
+rect 0 825 51 865
+rect 85 825 198 865
 rect 35 755 69 825
 rect 35 671 69 687
 rect 121 755 155 771
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 165 155 257
 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 859 85 869
-rect 51 835 85 859
+rect 51 859 85 865
+rect 51 831 85 859
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 257 155 291
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 869 198 886
-rect 0 835 51 869
-rect 85 835 198 869
-rect 0 825 198 835
+rect 0 865 198 886
+rect 0 831 51 865
+rect 85 831 198 865
+rect 0 825 198 831
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -97,15 +99,15 @@
 rect 109 257 121 291
 rect 155 257 167 291
 rect 109 251 167 257
-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 68 44 68 44 1 gnd
 rlabel viali 64 570 64 570 1 A
 port 1 n
 rlabel metal1 151 345 151 345 1 Y
 port 2 n
-rlabel viali 68 842 68 842 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 838 68 838 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__mux2_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__mux2_1.mag
index 90542cf..114b6bb 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__mux2_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__mux2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604095946
+timestamp 1606864421
 << checkpaint >>
 rect -1269 2461 1813 2601
 rect -1760 -1129 6260 2461
@@ -124,9 +124,9 @@
 rect 37 348 71 382
 rect 168 257 202 291
 << locali >>
-rect 0 871 550 888
-rect 0 827 459 871
-rect 493 827 550 871
+rect 0 867 550 888
+rect 0 827 459 867
+rect 493 827 550 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -158,33 +158,33 @@
 rect 311 115 345 131
 rect 397 171 431 405
 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 861 493 871
-rect 459 837 493 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 553 71 587
 rect 236 479 270 513
 rect 311 331 345 365
 rect 397 405 431 439
 rect 311 183 345 217
-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 871 550 888
-rect 0 837 459 871
-rect 493 837 550 871
-rect 0 827 550 837
+rect 0 867 550 888
+rect 0 833 459 867
+rect 493 833 550 867
+rect 0 827 550 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 117 587
@@ -206,13 +206,13 @@
 rect 299 183 311 217
 rect 345 183 357 217
 rect 299 177 357 183
-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 570 54 570 1 S0
 port 1 n
@@ -222,6 +222,6 @@
 port 3 n
 rlabel viali 414 422 414 422 1 A1
 port 4 n
-rlabel viali 476 844 476 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 840 476 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_1.mag
index 00e5f33..bb25372 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604095979
+timestamp 1606864422
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 47 424 81 458
 rect 166 331 200 365
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -100,29 +100,29 @@
 rect 35 115 69 131
 rect 193 171 227 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 405 155 439
 rect 195 479 229 513
 rect 35 183 69 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 115 587
@@ -140,11 +140,11 @@
 rect 23 183 35 217
 rect 69 183 155 217
 rect 23 177 81 183
-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 374 136 374 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 212 496 212 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_l.mag
index a4cc7eb..75beda2 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__nand2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309339
+timestamp 1606864422
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 286 897
 << nmos >>
@@ -77,10 +79,10 @@
 rect 47 498 81 532
 rect 166 348 200 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -96,29 +98,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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 195 553 229 587
 rect 35 257 69 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 183 587 241 593
 rect 35 553 47 587
@@ -136,17 +138,17 @@
 rect 23 257 35 291
 rect 69 257 155 291
 rect 23 251 81 257
-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 68 44 68 44 1 gnd
 rlabel metal1 136 448 136 448 1 Y
 port 1 n
 rlabel viali 212 570 212 570 1 B
 port 2 n
 rlabel viali 64 570 64 570 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_1.mag
index f816289..092df54 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096049
+timestamp 1606864422
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 181 438 215 472
 rect 66 305 100 339
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 193 757 227 827
 rect 193 681 227 697
@@ -100,29 +100,29 @@
 rect 121 115 155 131
 rect 207 171 241 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 181 553 215 587
 rect 35 405 69 439
 rect 113 479 147 513
 rect 121 183 155 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 169 587 227 593
 rect 148 553 181 587
 rect 215 553 227 587
@@ -140,11 +140,11 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 297 137 297 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 198 570 198 570 1 A
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_l.mag
index 79ef4ec..3bc8eb9 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__nor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309389
+timestamp 1606864422
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 286 897
 << nmos >>
@@ -77,10 +79,10 @@
 rect 181 512 215 546
 rect 66 379 100 413
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 35 513 69 621
 rect 193 757 227 827
@@ -95,30 +97,30 @@
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 35 479 69 513
 rect 113 553 147 587
 rect 181 512 215 513
 rect 181 479 215 512
 rect 121 257 155 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 101 587 159 593
 rect 79 553 113 587
 rect 147 553 159 587
@@ -137,16 +139,16 @@
 rect 155 257 167 291
 rect 34 256 167 257
 rect 109 251 167 256
-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 68 44 68 44 1 gnd
 rlabel viali 130 570 130 570 1 B
 port 3 n
 rlabel metal1 48 337 48 337 1 Y
 rlabel viali 198 496 198 496 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__oai21_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__oai21_l.mag
index e2062c4..07a47e1 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__oai21_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__oai21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605314751
+timestamp 1606864422
+<< checkpaint >>
+rect -1209 -1244 1481 2131
 << nwell >>
 rect -9 485 374 897
 << nmos >>
@@ -101,10 +103,10 @@
 rect 152 331 186 365
 rect 262 283 296 317
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 655 69 696
 rect 193 757 227 827
@@ -128,31 +130,31 @@
 rect 207 170 241 214
 rect 207 114 241 130
 rect 293 114 327 130
-rect 0 16 51 60
-rect 85 16 187 60
-rect 221 16 374 60
-rect 0 0 374 16
+rect 0 20 51 60
+rect 85 20 187 60
+rect 221 20 374 60
+rect 0 0 374 20
 << viali >>
-rect 51 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 66 553 100 587
 rect 162 479 196 513
 rect 291 479 325 513
 rect 223 405 257 439
 rect 293 189 327 217
 rect 293 183 327 189
-rect 51 26 85 50
-rect 51 16 85 26
-rect 187 26 221 50
-rect 187 16 221 26
+rect 51 26 85 54
+rect 51 20 85 26
+rect 187 26 221 54
+rect 187 20 221 26
 << metal1 >>
-rect 0 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 54 587 112 593
 rect 54 553 66 587
 rect 100 553 134 587
@@ -174,19 +176,19 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-rect 0 50 374 60
-rect 0 16 51 50
-rect 85 16 187 50
-rect 221 16 374 50
-rect 0 0 374 16
+rect 0 54 374 60
+rect 0 20 51 54
+rect 85 20 187 54
+rect 221 20 374 54
+rect 0 0 374 20
 << labels >>
-rlabel viali 68 43 68 43 1 gnd
 rlabel viali 83 570 83 570 1 A0
 port 1 n
 rlabel viali 179 496 179 496 1 A1
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 240 422 240 422 1 B0
 port 4 n
 rlabel viali 308 496 308 496 1 Y
+rlabel viali 68 47 68 47 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__oai22_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__oai22_l.mag
index 1745548..b0ae9cd 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__oai22_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__oai22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604556468
+timestamp 1606864423
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 483 462 897
 << nmos >>
@@ -126,11 +128,11 @@
 rect 146 331 180 365
 rect 248 353 282 387
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 635 69 651
 rect 200 757 234 773
@@ -162,37 +164,37 @@
 rect 379 165 413 181
 rect 241 131 379 143
 rect 207 109 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 52 438 86 439
 rect 52 405 86 438
 rect 223 479 257 513
 rect 146 331 180 365
 rect 384 406 418 440
 rect 316 331 350 365
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 211 513 269 519
 rect 189 479 223 513
 rect 257 479 269 513
@@ -213,14 +215,13 @@
 rect 350 331 362 365
 rect 134 325 192 331
 rect 304 325 362 331
-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 68 44 68 44 1 gnd
 rlabel viali 240 496 240 496 1 B0
 port 4 n
 rlabel viali 333 348 333 348 1 Y
@@ -228,5 +229,6 @@
 rlabel viali 401 423 401 423 1 B1
 rlabel viali 163 348 163 348 1 A1
 rlabel viali 69 422 69 422 1 A0
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_1.mag
index 305001a..755d125 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096476
+timestamp 1606864423
 << checkpaint >>
 rect -1269 2461 1634 2601
 rect -1760 -1129 6260 2461
@@ -105,10 +105,10 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -131,29 +131,29 @@
 rect 207 61 241 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -171,11 +171,11 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -183,6 +183,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_2.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_2.mag
index faa8084..caa68a6 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_2.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096479
+timestamp 1606864423
 << checkpaint >>
 rect -1269 2461 1722 2601
 rect -1760 -1129 6260 2461
@@ -128,11 +128,11 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -159,35 +159,35 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -205,12 +205,12 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -218,6 +218,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_4.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_4.mag
index 181cc5a..d5c6b5b 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_4.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096482
+timestamp 1606864423
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -166,12 +166,12 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -206,43 +206,43 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 465 405 499 439
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -267,13 +267,13 @@
 rect 499 183 511 217
 rect 281 177 339 183
 rect 453 177 511 183
-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 348 311 348 1 Y
 port 1 n
@@ -281,6 +281,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_8.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_8.mag
index 986f294..cea2401 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_8.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096485
+timestamp 1606864423
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -249,15 +249,15 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -308,30 +308,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
@@ -342,31 +342,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -406,16 +406,16 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 348 311 348 1 Y
 port 1 n
@@ -423,6 +423,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_l.mag
index 9f4baa3..17b21b4 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__or2_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__or2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309479
+timestamp 1606864424
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 374 897
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 438 207 472
 rect 269 348 303 382
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 621 69 689
 rect 207 757 241 827
@@ -126,30 +128,30 @@
 rect 207 61 241 131
 rect 293 165 327 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 496 71 513
 rect 37 479 71 496
 rect 173 479 207 513
 rect 293 479 327 513
 rect 293 257 327 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 513 83 519
 rect 161 513 219 519
 rect 281 513 339 519
@@ -167,16 +169,16 @@
 rect 281 257 293 291
 rect 327 257 339 291
 rect 281 251 339 257
-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 68 44 68 44 1 gnd
 rlabel metal1 311 422 311 422 1 Y
 port 1 n
 rlabel viali 190 496 190 496 1 A
 rlabel viali 54 496 54 496 1 B
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_1.mag
index af8c197..72e5ac8 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096578
+timestamp 1606864424
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -102,10 +102,10 @@
 rect 121 257 155 291
 rect 248 305 282 339
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 613 155 629
@@ -126,29 +126,29 @@
 rect 121 61 155 131
 rect 279 171 313 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 279 405 313 439
 rect 121 257 155 291
 rect 279 183 313 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -170,11 +170,11 @@
 rect 267 183 279 217
 rect 313 183 325 217
 rect 267 177 325 183
-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 268 305 268 1 Y
 port 1 n
@@ -182,6 +182,6 @@
 port 2 n
 rlabel metal1 138 496 138 496 1 OE
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_l.mag
index f108213..7f86ebf 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__tbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309523
+timestamp 1606864424
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 375 897
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 331 155 365
 rect 248 379 282 413
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 491 69 621
 rect 121 757 155 827
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 165 313 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 279 479 313 513
 rect 121 331 155 365
 rect 279 257 313 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -166,16 +168,16 @@
 rect 267 257 279 291
 rect 313 257 325 291
 rect 267 251 325 257
-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 68 44 68 44 1 gnd
 rlabel metal1 305 342 305 342 1 Y
 port 1 n
 rlabel metal1 138 496 138 496 1 OE
 rlabel viali 228 570 228 570 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__tiehi.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__tiehi.mag
index 72bc3db..1b4d68c 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__tiehi.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__tiehi.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096649
+timestamp 1606864424
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 287 124 321
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 545 69 561
 rect 121 757 155 773
@@ -71,31 +71,31 @@
 rect 35 61 69 131
 rect 121 171 155 287
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 121 479 155 513
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 94 513 167 519
 rect 94 479 121 513
 rect 155 479 167 513
 rect 94 473 167 479
-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 496 138 496 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__tielo.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__tielo.mag
index e3ebd0f..84586b4 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__tielo.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__tielo.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096652
+timestamp 1606864424
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 419 124 453
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 545 69 561
 rect 121 757 155 773
@@ -71,31 +71,31 @@
 rect 35 61 69 131
 rect 121 171 155 257
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 121 257 155 291
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 94 291 167 297
 rect 94 257 121 291
 rect 155 257 167 291
 rect 94 251 167 257
-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 274 138 274 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_1.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_1.mag
index bab094d..6a8487c 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_1.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096683
+timestamp 1606864425
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -101,10 +101,10 @@
 rect 121 322 155 356
 rect 248 305 282 339
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 613 155 629
@@ -125,29 +125,29 @@
 rect 121 61 155 131
 rect 279 171 313 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 121 479 155 513
 rect 279 405 313 439
 rect 279 183 313 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -165,11 +165,11 @@
 rect 267 183 279 217
 rect 313 183 325 217
 rect 267 177 325 183
-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 268 305 268 1 Y
 port 1 n
@@ -177,6 +177,6 @@
 port 2 n
 rlabel viali 138 496 138 496 1 OE
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_l.mag
index 3ec8e17..3ba6f49 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__tnbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309543
+timestamp 1606864425
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 375 897
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 395 155 429
 rect 248 379 282 413
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 430 69 621
 rect 121 757 155 827
@@ -123,29 +125,29 @@
 rect 121 61 155 131
 rect 279 165 313 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 279 553 313 587
 rect 121 479 155 513
 rect 211 405 245 439
 rect 279 257 313 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 266 587 325 593
 rect 266 553 279 587
 rect 313 553 325 587
@@ -165,16 +167,16 @@
 rect 267 257 279 291
 rect 313 257 325 291
 rect 267 251 325 257
-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 68 44 68 44 1 gnd
 rlabel metal1 305 342 305 342 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 228 423 228 423 1 A
 rlabel viali 138 497 138 497 1 OE
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__xnor2_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__xnor2_l.mag
index e999c5e..cface76 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__xnor2_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__xnor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605315216
+timestamp 1606864425
+<< checkpaint >>
+rect -1209 -1243 1753 2131
 << nwell >>
 rect -9 485 638 897
 << nmos >>
@@ -169,12 +171,12 @@
 rect 336 257 370 291
 rect 489 257 523 291
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 35 399 69 561
 rect 121 757 155 827
@@ -211,21 +213,21 @@
 rect 471 61 505 131
 rect 557 171 591 440
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 268 561 279 587
 rect 279 561 302 587
 rect 268 553 302 561
@@ -233,22 +235,22 @@
 rect 152 257 186 291
 rect 268 257 302 291
 rect 489 257 523 291
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 256 587 314 593
 rect 256 553 268 587
 rect 302 553 314 587
@@ -273,19 +275,19 @@
 rect 523 257 557 291
 rect 477 251 535 257
 rect 152 183 438 217
-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 506 274 506 274 1 B
 port 2 n
 rlabel metal1 284 331 284 331 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 169 274 169 274 1 A
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ls/magic/sky130_osu_sc_12T_ls__xor2_l.mag b/12T_ls/magic/sky130_osu_sc_12T_ls__xor2_l.mag
index 7a7e1ec..bf7eba3 100644
--- a/12T_ls/magic/sky130_osu_sc_12T_ls__xor2_l.mag
+++ b/12T_ls/magic/sky130_osu_sc_12T_ls__xor2_l.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604097546
+timestamp 1606864425
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -172,12 +172,12 @@
 rect 430 331 464 365
 rect 248 257 282 291
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -217,42 +217,42 @@
 rect 471 61 505 131
 rect 557 171 591 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 200 553 234 587
 rect 412 553 446 587
 rect 268 405 302 439
 rect 489 479 523 513
 rect 296 183 330 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 188 587 246 593
 rect 400 587 458 593
 rect 188 553 200 587
@@ -273,13 +273,13 @@
 rect 268 183 296 217
 rect 330 183 342 217
 rect 284 177 342 183
-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 570 218 570 1 A
 port 1 n
@@ -287,6 +287,6 @@
 port 2 n
 rlabel viali 506 496 506 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__addf_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__addf_1.gds
index 8ec073e..99bc944 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__addf_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__addf_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__addf_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__addf_l.gds
index 332ae89..30dbeb4 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__addf_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__addf_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__addh_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__addh_1.gds
index 901bea6..1603c99 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__addh_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__addh_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__addh_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__addh_l.gds
index c140e46..23b1667 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__addh_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__addh_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_1.gds
index 5c7c700..711f8d3 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_2.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_2.gds
index c8cf585..cf1a76c 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_2.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_2.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_4.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_4.gds
index 586a19f..61f322c 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_4.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_4.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_6.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_6.gds
index eaa18b9..b4d0c3f 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_6.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_6.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_8.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_8.gds
index ac8bbd0..c845d8a 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_8.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_8.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_l.gds
index c667e12..69fa701 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__and2_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__and2_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__ant.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__ant.gds
index c9293e9..89460e9 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__ant.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__ant.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__antfill.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__antfill.gds
index be470cc..11f5985 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__antfill.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__antfill.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__aoi21_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__aoi21_l.gds
index c0a266f..00ef0f7 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__aoi21_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__aoi21_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__aoi22_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__aoi22_l.gds
index 614e7e3..bbb6a7a 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__aoi22_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__aoi22_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_1.gds
index b2ff88a..67e66fc 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_2.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_2.gds
index b05ac2b..0652d5e 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_2.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_2.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_4.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_4.gds
index fa21979..8612433 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_4.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_4.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_6.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_6.gds
index fb9f266..9f15393 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_6.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_6.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_8.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_8.gds
index 3181cb7..8e95e68 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_8.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_8.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_l.gds
index 5e8a48e..635ff8f 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__buf_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__buf_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__decap_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__decap_1.gds
index fea07ee..e814759 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__decap_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__decap_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__decap_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__decap_l.gds
index e2d19a8..0d6d784 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__decap_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__decap_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dff_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dff_1.gds
index dfc8167..9ac8a42 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dff_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dff_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dff_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dff_l.gds
index 42f47ba..798013d 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dff_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dff_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_1.gds
index c3d0b65..0fcf842 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_l.gds
index e102cbe..7544172 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dffr_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_1.gds
index b1d5494..3435ab5 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_l.gds
index 6a29729..fdad8b7 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dffs_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_1.gds
index 5d941d4..42ec82d 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_l.gds
index cba8b35..cd1f65b 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__dffsr_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_1.gds
index 1f23caa..55a3e7c 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_16.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_16.gds
index 492a5d3..5502ebc 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_16.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_16.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_2.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_2.gds
index 918ffca..6d89033 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_2.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_2.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_32.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_32.gds
index 250a6de..7fa1108 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_32.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_32.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_4.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_4.gds
index b8b12a8..7b1bd84 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_4.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_4.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_8.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_8.gds
index 9ec8ccd..f44958a 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__fill_8.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__fill_8.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_1.gds
index ab83f63..c1daede 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_10.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_10.gds
index 60b9049..12f898f 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_10.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_10.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_2.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_2.gds
index 1dcd202..8aae909 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_2.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_2.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_3.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_3.gds
index 24162c3..d9239a4 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_3.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_3.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_4.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_4.gds
index 210ade4..bc52032 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_4.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_4.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_6.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_6.gds
index dad0f80..fc09279 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_6.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_6.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_8.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_8.gds
index b91bd26..f1d5636 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_8.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_8.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_l.gds
index 848baf4..127643e 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__inv_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__inv_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__mux2_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__mux2_1.gds
index 943717d..8339059 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__mux2_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__mux2_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_1.gds
index c0889cb..38b7638 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_l.gds
index f36610c..d98f994 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__nand2_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_1.gds
index eb20f57..b3e45c7 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_l.gds
index 9b5158d..453e2f4 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__nor2_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__oai21_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__oai21_l.gds
index b2f6f42..de1aff1 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__oai21_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__oai21_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__oai22_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__oai22_l.gds
index c1cdaae..742e7fe 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__oai22_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__oai22_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_1.gds
index adc9d65..17e91c8 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_2.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_2.gds
index 20b5492..eb6b379 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_2.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_2.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_4.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_4.gds
index fb56b65..9ed2795 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_4.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_4.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_8.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_8.gds
index 2acbfac..eb0a0b7 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_8.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_8.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_l.gds
index d3e0637..abbb59e 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__or2_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__or2_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_1.gds
index 97dd2c1..360495d 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_l.gds
index 00e71b6..44ffba1 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__tbufi_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__tiehi.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__tiehi.gds
index 970c7be..777953a 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__tiehi.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__tiehi.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__tielo.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__tielo.gds
index 0282a9e..430c906 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__tielo.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__tielo.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_1.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_1.gds
index 875611c..c6dfd56 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_1.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_1.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_l.gds
index 90f154c..848aa39 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__tnbufi_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__xnor2_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__xnor2_l.gds
index 58223fa..f6a85d9 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__xnor2_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__xnor2_l.gds
Binary files differ
diff --git a/12T_ms/gds/sky130_osu_sc_12T_ms__xor2_l.gds b/12T_ms/gds/sky130_osu_sc_12T_ms__xor2_l.gds
index 3056cab..f280510 100644
--- a/12T_ms/gds/sky130_osu_sc_12T_ms__xor2_l.gds
+++ b/12T_ms/gds/sky130_osu_sc_12T_ms__xor2_l.gds
Binary files differ
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__addf_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__addf_1.mag
index b7c0bea..a38aa02 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__addf_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__addf_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605314603
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1435 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1265 435 1299 469
 rect 1014 257 1048 291
 << locali >>
-rect 0 871 1408 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1408 871
+rect 0 867 1408 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1408 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -485,39 +487,39 @@
 rect 1247 61 1281 131
 rect 1333 171 1367 479
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 80 479 114 513
 rect 248 405 282 439
 rect 80 331 114 365
@@ -536,40 +538,40 @@
 rect 1014 331 1048 365
 rect 1211 257 1245 291
 rect 1333 479 1367 513
-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 871 1408 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1408 871
-rect 0 827 1408 837
+rect 0 867 1408 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1408 867
+rect 0 827 1408 833
 rect 1131 588 1189 594
 rect 1109 554 1143 588
 rect 1177 554 1189 588
@@ -621,29 +623,29 @@
 rect 304 251 362 257
 rect 771 251 820 257
 rect 1199 251 1257 257
-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 1160 571 1160 571 1 S
 port 5 n
 rlabel viali 1350 496 1350 496 1 CO
 port 6 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel metal1 129 496 129 496 1 B
 rlabel viali 265 422 265 422 1 CI
 rlabel viali 97 348 97 348 1 A
 port 1 n
 rlabel viali 1228 274 1228 274 1 CON
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__addf_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__addf_l.mag
index fa14fdf..ff729e5 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__addf_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__addf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605314583
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1435 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1265 435 1299 469
 rect 1014 257 1048 291
 << locali >>
-rect 0 871 1408 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1408 871
+rect 0 867 1408 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1408 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -485,39 +487,39 @@
 rect 1247 61 1281 131
 rect 1333 171 1367 479
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 80 479 114 513
 rect 248 405 282 439
 rect 80 331 114 365
@@ -536,40 +538,40 @@
 rect 1014 331 1048 365
 rect 1211 257 1245 291
 rect 1333 479 1367 513
-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 871 1408 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1408 871
-rect 0 827 1408 837
+rect 0 867 1408 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1408 867
+rect 0 827 1408 833
 rect 1131 588 1189 594
 rect 1109 554 1143 588
 rect 1177 554 1189 588
@@ -621,29 +623,29 @@
 rect 304 251 362 257
 rect 771 251 820 257
 rect 1199 251 1257 257
-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 1160 571 1160 571 1 S
 port 5 n
 rlabel viali 1350 496 1350 496 1 CO
 port 6 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel metal1 129 496 129 496 1 B
 rlabel viali 265 422 265 422 1 CI
 rlabel viali 97 348 97 348 1 A
 port 1 n
 rlabel viali 1228 274 1228 274 1 CON
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__addh_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__addh_1.mag
index 694be29..0ac2abc 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__addh_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__addh_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604458220
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 2025 2131
 << nwell >>
 rect -9 485 837 897
 << nmos >>
@@ -210,14 +212,14 @@
 rect 624 331 658 365
 rect 348 278 382 312
 << locali >>
-rect 0 871 836 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 836 871
+rect 0 867 836 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 836 867
 rect 35 757 69 773
 rect 35 527 69 553
 rect 133 757 167 827
@@ -272,27 +274,27 @@
 rect 753 171 787 187
 rect 701 131 753 144
 rect 581 110 787 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 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 35 561 69 587
 rect 35 553 69 561
 rect 260 405 294 439
@@ -304,28 +306,28 @@
 rect 624 331 658 365
 rect 507 257 541 291
 rect 667 257 701 291
-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 871 836 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 836 871
-rect 0 827 836 837
+rect 0 867 836 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 836 867
+rect 0 827 836 833
 rect 23 587 81 593
 rect 23 553 35 587
 rect 69 553 81 587
@@ -366,15 +368,15 @@
 rect 23 182 35 216
 rect 69 182 81 216
 rect 23 176 81 182
-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 381 50 381 1 S
 port 1 n
@@ -386,6 +388,6 @@
 port 4 n
 rlabel viali 684 274 684 274 1 CON
 port 5 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__addh_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__addh_l.mag
index 82e5c89..c390a71 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__addh_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__addh_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605310136
+timestamp 1606864417
+<< checkpaint >>
+rect -1209 -1243 2025 2131
 << nwell >>
 rect -9 485 837 897
 << nmos >>
@@ -214,14 +216,14 @@
 rect 624 331 658 365
 rect 348 278 382 312
 << locali >>
-rect 0 871 836 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 836 871
+rect 0 867 836 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 836 867
 rect 35 757 69 773
 rect 35 587 69 621
 rect 133 757 167 827
@@ -276,27 +278,27 @@
 rect 753 171 787 187
 rect 701 131 753 144
 rect 581 110 787 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 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 35 553 69 587
 rect 260 405 294 439
 rect 164 331 198 365
@@ -307,28 +309,28 @@
 rect 624 331 658 365
 rect 507 257 541 291
 rect 667 257 701 291
-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 871 836 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 836 871
-rect 0 827 836 837
+rect 0 867 836 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 836 867
+rect 0 827 836 833
 rect 23 587 81 593
 rect 23 553 35 587
 rect 69 553 81 587
@@ -369,15 +371,15 @@
 rect 23 182 35 216
 rect 69 182 81 216
 rect 23 176 81 182
-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 381 50 381 1 S
 port 1 n
@@ -389,6 +391,6 @@
 port 4 n
 rlabel viali 684 274 684 274 1 CON
 port 5 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_1.mag
index 7965e36..0089c69 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092445
+timestamp 1606864417
 << checkpaint >>
 rect -1269 2461 1634 2601
 rect -1760 -1129 6260 2461
@@ -105,10 +105,10 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -131,29 +131,29 @@
 rect 193 61 227 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -171,11 +171,11 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -183,6 +183,6 @@
 port 2 n
 rlabel viali 191 496 191 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_2.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_2.mag
index 2d5e1cb..927414f 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_2.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092937
+timestamp 1606864418
 << checkpaint >>
 rect -1269 2461 1722 2601
 rect -1760 -1129 6260 2461
@@ -128,11 +128,11 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -159,35 +159,35 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -205,12 +205,12 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 496 191 496 1 B
 port 1 n
@@ -218,6 +218,6 @@
 port 2 n
 rlabel metal1 311 348 311 348 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_4.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_4.mag
index 212f2ec..3859349 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_4.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092955
+timestamp 1606864418
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -166,12 +166,12 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -206,43 +206,43 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
 rect 465 405 499 439
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -267,13 +267,13 @@
 rect 499 183 511 217
 rect 281 177 339 183
 rect 453 177 511 183
-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 348 311 348 1 Y
 port 1 n
@@ -281,6 +281,6 @@
 port 2 n
 rlabel viali 191 496 191 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_8.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_8.mag
index a7e7aaa..8acc988 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_8.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092975
+timestamp 1606864418
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -249,15 +249,15 @@
 rect 173 372 207 406
 rect 269 274 303 308
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -308,30 +308,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 37 553 71 587
 rect 173 479 207 513
 rect 293 405 327 439
@@ -342,31 +342,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 105 587
@@ -406,16 +406,16 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 496 191 496 1 B
 port 1 n
@@ -423,6 +423,6 @@
 port 2 n
 rlabel metal1 311 348 311 348 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_l.mag
index 71d3e2c..23b839e 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__and2_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__and2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309070
+timestamp 1606864418
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 374 897
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 445 207 479
 rect 269 334 303 368
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 121 757 155 773
 rect 35 605 69 621
@@ -126,29 +128,29 @@
 rect 193 61 227 131
 rect 293 165 327 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 479 71 513
 rect 173 479 207 513
 rect 293 479 327 513
 rect 293 257 327 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 513 83 519
 rect 161 513 219 519
 rect 281 513 339 519
@@ -166,16 +168,16 @@
 rect 281 257 293 291
 rect 327 257 339 291
 rect 281 251 339 257
-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 68 44 68 44 1 gnd
 rlabel viali 54 497 54 497 1 A
 rlabel metal1 311 422 311 422 1 Y
 port 1 n
 rlabel viali 190 496 190 496 1 B
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__ant.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__ant.mag
index 66e6ad0..538b57c 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__ant.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__ant.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093319
+timestamp 1606864419
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 47 405 81 439
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 773
 rect 35 439 69 561
 rect 121 757 155 827
@@ -73,31 +73,31 @@
 rect 35 115 69 131
 rect 121 171 155 287
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 405 81 439
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 439 108 445
 rect 35 405 47 439
 rect 81 405 108 439
 rect 35 399 108 405
-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 422 64 422 1 A
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__antfill.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__antfill.mag
index 33cc053..bfa70aa 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__antfill.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__antfill.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093352
+timestamp 1606864419
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -19,9 +19,9 @@
 << nsubdiffcont >>
 rect 51 827 85 861
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 439 69 773
 rect 121 545 155 827
 rect 31 405 47 439
@@ -30,31 +30,31 @@
 rect 35 287 155 321
 rect 35 115 69 287
 rect 121 115 155 287
-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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 405 81 439
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 439 108 445
 rect 35 405 47 439
 rect 81 405 108 439
 rect 35 399 108 405
-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 422 64 422 1 A
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__aoi21_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__aoi21_l.mag
index e30021f..5a08cf3 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__aoi21_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__aoi21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605299867
+timestamp 1606864419
+<< checkpaint >>
+rect -1209 -1244 1481 2131
 << nwell >>
 rect -10 485 374 897
 << nmos >>
@@ -104,10 +106,10 @@
 rect 146 338 180 372
 rect 289 259 323 293
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 646 69 696
 rect 121 757 155 827
@@ -133,30 +135,30 @@
 rect 193 114 227 130
 rect 291 164 325 180
 rect 291 60 325 130
-rect 0 16 51 60
-rect 85 16 187 60
-rect 221 16 374 60
-rect 0 0 374 16
+rect 0 20 51 60
+rect 85 20 187 60
+rect 221 20 374 60
+rect 0 0 374 20
 << viali >>
-rect 51 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 60 405 94 439
 rect 128 479 162 513
 rect 216 405 250 439
 rect 293 331 327 365
 rect 193 183 227 217
-rect 51 26 85 50
-rect 51 16 85 26
-rect 187 26 221 50
-rect 187 16 221 26
+rect 51 26 85 54
+rect 51 20 85 26
+rect 187 26 221 54
+rect 187 20 221 26
 << metal1 >>
-rect 0 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 116 513 174 519
 rect 116 479 128 513
 rect 162 479 196 513
@@ -180,18 +182,18 @@
 rect 227 183 327 217
 rect 181 177 233 183
 rect 291 60 325 61
-rect 0 50 374 60
-rect 0 16 51 50
-rect 85 16 187 50
-rect 221 16 374 50
-rect 0 0 374 16
+rect 0 54 374 60
+rect 0 20 51 54
+rect 85 20 187 54
+rect 221 20 374 54
+rect 0 0 374 20
 << labels >>
-rlabel viali 68 43 68 43 1 gnd
 rlabel viali 145 496 145 496 1 A1
 port 4 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel metal1 310 318 310 318 1 Y
 port 3 n
 rlabel viali 77 422 77 422 1 A0
 rlabel viali 233 422 233 422 1 B0
+rlabel viali 68 47 68 47 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__aoi22_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__aoi22_l.mag
index fb8784a..16d6aab 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__aoi22_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__aoi22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604531859
+timestamp 1606864419
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 485 462 897
 << nmos >>
@@ -126,11 +128,11 @@
 rect 234 267 268 301
 rect 370 331 404 365
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 121 765 155 827
 rect 35 732 69 748
 rect 121 680 155 697
@@ -161,37 +163,37 @@
 rect 200 115 234 131
 rect 365 171 399 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 60 405 94 439
 rect 128 479 162 513
 rect 216 405 250 439
 rect 370 331 404 365
 rect 302 257 336 291
 rect 200 183 234 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 116 513 174 519
 rect 116 479 128 513
 rect 162 479 196 513
@@ -217,12 +219,12 @@
 rect 188 183 200 217
 rect 234 183 338 217
 rect 188 177 246 183
-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 233 422 233 422 1 B0
 port 2 n
@@ -230,8 +232,8 @@
 port 4 n
 rlabel metal1 321 244 321 244 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 77 422 77 422 1 A0
 rlabel viali 387 348 387 348 1 B1
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_1.mag
index c92abdf..88756e9 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093941
+timestamp 1606864419
 << checkpaint >>
 rect -1269 2461 1548 2601
 rect -1760 -1129 6260 2461
@@ -87,10 +87,10 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -108,28 +108,28 @@
 rect 121 61 155 131
 rect 207 171 241 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 207 183 241 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -143,16 +143,16 @@
 rect 195 183 207 217
 rect 241 183 253 217
 rect 195 177 253 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 213 359 213 359 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_2.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_2.mag
index b14d979..b62ddbd 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_2.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093979
+timestamp 1606864420
 << checkpaint >>
 rect -1269 2461 1636 2601
 rect -1760 -1129 6260 2461
@@ -104,10 +104,10 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -129,28 +129,28 @@
 rect 207 115 241 131
 rect 293 171 327 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 207 183 241 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -164,16 +164,16 @@
 rect 195 183 207 217
 rect 241 183 253 217
 rect 195 177 253 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_4.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_4.mag
index 99b89a2..856ef00 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_4.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093982
+timestamp 1606864420
 << checkpaint >>
 rect -1269 2461 1812 2601
 rect -1760 -1129 6260 2461
@@ -142,11 +142,11 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 550 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 550 871
+rect 0 867 550 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 550 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -178,36 +178,36 @@
 rect 379 115 413 131
 rect 465 171 499 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 379 479 413 513
 rect 207 183 241 217
 rect 379 183 413 217
-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 871 550 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 550 871
-rect 0 827 550 837
+rect 0 867 550 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 550 867
+rect 0 827 550 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -228,17 +228,17 @@
 rect 413 183 425 217
 rect 195 177 253 183
 rect 367 177 425 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_8.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_8.mag
index 275cff4..5df5ae1 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_8.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604093986
+timestamp 1606864420
 << checkpaint >>
 rect -1269 2461 2164 2601
 rect -1760 -1129 6260 2461
@@ -225,14 +225,14 @@
 rect 110 383 144 417
 rect 176 274 210 308
 << locali >>
-rect 0 871 902 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 902 871
+rect 0 867 902 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 902 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -278,27 +278,27 @@
 rect 723 115 757 131
 rect 809 171 843 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
 rect 110 553 144 587
 rect 207 479 241 513
 rect 379 479 413 513
@@ -308,28 +308,28 @@
 rect 379 183 413 217
 rect 551 183 585 217
 rect 723 183 757 217
-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 871 902 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 902 871
-rect 0 827 902 837
+rect 0 867 902 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 902 867
+rect 0 827 902 833
 rect 98 587 156 593
 rect 64 553 110 587
 rect 144 553 156 587
@@ -364,20 +364,20 @@
 rect 367 177 425 183
 rect 539 177 597 183
 rect 711 177 769 183
-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 570 127 570 1 A
 port 1 n
 rlabel metal1 211 358 211 358 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_l.mag
index ad4d9e4..e0f601a 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__buf_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__buf_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309142
+timestamp 1606864420
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 288 897
 << nmos >>
@@ -83,10 +85,10 @@
 rect 110 457 144 491
 rect 176 348 210 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 35 382 69 621
 rect 121 757 155 827
@@ -103,29 +105,29 @@
 rect 121 61 155 131
 rect 207 165 241 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 207 553 241 587
 rect 110 491 144 513
 rect 110 479 144 491
 rect 207 257 241 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 195 587 253 593
 rect 195 553 207 587
 rect 241 553 253 587
@@ -139,15 +141,15 @@
 rect 195 257 207 291
 rect 241 257 253 291
 rect 195 251 253 257
-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 68 44 68 44 1 gnd
 rlabel metal1 214 430 214 430 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 127 496 127 496 1 A
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__decap_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__decap_1.mag
index b5f4ce5..f7ffe21 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__decap_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__decap_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604545867
+timestamp 1606864421
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 365 199 897
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 263 110 601
 rect 80 80 110 115
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 605 69 621
 rect 121 757 155 827
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 200 155 216
 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 861 85 871
-rect 51 837 85 861
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 861 85 867
+rect 51 833 85 861
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
+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 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__decap_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__decap_l.mag
index c03e8cc..0ccc841 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__decap_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__decap_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604545987
+timestamp 1606864421
+<< checkpaint >>
+rect -1209 -1243 1345 2131
 << nwell >>
 rect -9 365 199 897
 << nmos >>
@@ -47,9 +49,9 @@
 rect 80 217 110 673
 rect 80 80 110 115
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 827
@@ -58,24 +60,24 @@
 rect 35 61 69 131
 rect 121 191 155 207
 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 861 85 871
-rect 51 837 85 861
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 861 85 867
+rect 51 833 85 861
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
-rect 0 51 198 61
-rect 0 17 51 51
-rect 85 17 198 51
-rect 0 0 198 17
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
+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 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dff_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dff_1.mag
index bf5acab..69ab1fb 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dff_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dff_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605308955
+timestamp 1606864421
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1456 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1226 331 1260 365
 rect 1018 257 1052 291
 << locali >>
-rect 0 871 1452 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1452 871
+rect 0 867 1452 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1452 867
 rect 40 757 74 773
 rect 17 561 40 573
 rect 126 757 160 827
@@ -487,39 +489,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 197
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 40 257 74 291
 rect 253 405 287 439
 rect 181 331 215 365
@@ -536,40 +538,40 @@
 rect 1226 331 1260 365
 rect 671 251 705 285
 rect 1018 257 1052 291
-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 871 1452 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1452 871
-rect 0 827 1452 837
+rect 0 867 1452 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1452 867
+rect 0 827 1452 833
 rect 783 513 841 519
 rect 1365 513 1424 519
 rect 783 479 795 513
@@ -631,26 +633,26 @@
 rect 705 251 717 257
 rect 1006 251 1064 257
 rect 665 245 711 251
-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 348 198 348 1 D
 port 1 n
 rlabel viali 915 422 915 422 1 CK
 port 4 n
-rlabel viali 68 845 68 845 1 vdd
-rlabel viali 68 45 68 45 1 gnd
 rlabel viali 1223 422 1223 422 1 ON
 rlabel viali 1394 496 1394 496 1 Q
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 841 68 841 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dff_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dff_l.mag
index 7e81b3d..adced0a 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dff_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dff_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309008
+timestamp 1606864421
+<< checkpaint >>
+rect -1209 -1243 2569 2131
 << nwell >>
 rect -9 485 1456 897
 << nmos >>
@@ -367,18 +369,18 @@
 rect 1226 331 1260 365
 rect 1018 257 1052 291
 << locali >>
-rect 0 871 1452 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 1003 871
-rect 1037 827 1139 871
-rect 1173 827 1275 871
-rect 1309 827 1452 871
+rect 0 867 1452 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 1003 867
+rect 1037 827 1139 867
+rect 1173 827 1275 867
+rect 1309 827 1452 867
 rect 40 757 74 773
 rect 17 561 40 573
 rect 126 757 160 827
@@ -487,39 +489,39 @@
 rect 1292 61 1326 131
 rect 1378 165 1412 197
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
-rect 1003 861 1037 871
-rect 1003 837 1037 861
-rect 1139 861 1173 871
-rect 1139 837 1173 861
-rect 1275 861 1309 871
-rect 1275 837 1309 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
+rect 1003 861 1037 867
+rect 1003 833 1037 861
+rect 1139 861 1173 867
+rect 1139 833 1173 861
+rect 1275 861 1309 867
+rect 1275 833 1309 861
 rect 40 257 74 291
 rect 253 405 287 439
 rect 181 331 215 365
@@ -536,40 +538,40 @@
 rect 1226 331 1260 365
 rect 671 251 705 285
 rect 1018 257 1052 291
-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 871 1452 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 1003 871
-rect 1037 837 1139 871
-rect 1173 837 1275 871
-rect 1309 837 1452 871
-rect 0 827 1452 837
+rect 0 867 1452 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 1003 867
+rect 1037 833 1139 867
+rect 1173 833 1275 867
+rect 1309 833 1452 867
+rect 0 827 1452 833
 rect 783 513 841 519
 rect 1365 513 1424 519
 rect 783 479 795 513
@@ -631,26 +633,26 @@
 rect 705 251 717 257
 rect 1006 251 1064 257
 rect 665 245 711 251
-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 348 198 348 1 D
 port 1 n
 rlabel viali 915 422 915 422 1 CK
 port 4 n
-rlabel viali 68 845 68 845 1 vdd
-rlabel viali 68 45 68 45 1 gnd
 rlabel viali 1223 422 1223 422 1 ON
 rlabel viali 1394 496 1394 496 1 Q
+rlabel viali 68 49 68 49 1 gnd
+rlabel viali 68 841 68 841 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_1.mag
index 8249130..8d16a25 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570023
+timestamp 1606864421
+<< checkpaint >>
+rect -1210 -1243 3112 2131
 << nwell >>
 rect -10 485 1917 897
 << nmos >>
@@ -468,22 +470,22 @@
 rect 1784 366 1818 400
 rect 1561 225 1595 259
 << locali >>
-rect 0 871 1914 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1914 871
+rect 0 867 1914 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1914 867
 rect 35 758 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -619,51 +621,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
 rect 47 553 81 587
 rect 227 259 261 291
 rect 227 257 261 259
@@ -685,52 +687,52 @@
 rect 1409 257 1443 291
 rect 1561 259 1595 291
 rect 1561 257 1595 259
-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 871 1914 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1914 871
-rect 0 827 1914 837
+rect 0 867 1914 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1914 867
+rect 0 827 1914 833
 rect 35 587 93 593
 rect 1826 587 1884 593
 rect 35 553 47 587
@@ -803,28 +805,26 @@
 rect 1549 251 1607 257
 rect 1561 217 1595 251
 rect 227 183 1595 217
-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 570 65 570 1 RN
 port 1 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1855 570 1855 570 1 Q
 port 4 n
 rlabel viali 1685 496 1685 496 1 QN
@@ -833,4 +833,6 @@
 port 2 n
 rlabel viali 1290 422 1290 422 1 CK
 port 3 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_l.mag
index e64dfdd..438de36 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dffr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309207
+timestamp 1606864422
+<< checkpaint >>
+rect -1210 -1243 3112 2131
 << nwell >>
 rect -10 485 1917 897
 << nmos >>
@@ -468,22 +470,22 @@
 rect 1784 366 1818 400
 rect 1561 225 1595 259
 << locali >>
-rect 0 871 1914 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1914 871
+rect 0 867 1914 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1914 867
 rect 35 758 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -619,51 +621,51 @@
 rect 1753 61 1787 131
 rect 1839 165 1873 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
 rect 47 553 81 587
 rect 227 259 261 291
 rect 227 257 261 259
@@ -685,52 +687,52 @@
 rect 1409 257 1443 291
 rect 1561 259 1595 291
 rect 1561 257 1595 259
-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 871 1914 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1914 871
-rect 0 827 1914 837
+rect 0 867 1914 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1914 867
+rect 0 827 1914 833
 rect 35 587 93 593
 rect 1826 587 1884 593
 rect 35 553 47 587
@@ -803,28 +805,26 @@
 rect 1549 251 1607 257
 rect 1561 217 1595 251
 rect 227 183 1595 217
-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 570 65 570 1 RN
 port 1 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1855 570 1855 570 1 Q
 port 4 n
 rlabel viali 1685 496 1685 496 1 QN
@@ -833,4 +833,6 @@
 port 2 n
 rlabel viali 1290 422 1290 422 1 CK
 port 3 n
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_1.mag
index 35cd06a..05be9be 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570052
+timestamp 1606864422
+<< checkpaint >>
+rect -1210 -1243 2840 2131
 << nwell >>
 rect -10 789 1741 897
 rect -11 563 1741 789
@@ -424,20 +426,20 @@
 rect 1594 366 1628 400
 rect 1371 225 1405 259
 << locali >>
-rect 0 871 1738 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1738 871
+rect 0 867 1738 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1738 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -553,45 +555,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
 rect 121 364 155 398
 rect 47 311 81 324
 rect 47 290 81 311
@@ -612,46 +614,46 @@
 rect 1203 257 1237 291
 rect 1371 225 1405 250
 rect 1371 216 1405 225
-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 871 1738 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1738 871
-rect 0 827 1738 837
+rect 0 867 1738 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1738 867
+rect 0 827 1738 833
 rect 1636 587 1694 593
 rect 1614 553 1648 587
 rect 1682 553 1694 587
@@ -722,31 +724,31 @@
 rect 281 211 1417 212
 rect 47 210 1417 211
 rect 47 183 1405 210
-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 348 383 348 1 D
 port 1 n
 rlabel viali 1100 422 1100 422 1 CK
 port 2 n
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1665 570 1665 570 1 Q
 port 4 n
 rlabel viali 1495 496 1495 496 1 QN
 port 3 n
 rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 844 67 844 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_l.mag
index ad44b74..32a5ce7 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dffs_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605570076
+timestamp 1606864422
+<< checkpaint >>
+rect -1210 -1243 2840 2131
 << nwell >>
 rect -10 789 1741 897
 rect -11 563 1741 789
@@ -424,20 +426,20 @@
 rect 1594 366 1628 400
 rect 1371 225 1405 259
 << locali >>
-rect 0 871 1738 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1738 871
+rect 0 867 1738 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1738 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -553,45 +555,45 @@
 rect 1563 61 1597 131
 rect 1649 165 1683 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
 rect 121 364 155 398
 rect 47 311 81 324
 rect 47 290 81 311
@@ -612,46 +614,46 @@
 rect 1203 257 1237 291
 rect 1371 225 1405 250
 rect 1371 216 1405 225
-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 871 1738 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1738 871
-rect 0 827 1738 837
+rect 0 867 1738 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1738 867
+rect 0 827 1738 833
 rect 1636 587 1694 593
 rect 1614 553 1648 587
 rect 1682 553 1694 587
@@ -722,31 +724,31 @@
 rect 281 211 1417 212
 rect 47 210 1417 211
 rect 47 183 1405 210
-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 348 383 348 1 D
 port 1 n
 rlabel viali 1100 422 1100 422 1 CK
 port 2 n
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1665 570 1665 570 1 Q
 port 4 n
 rlabel viali 1495 496 1495 496 1 QN
 port 3 n
 rlabel viali 64 307 64 307 1 SN
-rlabel viali 67 844 67 844 1 vdd
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_1.mag
index 7a82b5c..a2bc229 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_1.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605303565
+timestamp 1606864422
+<< checkpaint >>
+rect -1210 -1243 3248 2131
 << nwell >>
 rect -10 485 2090 897
 << nmos >>
@@ -525,23 +527,23 @@
 rect 1956 366 1990 400
 rect 1755 225 1789 259
 << locali >>
-rect 0 871 2090 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1954 871
-rect 1988 827 2090 871
+rect 0 867 2090 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1954 867
+rect 1988 827 2090 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -697,54 +699,54 @@
 rect 1925 61 1959 131
 rect 2011 171 2045 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
-rect 1954 861 1988 871
-rect 1954 837 1988 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
+rect 1954 861 1988 867
+rect 1954 833 1988 861
 rect 47 553 81 587
 rect 394 553 428 587
 rect 157 257 191 291
@@ -768,55 +770,55 @@
 rect 1502 257 1536 291
 rect 1755 259 1789 291
 rect 1755 257 1789 259
-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 871 2090 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1954 871
-rect 1988 837 2090 871
-rect 0 827 2090 837
+rect 0 867 2090 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1954 867
+rect 1988 833 2090 867
+rect 0 827 2090 833
 rect 35 587 93 593
 rect 380 587 439 593
 rect 1558 587 1617 592
@@ -901,24 +903,24 @@
 rect 1126 245 1172 251
 rect 1755 217 1789 251
 rect 157 183 1789 217
-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 348 659 348 1 D
 port 1 n
@@ -930,7 +932,7 @@
 port 5 n
 rlabel viali 2028 570 2028 570 1 Q
 port 6 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 1588 569 1588 569 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_l.mag
index 17841c2..72fec3b 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__dffsr_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605574407
+timestamp 1606864422
+<< checkpaint >>
+rect -1210 -1243 3248 2131
 << nwell >>
 rect -10 485 2090 897
 << nmos >>
@@ -525,23 +527,23 @@
 rect 1956 366 1990 400
 rect 1755 225 1789 259
 << locali >>
-rect 0 871 2090 888
-rect 0 827 50 871
-rect 84 827 186 871
-rect 220 827 322 871
-rect 356 827 458 871
-rect 492 827 594 871
-rect 628 827 730 871
-rect 764 827 866 871
-rect 900 827 1002 871
-rect 1036 827 1138 871
-rect 1172 827 1274 871
-rect 1308 827 1410 871
-rect 1444 827 1546 871
-rect 1580 827 1682 871
-rect 1716 827 1818 871
-rect 1852 827 1954 871
-rect 1988 827 2090 871
+rect 0 867 2090 888
+rect 0 827 50 867
+rect 84 827 186 867
+rect 220 827 322 867
+rect 356 827 458 867
+rect 492 827 594 867
+rect 628 827 730 867
+rect 764 827 866 867
+rect 900 827 1002 867
+rect 1036 827 1138 867
+rect 1172 827 1274 867
+rect 1308 827 1410 867
+rect 1444 827 1546 867
+rect 1580 827 1682 867
+rect 1716 827 1818 867
+rect 1852 827 1954 867
+rect 1988 827 2090 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -700,54 +702,54 @@
 rect 1925 61 1959 131
 rect 2011 171 2045 190
 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 861 84 871
-rect 50 837 84 861
-rect 186 861 220 871
-rect 186 837 220 861
-rect 322 861 356 871
-rect 322 837 356 861
-rect 458 861 492 871
-rect 458 837 492 861
-rect 594 861 628 871
-rect 594 837 628 861
-rect 730 861 764 871
-rect 730 837 764 861
-rect 866 861 900 871
-rect 866 837 900 861
-rect 1002 861 1036 871
-rect 1002 837 1036 861
-rect 1138 861 1172 871
-rect 1138 837 1172 861
-rect 1274 861 1308 871
-rect 1274 837 1308 861
-rect 1410 861 1444 871
-rect 1410 837 1444 861
-rect 1546 861 1580 871
-rect 1546 837 1580 861
-rect 1682 861 1716 871
-rect 1682 837 1716 861
-rect 1818 861 1852 871
-rect 1818 837 1852 861
-rect 1954 861 1988 871
-rect 1954 837 1988 861
+rect 50 861 84 867
+rect 50 833 84 861
+rect 186 861 220 867
+rect 186 833 220 861
+rect 322 861 356 867
+rect 322 833 356 861
+rect 458 861 492 867
+rect 458 833 492 861
+rect 594 861 628 867
+rect 594 833 628 861
+rect 730 861 764 867
+rect 730 833 764 861
+rect 866 861 900 867
+rect 866 833 900 861
+rect 1002 861 1036 867
+rect 1002 833 1036 861
+rect 1138 861 1172 867
+rect 1138 833 1172 861
+rect 1274 861 1308 867
+rect 1274 833 1308 861
+rect 1410 861 1444 867
+rect 1410 833 1444 861
+rect 1546 861 1580 867
+rect 1546 833 1580 861
+rect 1682 861 1716 867
+rect 1682 833 1716 861
+rect 1818 861 1852 867
+rect 1818 833 1852 861
+rect 1954 861 1988 867
+rect 1954 833 1988 861
 rect 47 553 81 587
 rect 394 553 428 587
 rect 157 257 191 291
@@ -770,55 +772,55 @@
 rect 1755 259 1789 291
 rect 1755 257 1789 259
 rect 2034 405 2068 439
-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 871 2090 888
-rect 0 837 50 871
-rect 84 837 186 871
-rect 220 837 322 871
-rect 356 837 458 871
-rect 492 837 594 871
-rect 628 837 730 871
-rect 764 837 866 871
-rect 900 837 1002 871
-rect 1036 837 1138 871
-rect 1172 837 1274 871
-rect 1308 837 1410 871
-rect 1444 837 1546 871
-rect 1580 837 1682 871
-rect 1716 837 1818 871
-rect 1852 837 1954 871
-rect 1988 837 2090 871
-rect 0 827 2090 837
+rect 0 867 2090 888
+rect 0 833 50 867
+rect 84 833 186 867
+rect 220 833 322 867
+rect 356 833 458 867
+rect 492 833 594 867
+rect 628 833 730 867
+rect 764 833 866 867
+rect 900 833 1002 867
+rect 1036 833 1138 867
+rect 1172 833 1274 867
+rect 1308 833 1410 867
+rect 1444 833 1546 867
+rect 1580 833 1682 867
+rect 1716 833 1818 867
+rect 1852 833 1954 867
+rect 1988 833 2090 867
+rect 0 827 2090 833
 rect 35 587 93 593
 rect 380 587 439 593
 rect 1558 587 1617 592
@@ -905,24 +907,24 @@
 rect 1126 245 1172 251
 rect 1755 217 1789 251
 rect 157 183 1789 217
-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 348 659 348 1 D
 port 1 n
@@ -932,8 +934,8 @@
 port 3 n
 rlabel viali 65 570 65 570 1 RN
 port 5 n
-rlabel viali 67 844 67 844 1 vdd
-rlabel viali 67 44 67 44 1 gnd
 rlabel viali 2051 422 2051 422 1 Q
 rlabel viali 1588 570 1588 570 1 SN
+rlabel viali 67 48 67 48 1 gnd
+rlabel viali 67 840 67 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_1.mag
index b743b95..d272a78 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604091897
+timestamp 1606864424
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -72,22 +72,22 @@
 rect 35 61 69 131
 rect 121 171 155 183
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 183 155 217
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -101,15 +101,15 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 345 151 345 1 Y
 port 1 n
 rlabel viali 64 570 64 570 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_10.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_10.mag
index 44cc480..fd97de5 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_10.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_10.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092186
+timestamp 1606864424
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -243,15 +243,15 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -299,30 +299,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -334,31 +334,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -400,21 +400,21 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_2.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_2.mag
index 39188a0..c4dc373 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_2.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092159
+timestamp 1606864424
 << checkpaint >>
 rect -1269 2461 1547 2601
 rect -1760 -1129 6260 2461
@@ -84,10 +84,10 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -103,28 +103,28 @@
 rect 121 115 155 131
 rect 207 171 241 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 183 155 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -138,16 +138,16 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_3.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_3.mag
index 7771535..48ca1ff 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_3.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_3.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092164
+timestamp 1606864424
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -100,10 +100,10 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -123,30 +123,30 @@
 rect 207 61 241 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
 rect 121 183 155 217
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -167,16 +167,16 @@
 rect 327 183 339 217
 rect 109 177 167 183
 rect 281 177 339 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_4.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_4.mag
index 42c2ec2..bc1c04a 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_4.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092169
+timestamp 1606864425
 << checkpaint >>
 rect -1269 2461 1723 2601
 rect -1760 -1129 6260 2461
@@ -122,11 +122,11 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -150,36 +150,36 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
 rect 121 183 155 217
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -200,17 +200,17 @@
 rect 327 183 339 217
 rect 109 177 167 183
 rect 281 177 339 183
-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 569 64 569 1 A
 port 1 n
 rlabel metal1 152 344 152 344 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_6.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_6.mag
index 9150902..a752d7d 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_6.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_6.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092174
+timestamp 1606864425
 << checkpaint >>
 rect -1269 2461 1899 2601
 rect -1760 -1129 6260 2461
@@ -161,12 +161,12 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -198,21 +198,21 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -220,22 +220,22 @@
 rect 121 183 155 217
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -263,18 +263,18 @@
 rect 109 177 167 183
 rect 281 177 339 183
 rect 453 177 511 183
-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 569 64 569 1 A
 port 1 n
 rlabel metal1 152 344 152 344 1 Y
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_8.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_8.mag
index 7d287f2..837ee40 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_8.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604092183
+timestamp 1606864425
 << checkpaint >>
 rect -1269 2461 2074 2601
 rect -1760 -1129 6260 2461
@@ -199,13 +199,13 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 871 814 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 814 871
+rect 0 867 814 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 814 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -245,24 +245,24 @@
 rect 637 115 671 131
 rect 723 171 757 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 293 479 327 513
@@ -272,25 +272,25 @@
 rect 293 183 327 217
 rect 465 183 499 217
 rect 637 183 671 217
-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 871 814 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 814 871
-rect 0 827 814 837
+rect 0 867 814 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 814 867
+rect 0 827 814 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -325,19 +325,19 @@
 rect 281 177 339 183
 rect 453 177 511 183
 rect 625 177 683 183
-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 344 152 344 1 Y
 port 1 n
 rlabel viali 64 569 64 569 1 A
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_l.mag
index d327278..d712cb2 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__inv_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__inv_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309040
+timestamp 1606864425
+<< checkpaint >>
+rect -1209 -1243 1345 2129
 << nwell >>
 rect -9 485 199 895
 << nmos >>
@@ -54,9 +56,9 @@
 << polycont >>
 rect 90 348 124 382
 << locali >>
-rect 0 869 198 886
-rect 0 825 51 869
-rect 85 825 198 869
+rect 0 865 198 886
+rect 0 825 51 865
+rect 85 825 198 865
 rect 35 755 69 825
 rect 35 671 69 687
 rect 121 755 155 771
@@ -68,22 +70,22 @@
 rect 35 61 69 131
 rect 121 165 155 257
 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 859 85 869
-rect 51 835 85 859
+rect 51 859 85 865
+rect 51 831 85 859
 rect 47 553 81 587
 rect 121 479 155 513
 rect 121 257 155 291
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 869 198 886
-rect 0 835 51 869
-rect 85 835 198 869
-rect 0 825 198 835
+rect 0 865 198 886
+rect 0 831 51 865
+rect 85 831 198 865
+rect 0 825 198 831
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 127 587
@@ -97,15 +99,15 @@
 rect 109 257 121 291
 rect 155 257 167 291
 rect 109 251 167 257
-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 68 44 68 44 1 gnd
 rlabel viali 64 570 64 570 1 A
 port 1 n
 rlabel metal1 151 345 151 345 1 Y
 port 2 n
-rlabel viali 68 842 68 842 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 838 68 838 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__mux2_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__mux2_1.mag
index 83ed5a0..bc28ae9 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__mux2_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__mux2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604095946
+timestamp 1606864425
 << checkpaint >>
 rect -1269 2461 1813 2601
 rect -1760 -1129 6260 2461
@@ -124,9 +124,9 @@
 rect 37 348 71 382
 rect 168 257 202 291
 << locali >>
-rect 0 871 550 888
-rect 0 827 459 871
-rect 493 827 550 871
+rect 0 867 550 888
+rect 0 827 459 867
+rect 493 827 550 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -158,33 +158,33 @@
 rect 311 115 345 131
 rect 397 171 431 405
 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 861 493 871
-rect 459 837 493 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 553 71 587
 rect 236 479 270 513
 rect 311 331 345 365
 rect 397 405 431 439
 rect 311 183 345 217
-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 871 550 888
-rect 0 837 459 871
-rect 493 837 550 871
-rect 0 827 550 837
+rect 0 867 550 888
+rect 0 833 459 867
+rect 493 833 550 867
+rect 0 827 550 833
 rect 25 587 83 593
 rect 25 553 37 587
 rect 71 553 117 587
@@ -206,13 +206,13 @@
 rect 299 183 311 217
 rect 345 183 357 217
 rect 299 177 357 183
-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 570 54 570 1 S0
 port 1 n
@@ -222,6 +222,6 @@
 port 3 n
 rlabel viali 414 422 414 422 1 A1
 port 4 n
-rlabel viali 476 844 476 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 476 840 476 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_1.mag
index 90f49e5..b440ec1 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604095979
+timestamp 1606864426
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 47 424 81 458
 rect 166 331 200 365
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 681 69 697
 rect 121 757 155 773
@@ -100,29 +100,29 @@
 rect 35 115 69 131
 rect 193 171 227 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 405 155 439
 rect 195 479 229 513
 rect 35 183 69 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 35 553 47 587
 rect 81 553 115 587
@@ -140,11 +140,11 @@
 rect 23 183 35 217
 rect 69 183 155 217
 rect 23 177 81 183
-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 374 136 374 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 212 496 212 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_l.mag
index 29a7e67..beb71db 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__nand2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309339
+timestamp 1606864426
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 286 897
 << nmos >>
@@ -77,10 +79,10 @@
 rect 47 498 81 532
 rect 166 348 200 382
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 827
 rect 35 673 69 689
 rect 121 757 155 773
@@ -96,29 +98,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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 47 553 81 587
 rect 121 479 155 513
 rect 195 553 229 587
 rect 35 257 69 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 35 587 93 593
 rect 183 587 241 593
 rect 35 553 47 587
@@ -136,17 +138,17 @@
 rect 23 257 35 291
 rect 69 257 155 291
 rect 23 251 81 257
-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 68 44 68 44 1 gnd
 rlabel metal1 136 448 136 448 1 Y
 port 1 n
 rlabel viali 212 570 212 570 1 B
 port 2 n
 rlabel viali 64 570 64 570 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_1.mag
index 3bfd131..7b65109 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096049
+timestamp 1606864426
 << checkpaint >>
 rect -1269 2461 1546 2601
 rect -1760 -1129 6260 2461
@@ -81,10 +81,10 @@
 rect 181 438 215 472
 rect 66 305 100 339
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 193 757 227 827
 rect 193 681 227 697
@@ -100,29 +100,29 @@
 rect 121 115 155 131
 rect 207 171 241 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 181 553 215 587
 rect 35 405 69 439
 rect 113 479 147 513
 rect 121 183 155 217
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 169 587 227 593
 rect 148 553 181 587
 rect 215 553 227 587
@@ -140,11 +140,11 @@
 rect 109 183 121 217
 rect 155 183 167 217
 rect 109 177 167 183
-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 297 137 297 1 Y
 port 1 n
@@ -152,6 +152,6 @@
 port 2 n
 rlabel viali 198 570 198 570 1 A
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_l.mag
index c1e6411..7facaca 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__nor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309389
+timestamp 1606864426
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 286 897
 << nmos >>
@@ -77,10 +79,10 @@
 rect 181 512 215 546
 rect 66 379 100 413
 << locali >>
-rect 0 871 286 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 286 871
+rect 0 867 286 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 286 867
 rect 35 757 69 773
 rect 35 513 69 621
 rect 193 757 227 827
@@ -95,30 +97,30 @@
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 35 479 69 513
 rect 113 553 147 587
 rect 181 512 215 513
 rect 181 479 215 512
 rect 121 257 155 291
-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 871 286 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 286 871
-rect 0 827 286 837
+rect 0 867 286 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 286 867
+rect 0 827 286 833
 rect 101 587 159 593
 rect 79 553 113 587
 rect 147 553 159 587
@@ -137,16 +139,16 @@
 rect 155 257 167 291
 rect 34 256 167 257
 rect 109 251 167 256
-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 68 44 68 44 1 gnd
 rlabel viali 130 570 130 570 1 B
 port 3 n
 rlabel metal1 48 337 48 337 1 Y
 rlabel viali 198 496 198 496 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__oai21_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__oai21_l.mag
index 3c3899a..4bb0049 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__oai21_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__oai21_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605314751
+timestamp 1606864426
+<< checkpaint >>
+rect -1209 -1244 1481 2131
 << nwell >>
 rect -9 485 374 897
 << nmos >>
@@ -101,10 +103,10 @@
 rect 152 331 186 365
 rect 262 283 296 317
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 655 69 696
 rect 193 757 227 827
@@ -128,31 +130,31 @@
 rect 207 170 241 214
 rect 207 114 241 130
 rect 293 114 327 130
-rect 0 16 51 60
-rect 85 16 187 60
-rect 221 16 374 60
-rect 0 0 374 16
+rect 0 20 51 60
+rect 85 20 187 60
+rect 221 20 374 60
+rect 0 0 374 20
 << viali >>
-rect 51 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 66 553 100 587
 rect 162 479 196 513
 rect 291 479 325 513
 rect 223 405 257 439
 rect 293 189 327 217
 rect 293 183 327 189
-rect 51 26 85 50
-rect 51 16 85 26
-rect 187 26 221 50
-rect 187 16 221 26
+rect 51 26 85 54
+rect 51 20 85 26
+rect 187 26 221 54
+rect 187 20 221 26
 << metal1 >>
-rect 0 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 54 587 112 593
 rect 54 553 66 587
 rect 100 553 134 587
@@ -174,19 +176,19 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-rect 0 50 374 60
-rect 0 16 51 50
-rect 85 16 187 50
-rect 221 16 374 50
-rect 0 0 374 16
+rect 0 54 374 60
+rect 0 20 51 54
+rect 85 20 187 54
+rect 221 20 374 54
+rect 0 0 374 20
 << labels >>
-rlabel viali 68 43 68 43 1 gnd
 rlabel viali 83 570 83 570 1 A0
 port 1 n
 rlabel viali 179 496 179 496 1 A1
 port 2 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 240 422 240 422 1 B0
 port 4 n
 rlabel viali 308 496 308 496 1 Y
+rlabel viali 68 47 68 47 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__oai22_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__oai22_l.mag
index 46b0e3d..7670037 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__oai22_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__oai22_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604556468
+timestamp 1606864427
+<< checkpaint >>
+rect -1209 -1243 1617 2131
 << nwell >>
 rect -9 483 462 897
 << nmos >>
@@ -126,11 +128,11 @@
 rect 146 331 180 365
 rect 248 353 282 387
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 827
 rect 35 635 69 651
 rect 200 757 234 773
@@ -162,37 +164,37 @@
 rect 379 165 413 181
 rect 241 131 379 143
 rect 207 109 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 52 438 86 439
 rect 52 405 86 438
 rect 223 479 257 513
 rect 146 331 180 365
 rect 384 406 418 440
 rect 316 331 350 365
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 211 513 269 519
 rect 189 479 223 513
 rect 257 479 269 513
@@ -213,14 +215,13 @@
 rect 350 331 362 365
 rect 134 325 192 331
 rect 304 325 362 331
-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 68 44 68 44 1 gnd
 rlabel viali 240 496 240 496 1 B0
 port 4 n
 rlabel viali 333 348 333 348 1 Y
@@ -228,5 +229,6 @@
 rlabel viali 401 423 401 423 1 B1
 rlabel viali 163 348 163 348 1 A1
 rlabel viali 69 422 69 422 1 A0
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_1.mag
index 19513e4..e4671c4 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096476
+timestamp 1606864427
 << checkpaint >>
 rect -1269 2461 1634 2601
 rect -1760 -1129 6260 2461
@@ -105,10 +105,10 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -131,29 +131,29 @@
 rect 207 61 241 131
 rect 293 171 327 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -171,11 +171,11 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -183,6 +183,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_2.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_2.mag
index d0bbd79..a58f50c 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_2.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_2.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096479
+timestamp 1606864427
 << checkpaint >>
 rect -1269 2461 1722 2601
 rect -1760 -1129 6260 2461
@@ -128,11 +128,11 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 462 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 462 871
+rect 0 867 462 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 462 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -159,35 +159,35 @@
 rect 293 115 327 131
 rect 379 171 413 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 293 183 327 217
-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 871 462 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 462 871
-rect 0 827 462 837
+rect 0 867 462 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 462 867
+rect 0 827 462 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -205,12 +205,12 @@
 rect 281 183 293 217
 rect 327 183 339 217
 rect 281 177 339 183
-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 348 311 348 1 Y
 port 1 n
@@ -218,6 +218,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_4.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_4.mag
index e2e07fc..ad9ddab 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_4.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_4.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096482
+timestamp 1606864427
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -166,12 +166,12 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -206,43 +206,43 @@
 rect 465 115 499 131
 rect 551 171 585 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
 rect 465 405 499 439
 rect 293 183 327 217
 rect 465 183 499 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -267,13 +267,13 @@
 rect 499 183 511 217
 rect 281 177 339 183
 rect 453 177 511 183
-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 348 311 348 1 Y
 port 1 n
@@ -281,6 +281,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_8.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_8.mag
index 7b77848..b07b066 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_8.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_8.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096485
+timestamp 1606864427
 << checkpaint >>
 rect -1269 2461 2250 2601
 rect -1760 -1129 6260 2461
@@ -249,15 +249,15 @@
 rect 173 364 207 398
 rect 269 274 303 308
 << locali >>
-rect 0 871 990 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 595 871
-rect 629 827 731 871
-rect 765 827 867 871
-rect 901 827 990 871
+rect 0 867 990 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 595 867
+rect 629 827 731 867
+rect 765 827 867 867
+rect 901 827 990 867
 rect 35 757 69 773
 rect 207 757 241 827
 rect 207 681 241 697
@@ -308,30 +308,30 @@
 rect 809 115 843 131
 rect 895 171 929 187
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
-rect 595 861 629 871
-rect 595 837 629 861
-rect 731 861 765 871
-rect 731 837 765 861
-rect 867 861 901 871
-rect 867 837 901 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
+rect 595 861 629 867
+rect 595 833 629 861
+rect 731 861 765 867
+rect 731 833 765 861
+rect 867 861 901 867
+rect 867 833 901 861
 rect 37 479 71 513
 rect 173 553 207 587
 rect 293 405 327 439
@@ -342,31 +342,31 @@
 rect 465 183 499 217
 rect 637 183 671 217
 rect 809 183 843 217
-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 871 990 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 595 871
-rect 629 837 731 871
-rect 765 837 867 871
-rect 901 837 990 871
-rect 0 827 990 837
+rect 0 867 990 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 595 867
+rect 629 833 731 867
+rect 765 833 867 867
+rect 901 833 990 867
+rect 0 827 990 833
 rect 161 587 219 593
 rect 140 553 173 587
 rect 207 553 219 587
@@ -406,16 +406,16 @@
 rect 453 177 511 183
 rect 625 177 683 183
 rect 797 177 855 183
-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 348 311 348 1 Y
 port 1 n
@@ -423,6 +423,6 @@
 port 2 n
 rlabel viali 54 496 54 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_l.mag
index 1bf97a7..95d3b6f 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__or2_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__or2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309479
+timestamp 1606864427
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 374 897
 << nmos >>
@@ -101,10 +103,10 @@
 rect 173 438 207 472
 rect 269 348 303 382
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 621 69 689
 rect 207 757 241 827
@@ -126,30 +128,30 @@
 rect 207 61 241 131
 rect 293 165 327 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 37 496 71 513
 rect 37 479 71 496
 rect 173 479 207 513
 rect 293 479 327 513
 rect 293 257 327 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 25 513 83 519
 rect 161 513 219 519
 rect 281 513 339 519
@@ -167,16 +169,16 @@
 rect 281 257 293 291
 rect 327 257 339 291
 rect 281 251 339 257
-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 68 44 68 44 1 gnd
 rlabel metal1 311 422 311 422 1 Y
 port 1 n
 rlabel viali 190 496 190 496 1 A
 rlabel viali 54 496 54 496 1 B
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_1.mag
index ab06eca..11767b1 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096578
+timestamp 1606864428
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -102,10 +102,10 @@
 rect 121 257 155 291
 rect 248 305 282 339
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 613 155 629
@@ -126,29 +126,29 @@
 rect 121 61 155 131
 rect 279 171 313 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 279 405 313 439
 rect 121 257 155 291
 rect 279 183 313 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -170,11 +170,11 @@
 rect 267 183 279 217
 rect 313 183 325 217
 rect 267 177 325 183
-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 268 305 268 1 Y
 port 1 n
@@ -182,6 +182,6 @@
 port 2 n
 rlabel metal1 138 496 138 496 1 OE
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_l.mag
index 4cbab95..f179030 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__tbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309523
+timestamp 1606864428
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 375 897
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 331 155 365
 rect 248 379 282 413
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 491 69 621
 rect 121 757 155 827
@@ -122,29 +124,29 @@
 rect 121 61 155 131
 rect 279 165 313 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 279 479 313 513
 rect 121 331 155 365
 rect 279 257 313 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -166,16 +168,16 @@
 rect 267 257 279 291
 rect 313 257 325 291
 rect 267 251 325 257
-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 68 44 68 44 1 gnd
 rlabel metal1 305 342 305 342 1 Y
 port 1 n
 rlabel metal1 138 496 138 496 1 OE
 rlabel viali 228 570 228 570 1 A
-rlabel viali 68 844 68 844 1 vdd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__tiehi.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__tiehi.mag
index fb0d7a4..2f32690 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__tiehi.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__tiehi.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096649
+timestamp 1606864428
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 287 124 321
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 545 69 561
 rect 121 757 155 773
@@ -71,31 +71,31 @@
 rect 35 61 69 131
 rect 121 171 155 287
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 121 479 155 513
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 94 513 167 519
 rect 94 479 121 513
 rect 155 479 167 513
 rect 94 473 167 479
-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 496 138 496 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__tielo.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__tielo.mag
index 10ca2c6..bb39b66 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__tielo.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__tielo.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096652
+timestamp 1606864428
 << checkpaint >>
 rect -1269 2461 1459 2601
 rect -1760 -1129 6260 2461
@@ -58,9 +58,9 @@
 << polycont >>
 rect 90 419 124 453
 << locali >>
-rect 0 871 198 888
-rect 0 827 51 871
-rect 85 827 198 871
+rect 0 867 198 888
+rect 0 827 51 867
+rect 85 827 198 867
 rect 35 757 69 827
 rect 35 545 69 561
 rect 121 757 155 773
@@ -71,31 +71,31 @@
 rect 35 61 69 131
 rect 121 171 155 257
 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 861 85 871
-rect 51 837 85 861
+rect 51 861 85 867
+rect 51 833 85 861
 rect 121 257 155 291
-rect 51 27 85 51
-rect 51 17 85 27
+rect 51 27 85 55
+rect 51 21 85 27
 << metal1 >>
-rect 0 871 198 888
-rect 0 837 51 871
-rect 85 837 198 871
-rect 0 827 198 837
+rect 0 867 198 888
+rect 0 833 51 867
+rect 85 833 198 867
+rect 0 827 198 833
 rect 94 291 167 297
 rect 94 257 121 291
 rect 155 257 167 291
 rect 94 251 167 257
-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 274 138 274 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_1.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_1.mag
index 6e6035b..2f16751 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_1.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_1.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604096683
+timestamp 1606864428
 << checkpaint >>
 rect -1269 2461 1635 2601
 rect -1760 -1129 6260 2461
@@ -101,10 +101,10 @@
 rect 121 322 155 356
 rect 248 305 282 339
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 613 155 629
@@ -125,29 +125,29 @@
 rect 121 61 155 131
 rect 279 171 313 183
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 211 553 245 587
 rect 121 479 155 513
 rect 279 405 313 439
 rect 279 183 313 217
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 199 587 257 593
 rect 177 553 211 587
 rect 245 553 257 587
@@ -165,11 +165,11 @@
 rect 267 183 279 217
 rect 313 183 325 217
 rect 267 177 325 183
-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 268 305 268 1 Y
 port 1 n
@@ -177,6 +177,6 @@
 port 2 n
 rlabel viali 138 496 138 496 1 OE
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_l.mag
index c129fde..c3dae5a 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__tnbufi_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605309543
+timestamp 1606864428
+<< checkpaint >>
+rect -1209 -1243 1481 2131
 << nwell >>
 rect -9 559 375 897
 << nmos >>
@@ -98,10 +100,10 @@
 rect 121 395 155 429
 rect 248 379 282 413
 << locali >>
-rect 0 871 374 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 374 871
+rect 0 867 374 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 374 867
 rect 35 757 69 773
 rect 35 430 69 621
 rect 121 757 155 827
@@ -123,29 +125,29 @@
 rect 121 61 155 131
 rect 279 165 313 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
 rect 279 553 313 587
 rect 121 479 155 513
 rect 211 405 245 439
 rect 279 257 313 291
-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 871 374 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 374 871
-rect 0 827 374 837
+rect 0 867 374 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 374 867
+rect 0 827 374 833
 rect 266 587 325 593
 rect 266 553 279 587
 rect 313 553 325 587
@@ -165,16 +167,16 @@
 rect 267 257 279 291
 rect 313 257 325 291
 rect 267 251 325 257
-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 68 44 68 44 1 gnd
 rlabel metal1 305 342 305 342 1 Y
 port 1 n
-rlabel viali 68 844 68 844 1 vdd
 rlabel viali 228 423 228 423 1 A
 rlabel viali 138 497 138 497 1 OE
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__xnor2_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__xnor2_l.mag
index 960f1fa..041d5ef 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__xnor2_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__xnor2_l.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1605315216
+timestamp 1606864429
+<< checkpaint >>
+rect -1209 -1243 1753 2131
 << nwell >>
 rect -9 485 638 897
 << nmos >>
@@ -169,12 +171,12 @@
 rect 336 257 370 291
 rect 489 257 523 291
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 35 399 69 561
 rect 121 757 155 827
@@ -211,21 +213,21 @@
 rect 471 61 505 131
 rect 557 171 591 440
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 268 561 279 587
 rect 279 561 302 587
 rect 268 553 302 561
@@ -233,22 +235,22 @@
 rect 152 257 186 291
 rect 268 257 302 291
 rect 489 257 523 291
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 256 587 314 593
 rect 256 553 268 587
 rect 302 553 314 587
@@ -273,19 +275,19 @@
 rect 523 257 557 291
 rect 477 251 535 257
 rect 152 183 438 217
-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 506 274 506 274 1 B
 port 2 n
 rlabel metal1 284 331 284 331 1 Y
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
 rlabel viali 169 274 169 274 1 A
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>
diff --git a/12T_ms/magic/sky130_osu_sc_12T_ms__xor2_l.mag b/12T_ms/magic/sky130_osu_sc_12T_ms__xor2_l.mag
index f507e72..9c956a1 100644
--- a/12T_ms/magic/sky130_osu_sc_12T_ms__xor2_l.mag
+++ b/12T_ms/magic/sky130_osu_sc_12T_ms__xor2_l.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1604097546
+timestamp 1606864429
 << checkpaint >>
 rect -1269 2461 1898 2601
 rect -1760 -1129 6260 2461
@@ -172,12 +172,12 @@
 rect 430 331 464 365
 rect 248 257 282 291
 << locali >>
-rect 0 871 638 888
-rect 0 827 51 871
-rect 85 827 187 871
-rect 221 827 323 871
-rect 357 827 459 871
-rect 493 827 638 871
+rect 0 867 638 888
+rect 0 827 51 867
+rect 85 827 187 867
+rect 221 827 323 867
+rect 357 827 459 867
+rect 493 827 638 867
 rect 35 757 69 773
 rect 121 757 155 827
 rect 121 681 155 697
@@ -217,42 +217,42 @@
 rect 471 61 505 131
 rect 557 171 591 257
 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 861 85 871
-rect 51 837 85 861
-rect 187 861 221 871
-rect 187 837 221 861
-rect 323 861 357 871
-rect 323 837 357 861
-rect 459 861 493 871
-rect 459 837 493 861
+rect 51 861 85 867
+rect 51 833 85 861
+rect 187 861 221 867
+rect 187 833 221 861
+rect 323 861 357 867
+rect 323 833 357 861
+rect 459 861 493 867
+rect 459 833 493 861
 rect 200 553 234 587
 rect 412 553 446 587
 rect 268 405 302 439
 rect 489 479 523 513
 rect 296 183 330 217
-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 871 638 888
-rect 0 837 51 871
-rect 85 837 187 871
-rect 221 837 323 871
-rect 357 837 459 871
-rect 493 837 638 871
-rect 0 827 638 837
+rect 0 867 638 888
+rect 0 833 51 867
+rect 85 833 187 867
+rect 221 833 323 867
+rect 357 833 459 867
+rect 493 833 638 867
+rect 0 827 638 833
 rect 188 587 246 593
 rect 400 587 458 593
 rect 188 553 200 587
@@ -273,13 +273,13 @@
 rect 268 183 296 217
 rect 330 183 342 217
 rect 284 177 342 183
-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 570 218 570 1 A
 port 1 n
@@ -287,6 +287,6 @@
 port 2 n
 rlabel viali 506 496 506 496 1 B
 port 3 n
-rlabel viali 68 844 68 844 1 vdd
-rlabel viali 68 44 68 44 1 gnd
+rlabel viali 68 48 68 48 1 gnd
+rlabel viali 68 840 68 840 1 vdd
 << end >>